X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=net.c;h=4a31f013446877e45c780e7eb24a27a0a1042c3a;hp=c18e7a0a19cfa1ff741fee6b8f3e0232a4813b7d;hb=a1beef4331994ddeb9fe0fd9fee363bfb91875e7;hpb=8536a1d8de423ab7d021c1f1364bb12fab8ce575

diff --git a/net.c b/net.c
index c18e7a0a..4a31f013 100644
--- a/net.c
+++ b/net.c
@@ -264,6 +264,12 @@ struct flowopts {
 	struct list_head sockopts;
 };
 
+/**
+ * Allocate and initialize a flowopt queue.
+ *
+ * \return A new structure to be passed to \ref flowopt_add(). It is
+ * automatically deallocated in \ref makesock().
+ */
 struct flowopts *flowopt_new(void)
 {
 	struct flowopts *new = para_malloc(sizeof(*new));
@@ -666,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;
 }
 
 /**