blob: 3fa009c84c3694ec0bb3432ee6e203110d89fd5f (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
|
diff --git a/nbase/nbase_addrset.c b/nbase/nbase_addrset.c
index 6f91bc1b2a..849044e4e3 100644
--- a/nbase/nbase_addrset.c
+++ b/nbase/nbase_addrset.c
@@ -477,30 +477,32 @@ static int sockaddr_to_addr(const struct sockaddr *sa, u32 *addr)
static int sockaddr_to_mask (const struct sockaddr *sa, int bits, u32 *mask)
{
- s8 i;
- int unmasked_bits = 0;
+ int i, k;
if (bits >= 0) {
if (sa->sa_family == AF_INET) {
- unmasked_bits = 32 - bits;
+ bits += 96;
}
#ifdef HAVE_IPV6
else if (sa->sa_family == AF_INET6) {
- unmasked_bits = 128 - bits;
+ ; /* do nothing */
}
#endif
else {
return 0;
}
}
+ else
+ bits = 128;
+ k = bits / 32;
for (i=0; i < 4; i++) {
- if (unmasked_bits <= 32 * (3 - i)) {
+ if (i < k) {
mask[i] = 0xffffffff;
}
- else if (unmasked_bits >= 32 * (4 - i)) {
+ else if (i > k) {
mask[i] = 0;
}
else {
- mask[i] = ~((1 << (unmasked_bits - (32 * (4 - i)))) - 1);
+ mask[i] = 0xfffffffe << (31 - bits % 32);
}
}
return 1;
diff --git a/ncat/test/test-addrset.sh b/ncat/test/test-addrset.sh
index 7f54023c52..285c7b675a 100755
--- a/ncat/test/test-addrset.sh
+++ b/ncat/test/test-addrset.sh
@@ -208,6 +208,25 @@ test_addrset "1:2::0003/120" "1:2::3 1:2::0 1:2::ff" <<EOF
1:3::3
EOF
+# IPv6 CIDR netmask.
+test_addrset "1:2::3:4:5/95" "1:2::3:4:5 1:2::2:0:0 1:2::3:ffff:ffff" <<EOF
+1:2::3:4:5
+1:2::1:ffff:ffff
+1:2::2:0:0
+1:2::3:ffff:ffff
+1:2::4:0:0
+1:3::3
+EOF
+
+# IPv6 CIDR netmask.
+test_addrset "11::2/15" "11::2:3:4:5 10::1 11:ffff:ffff:ffff:ffff:ffff:ffff:ffff" <<EOF
+11::2:3:4:5
+9:ffff:ffff:ffff:ffff:ffff:ffff:ffff
+10::1
+11:ffff:ffff:ffff:ffff:ffff:ffff:ffff
+12::0
+EOF
+
# /128 netmask.
test_addrset "1:2::0003/128" "1:2::3" <<EOF
1:2::3
|
