X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_send.c;h=52ec6b73d2328732290c274c89df0091ddb0b7aa;hp=4ad25e73d0e915bcd8c039a6688854694456dc80;hb=4fbe16430b47;hpb=b59e841036a107b52a0221e48d7e05f86da92979

diff --git a/dccp_send.c b/dccp_send.c
index 4ad25e73..52ec6b73 100644
--- a/dccp_send.c
+++ b/dccp_send.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file dccp_send.c Paraslash's dccp sender. */
 
@@ -25,8 +21,8 @@
 #include "error.h"
 #include "string.h"
 #include "afh.h"
-#include "server.h"
 #include "net.h"
+#include "server.h"
 #include "list.h"
 #include "send.h"
 #include "sched.h"
@@ -46,8 +42,11 @@ struct dccp_fec_client {
 static void dccp_pre_select(int *max_fileno, fd_set *rfds,
 		__a_unused fd_set *wfds)
 {
-	if (dss->listen_fd >= 0)
-		para_fd_set(dss->listen_fd, rfds, max_fileno);
+	unsigned n;
+
+	FOR_EACH_LISTEN_FD(n, dss)
+		if (dss->listen_fds[n] >= 0)
+			para_fd_set(dss->listen_fds[n], rfds, max_fileno);
 }
 
 /**
@@ -165,7 +164,8 @@ static void dccp_post_select(fd_set *rfds, __a_unused fd_set *wfds)
 
 static int dccp_com_on(__a_unused struct sender_command_data *scd)
 {
-	return generic_com_on(dss, IPPROTO_DCCP);
+	generic_com_on(dss, IPPROTO_DCCP);
+	return 1;
 }
 
 static int dccp_com_off(__a_unused struct sender_command_data *scd)
@@ -228,8 +228,6 @@ static char *dccp_status(void)
  */
 void dccp_send_init(struct sender *s)
 {
-	int ret;
-
 	s->status = dccp_status;
 	s->send = NULL;
 	s->pre_select = dccp_pre_select;
@@ -245,9 +243,8 @@ void dccp_send_init(struct sender *s)
 	s->client_cmds[SENDER_delete] = NULL;
 
 	init_sender_status(dss, OPT_RESULT(DCCP_ACCESS),
+		OPT_RESULT(DCCP_LISTEN_ADDRESS),
 		OPT_UINT32_VAL(DCCP_PORT), OPT_UINT32_VAL(DCCP_MAX_CLIENTS),
 		OPT_GIVEN(DCCP_DEFAULT_DENY));
-	ret = generic_com_on(dss, IPPROTO_DCCP);
-	if (ret < 0)
-		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+	generic_com_on(dss, IPPROTO_DCCP);
 }