/[linux-patches]/genpatches-2.6/trunk/2.6.16/1018_linux-2.6.16.19.patch
Gentoo

Contents of /genpatches-2.6/trunk/2.6.16/1018_linux-2.6.16.19.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 482 - (show annotations) (download) (as text)
Fri Jun 2 11:13:51 2006 UTC (14 years, 6 months ago) by dsd
File MIME type: text/x-diff
File size: 1117 byte(s)
remove version hunks, fix to apply
1 diff --git a/net/ipv4/netfilter/ip_conntrack_core.c b/net/ipv4/netfilter/ip_conntrack_core.c
2 index 84c66db..43f6b45 100644
3 --- a/net/ipv4/netfilter/ip_conntrack_core.c
4 +++ b/net/ipv4/netfilter/ip_conntrack_core.c
5 @@ -1318,6 +1318,7 @@ getorigdst(struct sock *sk, int optval,
6 .tuple.dst.u.tcp.port;
7 sin.sin_addr.s_addr = ct->tuplehash[IP_CT_DIR_ORIGINAL]
8 .tuple.dst.ip;
9 + memset(sin.sin_zero, 0, sizeof(sin.sin_zero));
10
11 DEBUGP("SO_ORIGINAL_DST: %u.%u.%u.%u %u\n",
12 NIPQUAD(sin.sin_addr.s_addr), ntohs(sin.sin_port));
13 diff --git a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
14 index 6c8624a..62a0f52 100644
15 --- a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
16 +++ b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
17 @@ -354,6 +354,7 @@ getorigdst(struct sock *sk, int optval,
18 .tuple.dst.u.tcp.port;
19 sin.sin_addr.s_addr = ct->tuplehash[IP_CT_DIR_ORIGINAL]
20 .tuple.dst.u3.ip;
21 + memset(sin.sin_zero, 0, sizeof(sin.sin_zero));
22
23 DEBUGP("SO_ORIGINAL_DST: %u.%u.%u.%u %u\n",
24 NIPQUAD(sin.sin_addr.s_addr), ntohs(sin.sin_port));

  ViewVC Help
Powered by ViewVC 1.1.20