chunk queue: Fix chunk dequeuing.

[paraslash.git] / udp_send.c

diff --git a/udp_send.c b/udp_send.c
index a21f478d78dd3c3c56f14196264ce8424b107254..8677ec5eeea4c17fcd0a5b9f7918fc47ea961c35 100644 (file)
--- a/udp_send.c
+++ b/udp_send.c
@@ -9,6 +9,7 @@
 
 #include <sys/time.h>
 #include <dirent.h>
+#include <sys/socket.h>
 #include <net/if.h>
 
 #include "server.cmdline.h"
@@ -178,9 +179,7 @@ static int udp_init_session(struct udp_target *ut)
        }
        add_close_on_fork_list(ut->fd);
        ut->cq = cq_new(UDP_CQ_BYTES);
-       PARA_NOTICE_LOG("sending to udp %s#%d using fec parms %d:%d:%d\n",
-               ut->host, ut->port , ut->fcp.max_slice_bytes,
-               ut->fcp.data_slices_per_group, ut->fcp.slices_per_group);
+       PARA_NOTICE_LOG("sending to udp %s#%d\n", ut->host, ut->port);
        return 1;
 }
 
@@ -231,8 +230,11 @@ static int udp_com_delete(struct sender_command_data *scd)
 static int udp_send_fec(char *buf, size_t len, void *private_data)
 {
        struct udp_target *ut = private_data;
-       int ret = udp_init_session(ut);
+       int ret;
 
+       if (sender_status == SENDER_OFF)
+               return 0;
+       ret = udp_init_session(ut);
        if (ret < 0)
                goto fail;
        ret = send_queued_chunks(ut->fd, ut->cq, 0);
@@ -289,9 +291,13 @@ static char *udp_info(void)
 
        list_for_each_entry(ut, &targets, node) {
                bool is_v6 = strchr(ut->host, ':') != NULL;
-               char *tmp = make_message("%s%s%s%s:%d ", tgts ? : "",
-                                        is_v6 ? "[" : "", ut->host,
-                                        is_v6 ? "]" : "", ut->port);
+               char *tmp = make_message("%s%s%s%s:%d/%u:%u:%u ", tgts ? : "",
+                       is_v6 ? "[" : "", ut->host,
+                       is_v6 ? "]" : "", ut->port,
+                       ut->fcp.max_slice_bytes,
+                       ut->fcp.data_slices_per_group,
+                       ut->fcp.slices_per_group
+               );
                free(tgts);
                tgts = tmp;
        }
@@ -344,7 +350,7 @@ static char *udp_help(void)
 /**
  * The init function of para_server's udp sender.
  *
- * \param s Pointer to the http sender struct.
+ * \param s Pointer to the udp sender struct.
  *
  * It initializes all function pointers of \a s and the list of udp targets.
  */