Remove some unused error codes.

[paraslash.git] / udp_send.c

diff --git a/udp_send.c b/udp_send.c
index b542f5a..adf2339 100644 (file)
--- a/udp_send.c
+++ b/udp_send.c
@@ -41,10 +41,6 @@
 
 /** Describes one entry in the list of targets for the udp sender. */
 struct udp_target {
 
 /** Describes one entry in the list of targets for the udp sender. */
 struct udp_target {

-       /** The hostname (DNS name or IPv4/v6 address string). */
-       char host[MAX_HOSTLEN];
-       /** The UDP port. */
-       int port;

        /** Track time (seconds) of last ICMP Port Unreachable error */
        time_t last_unreachable;
        /** Common sender client data */
        /** Track time (seconds) of last ICMP Port Unreachable error */
        time_t last_unreachable;
        /** Common sender client data */


@@ -63,22 +59,20 @@ static void udp_close_target(struct sender_client *sc)
        if (sc->cq != NULL) {
                del_close_on_fork_list(sc->fd);
                cq_destroy(sc->cq);
        if (sc->cq != NULL) {
                del_close_on_fork_list(sc->fd);
                cq_destroy(sc->cq);

-               free(sc->name);
-               sc->name = NULL;

                sc->cq = NULL;
                sc->cq = NULL;

-

        }
 }
 
        }
 }
 

-static void udp_delete_target(struct udp_target *ut, const char *msg)
+static void udp_delete_target(struct sender_client *sc, const char *msg)

 {
 {

+       struct udp_target *ut = sc->private_data;

 
 

-       PARA_NOTICE_LOG("deleting %s#%d (%s) from list\n", ut->host,
-               ut->port, msg);
-       udp_close_target(ut->sc);
+       PARA_NOTICE_LOG("deleting %s (%s) from list\n", sc->name, msg);
+       udp_close_target(sc);

        vss_del_fec_client(ut->fc);
        vss_del_fec_client(ut->fc);

-       list_del(&ut->sc->node);
-       free(ut->sc);
+       list_del(&sc->node);
+       free(sc->name);
+       free(sc);

        free(ut);
 }
 
        free(ut);
 }
 


@@ -107,6 +101,7 @@ static int mcast_sender_setup(struct sender_client *sc)
 
        if (getpeername(sc->fd, (struct sockaddr *)&ss, &sslen) < 0)
                goto err;
 
        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)
 
        /* RFC 3493, 5.2: -1 means 'use kernel default' */
        if (ttl < 0 || ttl > 255)


@@ -152,9 +147,6 @@ 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;
                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);
        }
 err:
        return -ERRNO_TO_PARA_ERROR(errno);


@@ -166,9 +158,8 @@ err:
 static void udp_init_session(struct sender_client *sc)
 {
        if (sc->cq == NULL) {
 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);
                add_close_on_fork_list(sc->fd);

-               sc->cq   = cq_new(UDP_CQ_BYTES);
-               sc->name = para_strdup(remote_name(sc->fd));

                PARA_NOTICE_LOG("sending to udp %s\n", sc->name);
        }
 }
                PARA_NOTICE_LOG("sending to udp %s\n", sc->name);
        }
 }


@@ -222,21 +213,35 @@ static int udp_com_off(__a_unused struct sender_command_data *scd)
        return 1;
 }
 
        return 1;
 }
 

-static int udp_com_delete(struct sender_command_data *scd)
+static struct sender_client *udp_lookup_target(struct sender_command_data *scd)

 {
        struct sender_client *sc, *tmp;
 {
        struct sender_client *sc, *tmp;

+       char host[MAX_HOSTLEN];
+       int32_t port;

 
        list_for_each_entry_safe(sc, tmp, &targets, node) {
 
        list_for_each_entry_safe(sc, tmp, &targets, node) {

-               struct udp_target *ut = sc->private_data;
+               parse_url(sc->name, host, sizeof(host), &port);

 
                /* Unspecified port means wildcard port match */
 
                /* Unspecified port means wildcard port match */

-               if (scd->port > 0 && scd->port != ut->port)
+               if (scd->port > 0 && scd->port != port)

                        continue;
                        continue;

-               if (strcmp(ut->host, scd->host))
+               if (strcmp(host, scd->host))

                        continue;
                        continue;

-               udp_delete_target(ut, "com_delete");
+               return sc;

        }
        }

-       return 1;
+       return NULL;
+}
+
+static int udp_com_delete(struct sender_command_data *scd)
+{
+       struct sender_client *sc = udp_lookup_target(scd);
+
+       if (sc) {
+               udp_delete_target(sc, "com_delete");
+               return 1;
+       }
+       PARA_NOTICE_LOG("not deleting non-existing target '%s'\n", scd->host);
+       return -E_TARGET_NOT_FOUND;

 }
 
 /** Initialize UDP session and set maximum payload size. */
 }
 
 /** Initialize UDP session and set maximum payload size. */


