X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_send.c;h=7035f27968f8f90a7d2ce89a3cb77e98130ac632;hp=bbf634100c6de88e95c2e426de5c5a09d4dcfc80;hb=192417698d9dab017ef6108fa6e9fd5ea1dc5633;hpb=2ecabb05dbeb0948e514cdad1bb811d9edf97e2e

diff --git a/http_send.c b/http_send.c
index bbf63410..7035f279 100644
--- a/http_send.c
+++ b/http_send.c
@@ -6,17 +6,22 @@
 
 /** \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"
 
@@ -165,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
@@ -460,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)