]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[NETFILTER] ctnetlink: add marking support from userspace
authorPablo Neira Ayuso <pablo@netfilter.org>
Wed, 9 Nov 2005 21:00:04 +0000 (13:00 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 9 Nov 2005 21:00:04 +0000 (13:00 -0800)
This patch adds support for conntrack marking from user space.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/netfilter/ip_conntrack_netlink.c

index 838262e17376dab3be9e3e21237d39e2c42a74b9..09957f9be97d99fe3f23aa67c180352dffb87f2f 100644 (file)
@@ -979,6 +979,11 @@ ctnetlink_change_conntrack(struct ip_conntrack *ct, struct nfattr *cda[])
                        return err;
        }
 
+#if defined(CONFIG_IP_NF_CONNTRACK_MARK)
+       if (cda[CTA_MARK-1])
+               ct->mark = ntohl(*(u_int32_t *)NFA_DATA(cda[CTA_MARK-1]));
+#endif
+
        DEBUGP("all done\n");
        return 0;
 }
@@ -1022,6 +1027,11 @@ ctnetlink_create_conntrack(struct nfattr *cda[],
        if (ct->helper)
                ip_conntrack_helper_put(ct->helper);
 
+#if defined(CONFIG_IP_NF_CONNTRACK_MARK)
+       if (cda[CTA_MARK-1])
+               ct->mark = ntohl(*(u_int32_t *)NFA_DATA(cda[CTA_MARK-1]));
+#endif
+
        DEBUGP("conntrack with id %u inserted\n", ct->id);
        return 0;