fix two bugs concerning blocking fds

[paraslash.git] / http_send.c

diff --git a/http_send.c b/http_send.c
index 6aa82e448b558c4b4068daaed70c8930d1f1e9e3..1d970a5df561a3395effa19abf0960a70af9c3ef 100644 (file)
--- a/http_send.c
+++ b/http_send.c
@@ -38,8 +38,6 @@
 #define HTTP_ERR_MSG "HTTP/1.0 400 Bad Request\n"
 /** \endcond */
 
 #define HTTP_ERR_MSG "HTTP/1.0 400 Bad Request\n"
 /** \endcond */
 

-extern struct gengetopt_args_info conf;
-

 /** the possible states of a client from the server's POV */
 enum http_status {
        HTTP_CONNECTED,
 /** the possible states of a client from the server's POV */
 enum http_status {
        HTTP_CONNECTED,


@@ -116,7 +114,7 @@ static void http_shutdown_client(struct http_client *hc, const char *msg)
                hc->fd, msg);
        numclients--;
        close(hc->fd);
                hc->fd, msg);
        numclients--;
        close(hc->fd);

-
+       del_close_on_fork_list(hc->fd);

        list_for_each_entry_safe(qp, tmp, &hc->packet_queue, node) {
                free(qp->packet);
                list_del(&qp->node);
        list_for_each_entry_safe(qp, tmp, &hc->packet_queue, node) {
                free(qp->packet);
                list_del(&qp->node);


@@ -124,21 +122,13 @@ static void http_shutdown_client(struct http_client *hc, const char *msg)
        }
        list_del(&hc->node);
        free(hc);
        }
        list_del(&hc->node);
        free(hc);

-       return;

 }
 
 }
 

-static void http_shutdown_clients_real(void)
-{
-       struct http_client *hc, *tmp;
-       list_for_each_entry_safe(hc, tmp, &clients, node)
-               http_shutdown_client(hc, "afs request");
-}

 static void http_shutdown_clients(void)
 {
        struct http_client *hc, *tmp;
        list_for_each_entry_safe(hc, tmp, &clients, node)
 static void http_shutdown_clients(void)
 {
        struct http_client *hc, *tmp;
        list_for_each_entry_safe(hc, tmp, &clients, node)

-               if (hc->status == HTTP_STREAMING)
-                       http_shutdown_client(hc, "afs request");
+               http_shutdown_client(hc, "afs request");

 }
 
 static int http_send_msg(struct http_client *hc, const char *msg)
 }
 
 static int http_send_msg(struct http_client *hc, const char *msg)


@@ -218,11 +208,11 @@ static void http_send( long unsigned current_chunk,
                        continue;
                if (hc->status == HTTP_READY_TO_STREAM) {
                        int hlen;
                        continue;
                if (hc->status == HTTP_READY_TO_STREAM) {
                        int hlen;

-                       char *buf = afs_get_header(&hlen);
-                       if (buf && hlen > 0 && current_chunk) {
+                       char *hbuf = afs_get_header(&hlen);
+                       if (hbuf && hlen > 0 && current_chunk) {

                                /* need to send header */
                                PARA_INFO_LOG("queueing header: %d\n", hlen);
                                /* need to send header */
                                PARA_INFO_LOG("queueing header: %d\n", hlen);

-                               if (queue_packet(hc, buf, hlen) < 0)
+                               if (queue_packet(hc, hbuf, hlen) < 0)

                                        continue;
                        } else
                                PARA_INFO_LOG("%s", "no need to queue header\n");
                                        continue;
                        } else
                                PARA_INFO_LOG("%s", "no need to queue header\n");


@@ -334,6 +324,8 @@ static void http_post_select(fd_set *rfds, fd_set *wfds)
                CLIENT_ADDR(hc), hc->fd);
        numclients++;
        list_add(&hc->node, &clients);
                CLIENT_ADDR(hc), hc->fd);
        numclients++;
        list_add(&hc->node, &clients);

+       add_close_on_fork_list(hc->fd);
+       mark_fd_nonblock(hc->fd);

        return;
 err_out:
        PARA_WARNING_LOG("ignoring connect request from %s (%s)\n",
        return;
 err_out:
        PARA_WARNING_LOG("ignoring connect request from %s (%s)\n",


@@ -379,12 +371,19 @@ static void http_pre_select(int *max_fileno, fd_set *rfds, fd_set *wfds)
 
 static int open_tcp_port(int port)
 {
 
 static int open_tcp_port(int port)
 {

+       int ret;
+

        server_fd = init_tcp_socket(port);
        if (server_fd < 0) {
        server_fd = init_tcp_socket(port);
        if (server_fd < 0) {

-               http_shutdown_clients_real();
+               http_shutdown_clients();

                self->status = SENDER_OFF;
                return server_fd;
        }
                self->status = SENDER_OFF;
                return server_fd;
        }

+       ret = mark_fd_nonblock(server_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);
        return 1;
        self->status = SENDER_ON;
        add_close_on_fork_list(server_fd);
        return 1;


@@ -405,7 +404,7 @@ static int http_com_off(__a_unused struct sender_command_data *scd)
                del_close_on_fork_list(server_fd);
                server_fd = -1;
        }
                del_close_on_fork_list(server_fd);
                server_fd = -1;
        }

-       http_shutdown_clients_real();
+       http_shutdown_clients();

        return 1;
 }
 
        return 1;
 }