X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_send.c;h=7035f27968f8f90a7d2ce89a3cb77e98130ac632;hp=54c59d61da2fc62097ca641fad971d0bdad26210;hb=045273c289eb3d972eea99df99967f680b06940f;hpb=b8480b19c115137c5ca5e281b94c2ad1a57297e4 diff --git a/http_send.c b/http_send.c index 54c59d61..7035f279 100644 --- a/http_send.c +++ b/http_send.c @@ -6,18 +6,24 @@ /** \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) @@ -49,14 +55,6 @@ static struct list_head clients; /** The whitelist/blacklist. */ static struct list_head access_perm_list; -struct chunk_queue{ - /** The list of pending chunks for this client. */ - struct list_head q; - /** The number of pending bytes for this client. */ - unsigned long num_pending; - unsigned long max_pending; -}; - /** Describes one client that connected the tcp port of the http sender. */ struct http_client { /** The file descriptor of the client. */ @@ -72,23 +70,7 @@ struct http_client { /** 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; -}; - -/** - * Describes one queued chunk of the chunk queue. - * - * 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 chunk for this client until - * the number of queued bytes exceeds \p MAX_BACKLOG. - */ -struct queued_chunk { - /** The number of the queued chunk, -1U means header. */ - unsigned chunk_num; - /** The number of bytes already sent. */ - unsigned sent; - /** Position of the chunk in the chunk queue. */ - struct list_head node; + struct chunk_queue *cq; }; /** @@ -106,18 +88,15 @@ 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_chunk *qc, *tmp; PARA_INFO_LOG("shutting down %s on fd %d (%s)\n", CLIENT_ADDR(hc), hc->fd, msg); numclients--; close(hc->fd); del_close_on_fork_list(hc->fd); - list_for_each_entry_safe(qc, tmp, &hc->cq.q, node) { - list_del(&qc->node); - free(qc); - } + cq_destroy(hc->cq); list_del(&hc->node); free(hc); } @@ -150,61 +129,23 @@ static int http_send_err_msg(struct http_client *hc) return http_send_msg(hc, HTTP_ERR_MSG); } -static int enqueue_chunk(struct http_client *hc, long unsigned chunk_num, - size_t sent) -{ - struct queued_chunk *qc; - char *buf; - size_t len; - int ret; - - if (chunk_num != -1U) { - ret = vss_get_chunk(chunk_num, &buf, &len); - if (ret < 0) - return ret; - } else - buf = vss_get_header(&len); - if (hc->cq.num_pending + len > MAX_BACKLOG) - return -E_QUEUE; - qc = para_malloc(sizeof(struct queued_chunk)); - hc->cq.num_pending += len; - qc->chunk_num = chunk_num; - qc->sent = sent; - list_add_tail(&qc->node, &hc->cq.q); - PARA_INFO_LOG("%lu bytes queued for fd %d\n", hc->cq.num_pending, hc->fd); - return 1; -} - static int send_queued_chunks(struct http_client *hc) { - int ret; - struct queued_chunk *qc, *tmp; - - if (list_empty(&hc->cq.q)) - return 1; - list_for_each_entry_safe(qc, tmp, &hc->cq.q, node) { + struct queued_chunk *qc; + while ((qc = cq_peek(hc->cq))) { char *buf; size_t len; - ret = write_ok(hc->fd); + int ret = write_ok(hc->fd); if (ret <= 0) return ret? -E_WRITE_OK : 0; - if (qc->chunk_num != -1U) { - ret = vss_get_chunk(qc->chunk_num, &buf, &len); - if (ret < 0) - return ret; - } else - buf = vss_get_header(&len); - assert(len && len > qc->sent); - ret = write(hc->fd, buf + qc->sent, len - qc->sent); + cq_get(qc, &buf, &len); + ret = write(hc->fd, buf, len); if (ret < 0) - return -1; /* FIXME */ - hc->cq.num_pending -= ret; - if (ret != len - qc->sent) { - qc->sent += ret; - return 0; - } - list_del(&qc->node); - free(qc); + return -E_SEND_QUEUED_CHUNK; + cq_update(hc->cq, ret); + if (ret != len) + return 1; + cq_dequeue(hc->cq); } return 1; } @@ -212,7 +153,7 @@ static int send_queued_chunks(struct http_client *hc) static int queue_chunk_or_shutdown(struct http_client *hc, long unsigned chunk_num, size_t sent) { - int ret = enqueue_chunk(hc, chunk_num, sent); + int ret = cq_enqueue(hc->cq, chunk_num, sent); if (ret < 0) http_shutdown_client(hc, "queue error"); return ret; @@ -229,11 +170,11 @@ 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); + PARA_INFO_LOG("queueing header: %zu\n", hlen); if (queue_chunk_or_shutdown(hc, -1U, 0) < 0) continue; } else @@ -248,9 +189,6 @@ static void http_send( long unsigned current_chunk, if (!len) continue; if (!ret || write_ok(hc->fd) <= 0) { - PARA_INFO_LOG("fd %d not ready (%lu bytes queued)," - " trying to queue chunk\n", hc->fd, - hc->cq.num_pending); queue_chunk_or_shutdown(hc, current_chunk, 0); continue; } @@ -342,7 +280,7 @@ static void http_post_select(fd_set *rfds, fd_set *wfds) goto err_out; } hc->status = HTTP_CONNECTED; - INIT_LIST_HEAD(&hc->cq.q); + hc->cq = cq_new(MAX_BACKLOG); PARA_INFO_LOG("accepted client #%d: %s (fd %d)\n", numclients, CLIENT_ADDR(hc), hc->fd); numclients++; @@ -527,7 +465,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)