Add new "screenshots".
[paraslash.git] / http_send.c
index 6c91295..33d5ed9 100644 (file)
 /*
  * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
  *
 /*
  * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
  *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file http_send.c paraslash's http sender */
 
  */
 
 /** \file http_send.c paraslash's http sender */
 
+#include <sys/types.h>
+#include <dirent.h>
 
 
+#include "para.h"
+#include "error.h"
+#include "string.h"
 #include "server.cmdline.h"
 #include "server.cmdline.h"
+#include "afh.h"
+#include "afs.h"
 #include "server.h"
 #include "http.h"
 #include "vss.h"
 #include "send.h"
 #include "list.h"
 #include "close_on_fork.h"
 #include "server.h"
 #include "http.h"
 #include "vss.h"
 #include "send.h"
 #include "list.h"
 #include "close_on_fork.h"
-#include "error.h"
 #include "net.h"
 #include "net.h"
-#include "string.h"
 #include "fd.h"
 #include "fd.h"
+#include "chunk_queue.h"
 
 
-/** \cond convert sock_addr_in to ascii */
-#define CLIENT_ADDR(hc) inet_ntoa((hc)->addr.sin_addr)
-/* get the port number of a struct http_client */
-#define CLIENT_PORT(hc) (hc)->addr.sin_port
+/** Message sent to clients that do not send a valid get request. */
 #define HTTP_ERR_MSG "HTTP/1.0 400 Bad Request\n"
 #define HTTP_ERR_MSG "HTTP/1.0 400 Bad Request\n"
-/** \endcond */
 
 
-/** the possible states of a client from the server's POV */
+
+/** The possible states of a client from the server's POV. */
 enum http_status {
 enum http_status {
+       /** We accepted the connection on the tcp socket. */
        HTTP_CONNECTED,
        HTTP_CONNECTED,
+       /** Successfully received the get request. */
        HTTP_GOT_GET_REQUEST,
        HTTP_GOT_GET_REQUEST,
+       /** We sent the OK message back to the client. */
        HTTP_SENT_OK_MSG,
        HTTP_SENT_OK_MSG,
+       /** Connection established, we might need to send the audio file header. */
        HTTP_READY_TO_STREAM,
        HTTP_READY_TO_STREAM,
+       /** Connection is ready for sending audio data. */
        HTTP_STREAMING,
        HTTP_STREAMING,
+       /** We didn't receive a valid get request. */
        HTTP_INVALID_GET_REQUEST
 };
 
        HTTP_INVALID_GET_REQUEST
 };
 
-/** clients will be kicked if there are more than that many bytes pending */
-#define MAX_BACKLOG 40000
-/** the list of connected clients **/
+/** Clients will be kicked if there are more than that many bytes pending. */
+#define MAX_BACKLOG 400000
+/** The list of connected clients. */
 static struct list_head clients;
 static struct list_head clients;
-/** the whitelist/blacklist */
+/** The whitelist/blacklist. */
 static struct list_head access_perm_list;
 
 static struct list_head access_perm_list;
 
-/** describes one client that connected the tcp port of the http sender */
+/** Describes one client that connected the tcp port of the http sender. */
 struct http_client {
 struct http_client {
-/** the file descriptor of the client */
+       /** The file descriptor of the client. */
        int fd;
        int fd;
-/** address information about the client */
-       struct sockaddr_in addr;
-/** the client's current status */
+       /** The socket `name' of the client. */
+       char *name;
+       /** The client's current status. */
        enum http_status status;
        enum http_status status;
-/** non-zero if we included \a fd in the read set */
+       /** Non-zero if we included \a fd in the read set.*/
        int check_r;
        int check_r;
-/** non-zero if we included \a fd in the write set */
+       /** Non-zero if we included \a fd in the write set. */
        int check_w;
        int check_w;
-/** the position of this client in the client list */
+       /** The position of this client in the client list. */
        struct list_head node;
        struct list_head node;
-/** the list of pending packets for this client */
-       struct list_head packet_queue;
-/** the number of pending bytes for this client */
-       unsigned long pq_bytes;
+       /** The list of pending chunks for this client. */
+       struct chunk_queue *cq;
 };
 
 /**
 };
 
 /**
- * describes one queued data packet for a client
- *
- * The send function of the http sender checks each client fd for writing. If a
- * client fd is not ready, it tries to queue that packet for this client until
- * the number of queued bytes exceeds \p MAX_BACKLOG.
- */
-struct queued_packet {
-/** the length of the packet in bytes */
-       unsigned int len;
-/** pointer to the packet data */
-       char *packet;
-/** position of the packet in the packet list */
-       struct list_head node;
-};
-
-/**
- * describes one entry in the blacklist/whitelist of the http sender
+ * Describes one entry in the blacklist/whitelist of the http sender.
  */
 struct access_info {
  */
 struct access_info {
-       /** the address to be black/whitelisted */
+       /** The address to be black/whitelisted. */
        struct in_addr addr;
        struct in_addr addr;
-       /** the netmask for this entry */
-       int netmask;
-       /** the position of this entry in the access_perm_list */
+       /** The netmask for this entry. */
+       unsigned netmask;
+       /** The position of this entry in the access_perm_list. */
        struct list_head node;
 };
 
        struct list_head node;
 };
 
@@ -109,17 +88,13 @@ static struct sender *self;
 
 static void http_shutdown_client(struct http_client *hc, const char *msg)
 {
 
 static void http_shutdown_client(struct http_client *hc, const char *msg)
 {
-       struct queued_packet *qp, *tmp;
-       PARA_INFO_LOG("shutting down %s on fd %d (%s)\n", CLIENT_ADDR(hc),
-               hc->fd, msg);
+       PARA_INFO_LOG("shutting down %s on fd %d (%s)\n", hc->name, hc->fd,
+               msg);
        numclients--;
        numclients--;
+       free(hc->name);
        close(hc->fd);
        del_close_on_fork_list(hc->fd);
        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);
-               free(qp);
-       }
+       cq_destroy(hc->cq);
        list_del(&hc->node);
        free(hc);
 }
        list_del(&hc->node);
        free(hc);
 }
