http_send.c: Introduce http_write.

[paraslash.git] / http_send.c

diff --git a/http_send.c b/http_send.c
index 7c1ea344e0f96e4ca515b6f797d8384ee1145e65..ec7c51355fdfad5b695b6a9b2c9a941801cc4570 100644 (file)
--- a/http_send.c
+++ b/http_send.c
@@ -71,7 +71,7 @@ struct http_client {
        struct chunk_queue *cq;
 };
 
-static int server_fd = -1, numclients;
+static int listen_fd = -1, numclients;
 static struct sender *self;
 
 
@@ -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;
@@ -197,6 +215,8 @@ static void http_post_select(fd_set *rfds, fd_set *wfds)
        struct http_client *hc, *tmp;
        const char *err_msg;
 
+       if (listen_fd < 0)
+               return;
        list_for_each_entry_safe(hc, tmp, &clients, node) {
                i++;
 //             PARA_DEBUG_LOG("handling client %d: %s\n", i, remote_name(hc->fd));
@@ -235,11 +255,11 @@ static void http_post_select(fd_set *rfds, fd_set *wfds)
                        break;
                }
        }
-       if (!FD_ISSET(server_fd, rfds))
+       if (!FD_ISSET(listen_fd, rfds))
                return;
        hc = para_calloc(sizeof(struct http_client));
        err_msg = "accept error";
-       hc->fd = para_accept(server_fd, NULL, 0);
+       hc->fd = para_accept(listen_fd, NULL, 0);
        if (hc->fd <= 0)
                goto err_out;
        hc->name = make_message("%s", remote_name(hc->fd));
@@ -256,6 +276,9 @@ static void http_post_select(fd_set *rfds, fd_set *wfds)
                err_msg = "permission denied";
                goto err_out;
        }
+       err_msg = "failed to mark fd non-blocking";
+       if (mark_fd_nonblocking(hc->fd) < 0)
+               goto err_out;
        hc->status = HTTP_CONNECTED;
        hc->cq = cq_new(MAX_BACKLOG);
        numclients++;
@@ -263,7 +286,6 @@ static void http_post_select(fd_set *rfds, fd_set *wfds)
                hc->name, hc->fd);
        para_list_add(&hc->node, &clients);
        add_close_on_fork_list(hc->fd);
-       mark_fd_nonblocking(hc->fd);
        return;
 err_out:
        PARA_WARNING_LOG("ignoring connect request from %s (%s)\n",
@@ -277,9 +299,9 @@ static void http_pre_select(int *max_fileno, fd_set *rfds, fd_set *wfds)
 {
        struct http_client *hc, *tmp;
 
-       if (server_fd < 0)
+       if (listen_fd < 0)
                return;
-       para_fd_set(server_fd, rfds, max_fileno);
+       para_fd_set(listen_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;
@@ -307,42 +329,38 @@ static void http_pre_select(int *max_fileno, fd_set *rfds, fd_set *wfds)
        }
 }
 
-static int http_open(int port)
+static int http_open(void)
 {
        int ret;
 
-       server_fd = para_listen(AF_UNSPEC, IPPROTO_TCP, port);
-       if (server_fd < 0) {
-               http_shutdown_clients();
-               self->status = SENDER_OFF;
-               return server_fd;
-       }
-       ret = mark_fd_nonblocking(server_fd);
+       listen_fd = para_listen(AF_UNSPEC, IPPROTO_TCP, conf.http_port_arg);
+       if (listen_fd < 0)
+               return listen_fd;
+       ret = mark_fd_nonblocking(listen_fd);
        if (ret < 0) {
                PARA_EMERG_LOG("%s\n", para_strerror(-ret));
                exit(EXIT_FAILURE);
        }
-       self->status = SENDER_ON;
-       add_close_on_fork_list(server_fd);
+       add_close_on_fork_list(listen_fd);
        return 1;
 }
 
 static int http_com_on(__a_unused struct sender_command_data *scd)
 {
-       if (self->status == SENDER_ON)
+       if (listen_fd >= 0)
                return 1;
-       return http_open(conf.http_port_arg);
+       return http_open();
 }
 
 static int http_com_off(__a_unused struct sender_command_data *scd)
 {
-       self->status = SENDER_OFF;
-       if (server_fd > 0) {
-               close(server_fd);
-               del_close_on_fork_list(server_fd);
-               server_fd = -1;
-       }
+       if (listen_fd < 0)
+               return 1;
+       PARA_NOTICE_LOG("closing http port %d\n", conf.http_port_arg);
+       close(listen_fd);
+       del_close_on_fork_list(listen_fd);
        http_shutdown_clients();
+       listen_fd = -1;
        return 1;
 }
 
@@ -382,7 +400,7 @@ static char *http_info(void)
                "http maximal number of clients: %d%s\n"
                "http connected clients: %s\n"
                "http access %s list: %s\n",
-               (self->status == SENDER_ON)? "on" : "off",
+               (listen_fd >= 0)? "on" : "off",
                conf.http_port_arg,
                numclients,
                conf.http_max_clients_arg,
@@ -431,6 +449,6 @@ void http_send_init(struct sender *s)
        self = s;
        acl_init(&http_acl, conf.http_access_arg, conf.http_access_given);
        if (!conf.http_no_autostart_given)
-               http_open(conf.http_port_arg); /* ignore errors */
+               http_open(); /* ignore errors */
        PARA_DEBUG_LOG("%s", "http sender init complete\n");
 }