X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_send.c;h=daf39e73938b6a21b4656c08b5f3367e0e67ceb1;hp=e8b22cf9958959b48d3d84855aeaf45cb1a5cf62;hb=213b3181e7f8ebd07ec37e256188ea9094722cef;hpb=fd652c08d4b5b26032646c449e1979c48018b70a

diff --git a/http_send.c b/http_send.c
index e8b22cf9..daf39e73 100644
--- a/http_send.c
+++ b/http_send.c
@@ -1,26 +1,29 @@
 /*
- * Copyright (C) 2005-2010 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 <dirent.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"
 #include "send.h"
+#include "sched.h"
 #include "vss.h"
 #include "close_on_fork.h"
 #include "net.h"
@@ -53,7 +56,7 @@ static struct sender_status http_sender_status, *hss = &http_sender_status;
 
 static int http_send_msg(struct sender_client *sc, const char *msg)
 {
-	int ret = send_buffer(sc->fd, msg);
+	int ret = write_buffer(sc->fd, msg);
 
 	if (ret < 0)
 		shutdown_client(sc, hss);
@@ -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,11 +249,12 @@ 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;
 	s->shutdown_clients = http_shutdown_clients;
+	s->resolve_target = NULL;
 	s->help = generic_sender_help;
 	s->client_cmds[SENDER_ON] = http_com_on;
 	s->client_cmds[SENDER_OFF] = http_com_off;