X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=net.c;h=2db340542d4f78531b6d4af4909d6fdc8eb1ce91;hp=5d7c3fef7d15a5c2c58d380f5f0412bb493deb4a;hb=b88a9a0cbbb39e999ae4942ed596b17ce2ae7f23;hpb=35bbbf736c75f13c2bf9f6d6bdc2feecd42072cb

diff --git a/net.c b/net.c
index 5d7c3fef..2db34054 100644
--- a/net.c
+++ b/net.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -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 = {.s_addr = 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.
  *