@@ -152,50 +127,36 @@ static int http_send_err_msg(struct http_client *hc)
        return http_send_msg(hc, HTTP_ERR_MSG);
 }
 
        return http_send_msg(hc, HTTP_ERR_MSG);
 }
 
-static int queue_packet(struct http_client *hc, const char *buf, size_t len)
-{
-       struct queued_packet *qp;
-       if (hc->pq_bytes + len > MAX_BACKLOG) {
-               http_shutdown_client(hc, "packet queue overrun");
-               return -E_QUEUE;
-       }
-       qp = para_malloc(sizeof(struct queued_packet));
-       hc->pq_bytes += len;
-       qp->packet = para_malloc(len);
-       memcpy(qp->packet, buf, len);
-       qp->len = len;
-       list_add_tail(&qp->node, &hc->packet_queue);
-       PARA_INFO_LOG("%lu bytes queued for fd %d\n", hc->pq_bytes, hc->fd);
-       return 1;
-}
-
-static int send_queued_packets(struct http_client *hc)
+static int send_queued_chunks(struct http_client *hc)
 {
 {
-       int ret;
-       struct queued_packet *qp, *tmp;
-
-       if (list_empty(&hc->packet_queue))
-               return 1;
-       list_for_each_entry_safe(qp, tmp, &hc->packet_queue, node) {
-               ret = write_ok(hc->fd);
+       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;
                if (ret <= 0)
                        return ret? -E_WRITE_OK : 0;
-               ret = write(hc->fd, qp->packet, qp->len);
+               cq_get(qc, &buf, &len);
+               ret = write(hc->fd, buf, len);
                if (ret < 0)
                if (ret < 0)
-                       return ret;
-               if (ret != qp->len) {
-                       qp->len -= ret;
-                       memmove(qp->packet, qp->packet + ret, qp->len);
-                       return 0;
-               }
-               hc->pq_bytes -= qp->len;
-               free(qp->packet);
-               list_del(&qp->node);
-               free(qp);
+                       return -E_SEND_QUEUED_CHUNK;
+               cq_update(hc->cq, ret);
+               if (ret != len)
+                       return 1;
+               cq_dequeue(hc->cq);
        }
        return 1;
 }
 
        }
        return 1;
 }
 
+static int queue_chunk_or_shutdown(struct http_client *hc, long unsigned chunk_num,
+       size_t sent)
+{
+       int ret = cq_enqueue(hc->cq, chunk_num, sent);
+       if (ret < 0)
+               http_shutdown_client(hc, "queue error");
+       return ret;
+}
+
 static void http_send( 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)
 {
@@ -207,49 +168,57 @@ static void http_send( long unsigned current_chunk,
                                hc->status != HTTP_READY_TO_STREAM)
                        continue;
                if (hc->status == HTTP_READY_TO_STREAM) {
                                hc->status != HTTP_READY_TO_STREAM)
                        continue;
                if (hc->status == HTTP_READY_TO_STREAM) {
-                       int hlen;
+                       size_t hlen;
                        char *hbuf = vss_get_header(&hlen);
                        if (hbuf && hlen > 0 && current_chunk) {
                                /* need to send header */
                        char *hbuf = vss_get_header(&hlen);
                        if (hbuf && hlen > 0 && current_chunk) {
                                /* need to send header */
-                               PARA_INFO_LOG("queueing header: %d\n", hlen);
-                               if (queue_packet(hc, hbuf, hlen) < 0)
+                               PARA_INFO_LOG("queueing header: %zu\n", hlen);
+                               if (queue_chunk_or_shutdown(hc, -1U, 0) < 0)
                                        continue;
                        } else
                                        continue;
                        } else
-                               PARA_INFO_LOG("%s", "no need to queue header\n");
+                               PARA_INFO_LOG("no need to queue header\n");
                        hc->status = HTTP_STREAMING;
                }
                        hc->status = HTTP_STREAMING;
                }
