Remove some duplicate #include statements.
[paraslash.git] / udp_send.c
index 71e85b7..8fca5bc 100644 (file)
@@ -1,36 +1,35 @@
 /*
- * Copyright (C) 2005-2010 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2014 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file udp_send.c Para_server's udp sender. */
 
-
-#include <regex.h>
-#include <sys/time.h>
-#include <dirent.h>
+#include <netinet/in.h>
 #include <sys/socket.h>
+#include <regex.h>
+#include <sys/types.h>
 #include <netinet/udp.h>
 #include <net/if.h>
-#include <osl.h>
+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.h>
 
 #include "server.cmdline.h"
 #include "para.h"
 #include "error.h"
 #include "string.h"
 #include "afh.h"
-#include "afs.h"
 #include "server.h"
 #include "list.h"
 #include "send.h"
+#include "sched.h"
 #include "vss.h"
 #include "portable_io.h"
 #include "net.h"
 #include "fd.h"
-#include "sched.h"
 #include "close_on_fork.h"
-#include "chunk_queue.h"
 
 /**
  * Time window during which ICMP Destination/Port Unreachable messages are
@@ -43,8 +42,6 @@
 struct udp_target {
        /** Track time (seconds) of last ICMP Port Unreachable error */
        time_t last_unreachable;
-       /** Common sender client data */
-       struct sender_client *sc;
        /** The opaque structure returned by vss_add_fec_client(). */
        struct fec_client *fc;
        /** The FEC parameters for this target. */
@@ -56,21 +53,30 @@ static int sender_status;
 
 static void udp_close_target(struct sender_client *sc)
 {
-       if (sc->cq != NULL) {
-               del_close_on_fork_list(sc->fd);
-               cq_destroy(sc->cq);
-               sc->cq = NULL;
-       }
+       const char *buf;
+       size_t len = vss_get_fec_eof_packet(&buf);
+
+       /*
+        * Ignore the return value of write() since we are closing the target
+        * anyway. The sole purpose of the "do_nothing" statement is to silence
+        * gcc.
+        */
+       if (write(sc->fd, buf, len))
+               do_nothing;
 }
 
-static void udp_delete_target(struct udp_target *ut, const char *msg)
+static void udp_delete_target(struct sender_client *sc, const char *msg)
 {
-       PARA_NOTICE_LOG("deleting %s (%s) from list\n", ut->sc->name, msg);
-       udp_close_target(ut->sc);
+       struct udp_target *ut = sc->private_data;
+
+       PARA_NOTICE_LOG("deleting %s (%s) from list\n", sc->name, msg);
+       udp_close_target(sc);
+       close(sc->fd);
+       del_close_on_fork_list(sc->fd);
        vss_del_fec_client(ut->fc);
-       list_del(&ut->sc->node);
-       free(ut->sc->name);
-       free(ut->sc);
+       list_del(&sc->node);
+       free(sc->name);
+       free(sc);
        free(ut);
 }
 
@@ -99,6 +105,7 @@ static int mcast_sender_setup(struct sender_client *sc)
 
        if (getpeername(sc->fd, (struct sockaddr *)&ss, &sslen) < 0)
                goto err;
+       assert(ss.ss_family == AF_INET || ss.ss_family == AF_INET6);
 
        /* RFC 3493, 5.2: -1 means 'use kernel default' */
        if (ttl < 0 || ttl > 255)
@@ -144,38 +151,21 @@ static int mcast_sender_setup(struct sender_client *sc)
                if (setsockopt(sc->fd, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, &ttl, sizeof(ttl)) < 0)
                        break;
                return 0;
-       default:
-               PARA_ERROR_LOG("address family %d not supported", ss.ss_family);
-               return -E_ADDRESS_LOOKUP;
        }
 err:
        return -ERRNO_TO_PARA_ERROR(errno);
 }
 
-/** The maximal size of the per-target chunk queue. */
-#define UDP_CQ_BYTES 40000
-
 static void udp_init_session(struct sender_client *sc)
 {
-       if (sc->cq == NULL) {
-               sc->cq = cq_new(UDP_CQ_BYTES);
-               add_close_on_fork_list(sc->fd);
-               PARA_NOTICE_LOG("sending to udp %s\n", sc->name);
-       }
+       PARA_NOTICE_LOG("sending to udp %s\n", sc->name);
 }
 
 static void udp_shutdown_targets(void)
 {
        struct sender_client *sc, *tmp;
-       const char *buf;
-       size_t len = vss_get_fec_eof_packet(&buf);
-
        list_for_each_entry_safe(sc, tmp, &targets, node)
-               if (sc->cq != NULL) {
-                       /* ignore return value, closing the target anyway. */
-                       (void)write(sc->fd, buf, len);
-                       udp_close_target(sc);
-               }
+               udp_close_target(sc);
 }
 
 static int udp_resolve_target(const char *url, struct sender_command_data *scd)
