Explorar el Código

OpenBSD getifaddrs returns netmask without sa_family

So we relax netmask check and set to same family as ipaddr
if needed

Signed-off-by: Jan Friesse <jfriesse@redhat.com>
Reviewed-by: Steven Dake <sdake@redhat.com>
Jan Friesse hace 13 años
padre
commit
ee59122ad7
Se han modificado 1 ficheros con 6 adiciones y 1 borrados
  1. 6 1
      exec/totemip.c

+ 6 - 1
exec/totemip.c

@@ -333,9 +333,14 @@ int totemip_getifaddrs(struct list_head *addrs)
 			continue ;
 
 		if ((ifa->ifa_addr->sa_family != AF_INET && ifa->ifa_addr->sa_family != AF_INET6) ||
-		    (ifa->ifa_netmask->sa_family != AF_INET && ifa->ifa_netmask->sa_family != AF_INET6))
+		    (ifa->ifa_netmask->sa_family != AF_INET && ifa->ifa_netmask->sa_family != AF_INET6 &&
+		     ifa->ifa_netmask->sa_family != 0))
 			continue ;
 
+		if (ifa->ifa_netmask->sa_family == 0) {
+			ifa->ifa_netmask->sa_family = ifa->ifa_addr->sa_family;
+		}
+
 		if_addr = malloc(sizeof(struct totem_ip_if_address));
 		if (if_addr == NULL) {
 			goto error_free_ifaddrs;