05_dccp-supported-ccid-lookup.diff

[paraslash.git] / net.c

diff --git a/net.c b/net.c
index 61f50dd71041a2a5e80008dbb2da110b75b70a42..b83ab8c61d34c3a52f8e0f35dfa63d05c3584f21 100644 (file)
--- a/net.c
+++ b/net.c
@@ -187,6 +187,31 @@ failed:
        return NULL;
 }
 
        return NULL;
 }
 

+/**
+ * Stringify port number, resolve into service name where defined.
+ * \param port 2-byte port number, in host-byte-order.
+ * \param transport Transport protocol name (e.g. "udp", "tcp"), or NULL.
+ * \return Pointer to static result buffer.
+ *
+ * \sa getservent(3), services(5), nsswitch.conf(5)
+ */
+const char *stringify_port(int port, const char *transport)
+{
+       static char service[NI_MAXSERV];
+
+       if (port < 0 || port > 0xFFFF) {
+               snprintf(service, sizeof(service), "undefined (%d)", port);
+       } else {
+               struct servent *se = getservbyport(htons(port), transport);
+
+               if (se == NULL)
+                       snprintf(service, sizeof(service), "%u", port);
+               else
+                       snprintf(service, sizeof(service), "%s", se->s_name);
+       }
+       return service;
+}
+

 /**
  * Determine the socket type for a given layer-4 protocol.
  *
 /**
  * Determine the socket type for a given layer-4 protocol.
  *


@@ -368,28 +393,70 @@ int para_listen(unsigned l3type, unsigned l4type, unsigned short port)
        return fd;
 }
 
        return fd;
 }
 

+/**
+ * Determine IPv4/v6 socket address length.
+ * \param sa Container of IPv4 or IPv6 address.
+ * \return Address-family dependent address length.
+ */
+static socklen_t salen(const struct sockaddr *sa)
+{
+       assert(sa->sa_family == AF_INET || sa->sa_family == AF_INET6);
+
+       return sa->sa_family == AF_INET6
+               ? sizeof(struct sockaddr_in6)
+               : sizeof(struct sockaddr_in);
+}
+
+/**
+ * Process IPv4/v6 address, turn v6-mapped-v4 address into normal IPv4 address.
+ * \param ss Container of IPv4/6 address.
+ * \return Pointer to normalized address (may be static storage).
+ *
+ * \sa RFC 3493
+ */
+static const struct sockaddr *
+normalize_ip_address(const struct sockaddr_storage *ss)
+{
+       const struct sockaddr_in6 *ia6 = (const struct sockaddr_in6 *)ss;
+
+       assert(ss->ss_family == AF_INET || ss->ss_family == AF_INET6);
+
+       if (ss->ss_family == AF_INET6 && IN6_IS_ADDR_V4MAPPED(&ia6->sin6_addr)) {
+               static struct sockaddr_in ia;
+
+               ia.sin_family = AF_INET;
+               ia.sin_port   = ia6->sin6_port;
+               memcpy(&ia.sin_addr.s_addr, &(ia6->sin6_addr.s6_addr[12]), 4);
+               return (const struct sockaddr *)&ia;
+       }
+       return (const struct sockaddr *)ss;
+}
+

 /**
  * Print numeric host and port number (beware - uses static char).
  *
  * \param sa The IPv4/IPv6 socket address to use.
 /**
  * Print numeric host and port number (beware - uses static char).
  *
  * \param sa The IPv4/IPv6 socket address to use.

- * \param len The length of \p sa.

  *
  *

- * \sa getnameinfo(3).
+ * \sa getnameinfo(3), services(5), nsswitch.conf(5)

  */
  */

-static char *host_and_port(struct sockaddr *sa, socklen_t len)
+static char *host_and_port(const struct sockaddr_storage *ss)

 {
 {

-       static char output[NI_MAXHOST + NI_MAXSERV + 2];
+       const struct sockaddr *sa = normalize_ip_address(ss);

        char hbuf[NI_MAXHOST], sbuf[NI_MAXSERV];
        char hbuf[NI_MAXHOST], sbuf[NI_MAXSERV];

+       static char output[sizeof(hbuf) + sizeof(sbuf) + 2];

        int ret;
 
        int ret;
 

-       ret = getnameinfo(sa, len, hbuf, sizeof(hbuf), sbuf, sizeof(sbuf),
-               NI_NUMERICHOST | NI_NUMERICSERV);
-       if (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 {
+               snprintf(output, sizeof(output), "(unknown)");

                PARA_WARNING_LOG("hostname lookup error (%s).\n",
                PARA_WARNING_LOG("hostname lookup error (%s).\n",

-                       gai_strerror(ret));
-               sprintf(output, "(unknown)");
-       } else
-               sprintf(output, "%s#%s", hbuf, sbuf);
+                                gai_strerror(ret));
+       }

        return output;
 }
 
        return output;
 }
 