-               ret = send_queued_packets(hc);
+               ret = send_queued_chunks(hc);
                if (ret < 0) {
                if (ret < 0) {
-                       http_shutdown_client(hc, "send error");
+                       http_shutdown_client(hc, "queue send error");
                        continue;
                }
                if (!len)
                        continue;
                if (!ret || write_ok(hc->fd) <= 0) {
                        continue;
                }
                if (!len)
                        continue;
                if (!ret || write_ok(hc->fd) <= 0) {
-                       PARA_INFO_LOG("fd %d not ready (%lu bytes queued),"
-                               " trying to queue packet\n", hc->fd,
-                               hc->pq_bytes);
-                       queue_packet(hc, buf, len);
+                       queue_chunk_or_shutdown(hc, current_chunk, 0);
                        continue;
                }
                        continue;
                }
-//             PARA_DEBUG_LOG("sending %d -> %s\n", len, CLIENT_ADDR(hc));
+//             PARA_DEBUG_LOG("sending %d -> %s\n", len, remote_name(hc->fd));
                ret = write(hc->fd, buf, len);
                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)
                if (ret < 0) {
                        http_shutdown_client(hc, "send error");
                        continue;
                }
                if (ret != len)
-                       queue_packet(hc, buf + ret, len - ret);
+                       queue_chunk_or_shutdown(hc, current_chunk, ret);
        }
 }
 
 static int host_in_access_perm_list(struct http_client *hc)
 {
        }
 }
 
 static int host_in_access_perm_list(struct http_client *hc)
 {
-       struct access_info *ai, *tmp;
-       list_for_each_entry_safe(ai, tmp, &access_perm_list, node) {
-               unsigned mask = ((~0) >> ai->netmask);
-               if ((hc->addr.sin_addr.s_addr & mask) == (ai->addr.s_addr & mask))
-                       return 1;
+       struct sockaddr_storage   ss;
+       socklen_t                 sslen = sizeof(ss);
+
+       if (getpeername(hc->fd, (struct sockaddr *)&ss, &sslen) < 0) {
+               PARA_ERROR_LOG("can not determine address family: %s\n", strerror(errno));
+       } else if (ss.ss_family == AF_INET) {
+               /* FIXME: access restriction is (currently) only supported for IPv4 */
+               struct access_info *ai, *tmp;
+               struct in_addr client_addr = ((struct sockaddr_in *)&ss)->sin_addr;
+
+               list_for_each_entry_safe(ai, tmp, &access_perm_list, node) {
+                       unsigned mask = ((~0U) >> ai->netmask);
+                       if ((client_addr.s_addr & mask) == (ai->addr.s_addr & mask))
+                               return 1;
+               }
        }
        return 0;
 }
        }
        return 0;
 }
