X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_send.c;h=9d0f49aee03cd6b30d6a73e9eda74dcb9be4cfc0;hp=eddc0295f229a26c4e826d8656712c4609a35989;hb=5e8d8a8eea6de9459ebdf4498f9f061c84bfa63a;hpb=f0e41e36c3f1a3a5bb6ff66d92d2814391d8f908

diff --git a/http_send.c b/http_send.c
index eddc0295..9d0f49ae 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"
@@ -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,19 +249,19 @@ 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;
-	s->client_cmds[SENDER_DENY] = http_com_deny;
-	s->client_cmds[SENDER_ALLOW] = http_com_allow;
-	s->client_cmds[SENDER_ADD] = NULL;
-	s->client_cmds[SENDER_DELETE] = NULL;
+	s->client_cmds[SENDER_on] = http_com_on;
+	s->client_cmds[SENDER_off] = http_com_off;
+	s->client_cmds[SENDER_deny] = http_com_deny;
+	s->client_cmds[SENDER_allow] = http_com_allow;
+	s->client_cmds[SENDER_add] = NULL;
+	s->client_cmds[SENDER_delete] = NULL;
 
 	init_sender_status(hss, conf.http_access_arg, conf.http_access_given,
 		conf.http_port_arg, conf.http_max_clients_arg,