--- libelwix/src/net.c 2013/06/03 11:41:45 1.2.2.1 +++ libelwix/src/net.c 2013/06/03 11:48:26 1.2.2.2 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: net.c,v 1.2.2.1 2013/06/03 11:41:45 misho Exp $ +* $Id: net.c,v 1.2.2.2 2013/06/03 11:48:26 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -290,7 +290,7 @@ e_usleep(u_int usec) * return: -1 error, 0 match or 1 not match */ int -e_innet(netaddr_t * __restrict net, netaddr_t * __restrict addr) +e_innet(netaddr_t * __restrict net, inaddr_t * __restrict addr) { register int i; int ret = 0; @@ -298,17 +298,15 @@ e_innet(netaddr_t * __restrict net, netaddr_t * __rest if (!net || !addr) return -1; - if (net->addr.sa.sa_family != addr->addr.sa.sa_family) - return -1; switch (net->addr.sa.sa_family) { case AF_INET: ret = net->addr.sin.sin_addr.s_addr & net->mask.in.s_addr; - ret -= addr->addr.sin.sin_addr.s_addr & addr->mask.in.s_addr; + ret -= addr->in.s_addr & net->mask.in.s_addr; break; case AF_INET6: for (i = 0; i < sizeof(struct in6_addr); i++) { ret = net->addr.sin6.sin6_addr.s6_addr[i] & net->mask.in6.s6_addr[i]; - ret -= addr->addr.sin6.sin6_addr.s6_addr[i] & addr->mask.in6.s6_addr[i]; + ret -= addr->in6.s6_addr[i] & net->mask.in6.s6_addr[i]; if (ret) break; }