http_send.c: Get rid of write_ok().

[paraslash.git] / http_send.c

diff --git a/http_send.c b/http_send.c
index 69e75ccb80eddd0badfdf49aadaadcf6e75e8417..a19836af52101fa00aa2b9fdc2d5a52d3c91ec31 100644 (file)
--- a/http_send.c
+++ b/http_send.c
@@ -38,8 +38,6 @@ enum http_status {
        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. */
@@ -67,6 +65,8 @@ struct http_client {
        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;
 };
@@ -116,19 +116,37 @@ static int http_send_err_msg(struct http_client *hc)
        return http_send_msg(hc, HTTP_ERR_MSG);
 }
 
+/*
+ * ret: Negative on errors, zero if nothing was written and write returned
+ * EAGAIN, number of bytes written else.
+ */
+static int http_write(int fd, const char *buf, size_t len)
+{
+       size_t written = 0;
+
+       while (written < len) {
+               int ret = write(fd, buf + written, len - written);
+               if (ret < 0 && errno == EAGAIN)
+                       return written;
+               if (ret < 0)
+                       return -ERRNO_TO_PARA_ERROR(errno);
+               written += ret;
+       }
+       return written;
+}
+
+
 static int send_queued_chunks(struct http_client *hc)
 {
        struct queued_chunk *qc;
        while ((qc = cq_peek(hc->cq))) {
                char *buf;
                size_t len;
-               int ret = write_ok(hc->fd);
-               if (ret <= 0)
-                       return ret? -E_WRITE_OK : 0;
+               int ret;
                cq_get(qc, &buf, &len);
-               ret = write(hc->fd, buf, len);
+               ret = http_write(hc->fd, buf, len);
                if (ret < 0)
-                       return -E_SEND_QUEUED_CHUNK;
+                       return ret;
                cq_update(hc->cq, ret);
                if (ret != len)
                        return 1;
@@ -146,27 +164,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) {
@@ -175,13 +191,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;
@@ -204,7 +214,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)) {
@@ -233,7 +242,7 @@ static void http_post_select(fd_set *rfds, fd_set *wfds)
                        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;
+                               hc->status = HTTP_STREAMING;
                        break;
                }
        }
@@ -290,7 +299,6 @@ static void http_pre_select(int *max_fileno, fd_set *rfds, fd_set *wfds)
                hc->check_w = 0;
                switch (hc->status) {
                case HTTP_STREAMING:
-               case HTTP_READY_TO_STREAM:
                        break;
                case HTTP_CONNECTED: /* need to recv get request */
                        para_fd_set(hc->fd, rfds, max_fileno);