Merge branch 'master' into next
[paraslash.git] / udp_send.c
index a21f478..f8cce2b 100644 (file)
@@ -7,9 +7,12 @@
 /** \file udp_send.c Para_server's udp sender. */
 
 
+#include <regex.h>
 #include <sys/time.h>
 #include <dirent.h>
+#include <sys/socket.h>
 #include <net/if.h>
+#include <osl.h>
 
 #include "server.cmdline.h"
 #include "para.h"
@@ -289,9 +292,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 +351,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.
  */