Use sideband also for challenge response.

[paraslash.git] / udp_send.c

diff --git a/udp_send.c b/udp_send.c
index f39b4f1435d1189308637c306a5be13e4cf855a1..3e3950f90d232794df915e45c39d2e8ad031d44f 100644 (file)
--- a/udp_send.c
+++ b/udp_send.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2010 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2012 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -9,7 +9,6 @@
 
 #include <regex.h>
 #include <sys/time.h>
-#include <dirent.h>
 #include <sys/socket.h>
 #include <netinet/udp.h>
 #include <net/if.h>
@@ -24,11 +23,11 @@
 #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"
 
 /**
@@ -56,8 +55,13 @@ static void udp_close_target(struct sender_client *sc)
        const char *buf;
        size_t len = vss_get_fec_eof_packet(&buf);
 
-       /* ignore return value, closing the target anyway. */
-       (void)write(sc->fd, buf, len);
+       /*
+        * 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)
@@ -273,18 +277,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;
+               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
@@ -294,10 +298,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)
@@ -317,6 +320,7 @@ 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;