-/*
- * Copyright (C) 2005-2014 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
/** \file udp_send.c Para_server's udp sender. */
#include <sys/socket.h>
#include <regex.h>
#include <sys/types.h>
-#include <sys/socket.h>
#include <netinet/udp.h>
#include <net/if.h>
#include <arpa/inet.h>
#include <sys/un.h>
#include <netdb.h>
+#include <lopsub.h>
-#include "server.cmdline.h"
+#include "server.lsg.h"
#include "para.h"
#include "error.h"
#include "string.h"
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;
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 wirte() 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)
{
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)
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;
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)
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;
}
/** 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;
{
int ret;
- if (sender_status == SENDER_OFF)
+ if (sender_status == SENDER_off)
return;
if (len == 0)
return;
return ret;
}
-static char *udp_info(void)
+static char *udp_status(void)
{
struct sender_client *sc;
char *ret, *tgts = NULL;
tgts = tmp;
}
ret = make_message(
- "udp sender:\n"
- "\tstatus: %s\n"
- "\tport: %s\n"
- "\ttargets: %s\n",
- (sender_status == SENDER_ON)? "on" : "off",
- stringify_port(conf.udp_default_port_arg, "udp"),
+ "status: %s\n"
+ "port: %s\n"
+ "targets: %s\n",
+ (sender_status == SENDER_on)? "on" : "off",
+ stringify_port(OPT_UINT32_VAL(UDP_DEFAULT_PORT), "udp"),
tgts? tgts : "(none)"
);
free(tgts);
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);
}
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;
+ if (!OPT_GIVEN(UDP_NO_AUTOSTART))
+ sender_status = SENDER_on;
PARA_DEBUG_LOG("udp sender init complete\n");
}
projects / paraslash.git / blobdiff