X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_send.c;h=f3ae608b4b5ac235894faaeca609eed4694ef50c;hp=3f03f00b41a943af347c2e5599fde1ff9a3e507d;hb=89b30ef7b5ee1bb73b8efa3ccbb53c229066439e;hpb=3689799ede7bba230ca544ac953392b428c3d662

diff --git a/http_send.c b/http_send.c
index 3f03f00b..f3ae608b 100644
--- a/http_send.c
+++ b/http_send.c
@@ -10,17 +10,18 @@
 #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"
 
@@ -285,7 +286,7 @@ static void http_post_select(fd_set *rfds, fd_set *wfds)
 	numclients++;
 	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",
@@ -339,7 +340,7 @@ static int open_tcp_port(int port)
 		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);
@@ -464,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)