X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_send.c;h=7035f27968f8f90a7d2ce89a3cb77e98130ac632;hp=1f28f722952b2b235e2e509c5b9b03f9a3e769dc;hb=da0a1b59045898dd73d6737ccd4f4af6fb29ad7f;hpb=28ca8e57ce76f5496f0d1ba143ec2c1c725bc90a

diff --git a/http_send.c b/http_send.c
index 1f28f722..7035f279 100644
--- a/http_send.c
+++ b/http_send.c
@@ -6,18 +6,24 @@
 
 /** \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 "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. */
@@ -75,22 +73,6 @@ struct http_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;
-};
-
 /**
  * Describes one entry in the blacklist/whitelist of the http sender.
  */
@@ -107,90 +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;
-}
-
-struct chunk_queue *cq_init(size_t max_pending)
-{
-	struct chunk_queue *cq = para_malloc(sizeof(*cq));
-	INIT_LIST_HEAD(&cq->q);
-	cq->max_pending = max_pending;
-	cq->num_pending = 0;
-	return cq;
-}
-
-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);
-	}
-	free(cq);
-}
-
 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),
@@ -231,7 +129,6 @@ 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;
@@ -244,7 +141,7 @@ 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 */
+			return -E_SEND_QUEUED_CHUNK;
 		cq_update(hc->cq, ret);
 		if (ret != len)
 			return 1;
@@ -273,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
@@ -383,7 +280,7 @@ static void http_post_select(fd_set *rfds, fd_set *wfds)
 		goto err_out;
 	}
 	hc->status = HTTP_CONNECTED;
-	hc->cq = cq_init(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++;
@@ -568,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)