Merge branch 'maint'

A fix for the udp sender which silences an annoying log message.

* maint:
  udp sender: Send EOF package only once.

diff --combined udp_send.c
index 8c9eebc94c3a5ef684ef86340b70d3140cd6fcda,2eb33b537606725dd71f1ddc4bb531814c659c7d..0ea95e41993c0c3442ff0fc219c2111f73e5e0f1
--- 1/udp_send.c
--- 2/udp_send.c
+++ b/udp_send.c
@@@ -15,9 -15,8 +15,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"
@@@ -65,8 -64,9 +65,9 @@@ static void udp_close_target(struct sen
        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)
@@@ -95,11 -95,11 +96,11 @@@ static int mcast_sender_setup(struct se
  {
        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)
@@@ -175,7 -175,7 +176,7 @@@ static int udp_resolve_target(const cha
        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)
@@@ -373,7 -373,7 +374,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);
@@@ -386,11 -386,10 +387,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);
        }
@@@ -440,7 -439,7 +441,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");
  }