Changeset 3860

Timestamp:

03/02/06 19:10:37 (3 years ago)

Author:

morris

Message:

Also return an address with the IPv6 wildcard on Linux

Files:

• libwired/trunk/libwired/net/wi-host.c (modified) (2 diffs)

libwired/trunk/libwired/net/wi-host.c

@@ -197 +197 @@
-static wi_list_t * _wi_host_all_interface_addresses(void) {
-#if defined(HAVE_GETIFADDRS) && !defined(HAVE_GLIBC)
- = NULL
+
-        wi_address_t            *address;
-        struct ifaddrs          *ifap, *ifp;
@@ -232 +232 @@
-        return wi_autorelease(list);
-#else
-
-
-
+
+
+
+
+
+
-
-        memset(&sa, 0, sizeof(sa));
-        sa.sin_family           = AF_INET;
-        sa.sin_addr.s_addr      = INADDR_ANY;
+#ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
+        sa.sin_len                      = sizeof(sa);
+#endif
-
-        address = wi_address_init_with_sa(wi_address_alloc(), (struct sockaddr *) &sa);
-list = wi_list_init_with_data(wi_list_alloc(), address, NULL
+wi_list_append_data(list, address
-        wi_release(address);
-        
+        memset(&sa6, 0, sizeof(sa6));
+        sa6.sin6_family         = AF_INET6;
+        sa6.sin6_addr           = in6addr_any;
+#ifdef HAVE_STRUCT_SOCKADDR_IN6_SIN6_LEN
+        sa6.sin6_len            = sizeof(sa6);
+#endif
+        
+        address = wi_address_init_with_sa(wi_address_alloc(), (struct sockaddr *) &sa6);
+        wi_list_append_data(list, address);
+        wi_release(address);
+
-        return wi_autorelease(list);
-#endif