introduce INIT_STDERR_LOCKING macro

[paraslash.git] / http_send.c

diff --git a/http_send.c b/http_send.c
index f9345acedb0e76ef8ef0487cd24ec411a35ea53f..f06a5ac258e9a36c88cc9d9dd26acaede6fe2029 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 */
 
-extern struct gengetopt_args_info conf;
-
 /** 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);
-
+       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);
@@ -124,21 +122,13 @@ static void http_shutdown_client(struct http_client *hc, const char *msg)
        }
        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)
-               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)
@@ -206,9 +196,8 @@ static int send_queued_packets(struct http_client *hc)
        return 1;
 }
 
-static void http_send(__a_unused struct audio_format_handler *af,
-               long unsigned current_chunk,
-               __a_unused long unsigned chunks_sent, const char *buf, size_t len)
+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;
@@ -218,14 +207,12 @@ static void http_send(__a_unused struct audio_format_handler *af,
                                hc->status != HTTP_READY_TO_STREAM)
                        continue;
                if (hc->status == HTTP_READY_TO_STREAM) {
-                       if (af->get_header_info && current_chunk) {
+                       int hlen;
+                       char *hbuf = afs_get_header(&hlen);
+                       if (hbuf && hlen > 0 && current_chunk) {
                                /* need to send header */
-                               int hlen;
-                               char *buf = af->get_header_info(&hlen);
-                               if (!buf || hlen <= 0)
-                                       continue; /* header not yet available */
                                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");
@@ -267,8 +254,7 @@ static int host_in_access_perm_list(struct http_client *hc)
        return 0;
 }
 
-static void http_post_select(__a_unused struct audio_format_handler *af, fd_set *rfds,
-               fd_set *wfds)
+static void http_post_select(fd_set *rfds, fd_set *wfds)
 {
        int i = -1, match;
        struct http_client *hc, *tmp;
@@ -337,7 +323,9 @@ static void http_post_select(__a_unused struct audio_format_handler *af, fd_set
        PARA_INFO_LOG("accepted client #%d: %s (fd %d)\n", numclients,
                CLIENT_ADDR(hc), hc->fd);
        numclients++;
-       list_add(&hc->node, &clients);
+       para_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",
@@ -347,8 +335,7 @@ err_out:
        free(hc);
 }
 
-static void http_pre_select(struct audio_format_handler *af, int *max_fileno,
-       fd_set *rfds, fd_set *wfds)
+static void http_pre_select(int *max_fileno, fd_set *rfds, fd_set *wfds)
 {
        struct http_client *hc, *tmp;
 
@@ -373,7 +360,7 @@ static void http_pre_select(struct audio_format_handler *af, int *max_fileno,
                        hc->check_w = 1;
                        break;
                case HTTP_SENT_OK_MSG:
-                       if (!af || !afs_playing())
+                       if (!afs_playing())
                                break; /* wait until server starts playing */
                        para_fd_set(hc->fd, wfds, max_fileno);
                        hc->check_w = 1;
@@ -384,12 +371,19 @@ static void http_pre_select(struct audio_format_handler *af, int *max_fileno,
 
 static int open_tcp_port(int port)
 {
+       int ret;
+
        server_fd = init_tcp_socket(port);
        if (server_fd < 0) {
-               http_shutdown_clients_real();
+               http_shutdown_clients();
                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;
@@ -410,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;
        }
-       http_shutdown_clients_real();
+       http_shutdown_clients();
        return 1;
 }
 
@@ -438,7 +432,7 @@ static void add_perm_list_entry(struct sender_command_data *scd)
        ai->netmask = scd->netmask;
        PARA_INFO_LOG("adding %s/%i to access list\n", inet_ntoa(ai->addr),
                ai->netmask);
-       list_add(&ai->node, &access_perm_list);
+       para_list_add(&ai->node, &access_perm_list);
 }
 
 static int http_com_deny(struct sender_command_data *scd)