Define status items in para.h.

[paraslash.git] / dccp_send.c

diff --git a/dccp_send.c b/dccp_send.c
index 77bee09783ad2cd46b7a55a70722b2dc5ffc4c93..61d42126f95ffc98cf10b33c3c286f7082d44692 100644 (file)
--- a/dccp_send.c
+++ b/dccp_send.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2010 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -11,25 +11,29 @@
  * (C) 2005 Ian McDonald <imcdnzl@gmail.com>
  */
 
+#include <netinet/in.h>
+#include <sys/socket.h>
 #include <regex.h>
 #include <sys/types.h>
-#include <dirent.h>
-#include <osl.h>
+#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 "afs.h"
 #include "server.h"
 #include "net.h"
 #include "list.h"
 #include "send.h"
+#include "sched.h"
 #include "vss.h"
 #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;
@@ -88,6 +92,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);
@@ -97,16 +102,18 @@ static int dccp_init_fec(struct sender_client *sc)
        }
        PARA_INFO_LOG("current MPS = %d bytes\n", mps);
        assert(mps > 0);
+       mss = OPT_UINT32_VAL(DCCP_MAX_SLICE_SIZE);
+       if (mss > 0 && mss <= INT_MAX)
+               mps = PARA_MIN(mps, (int)mss);
        return mps;
 }
 
-static int dccp_send_fec(struct sender_client *sc, char *buf, size_t len)
+static void dccp_send_fec(struct sender_client *sc, char *buf, size_t len)
 {
-       int ret = write_nonblock(sc->fd, buf, len, 0);
+       int ret = xwrite(sc->fd, buf, len);
 
        if (ret < 0)
                dccp_shutdown_client(sc);
-       return ret;
 }
 
 static void dccp_post_select(fd_set *rfds, __a_unused fd_set *wfds)
@@ -114,6 +121,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)
@@ -139,10 +147,19 @@ static void dccp_post_select(fd_set *rfds, __a_unused fd_set *wfds)
        }
        dfc = para_calloc(sizeof(*dfc));
        sc->private_data = dfc;
-       dfc->fcp.slices_per_group       = 4;
-       dfc->fcp.data_slices_per_group  = 3;
+       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;
        dfc->fc = vss_add_fec_client(sc, &dfc->fcp);
 }
 
@@ -153,6 +170,7 @@ static int dccp_com_on(__a_unused struct sender_command_data *scd)
 
 static int dccp_com_off(__a_unused struct sender_command_data *scd)
 {
+       dccp_shutdown_clients();
        generic_com_off(dss);
        return 1;
 }
@@ -191,13 +209,13 @@ static const char *dccp_list_available_ccids(void)
        return list;
 }
 
-static char *dccp_info(void)
+static char *dccp_status(void)
 {
-       char *info = get_sender_info(dss, "dccp");
-       char *ret  = make_message("%s" "\tsupported ccids: %s\n",
-                                 info, dccp_list_available_ccids());
-       free(info);
-       return ret;
+       char *status = generic_sender_status(dss, "dccp");
+       char *result = make_message("%ssupported ccids: %s\n", status,
+               dccp_list_available_ccids());
+       free(status);
+       return result;
 }
 
 /**
@@ -212,22 +230,23 @@ void dccp_send_init(struct sender *s)
 {
        int ret;
 
-       s->info = dccp_info;
+       s->status = dccp_status;
        s->send = NULL;
        s->pre_select = dccp_pre_select;
        s->post_select = dccp_post_select;
        s->shutdown_clients = dccp_shutdown_clients;
+       s->resolve_target = NULL;
        s->help = generic_sender_help;
-       s->client_cmds[SENDER_ON] = dccp_com_on;
-       s->client_cmds[SENDER_OFF] = dccp_com_off;
-       s->client_cmds[SENDER_DENY] = dccp_com_deny;
-       s->client_cmds[SENDER_ALLOW] = dccp_com_allow;
-       s->client_cmds[SENDER_ADD] = NULL;
-       s->client_cmds[SENDER_DELETE] = NULL;
-
-       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);
+       s->client_cmds[SENDER_on] = dccp_com_on;
+       s->client_cmds[SENDER_off] = dccp_com_off;
+       s->client_cmds[SENDER_deny] = dccp_com_deny;
+       s->client_cmds[SENDER_allow] = dccp_com_allow;
+       s->client_cmds[SENDER_add] = NULL;
+       s->client_cmds[SENDER_delete] = NULL;
+
+       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));