@@ -234,11 +224,10 @@ static struct sender_client *udp_lookup_target(struct sender_command_data *scd)
 
 static int udp_com_delete(struct sender_command_data *scd)
 {
-       struct udp_target *ut = sc->private_data;
        struct sender_client *sc = udp_lookup_target(scd);
 
        if (sc) {
-               udp_delete_target(ut, "com_delete");
+               udp_delete_target(sc, "com_delete");
                return 1;
        }
        PARA_NOTICE_LOG("not deleting non-existing target '%s'\n", scd->host);
@@ -257,12 +246,13 @@ static int udp_init_fec(struct sender_client *sc)
 }
 
 /** Check and clear socket error if any. */
-static int udp_check_socket_state(struct udp_target *ut)
+static int udp_check_socket_state(struct sender_client *sc)
 {
+       struct udp_target *ut = sc->private_data;
        int ret;
        socklen_t errlen = sizeof(ret);
 
-       if (getsockopt(ut->sc->fd, SOL_SOCKET, SO_ERROR, &ret, &errlen) < 0) {
+       if (getsockopt(sc->fd, SOL_SOCKET, SO_ERROR, &ret, &errlen) < 0) {
                PARA_ERROR_LOG("SO_ERROR failed: %s\n", strerror(ret));
                return 0;
        } else if (ret == 0) {
@@ -282,33 +272,24 @@ static int udp_check_socket_state(struct udp_target *ut)
                         */
                        PARA_NOTICE_LOG("Evicting %s after %d seconds "
                                        "of connection errors.\n",
-                                       ut->sc->name, (int)dist);
+                                       sc->name, (int)dist);
                }
        }
        return -ERRNO_TO_PARA_ERROR(ret);
 }
 
