X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_send.c;h=6f9895410161e47133d65a4f0893bac14a0743b4;hp=92dd933347d2c48d857355da34c13673da54968b;hb=23dd2200dd4fc74025ae87f5c2127f3b0ff71e9b;hpb=a23e12ae76608a7ba3d333d8d76d5bbba0ba3ef0

diff --git a/dccp_send.c b/dccp_send.c
index 92dd9333..6f989541 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. */
 
@@ -18,7 +14,9 @@
 #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"
@@ -32,7 +30,6 @@
 #include "fd.h"
 #include "close_on_fork.h"
 #include "chunk_queue.h"
-#include "server.cmdline.h"
 #include "acl.h"
 
 static struct sender_status dccp_sender_status, *dss = &dccp_sender_status;
@@ -91,6 +88,7 @@ static int dccp_init_fec(struct sender_client *sc)
 {
 	int mps, ret;
 	socklen_t ml = sizeof(mps);
+	uint32_t mss; /* max slize size */
 
 	/* If call fails, return some sensible minimum value */
 	ret = getsockopt(sc->fd, SOL_DCCP, DCCP_SOCKOPT_GET_CUR_MPS, &mps, &ml);
@@ -100,8 +98,9 @@ static int dccp_init_fec(struct sender_client *sc)
 	}
 	PARA_INFO_LOG("current MPS = %d bytes\n", mps);
 	assert(mps > 0);
-	if (conf.dccp_max_slice_size_arg > 0)
-		mps = PARA_MIN(mps, conf.dccp_max_slice_size_arg);
+	mss = OPT_UINT32_VAL(DCCP_MAX_SLICE_SIZE);
+	if (mss > 0 && mss <= INT_MAX)
+		mps = PARA_MIN(mps, (int)mss);
 	return mps;
 }
 
@@ -118,6 +117,7 @@ static void dccp_post_select(fd_set *rfds, __a_unused fd_set *wfds)
 	struct sender_client *sc;
 	struct dccp_fec_client *dfc;
 	int tx_ccid;
+	uint32_t k, n;
 
 	sc = accept_sender_client(dss, rfds);
 	if (!sc)
@@ -134,7 +134,7 @@ static void dccp_post_select(fd_set *rfds, __a_unused fd_set *wfds)
 	/*
 	 * Bypass unused CCID paths: the sender does not receive application data
 	 * from the client; by shutting down this unused communication path we can
-	 * reduce processing costs a bit. See analogous comment in dccp_recv.c.
+	 * reduce processing costs a bit. See analogous comment in \ref dccp_recv.c.
 	 */
 	if (shutdown(sc->fd, SHUT_RD) < 0) {
 		PARA_WARNING_LOG("%s\n", strerror(errno));
@@ -143,8 +143,16 @@ static void dccp_post_select(fd_set *rfds, __a_unused fd_set *wfds)
 	}
 	dfc = para_calloc(sizeof(*dfc));
 	sc->private_data = dfc;
-	dfc->fcp.data_slices_per_group	= conf.dccp_data_slices_per_group_arg;
-	dfc->fcp.slices_per_group	= conf.dccp_slices_per_group_arg;
+	k = OPT_UINT32_VAL(DCCP_DATA_SLICES_PER_GROUP);
+	n = OPT_UINT32_VAL(DCCP_SLICES_PER_GROUP);
+	if (k == 0 || n == 0 || k >= n) {
+		PARA_WARNING_LOG("invalid FEC parameters, using defaults\n");
+		dfc->fcp.data_slices_per_group = 3;
+		dfc->fcp.slices_per_group = 4;
+	} else {
+		dfc->fcp.data_slices_per_group = k;
+		dfc->fcp.slices_per_group = n;
+	}
 	dfc->fcp.init_fec		= dccp_init_fec;
 	dfc->fcp.send_fec		= dccp_send_fec;
 	dfc->fcp.need_periodic_header   = false;
@@ -216,7 +224,7 @@ static char *dccp_status(void)
  */
 void dccp_send_init(struct sender *s)
 {
-	int ret, k, n;
+	int ret;
 
 	s->status = dccp_status;
 	s->send = NULL;
@@ -232,18 +240,9 @@ void dccp_send_init(struct sender *s)
 	s->client_cmds[SENDER_add] = NULL;
 	s->client_cmds[SENDER_delete] = NULL;
 
-	k = conf.dccp_data_slices_per_group_arg;
-	n = conf.dccp_slices_per_group_arg;
-
-	if (k <= 0 || n <= 0 || k >= n) {
-		PARA_WARNING_LOG("invalid FEC parameters, using defaults\n");
-		conf.dccp_data_slices_per_group_arg = 3;
-		conf.dccp_slices_per_group_arg = 4;
-	}
-
-	init_sender_status(dss, conf.dccp_access_arg, conf.dccp_access_given,
-		conf.dccp_port_arg, conf.dccp_max_clients_arg,
-		conf.dccp_default_deny_given);
+	init_sender_status(dss, OPT_RESULT(DCCP_ACCESS),
+		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));