X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=udp_send.c;h=24ebf5848ed3c2de5d671de98dab142ce9018581;hp=273b6a42e4c26e21abf4211a7e528ba5a7629a9c;hb=4ebaf62d6bbd0498d93e19bc4f0a3c9564b1a8f5;hpb=63c513602a6b6a97cdced053beea0b2d07a9f984 diff --git a/udp_send.c b/udp_send.c index 273b6a42..24ebf584 100644 --- a/udp_send.c +++ b/udp_send.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 Andre Noll + * Copyright (C) 2005-2010 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -11,6 +11,7 @@ #include #include #include +#include #include #include @@ -21,9 +22,9 @@ #include "afh.h" #include "afs.h" #include "server.h" -#include "vss.h" #include "list.h" #include "send.h" +#include "vss.h" #include "portable_io.h" #include "net.h" #include "fd.h" @@ -31,18 +32,23 @@ #include "close_on_fork.h" #include "chunk_queue.h" +/** + * Time window during which ICMP Destination/Port Unreachable messages are + * ignored, covering transient receiver problems such as restarting the + * client, rebooting, reconfiguration, or handover. + */ +#define UDP_MAX_UNREACHABLE_TIME 30 + /** Describes one entry in the list of targets for the udp sender. */ struct udp_target { - /** The position of this target in the list of targets. */ - struct list_head node; /** The hostname (DNS name or IPv4/v6 address string). */ char host[MAX_HOSTLEN]; /** The UDP port. */ int port; - /** The socket fd. */ - int fd; - /** The list of queued chunks for this fd. */ - struct chunk_queue *cq; + /** 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. */ @@ -52,50 +58,55 @@ struct udp_target { static struct list_head targets; static int sender_status; -static void udp_close_target(struct udp_target *ut) +static void udp_close_target(struct sender_client *sc) { - if (ut->fd < 0) - return; - close(ut->fd); - del_close_on_fork_list(ut->fd); - cq_destroy(ut->cq); - ut->cq = NULL; - ut->fd = -1; + if (sc->cq != NULL) { + del_close_on_fork_list(sc->fd); + cq_destroy(sc->cq); + free(sc->name); + sc->name = NULL; + sc->cq = NULL; + + } } static void udp_delete_target(struct udp_target *ut, const char *msg) { + PARA_NOTICE_LOG("deleting %s#%d (%s) from list\n", ut->host, ut->port, msg); - udp_close_target(ut); + udp_close_target(ut->sc); vss_del_fec_client(ut->fc); - list_del(&ut->node); + list_del(&ut->sc->node); + free(ut->sc); free(ut); } /** * Perform AF-independent multicast sender setup. * - * \param fd The connected socket descriptor. - * \param ttl UDPv4 multicast TTL or UDPv6 multicast number of hops. - * Use -1 to mean default, 0..255 otherwise. - * \param iface The outgoing multicast interface, or NULL for the default. + * \param sc The connected sender client. * * \return Zero if okay, negative on error. */ -static int mcast_sender_setup(struct udp_target *ut, int ttl, char *iface) +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; const int on = 1; - int id = iface == NULL ? 0 : if_nametoindex(iface); - if (getpeername(ut->fd, (struct sockaddr *)&ss, &sslen) < 0) - goto err; + if (conf.udp_mcast_iface_given) { + char *iface = conf.udp_mcast_iface_arg; + + id = if_nametoindex(iface); + if (id == 0) + PARA_WARNING_LOG("could not resolve interface '%s', " + "using default", iface); + } - if (iface != NULL && id == 0) - PARA_WARNING_LOG("could not resolve interface %s, using default", iface); + if (getpeername(sc->fd, (struct sockaddr *)&ss, &sslen) < 0) + goto err; /* RFC 3493, 5.2: -1 means 'use kernel default' */ if (ttl < 0 || ttl > 255) @@ -111,7 +122,7 @@ static int mcast_sender_setup(struct udp_target *ut, int ttl, char *iface) memset(&mn, 0, sizeof(mn)); mn.imr_ifindex = id; - if (setsockopt(ut->fd, IPPROTO_IP, IP_MULTICAST_IF, &mn, sizeof(mn)) < 0) + if (setsockopt(sc->fd, IPPROTO_IP, IP_MULTICAST_IF, &mn, sizeof(mn)) < 0) goto err; #else PARA_ERROR_LOG("No support for setting outgoing IPv4 mcast interface."); @@ -121,24 +132,24 @@ static int mcast_sender_setup(struct udp_target *ut, int ttl, char *iface) * Enable receiving multicast messages generated on the local host * At least on Linux, this is enabled by default. */ - if (setsockopt(ut->fd, IPPROTO_IP, IP_MULTICAST_LOOP, &on, sizeof(on)) < 0) + if (setsockopt(sc->fd, IPPROTO_IP, IP_MULTICAST_LOOP, &on, sizeof(on)) < 0) break; /* Default: use local subnet (do not flood out into the WAN) */ if (ttl == -1) ttl = 1; - if (setsockopt(ut->fd, IPPROTO_IP, IP_MULTICAST_TTL, &ttl, sizeof(ttl)) < 0) + if (setsockopt(sc->fd, IPPROTO_IP, IP_MULTICAST_TTL, &ttl, sizeof(ttl)) < 0) break; return 0; case AF_INET6: if (!IN6_IS_ADDR_MULTICAST(&((struct sockaddr_in6 *)&ss)->sin6_addr)) return 0; if (id != 0 && - setsockopt(ut->fd, IPPROTO_IPV6, IPV6_MULTICAST_IF, &id, sizeof(id)) < 0) + setsockopt(sc->fd, IPPROTO_IPV6, IPV6_MULTICAST_IF, &id, sizeof(id)) < 0) break; - if (setsockopt(ut->fd, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, &on, sizeof(on)) < 0) + if (setsockopt(sc->fd, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, &on, sizeof(on)) < 0) break; - if (setsockopt(ut->fd, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, &ttl, sizeof(ttl)) < 0) + if (setsockopt(sc->fd, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, &ttl, sizeof(ttl)) < 0) break; return 0; default: @@ -152,53 +163,28 @@ err: /** The maximal size of the per-target chunk queue. */ #define UDP_CQ_BYTES 40000 -static int udp_init_session(struct udp_target *ut) +static void udp_init_session(struct sender_client *sc) { - int ret; - char *iface = NULL; - - if (ut->fd >= 0) /* nothing to do */ - return 0; - - ret = makesock(AF_UNSPEC, IPPROTO_UDP, 0, ut->host, ut->port); - if (ret < 0) - return ret; - ut->fd = ret; - - if (conf.udp_mcast_iface_given) - iface = conf.udp_mcast_iface_arg; - - ret = mcast_sender_setup(ut, conf.udp_ttl_arg, iface); - if (ret < 0) { - close(ut->fd); - return ret; + if (sc->cq == NULL) { + 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); } - - ret = mark_fd_nonblocking(ut->fd); - if (ret < 0) { - close(ut->fd); - return ret; - } - add_close_on_fork_list(ut->fd); - ut->cq = cq_new(UDP_CQ_BYTES); - PARA_NOTICE_LOG("sending to udp %s#%d\n", ut->host, ut->port); - return 1; } static void udp_shutdown_targets(void) { - struct udp_target *ut, *tmp; - const char *buf = NULL; - size_t len = 0; /* STFU, gcc */ - - list_for_each_entry_safe(ut, tmp, &targets, node) { - if (ut->fd < 0) - continue; - if (!buf) - len = vss_get_fec_eof_packet(&buf); - write(ut->fd, buf, len); - udp_close_target(ut); - } + 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); + } } static int udp_com_on(__a_unused struct sender_command_data *scd) @@ -216,9 +202,11 @@ static int udp_com_off(__a_unused struct sender_command_data *scd) static int udp_com_delete(struct sender_command_data *scd) { - struct udp_target *ut, *tmp; + struct sender_client *sc, *tmp; + + list_for_each_entry_safe(sc, tmp, &targets, node) { + struct udp_target *ut = sc->private_data; - list_for_each_entry_safe(ut, tmp, &targets, node) { /* Unspecified port means wildcard port match */ if (scd->port > 0 && scd->port != ut->port) continue; @@ -229,30 +217,82 @@ static int udp_com_delete(struct sender_command_data *scd) return 1; } -static int udp_send_fec(char *buf, size_t len, void *private_data) +/** Initialize UDP session and set maximum payload size. */ +static int udp_init_fec(struct sender_client *sc) +{ + int mps; + + udp_init_session(sc); + mps = generic_max_transport_msg_size(sc->fd) - sizeof(struct udphdr); + PARA_INFO_LOG("current MPS = %d bytes\n", mps); + return mps; +} + +/** Check and clear socket error if any. */ +static int udp_check_socket_state(struct udp_target *ut) { - struct udp_target *ut = private_data; - int ret = udp_init_session(ut); + int ret; + socklen_t errlen = sizeof(ret); + + if (getsockopt(ut->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) { + return 0; + } else if (ret == ECONNREFUSED) { + time_t dist = now->tv_sec - ut->last_unreachable; + + if (dist <= UDP_MAX_UNREACHABLE_TIME) { + return 0; + } else if (dist > 2 * UDP_MAX_UNREACHABLE_TIME) { + ut->last_unreachable = now->tv_sec; + return 0; + } else { + /* + * unreachable_time < dist <= 2 * unreachable_time + * No errors are allowed during this time window. + */ + PARA_NOTICE_LOG("Evicting %s#%d after %d seconds " + "of connection errors.\n", + ut->host, ut->port, (int)dist); + } + } + return -ERRNO_TO_PARA_ERROR(ret); +} + +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; + 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(ut->fd, ut->cq, 0); + ret = send_queued_chunks(sc->fd, sc->cq); if (ret < 0) goto fail; - if (!len) - return 0; if (!ret) { /* still data left in the queue */ - ret = cq_enqueue(ut->cq, buf, len); - if (ret < 0) - goto fail; + ret = cq_force_enqueue(sc->cq, buf, len); + assert(ret >= 0); + return 0; + } + ret = write_nonblock(sc->fd, buf, len); + if (ret == -ERRNO_TO_PARA_ERROR(ECONNREFUSED)) { + /* + * Happens if meanwhile an ICMP Destination / Port Unreachable + * has arrived. Ignore, persistent errors will be caught above. + */ + ret = 0; } - ret = write_nonblock(ut->fd, buf, len, 0); if (ret < 0) goto fail; if (ret != len) { - ret = cq_enqueue(ut->cq, buf + ret, len - ret); - if (ret < 0) - goto fail; + ret = cq_force_enqueue(sc->cq, buf + ret, len - ret); + assert(ret >= 0); } return 1; fail: @@ -262,19 +302,43 @@ fail: static void udp_add_target(struct sender_command_data *scd) { - struct udp_target *ut = para_calloc(sizeof(struct udp_target)); + int ret, port = scd->port > 0 ? scd->port : conf.udp_default_port_arg; + struct udp_target *ut = para_calloc(sizeof(*ut)); strncpy(ut->host, scd->host, sizeof(ut->host)); ut->port = scd->port > 0 ? scd->port : conf.udp_default_port_arg; - ut->fd = -1; /* not yet connected */ - PARA_INFO_LOG("adding to target list (%s#%d)\n", ut->host, ut->port); - para_list_add(&ut->node, &targets); - ut->fcp.slices_per_group = scd->slices_per_group; + + 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.send = udp_send_fec; - ut->fcp.private_data = ut; - vss_add_fec_client(&ut->fcp, &ut->fc); + 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; + ret = para_connect_simple(IPPROTO_UDP, scd->host, port); + if (ret < 0) + goto err; + ut->sc->fd = ret; + + ret = mcast_sender_setup(ut->sc); + if (ret < 0) + goto err; + ret = mark_fd_nonblocking(ut->sc->fd); + 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; +err: + if (ut->sc->fd >= 0) + close(ut->sc->fd); + PARA_NOTICE_LOG("failed to set up %s#%d (%s)- not adding it\n", + scd->host, port, para_strerror(-ret)); + free(ut->sc); + free(ut); } static int udp_com_add(struct sender_command_data *scd) @@ -285,10 +349,11 @@ static int udp_com_add(struct sender_command_data *scd) static char *udp_info(void) { - struct udp_target *ut; + struct sender_client *sc; char *ret, *tgts = NULL; - list_for_each_entry(ut, &targets, node) { + 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, @@ -303,10 +368,10 @@ static char *udp_info(void) ret = make_message( "udp sender:\n" "\tstatus: %s\n" - "\tport: udp %d\n" + "\tport: %s\n" "\ttargets: %s\n", (sender_status == SENDER_ON)? "on" : "off", - conf.udp_default_port_arg, + stringify_port(conf.udp_default_port_arg, "udp"), tgts? tgts : "(none)" ); free(tgts);