user_list.c: Simplify populate_user_list().
[paraslash.git] / http_send.c
index 7c1ea34..9a55ba0 100644 (file)
@@ -18,8 +18,8 @@
 #include "server.h"
 #include "http.h"
 #include "vss.h"
-#include "send.h"
 #include "list.h"
+#include "send.h"
 #include "close_on_fork.h"
 #include "net.h"
 #include "fd.h"
@@ -36,10 +36,6 @@ enum http_status {
        HTTP_CONNECTED,
        /** Successfully received the get request. */
        HTTP_GOT_GET_REQUEST,
-       /** We sent the OK message back to the client. */
-       HTTP_SENT_OK_MSG,
-       /** Connection established, we might need to send the audio file header. */
-       HTTP_READY_TO_STREAM,
        /** Connection is ready for sending audio data. */
        HTTP_STREAMING,
        /** We didn't receive a valid get request. */
@@ -53,325 +49,181 @@ static struct list_head clients;
 /** The whitelist/blacklist. */
 static struct list_head http_acl;
 
-/** Describes one client that connected the tcp port of the http sender. */
-struct http_client {
-       /** The file descriptor of the client. */
-       int fd;
-       /** The socket `name' of the client. */
-       char *name;
-       /** The client's current status. */
+static int listen_fd = -1, numclients;
+
+struct private_http_sender_data {
        enum http_status status;
-       /** Non-zero if we included \a fd in the read set.*/
-       int check_r;
-       /** Non-zero if we included \a fd in the write set. */
-       int check_w;
-       /** The position of this client in the client list. */
-       struct list_head node;
-       /** The list of pending chunks for this client. */
-       struct chunk_queue *cq;
 };
 
-static int server_fd = -1, numclients;
-static struct sender *self;
-
-
-static void http_shutdown_client(struct http_client *hc, const char *msg)
+static int http_send_msg(struct sender_client *sc, const char *msg)
 {
-       PARA_INFO_LOG("shutting down %s on fd %d (%s)\n", hc->name, hc->fd,
-               msg);
-       numclients--;
-       free(hc->name);
-       close(hc->fd);
-       del_close_on_fork_list(hc->fd);
-       cq_destroy(hc->cq);
-       list_del(&hc->node);
-       free(hc);
-}
-
-static void http_shutdown_clients(void)
-{
-       struct http_client *hc, *tmp;
-       list_for_each_entry_safe(hc, tmp, &clients, node)
-               http_shutdown_client(hc, "vss request");
-}
-
-static int http_send_msg(struct http_client *hc, const char *msg)
-{
-       int ret = send_buffer(hc->fd, msg);
+       int ret = send_buffer(sc->fd, msg);
 
        if (ret < 0)
-               http_shutdown_client(hc, "send msg failed");
+               shutdown_client(sc);
        return ret;
 }
 
-static void http_send_ok_msg(struct http_client *hc)
-{
-       PARA_INFO_LOG("sending http ok message to fd %d\n", hc->fd);
-       http_send_msg(hc, HTTP_OK_MSG);
-}
-
-static int http_send_err_msg(struct http_client *hc)
+static void http_send_ok_msg(struct sender_client *sc)
 {
-       PARA_NOTICE_LOG("sending bad request message to fd %d\n", hc->fd);
-       return http_send_msg(hc, HTTP_ERR_MSG);
+       PARA_INFO_LOG("sending http ok message to fd %d\n", sc->fd);
+       http_send_msg(sc, HTTP_OK_MSG);
 }
 
-static int send_queued_chunks(struct http_client *hc)
+static int http_send_err_msg(struct sender_client *sc)
 {
-       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;
-               cq_get(qc, &buf, &len);
-               ret = write(hc->fd, buf, len);
-               if (ret < 0)
-                       return -E_SEND_QUEUED_CHUNK;
-               cq_update(hc->cq, ret);
-               if (ret != len)
-                       return 1;
-               cq_dequeue(hc->cq);
-       }
-       return 1;
+       PARA_NOTICE_LOG("sending bad request message to fd %d\n", sc->fd);
+       return http_send_msg(sc, HTTP_ERR_MSG);
 }
 
-static int queue_chunk_or_shutdown(struct http_client *hc, long unsigned chunk_num,
-       size_t sent)
+static void http_shutdown_clients(void)
 {
-       int ret = cq_enqueue(hc->cq, chunk_num, sent);
-       if (ret < 0)
-               http_shutdown_client(hc, "queue error");
-       return ret;
+       struct sender_client *sc, *tmp;
+       list_for_each_entry_safe(sc, tmp, &clients, node)
+               shutdown_client(sc);
 }
 
-static void http_send( long unsigned current_chunk,
+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;
+       struct sender_client *sc, *tmp;
 
-       list_for_each_entry_safe(hc, tmp, &clients, node) {
-               if (hc->status != HTTP_STREAMING &&
-                               hc->status != HTTP_READY_TO_STREAM)
-                       continue;
-               if (hc->status == HTTP_READY_TO_STREAM) {
-                       size_t hlen;
-                       char *hbuf = vss_get_header(&hlen);
-                       if (hbuf && hlen > 0 && current_chunk) {
-                               /* need to send header */
-                               PARA_INFO_LOG("queueing header: %zu\n", hlen);
-                               if (queue_chunk_or_shutdown(hc, -1U, 0) < 0)
-                                       continue;
-                       } else
-                               PARA_INFO_LOG("no need to queue header\n");
-                       hc->status = HTTP_STREAMING;
-               }
-               ret = send_queued_chunks(hc);
-               if (ret < 0) {
-                       http_shutdown_client(hc, "queue send error");
-                       continue;
-               }
-               if (!len)
+       list_for_each_entry_safe(sc, tmp, &clients, node) {
+               struct private_http_sender_data *phsd = sc->private_data;
+               if (phsd->status != HTTP_STREAMING)
                        continue;
-               if (!ret || write_ok(hc->fd) <= 0) {
-                       queue_chunk_or_shutdown(hc, current_chunk, 0);
-                       continue;
-               }
-//             PARA_DEBUG_LOG("sending %d -> %s\n", len, remote_name(hc->fd));
-               ret = write(hc->fd, buf, len);
-//             PARA_DEBUG_LOG("ret: %d\n", ret);
-               if (ret < 0) {
-                       http_shutdown_client(hc, "send error");
-                       continue;
-               }
-               if (ret != len)
-                       queue_chunk_or_shutdown(hc, current_chunk, ret);
+               send_chunk(sc, 0, current_chunk, buf, len);
        }
 }
 
-static void http_post_select(fd_set *rfds, fd_set *wfds)
+static void http_post_select(fd_set *rfds, __a_unused fd_set *wfds)
 {
-       int i = -1, match;
-       struct http_client *hc, *tmp;
-       const char *err_msg;
+       int ret, fd;
+       struct sender_client *sc, *tmp;
+       struct private_http_sender_data *phsd;
 
-       list_for_each_entry_safe(hc, tmp, &clients, node) {
-               i++;
-//             PARA_DEBUG_LOG("handling client %d: %s\n", i, remote_name(hc->fd));
-               switch (hc->status) {
+       if (listen_fd < 0)
+               return;
+       list_for_each_entry_safe(sc, tmp, &clients, node) {
+               phsd = sc->private_data;
+               switch (phsd->status) {
                case HTTP_STREAMING: /* nothing to do */
-               case HTTP_READY_TO_STREAM:
                        break;
                case HTTP_CONNECTED: /* need to recv get request */
-                       if (hc->check_r && FD_ISSET(hc->fd, rfds)) {
-                               if (recv_pattern(hc->fd, HTTP_GET_MSG, MAXLINE)
+                       if (FD_ISSET(sc->fd, rfds)) {
+                               if (recv_pattern(sc->fd, HTTP_GET_MSG, MAXLINE)
                                                < 0) {
-                                       hc->status = HTTP_INVALID_GET_REQUEST;
+                                       phsd->status = HTTP_INVALID_GET_REQUEST;
                                } else {
-                                       hc->status = HTTP_GOT_GET_REQUEST;
+                                       phsd->status = HTTP_GOT_GET_REQUEST;
                                        PARA_INFO_LOG("%s",
                                                "received get request\n");
                                }
                        }
                        break;
                case HTTP_GOT_GET_REQUEST: /* need to send ok msg */
-                       if (hc->check_w && FD_ISSET(hc->fd, wfds)) {
-                               hc->status = HTTP_SENT_OK_MSG;
-                               http_send_ok_msg(hc);
-                       }
+                       phsd->status = HTTP_STREAMING;
+                       http_send_ok_msg(sc);
                        break;
                case HTTP_INVALID_GET_REQUEST: /* need to send err msg */
-                       if (hc->check_w && FD_ISSET(hc->fd, wfds)) {
-                               if (http_send_err_msg(hc) >= 0)
-                                       http_shutdown_client(hc,
-                                               "invalid get request");
-                       }
-                       break;
-               case HTTP_SENT_OK_MSG: /* need to send header? */
-                       if (hc->check_w && FD_ISSET(hc->fd, wfds))
-                               hc->status = HTTP_READY_TO_STREAM;
+                       if (http_send_err_msg(sc) >= 0)
+                               shutdown_client(sc);
                        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);
-       if (hc->fd <= 0)
-               goto err_out;
-       hc->name = make_message("%s", remote_name(hc->fd));
-       PARA_NOTICE_LOG("connection from %s (fd %d)\n", hc->name, hc->fd);
+       ret = para_accept(listen_fd, NULL, 0);
+       if (ret < 0) {
+               PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+               return;
+       }
+       fd = ret;
+       ret = -E_MAX_CLIENTS;
        if (conf.http_max_clients_arg > 0 && numclients >=
                        conf.http_max_clients_arg) {
-               err_msg = "server full";
                goto err_out;
        }
-       match = acl_lookup(hc->fd, &http_acl);
-       PARA_DEBUG_LOG("acl lookup returned %d\n", match);
-       if ((match && !conf.http_default_deny_given) ||
-                       (!match && conf.http_default_deny_given)) {
-               err_msg = "permission denied";
+       ret = mark_fd_nonblocking(fd);
+       if (ret < 0)
+               goto err_out;
+       ret = acl_check_access(fd, &http_acl, conf.http_default_deny_given);
+       if (ret < 0)
                goto err_out;
-       }
-       hc->status = HTTP_CONNECTED;
-       hc->cq = cq_new(MAX_BACKLOG);
        numclients++;
+       sc = para_calloc(sizeof(*sc));
+       sc->fd = fd;
+       sc->name = make_message("%s", remote_name(fd));
+       PARA_NOTICE_LOG("connection from %s (fd %d)\n", sc->name, fd);
+       phsd = para_malloc(sizeof(*phsd));
+       sc->private_data = phsd;
+       phsd->status = HTTP_CONNECTED;
+       sc->cq = cq_new(MAX_BACKLOG);
        PARA_INFO_LOG("accepted client #%d: %s (fd %d)\n", numclients,
-               hc->name, hc->fd);
-       para_list_add(&hc->node, &clients);
-       add_close_on_fork_list(hc->fd);
-       mark_fd_nonblocking(hc->fd);
+               sc->name, fd);
+       para_list_add(&sc->node, &clients);
+       add_close_on_fork_list(fd);
        return;
 err_out:
-       PARA_WARNING_LOG("ignoring connect request from %s (%s)\n",
-               hc->name, err_msg);
-       if (hc->fd > 0)
-               close(hc->fd);
-       free(hc);
+       PARA_WARNING_LOG("%s\n", para_strerror(-ret));
+       close(fd);
 }
 
-static void http_pre_select(int *max_fileno, fd_set *rfds, fd_set *wfds)
+static void http_pre_select(int *max_fileno, fd_set *rfds, __a_unused fd_set *wfds)
 {
-       struct http_client *hc, *tmp;
+       struct sender_client *sc, *tmp;
 
-       if (server_fd < 0)
+       if (listen_fd < 0)
                return;
-       para_fd_set(server_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;
-               hc->check_w = 0;
-               switch (hc->status) {
-               case HTTP_STREAMING:
-               case HTTP_READY_TO_STREAM:
-                       break;
-               case HTTP_CONNECTED: /* need to recv get request */
-                       para_fd_set(hc->fd, rfds, max_fileno);
-                       hc->check_r = 1;
-                       break;
-               case HTTP_GOT_GET_REQUEST: /* need to send ok msg */
-               case HTTP_INVALID_GET_REQUEST: /* need to send err msg */
-                       para_fd_set(hc->fd, wfds, max_fileno);
-                       hc->check_w = 1;
-                       break;
-               case HTTP_SENT_OK_MSG:
-                       if (!vss_playing())
-                               break; /* wait until server starts playing */
-                       para_fd_set(hc->fd, wfds, max_fileno);
-                       hc->check_w = 1;
-                       break;
-               }
+       para_fd_set(listen_fd, rfds, max_fileno);
+       list_for_each_entry_safe(sc, tmp, &clients, node) {
+               struct private_http_sender_data *phsd = sc->private_data;
+               if (phsd->status == HTTP_CONNECTED) /* need to recv get request */
+                       para_fd_set(sc->fd, rfds, max_fileno);
        }
 }
 
-static int http_open(int port)
-{
-       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);
-       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;
-}
-
 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 open_sender(IPPROTO_TCP, conf.http_port_arg);
 }
 
 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;
 }
 
 static int http_com_deny(struct sender_command_data *scd)
 {
-       if (conf.http_default_deny_given)
-               acl_del_entry(&http_acl, scd->addr, scd->netmask);
-       else
-               acl_add_entry(&http_acl, scd->addr, scd->netmask);
+       acl_deny(scd->addr, scd->netmask, &http_acl,
+               conf.http_default_deny_given);
        return 1;
 }
 
 static int http_com_allow(struct sender_command_data *scd)
 {
-       if (conf.http_default_deny_given)
-               acl_add_entry(&http_acl, scd->addr, scd->netmask);
-       else
-               acl_del_entry(&http_acl, scd->addr, scd->netmask);
+       acl_allow(scd->addr, scd->netmask, &http_acl,
+               conf.http_default_deny_given);
        return 1;
 }
 
 static char *http_info(void)
 {
        char *clnts = NULL, *ret;
-       struct http_client *hc, *tmp_hc;
+       struct sender_client *sc, *tmp_sc;
 
        char *acl_contents = acl_get_contents(&http_acl);
-       list_for_each_entry_safe(hc, tmp_hc, &clients, node) {
-               char *tmp = make_message("%s%s ", clnts? clnts : "", hc->name);
+       list_for_each_entry_safe(sc, tmp_sc, &clients, node) {
+               char *tmp = make_message("%s%s ", clnts? clnts : "", sc->name);
                free(clnts);
                clnts = tmp;
        }
@@ -382,7 +234,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,
@@ -415,6 +267,7 @@ static char *http_help(void)
  */
 void http_send_init(struct sender *s)
 {
+       int ret;
        INIT_LIST_HEAD(&clients);
        s->info = http_info;
        s->send = http_send;
@@ -428,9 +281,12 @@ void http_send_init(struct sender *s)
        s->client_cmds[SENDER_ALLOW] = http_com_allow;
        s->client_cmds[SENDER_ADD] = NULL;
        s->client_cmds[SENDER_DELETE] = NULL;
-       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 */
-       PARA_DEBUG_LOG("%s", "http sender init complete\n");
+       if (conf.http_no_autostart_given)
+               return;
+       ret = open_sender(IPPROTO_TCP, conf.http_port_arg);
+       if (ret < 0)
+               PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+       else
+               listen_fd = ret;
 }