linux.git/include/linux/netfilter_ipv4, branch v2.6.19 Linux kernel source tree [NETFILTER]: ip6_tables: fixed conflicted optname for getsockopt 2006-11-16T05:18:49+00:00 Yasuyuki Kozakai yasuyuki.kozakai@toshiba.co.jp 2006-11-15T03:48:48+00:00 b96e7ecbd052a0916b6078e7600604d7e276a336 66 and 67 for getsockopt on IPv6 socket is doubly used for IPv6 Advanced API and ip6tables. This moves numbers for ip6tables to 68 and 69. This also kills XT_SO_* because {ip,ip6,arp}_tables doesn't have so much common numbers now. The old userland tools keep to behave as ever, because old kernel always calls functions of IPv6 Advanced API for their numbers. Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp> Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net> 
66 and 67 for getsockopt on IPv6 socket is doubly used for IPv6 Advanced
API and ip6tables. This moves numbers for ip6tables to 68 and 69.
This also kills XT_SO_* because {ip,ip6,arp}_tables doesn't have so much
common numbers now.

The old userland tools keep to behave as ever, because old kernel always
calls functions of IPv6 Advanced API for their numbers.

Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
[NETFILTER]: h323 annotations 2006-09-29T01:03:03+00:00 Al Viro viro@zeniv.linux.org.uk 2006-09-28T21:22:51+00:00 d4263cde88d3fee2af0aac8836bb785cdb6b06c0 Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net> 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
[NETFILTER]: ipt annotations 2006-09-29T01:03:02+00:00 Al Viro viro@zeniv.linux.org.uk 2006-09-28T21:22:24+00:00 6a19d61472d0802a24493c0d200e88f99ad39cd8 Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net> 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
[NETFILTER]: NAT annotations 2006-09-29T01:03:01+00:00 Al Viro viro@zeniv.linux.org.uk 2006-09-28T21:22:02+00:00 a76b11dd25957287af12ce6855be6d7fd415b3a9 Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net> 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
[NETFILTER]: conntrack annotations 2006-09-29T01:03:00+00:00 Al Viro viro@zeniv.linux.org.uk 2006-09-28T21:21:37+00:00 cdcb71bf964e02e0a22007f5d90ead7bede3b85b Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net> 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
[NETFILTER]: netfilter misc annotations 2006-09-29T01:02:59+00:00 Al Viro viro@zeniv.linux.org.uk 2006-09-28T21:21:07+00:00 59b8bfd8fd608821e5addc9f4682c7f2424afd8c Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net> 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
[NETFILTER]: PPTP conntrack: fix another GRE keymap leak 2006-09-22T22:20:20+00:00 Patrick McHardy kaber@trash.net 2006-09-20T19:11:30+00:00 4c5de695cf7f71c85ad8cfff509f6475b8bd4d27 When the master PPTP connection times out while still having unfullfilled expectations (and a GRE keymap entry) associated with it, the keymap entry is not destroyed. Add a destroy callback to struct ip_conntrack_helper and use it to destroy PPTP siblings when the master is destroyed. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net> 
When the master PPTP connection times out while still having unfullfilled
expectations (and a GRE keymap entry) associated with it, the keymap entry
is not destroyed.

Add a destroy callback to struct ip_conntrack_helper and use it to destroy
PPTP siblings when the master is destroyed.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
[NETFILTER]: PPTP conntrack: simplify expectation handling 2006-09-22T22:20:13+00:00 Patrick McHardy kaber@trash.net 2006-09-20T19:09:34+00:00 cf9f81523ef3e95d9f222c896d266e4562999150 Remove duplicated expectation handling in the NAT helper and simplify the remains in the conntrack helper. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net> 
Remove duplicated expectation handling in the NAT helper and simplify
the remains in the conntrack helper.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
[NETFILTER]: PPTP conntrack: fix header definitions 2006-09-22T22:20:11+00:00 Patrick McHardy kaber@trash.net 2006-09-20T19:08:56+00:00 6013c0a13e335674a783215e182c367406294392 Fix a few header definitions to match RFC2637. Most importantly the PptpOutCallRequest header included an invalid padding field and a size check was disabled because of this. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net> 
Fix a few header definitions to match RFC2637. Most importantly the
PptpOutCallRequest header included an invalid padding field and a
size check was disabled because of this.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
[NETFILTER]: PPTP conntrack: get rid of unnecessary byte order conversions 2006-09-22T22:20:08+00:00 Patrick McHardy kaber@trash.net 2006-09-20T19:08:03+00:00 955b944293dd4c931ec866ebe19a6b2463b8f9a0 The conntrack structure contains the call ID in host byte order for no reason, get rid of back and forth conversions. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net> 
The conntrack structure contains the call ID in host byte order for no
reason, get rid of back and forth conversions.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>