-static int udp_send_fec(struct sender_client *sc, char *buf, size_t len)
+static void udp_send_fec(struct sender_client *sc, char *buf, size_t len)
 {
-       struct udp_target *ut = sc->private_data;
        int ret;
 
        if (sender_status == SENDER_OFF)
-               return 0;
-       if (len == 0 && !cq_peek(ut->sc->cq))
-               return 0;
-       ret = udp_check_socket_state(ut);
+               return;
+       if (len == 0)
+               return;
+       ret = udp_check_socket_state(sc);
        if (ret < 0)
                goto fail;
-       ret = send_queued_chunks(sc->fd, sc->cq);
-       if (ret < 0)
-               goto fail;
-       if (!ret) { /* still data left in the queue */
-               ret = cq_force_enqueue(sc->cq, buf, len);
-               assert(ret >= 0);
-               return 0;
-       }
-       ret = write_nonblock(sc->fd, buf, len);
+       ret = xwrite(sc->fd, buf, len);
        if (ret == -ERRNO_TO_PARA_ERROR(ECONNREFUSED)) {
                /*
                 * Happens if meanwhile an ICMP Destination / Port Unreachable
@@ -318,14 +299,9 @@ static int udp_send_fec(struct sender_client *sc, char *buf, size_t len)
        }
        if (ret < 0)
                goto fail;
-       if (ret != len) {
-               ret = cq_force_enqueue(sc->cq, buf + ret, len - ret);
-               assert(ret >= 0);
-       }
-       return 1;
+       return;
 fail:
-       udp_delete_target(ut, para_strerror(-ret));
-       return ret;
+       udp_delete_target(sc, para_strerror(-ret));
 }
 
 static int udp_com_add(struct sender_command_data *scd)
@@ -340,51 +316,51 @@ static int udp_com_add(struct sender_command_data *scd)
                return -E_TARGET_EXISTS;
        }
        ut = para_calloc(sizeof(*ut));
-       sc = ut->sc = para_calloc(sizeof(*sc));
+       sc = para_calloc(sizeof(*sc));
        ut->fcp.slices_per_group      = scd->slices_per_group;
        ut->fcp.data_slices_per_group = scd->data_slices_per_group;
-       ut->fcp.max_slice_bytes       = scd->max_slice_bytes;
        ut->fcp.init_fec              = udp_init_fec;
        ut->fcp.send_fec              = udp_send_fec;
+       ut->fcp.need_periodic_header  = true;
 
-       ut->sc->private_data = ut;
-       ut->sc->fd = -1;
+       sc->private_data = ut;
+       sc->fd = -1;
        ret = para_connect_simple(IPPROTO_UDP, scd->host, scd->port);
        if (ret < 0)
                goto err;
-       ut->sc->fd = ret;
+       sc->fd = ret;
 
-       ret = mcast_sender_setup(ut->sc);
+       ret = mcast_sender_setup(sc);
        if (ret < 0)
                goto err;
-       ret = mark_fd_nonblocking(ut->sc->fd);
+       ret = mark_fd_nonblocking(sc->fd);
        if (ret < 0)
                goto err;
-       ut->sc->name = para_strdup(remote_name(ut->sc->fd));
-       PARA_INFO_LOG("adding to target list (%s)\n", ut->sc->name);
-       ut->fc = vss_add_fec_client(ut->sc, &ut->fcp);
-       para_list_add(&ut->sc->node, &targets);
+       sc->name = para_strdup(remote_name(sc->fd));
+       PARA_INFO_LOG("adding to target list (%s)\n", sc->name);
+       ut->fc = vss_add_fec_client(sc, &ut->fcp);
+       para_list_add(&sc->node, &targets);
+       add_close_on_fork_list(sc->fd);
        return 1;
 err:
-       if (ut->sc->fd >= 0)
-               close(ut->sc->fd);
+       if (sc->fd >= 0)
+               close(sc->fd);
        PARA_NOTICE_LOG("failed to set up %s:%d (%s)- not adding it\n",
                        scd->host, scd->port, para_strerror(-ret));
-       free(ut->sc);
+       free(sc);
        free(ut);
        return ret;
 }
 
-static char *udp_info(void)
+static char *udp_status(void)
 {
        struct sender_client *sc;
        char *ret, *tgts = NULL;
 
        list_for_each_entry(sc, &targets, node) {
                struct udp_target *ut = sc->private_data;
-               char *tmp = make_message("%s%s/%u:%u:%u ", tgts ? : "",
-                       ut->sc->name,
-                       ut->fcp.max_slice_bytes,
+               char *tmp = make_message("%s%s/%u:%u ",
+                       tgts ? : "", sc->name,
                        ut->fcp.data_slices_per_group,
                        ut->fcp.slices_per_group
                );
@@ -392,10 +368,9 @@ static char *udp_info(void)
                tgts = tmp;
        }
        ret = make_message(
-               "udp sender:\n"
-               "\tstatus: %s\n"
-               "\tport: %s\n"
-               "\ttargets: %s\n",
+               "status: %s\n"
+               "port: %s\n"
+               "targets: %s\n",
                (sender_status == SENDER_ON)? "on" : "off",
                stringify_port(conf.udp_default_port_arg, "udp"),
                tgts? tgts : "(none)"
@@ -423,15 +398,17 @@ static char *udp_help(void)
 {
        return make_message(
                "usage: {on|off}\n"
-               "usage: {add|delete} host[:port][/packet_size:k:n]\n"
+               "usage: {add|delete} ip_address[:port][/[packet_size:]k:n]\n"
+               "       - k is the number of data slices per FEC group\n"
+               "       - n is the total number of slices in a FEC group\n"
+               "       - packet_size reduces the slice size below path MTU\n\n"
                "examples: add 224.0.1.38:1500  (IPv4 multicast)\n"
-               "          add 224.0.1.38:1500/1400:14:16\n"
-               "              (likewise, using 1400 byte packets, with 14\n"
-               "               data slices per 16 slice FEC group)\n"
+               "          add 224.0.1.38:8080/14:16 (explicit FEC)\n"
                "          add 10.10.1.42       (using default port)\n"
                "          add [FF05::42]:1500  (IPv6 multicast)\n"
                "          add [::1]            (IPv6 localhost/default port)\n"
                "          delete myhost.net    (host with port wildcard)\n"
+               "          delete 10.1.2.3:456  (IPv4 with explicit port)\n"
                "          delete [badc0de::1]  (IPv6 with port wildcard)\n"
        );
 }
@@ -446,7 +423,7 @@ static char *udp_help(void)
 void udp_send_init(struct sender *s)
 {
        INIT_LIST_HEAD(&targets);
-       s->info = udp_info;
+       s->status = udp_status;
        s->help = udp_help;
        s->send = NULL;
        s->pre_select = NULL;