http_send.c: Rename server_fd to listen_fd.

[paraslash.git] / http_send.c

diff --git a/http_send.c b/http_send.c
index 6a4d24ddea6405805a3ea42f3f2029a28af2b549..2a14f4282e4b453a465dbbfeb6ee16fcf611a726 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;
 
 
@@ -197,7 +197,7 @@ static void http_post_select(fd_set *rfds, fd_set *wfds)
        struct http_client *hc, *tmp;
        const char *err_msg;
 
-       if (server_fd < 0)
+       if (listen_fd < 0)
                return;
        list_for_each_entry_safe(hc, tmp, &clients, node) {
                i++;
@@ -237,11 +237,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));
@@ -279,9 +279,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;
@@ -313,36 +313,36 @@ static int http_open(int port)
 {
        int ret;
 
-       server_fd = para_listen(AF_UNSPEC, IPPROTO_TCP, port);
-       if (server_fd < 0) {
+       listen_fd = para_listen(AF_UNSPEC, IPPROTO_TCP, port);
+       if (listen_fd < 0) {
                http_shutdown_clients();
-               return server_fd;
+               return listen_fd;
        }
-       ret = mark_fd_nonblocking(server_fd);
+       ret = mark_fd_nonblocking(listen_fd);
        if (ret < 0) {
                PARA_EMERG_LOG("%s\n", para_strerror(-ret));
                exit(EXIT_FAILURE);
        }
-       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 (server_fd >= 0)
+       if (listen_fd >= 0)
                return 1;
        return http_open(conf.http_port_arg);
 }
 
 static int http_com_off(__a_unused struct sender_command_data *scd)
 {
-       if (server_fd < 0)
+       if (listen_fd < 0)
                return 1;
        PARA_NOTICE_LOG("closing http port %d\n", conf.http_port_arg);
-       close(server_fd);
-       del_close_on_fork_list(server_fd);
+       close(listen_fd);
+       del_close_on_fork_list(listen_fd);
        http_shutdown_clients();
-       server_fd = -1;
+       listen_fd = -1;
        return 1;
 }
 
@@ -382,7 +382,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",
-               (server_fd >= 0)? "on" : "off",
+               (listen_fd >= 0)? "on" : "off",
                conf.http_port_arg,
                numclients,
                conf.http_max_clients_arg,