[GNUnet-SVN] r19998 - in gnunet/src: include util

[gnunet]

Author: grothoff
Date: 2012-02-24 07:54:24 +0100 (Fri, 24 Feb 2012)
New Revision: 19998

Modified:
   gnunet/src/include/winproc.h
   gnunet/src/util/os_network.c
Log:
bratao/LRN: Use-bigger-buffer-for-EnumNICs3_results

Modified: gnunet/src/include/winproc.h
===================================================================
--- gnunet/src/include/winproc.h        2012-02-23 23:23:05 UTC (rev 19997)
+++ gnunet/src/include/winproc.h        2012-02-24 06:54:24 UTC (rev 19998)
@@ -217,9 +217,9 @@
     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);

Modified: gnunet/src/util/os_network.c
===================================================================
--- gnunet/src/util/os_network.c        2012-02-23 23:23:05 UTC (rev 19997)
+++ gnunet/src/util/os_network.c        2012-02-24 06:54:24 UTC (rev 19998)
@@ -60,10 +60,12 @@
   {
     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;
   }