diff options
Diffstat (limited to 'src/util/os_network.c')
-rw-r--r-- | src/util/os_network.c | 29 |
1 files changed, 2 insertions, 27 deletions
diff --git a/src/util/os_network.c b/src/util/os_network.c index 4df37b9e5..526678047 100644 --- a/src/util/os_network.c +++ b/src/util/os_network.c | |||
@@ -35,7 +35,7 @@ | |||
35 | #define LOG_STRERROR_FILE(kind, syscall, filename) GNUNET_log_from_strerror_file(kind, "util-os-network", syscall, filename) | 35 | #define LOG_STRERROR_FILE(kind, syscall, filename) GNUNET_log_from_strerror_file(kind, "util-os-network", syscall, filename) |
36 | 36 | ||
37 | 37 | ||
38 | #if !(HAVE_GETIFADDRS && HAVE_FREEIFADDRS) && !MINGW | 38 | #if !(HAVE_GETIFADDRS && HAVE_FREEIFADDRS) |
39 | /** | 39 | /** |
40 | * Try to enumerate all network interfaces using 'ifconfig'. | 40 | * Try to enumerate all network interfaces using 'ifconfig'. |
41 | * | 41 | * |
@@ -388,32 +388,7 @@ void | |||
388 | GNUNET_OS_network_interfaces_list(GNUNET_OS_NetworkInterfaceProcessor proc, | 388 | GNUNET_OS_network_interfaces_list(GNUNET_OS_NetworkInterfaceProcessor proc, |
389 | void *proc_cls) | 389 | void *proc_cls) |
390 | { | 390 | { |
391 | #ifdef MINGW | 391 | #if HAVE_GETIFADDRS && HAVE_FREEIFADDRS |
392 | int r; | ||
393 | int i; | ||
394 | struct EnumNICs3_results *results = NULL; | ||
395 | int results_count; | ||
396 | |||
397 | r = EnumNICs3(&results, &results_count); | ||
398 | if (r != GNUNET_OK) | ||
399 | return; | ||
400 | |||
401 | for (i = 0; i < results_count; i++) | ||
402 | { | ||
403 | if (GNUNET_OK != | ||
404 | proc(proc_cls, results[i].pretty_name, results[i].is_default, | ||
405 | (const struct sockaddr *)&results[i].address, | ||
406 | results[i]. | ||
407 | flags & ENUMNICS3_BCAST_OK ? | ||
408 | (const struct sockaddr *)&results[i].broadcast : NULL, | ||
409 | results[i].flags & ENUMNICS3_MASK_OK ? | ||
410 | (const struct sockaddr *)&results[i].mask : NULL, | ||
411 | results[i].addr_size)) | ||
412 | break; | ||
413 | } | ||
414 | EnumNICs3_free(results); | ||
415 | return; | ||
416 | #elif HAVE_GETIFADDRS && HAVE_FREEIFADDRS | ||
417 | struct ifaddrs *ifa_first; | 392 | struct ifaddrs *ifa_first; |
418 | struct ifaddrs *ifa_ptr; | 393 | struct ifaddrs *ifa_ptr; |
419 | socklen_t alen; | 394 | socklen_t alen; |