X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_send.c;h=210f85ac63c9dd718a3f00e6a6e9790ffeeb5d96;hp=60b877c08082ffa7e1cd7fb41617ab32bb7a465a;hb=bb1996d4ef04bf33e735f2ce49e9edeeb5a66e80;hpb=6a79f16de242c0c70ef56bbd96a748055df65917

diff --git a/http_send.c b/http_send.c
index 60b877c0..210f85ac 100644
--- a/http_send.c
+++ b/http_send.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2005-2013 Andre Noll <maan@systemlinux.org>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file http_send.c paraslash's http sender */
 
@@ -10,17 +6,17 @@
 #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 <lopsub.h>
 
+#include "server.lsg.h"
 #include "para.h"
 #include "error.h"
 #include "string.h"
-#include "server.cmdline.h"
 #include "afh.h"
-#include "afs.h"
+#include "net.h"
 #include "server.h"
 #include "http.h"
 #include "list.h"
@@ -28,7 +24,6 @@
 #include "sched.h"
 #include "vss.h"
 #include "close_on_fork.h"
-#include "net.h"
 #include "fd.h"
 #include "chunk_queue.h"
 #include "acl.h"
@@ -214,7 +209,8 @@ static void http_pre_select(int *max_fileno, fd_set *rfds, fd_set *wfds)
 
 static int http_com_on(__a_unused struct sender_command_data *scd)
 {
-	return generic_com_on(hss, IPPROTO_TCP);
+	generic_com_on(hss, IPPROTO_TCP);
+	return 1;
 }
 
 static int http_com_off(__a_unused struct sender_command_data *scd)
@@ -235,9 +231,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");
 }
 
 /**
@@ -250,27 +246,24 @@ 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,
-		conf.http_default_deny_given);
-	if (conf.http_no_autostart_given)
+	init_sender_status(hss, OPT_RESULT(HTTP_ACCESS),
+		OPT_UINT32_VAL(HTTP_PORT), OPT_UINT32_VAL(HTTP_MAX_CLIENTS),
+		OPT_GIVEN(HTTP_DEFAULT_DENY));
+	if (OPT_GIVEN(HTTP_NO_AUTOSTART))
 		return;
-	ret = generic_com_on(hss, IPPROTO_TCP);
-	if (ret < 0)
-		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+	generic_com_on(hss, IPPROTO_TCP);
 }