diff options
| author | Andreas Steffen <andreas.steffen@strongswan.org> | 2008-10-08 06:57:52 +0000 |
|---|---|---|
| committer | Andreas Steffen <andreas.steffen@strongswan.org> | 2008-10-08 06:57:52 +0000 |
| commit | 51358f9f7262546707b1383695cd0f5e7f8b5108 (patch) | |
| tree | da2891af4dfd5b471d4404a1c1bf5bf9aefb1132 /src | |
| parent | c85862931fd9b5e88742b12d9f1e790717f43ba0 (diff) | |
| download | strongswan-51358f9f7262546707b1383695cd0f5e7f8b5108.tar.bz2 strongswan-51358f9f7262546707b1383695cd0f5e7f8b5108.tar.xz | |
correct fix that replaces Changeset 4378
Diffstat (limited to 'src')
| -rw-r--r-- | src/charon/plugins/kernel_netlink/kernel_netlink_net.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/charon/plugins/kernel_netlink/kernel_netlink_net.c b/src/charon/plugins/kernel_netlink/kernel_netlink_net.c index f14776287..ea59541c7 100644 --- a/src/charon/plugins/kernel_netlink/kernel_netlink_net.c +++ b/src/charon/plugins/kernel_netlink/kernel_netlink_net.c @@ -695,17 +695,19 @@ static bool addr_in_subnet(chunk_t addr, chunk_t net, int net_len) { return FALSE; } - /* scan through all bits, beginning in the front */ + /* scan through all bits, beginning at the front */ for (byte = 0; byte < addr.len; byte++) { - for (bit = 7; bit >= 0; bit--) + for (bit = 0; bit < 8; bit++) { + u_char bitpos = 1 << (7-bit); + /* check if bits are equal (or we reached the end of the net) */ - if (bit + byte * 8 > net_len) + if (bit + byte * 8 >= net_len) { return TRUE; } - if (((1<<bit) & addr.ptr[byte]) != ((1<<bit) & net.ptr[byte])) + if ((bitpos & addr.ptr[byte]) != (bitpos & net.ptr[byte])) { return FALSE; } |