@@ -251,12 +256,13 @@ static int udp_init_fec(struct sender_client *sc)
 }
 
 /** Check and clear socket error if any. */
 }
 
 /** 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);
 
        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) {
                PARA_ERROR_LOG("SO_ERROR failed: %s\n", strerror(ret));
                return 0;
        } else if (ret == 0) {


@@ -274,9 +280,9 @@ static int udp_check_socket_state(struct udp_target *ut)
                         * unreachable_time < dist <= 2 * unreachable_time
                         * No errors are allowed during this time window.
                         */
                         * unreachable_time < dist <= 2 * unreachable_time
                         * No errors are allowed during this time window.
                         */

-                       PARA_NOTICE_LOG("Evicting %s#%d after %d seconds "
+                       PARA_NOTICE_LOG("Evicting %s after %d seconds "

                                        "of connection errors.\n",
                                        "of connection errors.\n",

-                                       ut->host, ut->port, (int)dist);
+                                       sc->name, (int)dist);

                }
        }
        return -ERRNO_TO_PARA_ERROR(ret);
                }
        }
        return -ERRNO_TO_PARA_ERROR(ret);


@@ -284,14 +290,13 @@ static int udp_check_socket_state(struct udp_target *ut)
 
 static int udp_send_fec(struct sender_client *sc, char *buf, size_t len)
 {
 
 static int 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;
        int ret;
 
        if (sender_status == SENDER_OFF)
                return 0;

-       if (len == 0 && !cq_peek(ut->sc->cq))
+       if (len == 0 && !cq_peek(sc->cq))

                return 0;
                return 0;

-       ret = udp_check_socket_state(ut);
+       ret = udp_check_socket_state(sc);

        if (ret < 0)
                goto fail;
        ret = send_queued_chunks(sc->fd, sc->cq);
        if (ret < 0)
                goto fail;
        ret = send_queued_chunks(sc->fd, sc->cq);


@@ -318,52 +323,55 @@ static int udp_send_fec(struct sender_client *sc, char *buf, size_t len)
        }
        return 1;
 fail:
        }
        return 1;
 fail:

-       udp_delete_target(ut, para_strerror(-ret));
+       udp_delete_target(sc, para_strerror(-ret));

        return ret;
 }
 
        return ret;
 }
 

-static void udp_add_target(struct sender_command_data *scd)
+static int udp_com_add(struct sender_command_data *scd)

 {
        int ret;
 {
        int ret;

-       struct udp_target *ut = para_calloc(sizeof(*ut));
+       struct udp_target *ut;
+       struct sender_client *sc = udp_lookup_target(scd);

 
 

+       if (sc) {
+               PARA_NOTICE_LOG("target %s already exists - not adding it\n",
+                               sc->name);
+               return -E_TARGET_EXISTS;
+       }
+       ut = para_calloc(sizeof(*ut));
+       sc = ut->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.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->sc = para_calloc(sizeof(*ut->sc));
-       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;
        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;
        if (ret < 0)
                goto err;

-       ret = mark_fd_nonblocking(ut->sc->fd);
+       ret = mark_fd_nonblocking(sc->fd);

        if (ret < 0)
                goto err;
        if (ret < 0)
                goto err;

-       PARA_INFO_LOG("adding to target list (%s#%d)\n", ut->host, ut->port);
-       ut->fc = vss_add_fec_client(ut->sc, &ut->fcp);
-       para_list_add(&ut->sc->node, &targets);
-       return;
+       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);
+       return 1;

 err:
 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));
        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);
        free(ut);

-}
-
-static int udp_com_add(struct sender_command_data *scd)
-{
-       udp_add_target(scd);
-       return 1;
+       return ret;

 }
 
 static char *udp_info(void)
 }
 
 static char *udp_info(void)


@@ -373,10 +381,8 @@ static char *udp_info(void)
 
        list_for_each_entry(sc, &targets, node) {
                struct udp_target *ut = sc->private_data;
 
        list_for_each_entry(sc, &targets, node) {
                struct udp_target *ut = sc->private_data;

-               bool is_v6 = strchr(ut->host, ':') != NULL;
-               char *tmp = make_message("%s%s%s%s:%d/%u:%u:%u ", tgts ? : "",
-                       is_v6 ? "[" : "", ut->host,
-                       is_v6 ? "]" : "", ut->port,
+               char *tmp = make_message("%s%s/%u:%u:%u ",
+                       tgts ? : "", sc->name,

                        ut->fcp.max_slice_bytes,
                        ut->fcp.data_slices_per_group,
                        ut->fcp.slices_per_group
                        ut->fcp.max_slice_bytes,
                        ut->fcp.data_slices_per_group,
                        ut->fcp.slices_per_group


@@ -408,7 +414,7 @@ static void udp_init_target_list(void)
                        PARA_CRIT_LOG("not adding requested target '%s'\n",
                                        conf.udp_target_arg[i]);
                else
                        PARA_CRIT_LOG("not adding requested target '%s'\n",
                                        conf.udp_target_arg[i]);
                else

-                       udp_add_target(&scd);
+                       udp_com_add(&scd);

        }
 }
 
        }
 }
 


@@ -416,15 +422,17 @@ static char *udp_help(void)
 {
        return make_message(
                "usage: {on|off}\n"
 {
        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"
                "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"
                "          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"
        );
 }
                "          delete [badc0de::1]  (IPv6 with port wildcard)\n"
        );
 }