Merge branch 'maint'

[paraslash.git] / send_common.c

diff --git a/send_common.c b/send_common.c
index 8653c330e6b0eb24bacb239c3904062105ea3128..92c9ab3b982aceed323f47c1c760493ab5a4f5b8 100644 (file)
--- a/send_common.c
+++ b/send_common.c
@@ -1,12 +1,15 @@
 /*
- * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2010 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file send_common.c Functions used by more than one paraslash sender. */
 
+#include <regex.h>
 #include <dirent.h>
+#include <osl.h>
+
 #include "para.h"
 #include "error.h"
 #include "string.h"
@@ -39,7 +42,7 @@
  */
 static int open_sender(unsigned l4type, int port)
 {
-       int fd, ret = para_listen(AF_UNSPEC, l4type, port);
+       int fd, ret = para_listen_simple(l4type, port);
 
        if (ret < 0)
                return ret;
@@ -214,7 +217,7 @@ void init_sender_status(struct sender_status *ss, char **access_arg,
  *
  * \return The string printed in the "si" command.
  */
-char *get_sender_info(struct sender_status *ss, char *name)
+char *get_sender_info(struct sender_status *ss, const char *name)
 {
        char *clnts = NULL, *ret;
        struct sender_client *sc, *tmp_sc;
@@ -228,14 +231,14 @@ char *get_sender_info(struct sender_status *ss, char *name)
        ret = make_message(
                "%s sender:\n"
                "\tstatus: %s\n"
-               "\tport: %d\n"
+               "\tport: %s\n"
                "\tnumber of connected clients: %d\n"
                "\tmaximal number of clients: %d%s\n"
                "\tconnected clients: %s\n"
                "\taccess %s list: %s\n",
                name,
                (ss->listen_fd >= 0)? "on" : "off",
-               ss->port,
+               stringify_port(ss->port, strcmp(name, "http") ? "dccp" : "tcp"),
                ss->num_clients,
                ss->max_clients,
                ss->max_clients > 0? "" : " (unlimited)",