move rc4_send_key and rc4_recv_key to struct private_client_data

[paraslash.git] / http_send.c

diff --git a/http_send.c b/http_send.c
index 08d20ec498299beec40de93ccb58461c69c33342..5eebba5612bd845190bc573fe3d73895e7c60c50 100644 (file)
--- a/http_send.c
+++ b/http_send.c
@@ -116,7 +116,7 @@ static void http_shutdown_client(struct http_client *hc, const char *msg)
                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);
@@ -126,12 +126,6 @@ static void http_shutdown_client(struct http_client *hc, const char *msg)
        free(hc);
 }
 
-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;
@@ -332,6 +326,8 @@ static void http_post_select(fd_set *rfds, fd_set *wfds)
                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",
@@ -379,7 +375,7 @@ static int open_tcp_port(int port)
 {
        server_fd = init_tcp_socket(port);
        if (server_fd < 0) {
-               http_shutdown_clients_real();
+               http_shutdown_clients();
                self->status = SENDER_OFF;
                return server_fd;
        }
@@ -403,7 +399,7 @@ static int http_com_off(__a_unused struct sender_command_data *scd)
                del_close_on_fork_list(server_fd);
                server_fd = -1;
        }
-       http_shutdown_clients_real();
+       http_shutdown_clients();
        return 1;
 }