Trivial: Rename completion_result variables.

[paraslash.git] / dccp_send.c

diff --git a/dccp_send.c b/dccp_send.c
index 92dd933347d2c48d857355da34c13673da54968b..69ba65f5ef864396e81a722d8e69817a0040166f 100644 (file)
--- 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,13 +14,15 @@
 #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 "afh.h"
-#include "server.h"
 #include "net.h"
+#include "server.h"
 #include "list.h"
 #include "send.h"
 #include "sched.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;
@@ -153,7 +161,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)
@@ -216,8 +225,6 @@ static char *dccp_status(void)
  */
 void dccp_send_init(struct sender *s)
 {
-       int ret, k, n;
-
        s->status = dccp_status;
        s->send = NULL;
        s->pre_select = dccp_pre_select;
@@ -232,19 +239,8 @@ 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);
-       ret = generic_com_on(dss, IPPROTO_DCCP);
-       if (ret < 0)
-               PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+       init_sender_status(dss, OPT_RESULT(DCCP_ACCESS),
+               OPT_UINT32_VAL(DCCP_PORT), OPT_UINT32_VAL(DCCP_MAX_CLIENTS),
+               OPT_GIVEN(DCCP_DEFAULT_DENY));
+       generic_com_on(dss, IPPROTO_DCCP);
 }