X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=net.c;h=ba19408e11337a82aaa380d2e8fe96ceca0c5673;hp=1fece043586cddc782791d0ec18af45881797c5f;hb=53af5c6efb309565990203fd8504a812ec9166c9;hpb=e2167286448ce2ed9a01a548e7e9832563035088

diff --git a/net.c b/net.c
index 1fece043..ba19408e 100644
--- a/net.c
+++ b/net.c
@@ -180,6 +180,36 @@ failed:
 	return NULL;
 }
 
+/**
+ * Pretty-print a host/port pair.
+ *
+ * \param url NULL, or any string accepted by \ref parse_url().
+ * \param default_port Applies if url has no port.
+ *
+ * If the url argument is NULL, the function returns the string
+ * 0.0.0.0:default_port. Otherwise it calls \ref parse_url() to check the
+ * syntax of the input string given by url. On errors the string "?" is
+ * returned. Otherwise, if url contains a port, a copy of url is returned. If
+ * no port was supplied, a colon and the default port are appended to url.
+ *
+ * \return In all cases the returned string is a allocated with malloc(3) and
+ * has to be freed by the caller.
+ */
+char *format_url(const char *url, int default_port)
+{
+	char host[MAX_HOSTLEN];
+	int url_port;
+
+	if (!url)
+		return make_message("0.0.0.0:%d", default_port);
+	if (!parse_url(url, host, sizeof(host), &url_port))
+		return make_message("?");
+	if (url_port < 0)
+		return make_message("%s:%d", url, default_port);
+	else
+		return para_strdup(url);
+}
+
 /**
  * Stringify port number, resolve into service name where defined.
  *
@@ -502,17 +532,28 @@ int makesock(unsigned l4type, bool passive, const char *host, uint16_t port_numb
  * Create a passive / listening socket.
  *
  * \param l4type The transport-layer type (\p IPPROTO_xxx).
- * \param port The decimal port number to listen on.
+ * \param addr Passed to \ref parse_url() if not NULL.
+ * \param port Ignored if addr contains a port number.
  *
  * \return Positive integer (socket descriptor) on success, negative value
  * otherwise.
  *
  * \sa \ref makesock(), ip(7), ipv6(7), bind(2), listen(2).
  */
-int para_listen_simple(unsigned l4type, uint16_t port)
+int para_listen(unsigned l4type, const char *addr, uint16_t port)
 {
-	int ret, fd = makesock(l4type, 1, NULL, port, NULL);
-
+	char host[MAX_HOSTLEN];
+	int ret, fd, addr_port;
+
+	if (addr) {
+		if (!parse_url(addr, host, sizeof(host), &addr_port))
+			return -ERRNO_TO_PARA_ERROR(EINVAL);
+		if (addr_port > 0)
+			port = addr_port;
+		addr = host;
+	}
+	fd = makesock(l4type, true /* passive */, addr, port,
+		NULL /* no flowopts */);
 	if (fd > 0) {
 		ret = listen(fd, BACKLOG);
 		if (ret < 0) {
@@ -526,6 +567,22 @@ int para_listen_simple(unsigned l4type, uint16_t port)
 	return fd;
 }
 
+/**
+ * Create a socket which listens on all network addresses.
+ *
+ * \param l4type See \ref para_listen().
+ * \param port See \ref para_listen().
+ *
+ * This is a simple wrapper for \ref para_listen() which passes a NULL pointer
+ * as the address information.
+ *
+ * \return See \ref para_listen().
+ */
+int para_listen_simple(unsigned l4type, uint16_t port)
+{
+	return para_listen(l4type, NULL, port);
+}
+
 /**
  * Determine IPv4/v6 socket address length.
  * \param sa Container of IPv4 or IPv6 address.