From: | "Mike Frysinger (vapier)" <vapier@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in net-firewall/iptables/files: iptables-1.4.0-in6-glibc-2.8.patch |
Date: | Mon, 09 Jun 2008 09:31:48 |
Message-Id: | E1K5dj5-0007t2-9Q@stork.gentoo.org |
1 | vapier 08/06/09 09:31:43 |
2 | |
3 | Added: iptables-1.4.0-in6-glibc-2.8.patch |
4 | Log: |
5 | Use the correct API for accessing ip6 structs #225505 by Jose daLuz. |
6 | (Portage version: 2.2_pre7-r1/cvs/Linux 2.6.25 AMD Athlon(tm) 64 X2 Dual Core Processor 4200+) |
7 | |
8 | Revision Changes Path |
9 | 1.1 net-firewall/iptables/files/iptables-1.4.0-in6-glibc-2.8.patch |
10 | |
11 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/iptables/files/iptables-1.4.0-in6-glibc-2.8.patch?rev=1.1&view=markup |
12 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/iptables/files/iptables-1.4.0-in6-glibc-2.8.patch?rev=1.1&content-type=text/plain |
13 | |
14 | Index: iptables-1.4.0-in6-glibc-2.8.patch |
15 | =================================================================== |
16 | use the proper api to access the data structures |
17 | |
18 | http://bugs.gentoo.org/225505 |
19 | |
20 | --- libiptc/libip6tc.c |
21 | +++ libiptc/libip6tc.c |
22 | @@ -113,7 +113,7 @@ |
23 | #include "libiptc.c" |
24 | |
25 | #define BIT6(a, l) \ |
26 | - ((ntohl(a->in6_u.u6_addr32[(l) / 32]) >> (31 - ((l) & 31))) & 1) |
27 | + ((ntohl(a->s6_addr32[(l) / 32]) >> (31 - ((l) & 31))) & 1) |
28 | |
29 | int |
30 | ipv6_prefix_length(const struct in6_addr *a) |
31 | --- ip6tables.c |
32 | +++ ip6tables.c |
33 | @@ -678,7 +678,7 @@ |
34 | for (i = 0, j = 0; i < n; i++) { |
35 | int k; |
36 | for (k = 0; k < 4; k++) |
37 | - addrp[j].in6_u.u6_addr32[k] &= maskp->in6_u.u6_addr32[k]; |
38 | + addrp[j].s6_addr32[k] &= maskp->s6_addr32[k]; |
39 | j++; |
40 | for (k = 0; k < j - 1; k++) { |
41 | if (IN6_ARE_ADDR_EQUAL(&addrp[k], &addrp[j - 1])) { |
42 | |
43 | |
44 | |
45 | -- |
46 | gentoo-commits@l.g.o mailing list |