[PATCH 3/8] Identify expect by its ID

[PATCH 3/8] Identify expect by its ID

[Pablo Neira]

[-- Attachment #1: Type: text/plain, Size: 259 bytes --]

Add support to identify expectations by ID's at getting.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

-- 
The dawn of the fourth age of Linux firewalling is coming; a time of
great struggle and heroic deeds -- J.Kadlecsik got inspired by J.Morris

[-- Attachment #2: 02-expect-id.patch --]
[-- Type: text/plain, Size: 829 bytes --]

Add support to identify expectations by ID's at getting.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

Index: netfilter-2.6.14.git/net/ipv4/netfilter/ip_conntrack_netlink.c
===================================================================
--- netfilter-2.6.14.git.orig/net/ipv4/netfilter/ip_conntrack_netlink.c	2005-11-06 19:29:49.000000000 +0100
+++ netfilter-2.6.14.git/net/ipv4/netfilter/ip_conntrack_netlink.c	2005-11-06 19:49:37.000000000 +0100
@@ -1299,6 +1299,14 @@ ctnetlink_get_expect(struct sock *ctnl, 
 	if (!exp)
 		return -ENOENT;
 
+	if (cda[CTA_EXPECT_ID-1]) {
+		u_int32_t id = *(u_int32_t *)NFA_DATA(cda[CTA_EXPECT_ID-1]);
+		if (exp->id != ntohl(id)) {
+			ip_conntrack_expect_put(exp);
+			return -ENOENT;
+		}
+	}	
+
 	err = -ENOMEM;
 	skb2 = alloc_skb(NLMSG_GOODSIZE, GFP_KERNEL);
 	if (!skb2)

Re: [PATCH 3/8] Identify expect by its ID

[Harald Welte]

[-- Attachment #1: Type: text/plain, Size: 513 bytes --]

On Tue, Nov 08, 2005 at 02:44:27AM +0100, Pablo Neira wrote:
> Add support to identify expectations by ID's at getting.

thanks, applied.
-- 
- Harald Welte <laforge@netfilter.org>                 http://netfilter.org/
============================================================================
  "Fragmentation is like classful addressing -- an interesting early
   architectural error that shows how much experimentation was going
   on while IP was being designed."                    -- Paul Vixie

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]