X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_send.c;h=7035f27968f8f90a7d2ce89a3cb77e98130ac632;hp=65b6c5a2ebee3b518a5383acd45273ce696a629c;hb=e63886e85c55c99e9732e5715b7ce641eff09914;hpb=c83577be9792e7872c70ba8f4d610278f01b8b11 diff --git a/http_send.c b/http_send.c index 65b6c5a2..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; }; /** @@ -107,87 +89,6 @@ static int server_fd = -1, numclients; static struct sender *self; -static int cq_enqueue(struct chunk_queue *cq, 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 (cq->num_pending + len > cq->max_pending) - return -E_QUEUE; - qc = para_malloc(sizeof(struct queued_chunk)); - cq->num_pending += len; - qc->chunk_num = chunk_num; - qc->sent = sent; - list_add_tail(&qc->node, &cq->q); - PARA_DEBUG_LOG("%lu bytes queued for %p\n", cq->num_pending, &cq->q); - return 1; -} - -static struct queued_chunk *cq_peek(struct chunk_queue *cq) -{ - if (list_empty(&cq->q)) - return NULL; - return list_entry(cq->q.next, struct queued_chunk, node); -} - -int cq_dequeue(struct chunk_queue *cq) -{ - struct queued_chunk *qc = cq_peek(cq); - assert(qc); - list_del(&qc->node); - free(qc); - return 1; -} - -void cq_update(struct chunk_queue *cq, size_t sent) -{ - struct queued_chunk *qc = cq_peek(cq); - assert(qc); - qc->sent += sent; - cq->num_pending -= sent; -} - -int cq_get(struct queued_chunk *qc, char **buf, size_t *len) -{ - int ret; - - 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 > qc->sent); - *buf += qc->sent; - *len -= qc->sent; - return 1; -} - -void cq_init(struct chunk_queue *cq, size_t max_pending) -{ - INIT_LIST_HEAD(&cq->q); - cq->max_pending = max_pending; - cq->num_pending = 0; -} - -void cq_destroy(struct chunk_queue *cq) -{ - struct queued_chunk *qc, *tmp; - list_for_each_entry_safe(qc, tmp, &cq->q, node) { - list_del(&qc->node); - free(qc); - } -} - static void http_shutdown_client(struct http_client *hc, const char *msg) { PARA_INFO_LOG("shutting down %s on fd %d (%s)\n", CLIENT_ADDR(hc), @@ -195,7 +96,7 @@ static void http_shutdown_client(struct http_client *hc, const char *msg) numclients--; close(hc->fd); del_close_on_fork_list(hc->fd); - cq_destroy(&hc->cq); + cq_destroy(hc->cq); list_del(&hc->node); free(hc); } @@ -228,11 +129,10 @@ static int http_send_err_msg(struct http_client *hc) return http_send_msg(hc, HTTP_ERR_MSG); } - static int send_queued_chunks(struct http_client *hc) { struct queued_chunk *qc; - while ((qc = cq_peek(&hc->cq))) { + while ((qc = cq_peek(hc->cq))) { char *buf; size_t len; int ret = write_ok(hc->fd); @@ -241,11 +141,11 @@ static int send_queued_chunks(struct http_client *hc) cq_get(qc, &buf, &len); ret = write(hc->fd, buf, len); if (ret < 0) - return -1; /* FIXME */ - cq_update(&hc->cq, ret); + return -E_SEND_QUEUED_CHUNK; + cq_update(hc->cq, ret); if (ret != len) return 1; - cq_dequeue(&hc->cq); + cq_dequeue(hc->cq); } return 1; } @@ -253,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 = cq_enqueue(&hc->cq, chunk_num, sent); + int ret = cq_enqueue(hc->cq, chunk_num, sent); if (ret < 0) http_shutdown_client(hc, "queue error"); return ret; @@ -270,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 @@ -380,7 +280,7 @@ static void http_post_select(fd_set *rfds, fd_set *wfds) goto err_out; } hc->status = HTTP_CONNECTED; - cq_init(&hc->cq, MAX_BACKLOG); + hc->cq = cq_new(MAX_BACKLOG); PARA_INFO_LOG("accepted client #%d: %s (fd %d)\n", numclients, CLIENT_ADDR(hc), hc->fd); numclients++; @@ -565,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)