149 |
const NETDEF *nd = item; |
const NETDEF *nd = item; |
150 |
const struct acl_closure *clos = data; |
const struct acl_closure *clos = data; |
151 |
|
|
152 |
if (nd->ipaddr == (clos->ip & nd->netmask)) |
if (ip_addr_in_net_p(nd, clos->ip)) |
153 |
return 0; |
return 0; |
154 |
return 1; |
return 1; |
155 |
} |
} |
2151 |
return -1; |
return -1; |
2152 |
} |
} |
2153 |
|
|
2154 |
|
/* FIXME: MIBS do not reflect netmask */ |
2155 |
for (num = 0; num < 4; num++) |
for (num = 0; num < 4; num++) |
2156 |
closure->quad[num] = (nas->ipaddr >> |
closure->quad[num] = (nas->netdef.ipaddr >> |
2157 |
(8*(3-num))) & 0xff; |
(8*(3-num))) & 0xff; |
2158 |
|
|
2159 |
break; |
break; |
2165 |
if (num == 0) { |
if (num == 0) { |
2166 |
if (nas = nas_lookup_index(1)) |
if (nas = nas_lookup_index(1)) |
2167 |
for (num = 0; num < 4; num++) |
for (num = 0; num < 4; num++) |
2168 |
closure->quad[num] = (nas->ipaddr >> |
closure->quad[num] = |
2169 |
(8*(3-num))) & 0xff; |
(nas->netdef.ipaddr >> |
2170 |
|
(8*(3-num))) & 0xff; |
2171 |
} |
} |
2172 |
break; |
break; |
2173 |
|
|