@@ -262,7 +231,7 @@ static void http_post_select(fd_set *rfds, fd_set *wfds)
 
        list_for_each_entry_safe(hc, tmp, &clients, node) {
                i++;
 
        list_for_each_entry_safe(hc, tmp, &clients, node) {
                i++;
-//             PARA_DEBUG_LOG("handling client %d: %s\n", i, CLIENT_ADDR(hc));
+//             PARA_DEBUG_LOG("handling client %d: %s\n", i, remote_name(hc->fd));
                switch (hc->status) {
                case HTTP_STREAMING: /* nothing to do */
                case HTTP_READY_TO_STREAM:
                switch (hc->status) {
                case HTTP_STREAMING: /* nothing to do */
                case HTTP_READY_TO_STREAM:
@@ -302,10 +271,11 @@ static void http_post_select(fd_set *rfds, fd_set *wfds)
                return;
        hc = para_calloc(sizeof(struct http_client));
        err_msg = "accept error";
                return;
        hc = para_calloc(sizeof(struct http_client));
        err_msg = "accept error";
-       hc->fd = para_accept(server_fd, &hc->addr, sizeof(struct sockaddr_in));
+       hc->fd = para_accept(server_fd, NULL, 0);
        if (hc->fd <= 0)
                goto err_out;
        if (hc->fd <= 0)
                goto err_out;
-       PARA_NOTICE_LOG("connection from %s (fd %d)\n", CLIENT_ADDR(hc), hc->fd);
+       hc->name = make_message("%s", remote_name(hc->fd));
+       PARA_NOTICE_LOG("connection from %s (fd %d)\n", hc->name, hc->fd);
        if (conf.http_max_clients_arg > 0 && numclients >=
                        conf.http_max_clients_arg) {
                err_msg = "server full";
        if (conf.http_max_clients_arg > 0 && numclients >=
                        conf.http_max_clients_arg) {
                err_msg = "server full";
@@ -319,17 +289,17 @@ static void http_post_select(fd_set *rfds, fd_set *wfds)
                goto err_out;
        }
        hc->status = HTTP_CONNECTED;
                goto err_out;
        }
        hc->status = HTTP_CONNECTED;
-       INIT_LIST_HEAD(&hc->packet_queue);
-       PARA_INFO_LOG("accepted client #%d: %s (fd %d)\n", numclients,
-               CLIENT_ADDR(hc), hc->fd);
+       hc->cq = cq_new(MAX_BACKLOG);
        numclients++;
        numclients++;
+       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);
        para_list_add(&hc->node, &clients);
        add_close_on_fork_list(hc->fd);
-       mark_fd_nonblock(hc->fd);
+       mark_fd_nonblocking(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",
-               CLIENT_ADDR(hc), err_msg);
+               hc->name, err_msg);
        if (hc->fd > 0)
                close(hc->fd);
        free(hc);
        if (hc->fd > 0)
                close(hc->fd);
        free(hc);
@@ -373,13 +343,13 @@ static int open_tcp_port(int port)
 {
        int ret;
 
 {
        int ret;
 
-       server_fd = init_tcp_socket(port);
+       server_fd = para_listen(AF_UNSPEC, IPPROTO_TCP, port);
        if (server_fd < 0) {
                http_shutdown_clients();
                self->status = SENDER_OFF;
                return server_fd;
        }
        if (server_fd < 0) {
                http_shutdown_clients();
                self->status = SENDER_OFF;
                return server_fd;
        }
-       ret = mark_fd_nonblock(server_fd);
+       ret = mark_fd_nonblocking(server_fd);
        if (ret < 0) {
                PARA_EMERG_LOG("%s\n", PARA_STRERROR(-ret));
                exit(EXIT_FAILURE);
        if (ret < 0) {
                PARA_EMERG_LOG("%s\n", PARA_STRERROR(-ret));
                exit(EXIT_FAILURE);
@@ -466,8 +436,7 @@ static char *http_info(void)
                ap = tmp;
        }
        list_for_each_entry_safe(hc, tmp_hc, &clients, node) {
                ap = tmp;
        }
        list_for_each_entry_safe(hc, tmp_hc, &clients, node) {
-               char *tmp = make_message("%s%s:%d ", clnts? clnts : "",
-                       CLIENT_ADDR(hc), CLIENT_PORT(hc));
+               char *tmp = make_message("%s%s ", clnts? clnts : "", hc->name);
                free(clnts);
                clnts = tmp;
        }
                free(clnts);
                clnts = tmp;
        }
@@ -504,7 +473,7 @@ static void init_access_control_list(void)
                if (!p)
                        goto err;
                *p = '\0';
                if (!p)
                        goto err;
                *p = '\0';
-               if (!inet_aton(arg, &scd.addr))
+               if (!inet_pton(AF_INET, arg, &scd.addr))
                        goto err;
                scd.netmask = atoi(++p);
                if (scd.netmask < 0 || scd.netmask > 32)
                        goto err;
                scd.netmask = atoi(++p);
                if (scd.netmask < 0 || scd.netmask > 32)
@@ -530,12 +499,12 @@ static char *http_help(void)
 }
 
 /**
 }
 
 /**
- * the init function of the http sender
+ * The init function of the http sender.
  *
  *
- * \param s pointer to the http sender struct
+ * \param s Pointer to the http sender struct.
  *
  *
- * It initializes all function pointers of \a s, init the client list and the
- * acess control list as well. If autostart is wanted, open the tcp port.
+ * It initializes all function pointers of \a s, the client list and the access
+ * control list. If the autostart option was given, the tcp port is opened.
  */
 void http_send_init(struct sender *s)
 {
  */
 void http_send_init(struct sender *s)
 {