X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=udp_send.c;h=52947b20610a6b26280755cf0ddb5125ac5ae8a2;hp=3379f98d1dcd2f6b205492f13f4a8bd3e2807ac0;hb=7f08e8b0eb9570f1eb787dbb4e10d56585b36bbf;hpb=68630d8b55d688a7c7ce116951c310150aa9c166 diff --git a/udp_send.c b/udp_send.c index 3379f98d..52947b20 100644 --- a/udp_send.c +++ b/udp_send.c @@ -1,8 +1,4 @@ -/* - * Copyright (C) 2005 Andre Noll - * - * Licensed under the GPL v2. For licencing details see COPYING. - */ +/* Copyright (C) 2005 Andre Noll , see file COPYING. */ /** \file udp_send.c Para_server's udp sender. */ @@ -15,8 +11,9 @@ #include #include #include +#include -#include "server.cmdline.h" +#include "server.lsg.h" #include "para.h" #include "error.h" #include "string.h" @@ -46,6 +43,8 @@ struct udp_target { struct fec_client *fc; /** The FEC parameters for this target. */ struct fec_client_parms fcp; + /** Whether we already sent the FEC eof packet to this target. */ + bool sent_fec_eof; }; static struct list_head targets; @@ -54,15 +53,17 @@ static int sender_status; static void udp_close_target(struct sender_client *sc) { const char *buf; - size_t len = vss_get_fec_eof_packet(&buf); + size_t len; + struct udp_target *ut = sc->private_data; - /* - * 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 (ut->sent_fec_eof) + return; + 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)) - do_nothing; + do_nothing; /* avoid "ignoring return value" warning */ + ut->sent_fec_eof = true; } static void udp_delete_target(struct sender_client *sc, const char *msg) @@ -71,8 +72,11 @@ static void udp_delete_target(struct sender_client *sc, const char *msg) 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); + /* command handlers already called close_listed_fds() */ + if (!process_is_command_handler()) { + close(sc->fd); + del_close_on_fork_list(sc->fd); + } vss_del_fec_client(ut->fc); list_del(&sc->node); free(sc->name); @@ -91,11 +95,11 @@ 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; + 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) @@ -156,16 +160,18 @@ err: return -ERRNO_TO_PARA_ERROR(errno); } -static void udp_init_session(struct sender_client *sc) +static void udp_shutdown_targets(void) { - PARA_NOTICE_LOG("sending to udp %s\n", sc->name); + struct sender_client *sc, *tmp; + list_for_each_entry_safe(sc, tmp, &targets, node) + udp_close_target(sc); } -static void udp_shutdown_targets(void) +static void udp_shutdown(void) { struct sender_client *sc, *tmp; list_for_each_entry_safe(sc, tmp, &targets, node) - udp_close_target(sc); + udp_delete_target(sc, "shutdown"); } static int udp_resolve_target(const char *url, struct sender_command_data *scd) @@ -176,7 +182,7 @@ static int udp_resolve_target(const char *url, struct sender_command_data *scd) 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) @@ -192,14 +198,14 @@ static int udp_resolve_target(const char *url, struct sender_command_data *scd) static int udp_com_on(__a_unused struct sender_command_data *scd) { - sender_status = SENDER_ON; + sender_status = SENDER_on; return 1; } static int udp_com_off(__a_unused struct sender_command_data *scd) { udp_shutdown_targets(); - sender_status = SENDER_OFF; + sender_status = SENDER_off; return 1; } @@ -237,9 +243,11 @@ static int udp_com_delete(struct sender_command_data *scd) /** Initialize UDP session and set maximum payload size. */ static int udp_init_fec(struct sender_client *sc) { + struct udp_target *ut = sc->private_data; int mps; - udp_init_session(sc); + PARA_NOTICE_LOG("sending to udp %s\n", sc->name); + ut->sent_fec_eof = false; mps = generic_max_transport_msg_size(sc->fd) - sizeof(struct udphdr); PARA_INFO_LOG("current MPS = %d bytes\n", mps); return mps; @@ -282,7 +290,7 @@ static void udp_send_fec(struct sender_client *sc, char *buf, size_t len) { int ret; - if (sender_status == SENDER_OFF) + if (sender_status == SENDER_off) return; if (len == 0) return; @@ -371,8 +379,8 @@ static char *udp_status(void) "status: %s\n" "port: %s\n" "targets: %s\n", - (sender_status == SENDER_ON)? "on" : "off", - stringify_port(conf.udp_default_port_arg, "udp"), + (sender_status == SENDER_on)? "on" : "off", + stringify_port(OPT_UINT32_VAL(UDP_DEFAULT_PORT), "udp"), tgts? tgts : "(none)" ); free(tgts); @@ -385,10 +393,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); } @@ -413,32 +422,38 @@ static char *udp_help(void) ); } -/** - * The init function of para_server's udp sender. - * - * \param s Pointer to the udp sender struct. - * - * It initializes all function pointers of \a s and the list of udp targets. - */ -void udp_send_init(struct sender *s) +/* Initialize the list of udp targets. */ +static void udp_send_init(void) { INIT_LIST_HEAD(&targets); - s->status = udp_status; - s->help = udp_help; - s->send = NULL; - s->pre_select = NULL; - s->post_select = NULL; - s->shutdown_clients = udp_shutdown_targets; - s->resolve_target = udp_resolve_target; - s->client_cmds[SENDER_ON] = udp_com_on; - s->client_cmds[SENDER_OFF] = udp_com_off; - s->client_cmds[SENDER_DENY] = NULL; - s->client_cmds[SENDER_ALLOW] = NULL; - s->client_cmds[SENDER_ADD] = udp_com_add; - s->client_cmds[SENDER_DELETE] = udp_com_delete; - sender_status = SENDER_OFF; + sender_status = SENDER_off; udp_init_target_list(); - if (!conf.udp_no_autostart_given) - sender_status = SENDER_ON; + if (!OPT_GIVEN(UDP_NO_AUTOSTART)) + sender_status = SENDER_on; PARA_DEBUG_LOG("udp sender init complete\n"); } + +/** + * The UDP sender. + * + * In contrast to the other senders the UDP sender is active in the sense that + * it initiates the network connection according to its list of targets rather + * than passively waiting for clients to connect. Like DCCP streams, UDP + * streams are always sent FEC-encoded. The UDP sender is the only sender which + * supports IP multicasting. + */ +const struct sender udp_sender = { + .name = "udp", + .init = udp_send_init, + .shutdown = udp_shutdown, + .shutdown_clients = udp_shutdown_targets, + .resolve_target = udp_resolve_target, + .client_cmds = { + [SENDER_on] = udp_com_on, + [SENDER_off] = udp_com_off, + [SENDER_add] = udp_com_add, + [SENDER_delete] = udp_com_delete, + }, + .help = udp_help, + .status = udp_status, +};