From: Christian Grothoff <christian@grothoff.org>
Date: Fri, 24 Feb 2012 06:54:24 +0000 (+0000)
Subject: bratao/LRN: Use-bigger-buffer-for-EnumNICs3_results
X-Git-Tag: initial-import-from-subversion-38251~14674
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4bf097a83030f69bffba531214bb71f351470518;p=oweals%2Fgnunet.git

bratao/LRN: Use-bigger-buffer-for-EnumNICs3_results
---

diff --git a/src/include/winproc.h b/src/include/winproc.h
index e65a3b55c..3670a74b0 100644
--- a/src/include/winproc.h
+++ b/src/include/winproc.h
@@ -217,9 +217,9 @@ extern "C"
     int is_default;
     char pretty_name[1001];
     size_t addr_size;
-    struct sockaddr address;
-    struct sockaddr mask;
-    struct sockaddr broadcast;
+    SOCKADDR_STORAGE address;
+    SOCKADDR_STORAGE mask;
+    SOCKADDR_STORAGE broadcast;
   };
 
   int EnumNICs3 (struct EnumNICs3_results **, int *EnumNICs3_results_count);
diff --git a/src/util/os_network.c b/src/util/os_network.c
index 01fe5f7dc..b0490efab 100644
--- a/src/util/os_network.c
+++ b/src/util/os_network.c
@@ -60,10 +60,12 @@ GNUNET_OS_network_interfaces_list (GNUNET_OS_NetworkInterfaceProcessor proc,
   {
     if (GNUNET_OK !=
         proc (proc_cls, results[i].pretty_name, results[i].is_default,
-              &results[i].address,
+              (const struct sockaddr *) &results[i].address,
               results[i].
-              flags & ENUMNICS3_BCAST_OK ? &results[i].broadcast : NULL,
-              results[i].flags & ENUMNICS3_MASK_OK ? &results[i].mask : NULL,
+              flags & ENUMNICS3_BCAST_OK ?
+              (const struct sockaddr *) &results[i].broadcast : NULL,
+              results[i].flags & ENUMNICS3_MASK_OK ?
+              (const struct sockaddr *) &results[i].mask : NULL,
               results[i].addr_size))
       break;
   }