X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=net.c;h=4a31f013446877e45c780e7eb24a27a0a1042c3a;hp=2ec3f03e546b3b1f3c038b7eea2e9cf8cf8a3438;hb=081c8921f827c1ed482c45ba22bd8bb97db2838b;hpb=0fd87393066ba5a6f0245b8a54b4fd47b281dfce

diff --git a/net.c b/net.c
index 2ec3f03e..4a31f013 100644
--- a/net.c
+++ b/net.c
@@ -672,19 +672,19 @@ char *remote_name(int sockfd)
 
 /**
  * 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
+ * \param ss Container of IPv4/6 address.
+ * \param ia Extracted IPv4 address (different from 0) or 0 if unsuccessful.
+ *
+ * \sa RFC 3493.
  */
-struct in_addr extract_v4_addr(const struct sockaddr_storage *ss)
+void extract_v4_addr(const struct sockaddr_storage *ss, struct in_addr *ia)
 {
-	struct in_addr ia = {.s_addr = 0};
 	const struct sockaddr *sa = normalize_ip_address(ss);
 
+	memset(ia, 0, sizeof(*ia));
 	if (sa->sa_family == AF_INET)
-		ia = ((struct sockaddr_in *)sa)->sin_addr;
-	return ia;
+		*ia = ((struct sockaddr_in *)sa)->sin_addr;
 }
 
 /**