diff options
| author |   Pablo Neira Ayuso <pablo@netfilter.org> | 2005-11-09 13:00:04 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2005-11-09 13:00:04 -0800 |
| commit | 02a78cdf425156b86abdb6883f837a70fb7106da (patch) | |
| tree | 477c2eb79a4591d25f6a1b1422d9dc80055deaf2 /net | |
| parent | [NETFILTER] ctnetlink: check if protoinfo is present (diff) | |
| download | linux-dev-02a78cdf425156b86abdb6883f837a70fb7106da.tar.xz linux-dev-02a78cdf425156b86abdb6883f837a70fb7106da.zip | |
[NETFILTER] ctnetlink: add marking support from userspace
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/netfilter/ip_conntrack_netlink.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/net/ipv4/netfilter/ip_conntrack_netlink.c b/net/ipv4/netfilter/ip_conntrack_netlink.c index 838262e17376..09957f9be97d 100644 --- a/net/ipv4/netfilter/ip_conntrack_netlink.c +++ b/net/ipv4/netfilter/ip_conntrack_netlink.c @@ -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; |