projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gui: Make some functions return void.
[paraslash.git]
/
udp_send.c
diff --git
a/udp_send.c
b/udp_send.c
index ba7163a8dcdbcffcc9f60772a7d34c5f3c0aec28..3e3950f90d232794df915e45c39d2e8ad031d44f 100644
(file)
--- a/
udp_send.c
+++ b/
udp_send.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 2005-201
0
Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-201
2
Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
@@
-9,7
+9,6
@@
#include <regex.h>
#include <sys/time.h>
#include <regex.h>
#include <sys/time.h>
-#include <dirent.h>
#include <sys/socket.h>
#include <netinet/udp.h>
#include <net/if.h>
#include <sys/socket.h>
#include <netinet/udp.h>
#include <net/if.h>
@@
-24,13
+23,12
@@
#include "server.h"
#include "list.h"
#include "send.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 "vss.h"
#include "portable_io.h"
#include "net.h"
#include "fd.h"
-#include "sched.h"
#include "close_on_fork.h"
#include "close_on_fork.h"
-#include "chunk_queue.h"
/**
* Time window during which ICMP Destination/Port Unreachable messages are
/**
* Time window during which ICMP Destination/Port Unreachable messages are
@@
-43,8
+41,6
@@
struct udp_target {
/** Track time (seconds) of last ICMP Port Unreachable error */
time_t last_unreachable;
struct udp_target {
/** Track time (seconds) of last ICMP Port Unreachable error */
time_t last_unreachable;
- /** Common sender client data */
- struct sender_client *sc;
/** The opaque structure returned by vss_add_fec_client(). */
struct fec_client *fc;
/** The FEC parameters for this target. */
/** The opaque structure returned by vss_add_fec_client(). */
struct fec_client *fc;
/** The FEC parameters for this target. */
@@
-56,10
+52,16
@@
static int sender_status;
static void udp_close_target(struct sender_client *sc)
{
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 wirte() 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)
}
static void udp_delete_target(struct sender_client *sc, const char *msg)
@@
-153,29
+155,16
@@
err:
return -ERRNO_TO_PARA_ERROR(errno);
}
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)
{
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;
}
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)
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)
}
static int udp_resolve_target(const char *url, struct sender_command_data *scd)
@@
-288,26
+277,18
@@
static int udp_check_socket_state(struct sender_client *sc)
return -ERRNO_TO_PARA_ERROR(ret);
}
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)
{
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 = 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 == -ERRNO_TO_PARA_ERROR(ECONNREFUSED)) {
/*
* Happens if meanwhile an ICMP Destination / Port Unreachable
@@
-317,14
+298,9
@@
static int udp_send_fec(struct sender_client *sc, char *buf, size_t len)
}
if (ret < 0)
goto fail;
}
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));
fail:
udp_delete_target(sc, para_strerror(-ret));
- return ret;
}
static int udp_com_add(struct sender_command_data *scd)
}
static int udp_com_add(struct sender_command_data *scd)
@@
-339,11
+315,12
@@
static int udp_com_add(struct sender_command_data *scd)
return -E_TARGET_EXISTS;
}
ut = para_calloc(sizeof(*ut));
return -E_TARGET_EXISTS;
}
ut = para_calloc(sizeof(*ut));
- sc =
ut->sc =
para_calloc(sizeof(*sc));
+ 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.init_fec = udp_init_fec;
ut->fcp.send_fec = udp_send_fec;
ut->fcp.slices_per_group = scd->slices_per_group;
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;
sc->private_data = ut;
sc->fd = -1;