http_send.c: Never check the client fd for writability.

[paraslash.git] / http_send.c

diff --git a/http_send.c b/http_send.c
index ec7c51355fdfad5b695b6a9b2c9a941801cc4570..8f834f70a7ef7f32325c6474ef4f43e4e929ebea 100644 (file)
--- a/http_send.c
+++ b/http_send.c
@@ -36,10 +36,6 @@ enum http_status {
        HTTP_CONNECTED,
        /** Successfully received the get request. */
        HTTP_GOT_GET_REQUEST,
-       /** We sent the OK message back to the client. */
-       HTTP_SENT_OK_MSG,
-       /** Connection established, we might need to send the audio file header. */
-       HTTP_READY_TO_STREAM,
        /** Connection is ready for sending audio data. */
        HTTP_STREAMING,
        /** We didn't receive a valid get request. */
@@ -63,16 +59,15 @@ struct http_client {
        enum http_status status;
        /** Non-zero if we included \a fd in the read set.*/
        int check_r;
-       /** Non-zero if we included \a fd in the write set. */
-       int check_w;
        /** The position of this client in the client list. */
        struct list_head node;
+       /** non-zero if audio file header has been sent */
+       int header_sent;
        /** The list of pending chunks for this client. */
        struct chunk_queue *cq;
 };
 
 static int listen_fd = -1, numclients;
-static struct sender *self;
 
 
 static void http_shutdown_client(struct http_client *hc, const char *msg)
@@ -164,27 +159,25 @@ static int queue_chunk_or_shutdown(struct http_client *hc, long unsigned chunk_n
        return ret;
 }
 
-static void http_send( long unsigned current_chunk,
+static void http_send(long unsigned current_chunk,
        __a_unused long unsigned chunks_sent, const char *buf, size_t len)
 {
        struct http_client *hc, *tmp;
        int ret;
 
        list_for_each_entry_safe(hc, tmp, &clients, node) {
-               if (hc->status != HTTP_STREAMING &&
-                               hc->status != HTTP_READY_TO_STREAM)
+               if (hc->status != HTTP_STREAMING)
                        continue;
-               if (hc->status == HTTP_READY_TO_STREAM) {
+               if (!hc->header_sent && current_chunk) {
                        size_t hlen;
                        char *hbuf = vss_get_header(&hlen);
-                       if (hbuf && hlen > 0 && current_chunk) {
-                               /* need to send header */
+                       if (hbuf && hlen > 0) { /* need to send header */
                                PARA_INFO_LOG("queueing header: %zu\n", hlen);
                                if (queue_chunk_or_shutdown(hc, -1U, 0) < 0)
                                        continue;
                        } else
                                PARA_INFO_LOG("no need to queue header\n");
-                       hc->status = HTTP_STREAMING;
+                       hc->header_sent = 1;
                }
                ret = send_queued_chunks(hc);
                if (ret < 0) {
@@ -193,13 +186,7 @@ static void http_send( long unsigned current_chunk,
                }
                if (!len)
                        continue;
-               if (!ret || write_ok(hc->fd) <= 0) {
-                       queue_chunk_or_shutdown(hc, current_chunk, 0);
-                       continue;
-               }
-//             PARA_DEBUG_LOG("sending %d -> %s\n", len, remote_name(hc->fd));
-               ret = write(hc->fd, buf, len);
-//             PARA_DEBUG_LOG("ret: %d\n", ret);
+               ret = http_write(hc->fd, buf, len);
                if (ret < 0) {
                        http_shutdown_client(hc, "send error");
                        continue;
@@ -209,7 +196,7 @@ static void http_send( long unsigned current_chunk,
        }
 }
 
-static void http_post_select(fd_set *rfds, fd_set *wfds)
+static void http_post_select(fd_set *rfds, __a_unused fd_set *wfds)
 {
        int i = -1, match;
        struct http_client *hc, *tmp;
@@ -222,7 +209,6 @@ static void http_post_select(fd_set *rfds, fd_set *wfds)
 //             PARA_DEBUG_LOG("handling client %d: %s\n", i, remote_name(hc->fd));
                switch (hc->status) {
                case HTTP_STREAMING: /* nothing to do */
-               case HTTP_READY_TO_STREAM:
                        break;
                case HTTP_CONNECTED: /* need to recv get request */
                        if (hc->check_r && FD_ISSET(hc->fd, rfds)) {
@@ -237,21 +223,12 @@ static void http_post_select(fd_set *rfds, fd_set *wfds)
                        }
                        break;
                case HTTP_GOT_GET_REQUEST: /* need to send ok msg */
-                       if (hc->check_w && FD_ISSET(hc->fd, wfds)) {
-                               hc->status = HTTP_SENT_OK_MSG;
-                               http_send_ok_msg(hc);
-                       }
+                       hc->status = HTTP_STREAMING;
+                       http_send_ok_msg(hc);
                        break;
                case HTTP_INVALID_GET_REQUEST: /* need to send err msg */
-                       if (hc->check_w && FD_ISSET(hc->fd, wfds)) {
-                               if (http_send_err_msg(hc) >= 0)
-                                       http_shutdown_client(hc,
-                                               "invalid get request");
-                       }
-                       break;
-               case HTTP_SENT_OK_MSG: /* need to send header? */
-                       if (hc->check_w && FD_ISSET(hc->fd, wfds))
-                               hc->status = HTTP_READY_TO_STREAM;
+                       if (http_send_err_msg(hc) >= 0)
+                               http_shutdown_client(hc, "invalid get request");
                        break;
                }
        }
@@ -295,7 +272,7 @@ err_out:
        free(hc);
 }
 
-static void http_pre_select(int *max_fileno, fd_set *rfds, fd_set *wfds)
+static void http_pre_select(int *max_fileno, fd_set *rfds, __a_unused fd_set *wfds)
 {
        struct http_client *hc, *tmp;
 
@@ -305,26 +282,15 @@ static void http_pre_select(int *max_fileno, fd_set *rfds, fd_set *wfds)
        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;
-               hc->check_w = 0;
                switch (hc->status) {
                case HTTP_STREAMING:
-               case HTTP_READY_TO_STREAM:
+               case HTTP_GOT_GET_REQUEST: /* need to send ok msg */
+               case HTTP_INVALID_GET_REQUEST: /* need to send err msg */
                        break;
                case HTTP_CONNECTED: /* need to recv get request */
                        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 */
-                       para_fd_set(hc->fd, wfds, max_fileno);
-                       hc->check_w = 1;
-                       break;
-               case HTTP_SENT_OK_MSG:
-                       if (!vss_playing())
-                               break; /* wait until server starts playing */
-                       para_fd_set(hc->fd, wfds, max_fileno);
-                       hc->check_w = 1;
-                       break;
                }
        }
 }
@@ -446,7 +412,6 @@ void http_send_init(struct sender *s)
        s->client_cmds[SENDER_ALLOW] = http_com_allow;
        s->client_cmds[SENDER_ADD] = NULL;
        s->client_cmds[SENDER_DELETE] = NULL;
-       self = s;
        acl_init(&http_acl, conf.http_access_arg, conf.http_access_given);
        if (!conf.http_no_autostart_given)
                http_open(); /* ignore errors */