X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_send.c;h=daf39e73938b6a21b4656c08b5f3367e0e67ceb1;hp=c26572f024557fc4f206835a7e93f24cf59d0231;hb=402bda88d8556619738ebde95cbcacac2e9f1169;hpb=748d1368bc96dd7e1af879df1ea41b4d52842f7e

diff --git a/http_send.c b/http_send.c
index c26572f0..daf39e73 100644
--- a/http_send.c
+++ b/http_send.c
@@ -1,21 +1,24 @@
 /*
- * Copyright (C) 2005-2012 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file http_send.c paraslash's http sender */
 
+#include <netinet/in.h>
+#include <sys/socket.h>
 #include <regex.h>
 #include <sys/types.h>
-#include <osl.h>
+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.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 "list.h"
@@ -125,7 +128,7 @@ static void http_send_chunk(struct sender_client *sc, struct sender_status *ss,
 		ret = queue_chunk_or_shutdown(sc, ss, buf, len);
 		goto out;
 	}
-	ret = write_nonblock(sc->fd, buf, len);
+	ret = xwrite(sc->fd, buf, len);
 	if (ret < 0) {
 		shutdown_client(sc, ss);
 		goto out;
@@ -230,9 +233,9 @@ static int http_com_allow(struct sender_command_data *scd)
 	return 1;
 }
 
-static char *http_info(void)
+static char *http_status(void)
 {
-	return get_sender_info(hss, "http");
+	return generic_sender_status(hss, "http");
 }
 
 /**
@@ -246,7 +249,7 @@ static char *http_info(void)
 void http_send_init(struct sender *s)
 {
 	int ret;
-	s->info = http_info;
+	s->status = http_status;
 	s->send = http_send;
 	s->pre_select = http_pre_select;
 	s->post_select = http_post_select;