X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_send.c;h=210f85ac63c9dd718a3f00e6a6e9790ffeeb5d96;hp=9d0f49aee03cd6b30d6a73e9eda74dcb9be4cfc0;hb=b6e25b286c553ac1f971f3c8e0a736f9e731d2b7;hpb=9d8fdf8898418711558f70a9630b2444036d8285

diff --git a/http_send.c b/http_send.c
index 9d0f49ae..210f85ac 100644
--- a/http_send.c
+++ b/http_send.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>
- *
- * 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 */
 
@@ -13,12 +9,14 @@
 #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 "net.h"
 #include "server.h"
 #include "http.h"
 #include "list.h"
@@ -26,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"
@@ -212,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)
@@ -248,7 +246,6 @@ static char *http_status(void)
  */
 void http_send_init(struct sender *s)
 {
-	int ret;
 	s->status = http_status;
 	s->send = http_send;
 	s->pre_select = http_pre_select;
@@ -263,12 +260,10 @@ void http_send_init(struct sender *s)
 	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);
 }