*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
/** \file udp_send.c Para_server's udp sender. */
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
/** \file udp_send.c Para_server's udp sender. */
/** The opaque structure returned by vss_add_fec_client(). */
struct fec_client *fc;
/** The FEC parameters for this target. */
struct fec_client_parms fcp;
/** The opaque structure returned by vss_add_fec_client(). */
struct fec_client *fc;
/** The FEC parameters for this target. */
struct fec_client_parms fcp;
- if (sc->cq != NULL) {
- del_close_on_fork_list(sc->fd);
- cq_destroy(sc->cq);
- sc->cq = NULL;
- }
+ const char *buf;
+ size_t len;
+ struct udp_target *ut = sc->private_data;
+
+ 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;
- 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);
/* 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)
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;
-/** 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);
- }
-}
-
static void udp_shutdown_targets(void)
{
struct sender_client *sc, *tmp;
static void udp_shutdown_targets(void)
{
struct sender_client *sc, *tmp;
list_for_each_entry_safe(sc, tmp, &targets, node)
list_for_each_entry_safe(sc, tmp, &targets, node)
{
struct sender_client *sc, *tmp;
char host[MAX_HOSTLEN];
int32_t port;
list_for_each_entry_safe(sc, tmp, &targets, node) {
{
struct sender_client *sc, *tmp;
char host[MAX_HOSTLEN];
int32_t port;
list_for_each_entry_safe(sc, tmp, &targets, node) {
parse_url(sc->name, host, sizeof(host), &port);
/* Unspecified port means wildcard port match */
parse_url(sc->name, host, sizeof(host), &port);
/* Unspecified port means wildcard port match */
+ 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. */
static int udp_init_fec(struct sender_client *sc)
{
}
/** Initialize UDP session and set maximum payload size. */
static int udp_init_fec(struct sender_client *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. */
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. */
- if (getsockopt(ut->sc->fd, SOL_SOCKET, SO_ERROR, &ret, &errlen) < 0) {
+ if (getsockopt(sc->fd, SOL_SOCKET, SO_ERROR, &ret, &errlen) < 0) {
*/
PARA_NOTICE_LOG("Evicting %s after %d seconds "
"of connection errors.\n",
*/
PARA_NOTICE_LOG("Evicting %s after %d seconds "
"of connection errors.\n",
- 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);
+ if (sender_status == SENDER_off)
+ return;
+ if (len == 0)
+ return;
+ ret = udp_check_socket_state(sc);
- 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
if (ret == -ERRNO_TO_PARA_ERROR(ECONNREFUSED)) {
/*
* Happens if meanwhile an ICMP Destination / Port Unreachable
+ 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.slices_per_group = scd->slices_per_group;
ut->fcp.data_slices_per_group = scd->data_slices_per_group;
- 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;
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));
{
struct sender_client *sc;
char *ret, *tgts = NULL;
list_for_each_entry(sc, &targets, node) {
struct udp_target *ut = sc->private_data;
{
struct sender_client *sc;
char *ret, *tgts = NULL;
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,
- "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"
- " 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"
- 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;