aacdec: raise min buffer size to 1000 bytes.
[paraslash.git] / http_send.c
index bb9534c..ea88bd4 100644 (file)
@@ -29,6 +29,7 @@
 #include "error.h"
 #include "net.h"
 #include "string.h"
+#include "fd.h"
 
 /** \cond convert sock_addr_in to ascii */
 #define CLIENT_ADDR(hc) inet_ntoa((hc)->addr.sin_addr)
@@ -346,7 +347,6 @@ err_out:
        free(hc);
 }
 
-/* FIXME: use para_fdset */
 static void http_pre_select(struct audio_format *af, int *max_fileno, fd_set *rfds,
                fd_set *wfds)
 {
@@ -354,8 +354,7 @@ static void http_pre_select(struct audio_format *af, int *max_fileno, fd_set *rf
 
        if (server_fd < 0)
                return;
-       FD_SET(server_fd, rfds);
-       *max_fileno = PARA_MAX(*max_fileno, server_fd);
+       para_fd_set(server_fd, rfds, max_fileno);
        list_for_each_entry_safe(hc, tmp, &clients, node) {
                //PARA_DEBUG_LOG("hc %p on fd %d: status %d\n", hc, hc->fd, hc->status);
                hc->check_r = 0;
@@ -365,21 +364,18 @@ static void http_pre_select(struct audio_format *af, int *max_fileno, fd_set *rf
                case HTTP_READY_TO_STREAM:
                        break;
                case HTTP_CONNECTED: /* need to recv get request */
-                       FD_SET(hc->fd, rfds);
-                       *max_fileno = PARA_MAX(*max_fileno, hc->fd);
+                       para_fd_set(hc->fd, rfds, max_fileno);
                        hc->check_r = 1;
                        break;
                case HTTP_GOT_GET_REQUEST: /* need to send ok msg */
                case HTTP_INVALID_GET_REQUEST: /* need to send err msg */
-                       FD_SET(hc->fd, wfds);
-                       *max_fileno = PARA_MAX(*max_fileno, hc->fd);
+                       para_fd_set(hc->fd, wfds, max_fileno);
                        hc->check_w = 1;
                        break;
                case HTTP_SENT_OK_MSG:
                        if (!af || !afs_playing())
                                break; /* wait until server starts playing */
-                       FD_SET(hc->fd, wfds);
-                       *max_fileno = PARA_MAX(*max_fileno, hc->fd);
+                       para_fd_set(hc->fd, wfds, max_fileno);
                        hc->check_w = 1;
                        break;
                }
@@ -565,6 +561,6 @@ void http_send_init(struct sender *s)
        self = s;
        init_access_control_list();
        if (!conf.http_no_autostart_given)
-               open_tcp_port(conf.http_port_arg);
+               open_tcp_port(conf.http_port_arg); /* ignore errors */
        PARA_DEBUG_LOG("%s", "http sender init complete\n");
 }