X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=udp_send.c;h=3e3950f90d232794df915e45c39d2e8ad031d44f;hp=8baf15e383586ad9a65e726cb62de4af8789f09a;hb=b55f405f8005821ffa369b929bc0b419da62683d;hpb=82adec241db558fe8e145237c6e5653a3ce20580 diff --git a/udp_send.c b/udp_send.c index 8baf15e3..3e3950f9 100644 --- a/udp_send.c +++ b/udp_send.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2010 Andre Noll + * Copyright (C) 2005-2012 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -9,7 +9,6 @@ #include #include -#include #include #include #include @@ -24,13 +23,12 @@ #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 +41,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 +52,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 wirte() 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 +104,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 +150,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) @@ -213,14 +202,13 @@ static int udp_com_off(__a_unused struct sender_command_data *scd) 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; char host[MAX_HOSTLEN]; int32_t port; 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 */ @@ -228,9 +216,21 @@ static int udp_com_delete(struct sender_command_data *scd) continue; if (strcmp(host, scd->host)) 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. */ @@ -245,12 +245,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) { @@ -270,33 +271,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); - if (ret < 0) - goto fail; - ret = send_queued_chunks(sc->fd, sc->cq); + return; + if (len == 0) + return; + ret = udp_check_socket_state(sc); 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 @@ -306,59 +298,57 @@ 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 void udp_add_target(struct sender_command_data *scd) +static int udp_com_add(struct sender_command_data *scd) { 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 = 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 = 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; - 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); - 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); + 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); -} - -static int udp_com_add(struct sender_command_data *scd) -{ - udp_add_target(scd); - return 1; + return ret; } static char *udp_info(void) @@ -368,9 +358,8 @@ static char *udp_info(void) 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 ); @@ -401,7 +390,7 @@ static void udp_init_target_list(void) PARA_CRIT_LOG("not adding requested target '%s'\n", conf.udp_target_arg[i]); else - udp_add_target(&scd); + udp_com_add(&scd); } } @@ -409,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" ); }