Fix git-version file creation.

[paraslash.git] / net.c

diff --git a/net.c b/net.c
index fa9575a6e5a6aa7d857777e1ea85d5f52ec05c01..2369dc8ce99027a4bb122a9a9d3e71bb5aa10f8b 100644 (file)
--- a/net.c
+++ b/net.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2010 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -380,8 +380,8 @@ int makesock(unsigned l4type, bool passive,
             const char *host, uint16_t port_number,
             struct flowopts *fo)
 {
-       struct addrinfo *local = NULL, *src,
-                       *remote = NULL, *dst, hints;
+       struct addrinfo *local = NULL, *src = NULL, *remote = NULL,
+               *dst = NULL, hints;
        unsigned int    l3type = AF_UNSPEC;
        int             rc, on = 1, sockfd = -1,
                        socktype = sock_type(l4type);
@@ -414,7 +414,8 @@ int makesock(unsigned l4type, bool passive,
                                layer4_name(l4type),
                                host? host : (passive? "[loopback]" : "[localhost]"),
                                port, gai_strerror(rc));
-               return -E_ADDRESS_LOOKUP;
+               rc = -E_ADDRESS_LOOKUP;
+               goto out;
        }
 
        /* Iterate over all src/dst combination, exhausting dst first */
@@ -439,7 +440,8 @@ int makesock(unsigned l4type, bool passive,
                        close(sockfd);
                        PARA_ERROR_LOG("can not set SO_REUSEADDR: %s\n",
                                       strerror(rc));
-                       return -ERRNO_TO_PARA_ERROR(rc);
+                       rc = -ERRNO_TO_PARA_ERROR(rc);
+                       break;
                }
                flowopt_setopts(sockfd, fo);
 
@@ -462,6 +464,7 @@ get_next_src:
                if (src && (src = src->ai_next)) /* restart inner loop */
                        dst = remote;
        }
+out:
        if (local)
                freeaddrinfo(local);
        if (remote)
@@ -469,11 +472,12 @@ get_next_src:
        flowopt_cleanup(fo);
 
        if (src == NULL && dst == NULL) {
-               rc = errno;
+               if (rc >= 0)
+                       rc = -E_MAKESOCK;
                PARA_ERROR_LOG("can not create %s socket %s#%s.\n",
                        layer4_name(l4type), host? host : (passive?
                        "[loopback]" : "[localhost]"), port);
-               return -ERRNO_TO_PARA_ERROR(rc);
+               return rc;
        }
        return sockfd;
 }
@@ -598,25 +602,28 @@ int generic_max_transport_msg_size(int sockfd)
  *
  * \param sa The IPv4/IPv6 socket address to use.
  *
+ * \return Host string in numeric host:port format, \sa parse_url().
  * \sa getnameinfo(3), services(5), nsswitch.conf(5)
  */
 static char *host_and_port(const struct sockaddr_storage *ss)
 {
        const struct sockaddr *sa = normalize_ip_address(ss);
        char hbuf[NI_MAXHOST], sbuf[NI_MAXSERV];
-       static char output[sizeof(hbuf) + sizeof(sbuf) + 2];
+       static char output[sizeof(hbuf) + sizeof(sbuf) + 4];
        int ret;
 
        ret = getnameinfo(sa, salen(sa),
                          hbuf, sizeof(hbuf),
                          sbuf, sizeof(sbuf),
-                         NI_NUMERICHOST);
-       if (ret == 0) {
-               snprintf(output, sizeof(output), "%s#%s", hbuf, sbuf);
-       } else {
+                         NI_NUMERICHOST | NI_NUMERICSERV);
+       if (ret) {
                snprintf(output, sizeof(output), "(unknown)");
                PARA_WARNING_LOG("hostname lookup error (%s).\n",
                                 gai_strerror(ret));
+       } else if (sa->sa_family == AF_INET6) {
+               snprintf(output, sizeof(output), "[%s]:%s", hbuf, sbuf);
+       } else {
+               snprintf(output, sizeof(output), "%s:%s", hbuf, sbuf);
        }
        return output;
 }
@@ -938,15 +945,17 @@ err:
  * This function creates a local socket for sequenced, reliable, two-way,
  * connection-based byte streams.
  *
- * \return The file descriptor, on success, negative on errors.
+ * \return The file descriptor of the connected socket on success, negative on
+ * errors.
  *
  * \sa create_local_socket(), unix(7), connect(2).
  */
-int create_remote_socket(const char *name)
+int connect_local_socket(const char *name)
 {
        struct sockaddr_un unix_addr;
        int fd, ret;
 
+       PARA_DEBUG_LOG("connecting to %s\n", name);
        ret = init_unix_addr(&unix_addr, name);
        if (ret < 0)
                return ret;