X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=udp_send.c;h=425118a135edfee7224f40256dc087a803115aaf;hp=4fb10b444be321c51e7d33da2442fd6b8a469138;hb=0b6e7a20c19d642f9d8e65683e1525c91dd3de39;hpb=db1a8e68e58a03bcf06ccc91e78c4da94e7b9144 diff --git a/udp_send.c b/udp_send.c index 4fb10b44..425118a1 100644 --- a/udp_send.c +++ b/udp_send.c @@ -1,35 +1,34 @@ /* - * Copyright (C) 2005-2011 Andre Noll + * Copyright (C) 2005 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ /** \file udp_send.c Para_server's udp sender. */ - -#include -#include -#include +#include #include +#include +#include #include #include -#include -#include +#include +#include +#include #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" /** @@ -47,6 +46,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; @@ -55,10 +56,16 @@ 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 return value, closing the target anyway. */ - (void)write(sc->fd, buf, len); + 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) == len) + ut->sent_fec_eof = true; } static void udp_delete_target(struct sender_client *sc, const char *msg) @@ -152,11 +159,6 @@ err: return -ERRNO_TO_PARA_ERROR(errno); } -static void udp_init_session(struct sender_client *sc) -{ - PARA_NOTICE_LOG("sending to udp %s\n", sc->name); -} - static void udp_shutdown_targets(void) { struct sender_client *sc, *tmp; @@ -188,14 +190,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; } @@ -233,9 +235,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; @@ -274,18 +278,18 @@ static int udp_check_socket_state(struct sender_client *sc) 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) { int ret; - if (sender_status == SENDER_OFF) - return 0; + if (sender_status == SENDER_off) + return; if (len == 0) - return 0; + return; ret = udp_check_socket_state(sc); if (ret < 0) goto fail; - 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 @@ -295,10 +299,9 @@ static int udp_send_fec(struct sender_client *sc, char *buf, size_t len) } if (ret < 0) goto fail; - return 1; + return; fail: udp_delete_target(sc, para_strerror(-ret)); - return ret; } static int udp_com_add(struct sender_command_data *scd) @@ -349,7 +352,7 @@ err: return ret; } -static char *udp_info(void) +static char *udp_status(void) { struct sender_client *sc; char *ret, *tgts = NULL; @@ -365,11 +368,10 @@ static char *udp_info(void) tgts = tmp; } ret = make_message( - "udp sender:\n" - "\tstatus: %s\n" - "\tport: %s\n" - "\ttargets: %s\n", - (sender_status == SENDER_ON)? "on" : "off", + "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)" ); @@ -421,22 +423,22 @@ 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; 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; + 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; udp_init_target_list(); if (!conf.udp_no_autostart_given) - sender_status = SENDER_ON; + sender_status = SENDER_on; PARA_DEBUG_LOG("udp sender init complete\n"); }