/*
- * Copyright (C) 2005-2010 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
/** \file udp_send.c Para_server's udp sender. */
-
-#include <regex.h>
-#include <sys/time.h>
-#include <dirent.h>
+#include <netinet/in.h>
#include <sys/socket.h>
+#include <regex.h>
+#include <sys/types.h>
#include <netinet/udp.h>
#include <net/if.h>
-#include <osl.h>
+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.h>
#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"
-#include "chunk_queue.h"
/**
* Time window during which ICMP Destination/Port Unreachable messages are
static void udp_close_target(struct sender_client *sc)
{
- if (sc->cq != NULL) {
- cq_destroy(sc->cq);
- sc->cq = NULL;
- }
+ const char *buf;
+ size_t len = vss_get_fec_eof_packet(&buf);
+
+ /*
+ * 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 (write(sc->fd, buf, len))
+ do_nothing;
}
static void udp_delete_target(struct sender_client *sc, const char *msg)
return -ERRNO_TO_PARA_ERROR(errno);
}
-/** 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);
- PARA_NOTICE_LOG("sending to udp %s\n", sc->name);
- }
+ PARA_NOTICE_LOG("sending to udp %s\n", sc->name);
}
static void udp_shutdown_targets(void)
{
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);
- }
+ udp_close_target(sc);
}
static int udp_resolve_target(const char *url, struct sender_command_data *scd)
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 (len == 0 && !cq_peek(sc->cq))
- return 0;
+ return;
+ if (len == 0)
+ return;
ret = udp_check_socket_state(sc);
if (ret < 0)
goto fail;
- ret = send_queued_chunks(sc->fd, sc->cq);
- if (ret < 0)
- goto fail;
- 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 < 0)
goto fail;
- if (ret != len) {
- ret = cq_force_enqueue(sc->cq, buf + ret, len - ret);
- assert(ret >= 0);
- }
- return 1;
+ return;
fail:
udp_delete_target(sc, para_strerror(-ret));
- return ret;
}
static int udp_com_add(struct sender_command_data *scd)
ut->fcp.data_slices_per_group = scd->data_slices_per_group;
ut->fcp.init_fec = udp_init_fec;
ut->fcp.send_fec = udp_send_fec;
+ ut->fcp.need_periodic_header = true;
sc->private_data = ut;
sc->fd = -1;
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",
+ "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)"
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;