X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=net.c;h=7f8d596d7d648511aa6478db75bc706159874be0;hp=e21f40293e591831dfcc64c7f4b236010e6e60b3;hb=b18a5fbb286422395ae52b78dcf0ceb2c3d070c8;hpb=d080286b39f943baf22f1b531816d8209d8685d6

diff --git a/net.c b/net.c
index e21f4029..7f8d596d 100644
--- a/net.c
+++ b/net.c
@@ -268,7 +268,7 @@ int para_listen(unsigned l3type, unsigned l4type, unsigned short port)
  *
  * \sa getnameinfo(3).
  */
-char *host_and_port(struct sockaddr *sa, socklen_t len)
+static char *host_and_port(struct sockaddr *sa, socklen_t len)
 {
 	static char output[NI_MAXHOST + NI_MAXSERV + 2];
 	char hbuf[NI_MAXHOST], sbuf[NI_MAXSERV];
@@ -276,12 +276,12 @@ char *host_and_port(struct sockaddr *sa, socklen_t len)
 
 	ret = getnameinfo(sa, len, hbuf, sizeof(hbuf), sbuf, sizeof(sbuf),
 		NI_NUMERICHOST | NI_NUMERICSERV);
-	if (ret)	{
-		PARA_WARNING_LOG("hostname lookup error (%s).\n", gai_strerror(ret));
+	if (ret) {
+		PARA_WARNING_LOG("hostname lookup error (%s).\n",
+			gai_strerror(ret));
 		sprintf(output, "(unknown)");
-	} else {
+	} else
 		sprintf(output, "%s#%s", hbuf, sbuf);
-	}
 	return output;
 }
 
@@ -312,7 +312,7 @@ static char *__get_sock_name(int fd, int (*getname)(int, struct sockaddr*,
 	return host_and_port((struct sockaddr *)&ss, sslen);
 }
 
-char  *local_name(int sockfd)
+char *local_name(int sockfd)
 {
 	return __get_sock_name(sockfd, getsockname);
 }
@@ -322,6 +322,28 @@ char *remote_name(int sockfd)
 	return __get_sock_name(sockfd, getpeername);
 }
 
+/**
+ * Extract IPv4 or IPv6-mapped-IPv4 address from sockaddr_storage.
+ * \param ss Container of IPv4/6 address
+ * \return Extracted IPv4 address (different from 0) or 0 if unsuccessful.
+ *
+ * \sa RFC 3493
+ */
+struct in_addr extract_v4_addr(const struct sockaddr_storage *ss)
+{
+	struct in_addr ia = { 0 };
+
+	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);
+	}
+	return ia;
+}
+
 /*
  * Send out a buffer, resend on short writes.
  *