X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_send.c;h=4d612285aeff00f7d8d153be5c9f1743f3fa9425;hp=9a35fc99f920beed52e19c12bab9f9dc308027e4;hb=e2167286448ce2ed9a01a548e7e9832563035088;hpb=8f69a1302a52163c61142531c4a6944510c3ec12 diff --git a/http_send.c b/http_send.c index 9a35fc99..4d612285 100644 --- a/http_send.c +++ b/http_send.c @@ -16,13 +16,14 @@ #include "error.h" #include "string.h" #include "afh.h" +#include "net.h" #include "server.h" #include "http.h" #include "list.h" #include "send.h" #include "sched.h" #include "vss.h" -#include "net.h" +#include "close_on_fork.h" #include "fd.h" #include "chunk_queue.h" @@ -213,7 +214,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) @@ -245,16 +247,12 @@ static char *http_status(void) */ static void http_send_init(void) { - int ret; - 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); } /**