@@ -417,7 +484,7 @@ static char *__get_sock_name(int fd, int (*getname)(int, struct sockaddr*,
                        fd, strerror(errno));
                return dont_know;
        }
                        fd, strerror(errno));
                return dont_know;
        }

-       return host_and_port((struct sockaddr *)&ss, sslen);
+       return host_and_port(&ss);

 }
 
 /**
 }
 
 /**


@@ -460,15 +527,10 @@ char *remote_name(int sockfd)
 struct in_addr extract_v4_addr(const struct sockaddr_storage *ss)
 {
        struct in_addr ia = {.s_addr = 0};
 struct in_addr extract_v4_addr(const struct sockaddr_storage *ss)
 {
        struct in_addr ia = {.s_addr = 0};

+       const struct sockaddr *sa = normalize_ip_address(ss);

 
 

-       if (ss->ss_family == AF_INET)
-               ia.s_addr = ((struct sockaddr_in *)ss)->sin_addr.s_addr;
-       if (ss->ss_family == AF_INET6) {
-               const struct in6_addr v6_addr = ((struct sockaddr_in6 *)ss)->sin6_addr;
-
-               if (IN6_IS_ADDR_V4MAPPED(&v6_addr))
-                       memcpy(&ia.s_addr, &(v6_addr.s6_addr[12]), 4);
-       }
+       if (sa->sa_family == AF_INET)
+               ia = ((struct sockaddr_in *)sa)->sin_addr;

        return ia;
 }
 
        return ia;
 }
 


@@ -599,6 +661,33 @@ int para_accept(int fd, void *addr, socklen_t size)
        return new_fd < 0? -ERRNO_TO_PARA_ERROR(errno) : new_fd;
 }
 
        return new_fd < 0? -ERRNO_TO_PARA_ERROR(errno) : new_fd;
 }
 

+/**
+ * Probe the list of DCCP CCIDs supported locally by the host.
+ * \param ccids Array to be filled in.
+ * \param nccids Length of \a ccids.
+ * \return Pointer to \a ccids, NULL on failure.
+ *
+ * NB: This feature is only available on Linux > 2.6.30; on older kernels
+ * ENOPROTOOPT ("Protocol not available") will be returned.
+ */
+const uint8_t *dccp_available_ccids(uint8_t *ccids, uint8_t *nccids)
+{
+       int fd = makesock(AF_UNSPEC, IPPROTO_DCCP, 0, NULL, 0);
+
+       if (fd < 0)
+               return NULL;
+
+       if (getsockopt(fd, SOL_DCCP, DCCP_SOCKOPT_AVAILABLE_CCIDS,
+                                       ccids, (socklen_t *)nccids) < 0) {
+               PARA_ERROR_LOG("No DCCP_SOCKOPT_AVAILABLE_CCIDS: %s\n",
+                               strerror(errno));
+               *nccids = 0;
+       }
+       close(fd);
+
+       return *nccids ? ccids : NULL;
+}
+

 /**
  * Prepare a structure for \p AF_UNIX socket addresses.
  *
 /**
  * Prepare a structure for \p AF_UNIX socket addresses.
  *


@@ -838,10 +927,11 @@ int recv_pattern(int fd, const char *pattern, size_t bufsize)
        ret = 1;
 out:
        if (ret < 0) {
        ret = 1;
 out:
        if (ret < 0) {

-               PARA_NOTICE_LOG("n = %d, did not receive pattern '%s'\n", n,
-                       pattern);
+               PARA_NOTICE_LOG("did not receive pattern '%s'\n", pattern);

                if (n > 0)
                if (n > 0)

-                       PARA_NOTICE_LOG("recvd: %s\n", buf);
+                       PARA_NOTICE_LOG("recvd %d bytes: %s\n", n, buf);
+               else if (n < 0)
+                       PARA_NOTICE_LOG("%s\n", para_strerror(-n));

        }
        free(buf);
        return ret;
        }
        free(buf);
        return ret;