server: Simplify afs socket cookie code.

[paraslash.git] / udp_send.c

diff --git a/udp_send.c b/udp_send.c
index 425118a135edfee7224f40256dc087a803115aaf..49c17631487db2cabedb4acd5444bb589d602762 100644 (file)
--- a/udp_send.c
+++ b/udp_send.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file udp_send.c Para_server's udp sender. */
 
@@ -15,8 +11,9 @@
 #include <arpa/inet.h>
 #include <sys/un.h>
 #include <netdb.h>
+#include <lopsub.h>
 
-#include "server.cmdline.h"
+#include "server.lsg.h"
 #include "para.h"
 #include "error.h"
 #include "string.h"
@@ -64,8 +61,9 @@ static void udp_close_target(struct sender_client *sc)
        PARA_NOTICE_LOG("sending FEC EOF\n");
        len = vss_get_fec_eof_packet(&buf);
        /* Ignore write() errors since we are closing the target anyway. */
-       if (write(sc->fd, buf, len) == len)
-               ut->sent_fec_eof = true;
+       if (write(sc->fd, buf, len))
+               do_nothing; /* avoid "ignoring return value" warning */
+       ut->sent_fec_eof = true;
 }
 
 static void udp_delete_target(struct sender_client *sc, const char *msg)
@@ -94,11 +92,11 @@ static int mcast_sender_setup(struct sender_client *sc)
 {
        struct sockaddr_storage ss;
        socklen_t sslen = sizeof(ss);
-       int ttl = conf.udp_ttl_arg, id = 0;
+       int ttl = OPT_INT32_VAL(UDP_TTL), id = 0;
        const int on = 1;
 
-       if (conf.udp_mcast_iface_given) {
-               char *iface = conf.udp_mcast_iface_arg;
+       if (OPT_GIVEN(UDP_MCAST_IFACE)) {
+               const char *iface = OPT_STRING_VAL(UDP_MCAST_IFACE);
 
                id = if_nametoindex(iface);
                if (id == 0)
@@ -174,7 +172,7 @@ static int udp_resolve_target(const char *url, struct sender_command_data *scd)
        ret = parse_fec_url(url, scd);
        if (ret)
                return ret;
-       port = scd->port > 0 ? scd->port : conf.udp_default_port_arg;
+       port = scd->port > 0 ? scd->port : OPT_UINT32_VAL(UDP_DEFAULT_PORT);
 
        ret = para_connect_simple(IPPROTO_UDP, scd->host, port);
        if (ret < 0)
@@ -372,7 +370,7 @@ static char *udp_status(void)
                "port: %s\n"
                "targets: %s\n",
                (sender_status == SENDER_on)? "on" : "off",
-               stringify_port(conf.udp_default_port_arg, "udp"),
+               stringify_port(OPT_UINT32_VAL(UDP_DEFAULT_PORT), "udp"),
                tgts? tgts : "(none)"
        );
        free(tgts);
@@ -385,10 +383,11 @@ static void udp_init_target_list(void)
        int i;
 
        INIT_LIST_HEAD(&targets);
-       for (i = 0; i < conf.udp_target_given; i++) {
-               if (udp_resolve_target(conf.udp_target_arg[i], &scd) < 0)
+       for (i = 0; i < OPT_GIVEN(UDP_TARGET); i++) {
+               const char *arg = lls_string_val(i, OPT_RESULT(UDP_TARGET));
+               if (udp_resolve_target(arg, &scd) < 0)
                        PARA_CRIT_LOG("not adding requested target '%s'\n",
-                                       conf.udp_target_arg[i]);
+                                       arg);
                else
                        udp_com_add(&scd);
        }
@@ -438,7 +437,7 @@ void udp_send_init(struct sender *s)
        s->client_cmds[SENDER_delete] = udp_com_delete;
        sender_status = SENDER_off;
        udp_init_target_list();
-       if (!conf.udp_no_autostart_given)
+       if (!OPT_GIVEN(UDP_NO_AUTOSTART))
                sender_status = SENDER_on;
        PARA_DEBUG_LOG("udp sender init complete\n");
 }