X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_send.c;h=33d5ed934dc3cfc05117a991be02dc9f1d2cfc6c;hp=d09306be2ad903045388fc49518bd06b5c28d228;hb=ff5830c9fc83ee59be9351c7ff45c1e376bac22b;hpb=d3eb6494a1883dac8a59ba3c82ada0fbc8ce0971;ds=sidebyside diff --git a/http_send.c b/http_send.c index d09306be..33d5ed93 100644 --- a/http_send.c +++ b/http_send.c @@ -6,25 +6,28 @@ /** \file http_send.c paraslash's http sender */ +#include +#include +#include "para.h" +#include "error.h" +#include "string.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 "error.h" #include "net.h" -#include "string.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" -/** \endcond */ + /** The possible states of a client from the server's POV. */ enum http_status { @@ -43,7 +46,7 @@ enum http_status { }; /** Clients will be kicked if there are more than that many bytes pending. */ -#define MAX_BACKLOG 40000 +#define MAX_BACKLOG 400000 /** The list of connected clients. */ static struct list_head clients; /** The whitelist/blacklist. */ @@ -53,8 +56,8 @@ static struct list_head access_perm_list; struct http_client { /** The file descriptor of the client. */ int fd; - /** Address information about the client. */ - struct sockaddr_in addr; + /** The socket `name' of the client. */ + char *name; /** The client's current status. */ enum http_status status; /** Non-zero if we included \a fd in the read set.*/ @@ -63,26 +66,8 @@ struct http_client { int check_w; /** The position of this client in the client list. */ struct list_head node; - /** Te list of pending packets for this client. */ - struct list_head packet_queue; - /** The number of pending bytes for this client. */ - unsigned long pq_bytes; -}; - -/** - * 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; + /** The list of pending chunks for this client. */ + struct chunk_queue *cq; }; /** @@ -100,19 +85,16 @@ struct access_info { static int server_fd = -1, numclients; static struct sender *self; + 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--; + free(hc->name); 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); } @@ -145,50 +127,36 @@ static int http_send_err_msg(struct http_client *hc) return http_send_msg(hc, HTTP_ERR_MSG); } -static int queue_packet(struct http_client *hc, const char *buf, size_t len) +static int send_queued_chunks(struct http_client *hc) { - 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) -{ - 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; - ret = write(hc->fd, qp->packet, qp->len); + cq_get(qc, &buf, &len); + ret = write(hc->fd, buf, len); 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; } +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) { @@ -200,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) { - unsigned hlen; + size_t hlen; 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 - PARA_INFO_LOG("%s", "no need to queue header\n"); + PARA_INFO_LOG("no need to queue header\n"); hc->status = HTTP_STREAMING; } - ret = send_queued_packets(hc); + ret = send_queued_chunks(hc); 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) { - 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; } -// 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); +// PARA_DEBUG_LOG("ret: %d\n", ret); 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) { - struct access_info *ai, *tmp; - list_for_each_entry_safe(ai, tmp, &access_perm_list, node) { - unsigned mask = ((~0U) >> 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; } @@ -255,7 +231,7 @@ static void http_post_select(fd_set *rfds, fd_set *wfds) 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: @@ -295,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"; - 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; - 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"; @@ -312,17 +289,17 @@ static void http_post_select(fd_set *rfds, fd_set *wfds) 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++; + 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_nonblock(hc->fd); + mark_fd_nonblocking(hc->fd); 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); @@ -366,13 +343,13 @@ static int open_tcp_port(int port) { 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; } - 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); @@ -459,8 +436,7 @@ static char *http_info(void) 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; } @@ -497,7 +473,7 @@ static void init_access_control_list(void) 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)