19035N/Adiff --git a/common/libnwamui.c b/common/libnwamui.c

19035N/Aindex bd2f9ca..8599f19 100644

19035N/A--- a/common/libnwamui.c

19035N/A+++ b/common/libnwamui.c

19035N/A@@ -1665,18 +1665,18 @@ nwamui_util_ncp_init_acquired_ip(NwamuiNcp *ncp)

19035N/A const char *mask_p;

19035N/A

19035N/A /* Found it. */

19035N/A- if (idx->ifa_addr->ss_family == AF_INET) {

19035N/A- addr_p = inet_ntop((int)idx->ifa_addr->ss_family,

19035N/A+ if (idx->ifa_addr->sa_family == AF_INET) {

19035N/A+ addr_p = inet_ntop((int)idx->ifa_addr->sa_family,

19035N/A &((struct sockaddr_in *)idx->ifa_addr)->sin_addr,

19035N/A addr_str, INET_ADDRSTRLEN);

19035N/A- mask_p = inet_ntop((int)idx->ifa_netmask->ss_family,

19035N/A+ mask_p = inet_ntop((int)idx->ifa_netmask->sa_family,

19035N/A &((struct sockaddr_in *)idx->ifa_netmask)->sin_addr,

19035N/A mask_str, INET_ADDRSTRLEN);

19035N/A } else {

19035N/A- addr_p = inet_ntop((int)idx->ifa_addr->ss_family,

19035N/A+ addr_p = inet_ntop((int)idx->ifa_addr->sa_family,

19035N/A &((struct sockaddr_in6 *)idx->ifa_addr)->sin6_addr,

19035N/A addr_str, INET6_ADDRSTRLEN);

19035N/A- mask_p = inet_ntop((int)idx->ifa_netmask->ss_family,

19035N/A+ mask_p = inet_ntop((int)idx->ifa_netmask->sa_family,

19035N/A &((struct sockaddr_in6 *)idx->ifa_netmask)->sin6_addr,

19035N/A mask_str, INET6_ADDRSTRLEN);

19035N/A }

19035N/A@@ -1701,17 +1701,17 @@ nwamui_util_get_interface_address(const char *ifname, sa_family_t family,

19035N/A

19035N/A for (idx = ifap; idx; idx = idx->ifa_next) {

19035N/A if (g_strcmp0(ifname, idx->ifa_name) == 0

19035N/A- && idx->ifa_addr->ss_family == family) {

19035N/A+ && idx->ifa_addr->sa_family == family) {

19035N/A char addr_str[INET6_ADDRSTRLEN];

19035N/A const char *addr_p;

19035N/A

19035N/A /* Found it. */

19035N/A- if (idx->ifa_addr->ss_family == AF_INET) {

19035N/A- addr_p = inet_ntop((int)idx->ifa_addr->ss_family,

19035N/A+ if (idx->ifa_addr->sa_family == AF_INET) {

19035N/A+ addr_p = inet_ntop((int)idx->ifa_addr->sa_family,

19035N/A &((struct sockaddr_in *)idx->ifa_addr)->sin_addr,

19035N/A addr_str, INET_ADDRSTRLEN);

19035N/A } else {

19035N/A- addr_p = inet_ntop((int)idx->ifa_addr->ss_family,

19035N/A+ addr_p = inet_ntop((int)idx->ifa_addr->sa_family,

19035N/A &((struct sockaddr_in6 *)idx->ifa_addr)->sin6_addr,

19035N/A addr_str, INET6_ADDRSTRLEN);

19035N/A }

19035N/A@@ -1720,7 +1720,7 @@ nwamui_util_get_interface_address(const char *ifname, sa_family_t family,

19035N/A *address_p = g_strdup(addr_p?addr_p:"");

19035N/A }

19035N/A if (prefixlen_p) {

19035N/A- *prefixlen_p = mask2plen(idx->ifa_netmask);

19035N/A+ *prefixlen_p = mask2plen((struct sockaddr_storage *)idx->ifa_netmask);

19035N/A }

19035N/A if (is_dhcp_p != NULL) {

19035N/A if (idx->ifa_flags & IFF_DHCPRUNNING) {