Skip to content

Commit

Permalink
[NETFILTER]: xt_MARK target, revision 2
Browse files Browse the repository at this point in the history 
Introduces the xt_MARK target revision 2. It uses fixed types, and
also uses the more expressive XOR logic.

Signed-off-by: Jan Engelhardt <jengelh@computergmbh.de>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Jan Engelhardt authored and David S. Miller committed Jan 28, 2008
1 parent 0dc8c76 commit e0a812a
Show file tree
Hide file tree
Showing 2 changed files with 56 additions and 22 deletions.
4 changes: 4 additions & 0 deletions include/linux/netfilter/xt_MARK.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,8 @@ struct xt_mark_target_info_v1 {
u_int8_t mode;
};

struct xt_mark_tginfo2 {
u_int32_t mark, mask;
};

#endif /*_XT_MARK_H_target */
74 changes: 52 additions & 22 deletions net/netfilter/xt_MARK.c
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
/* This is a module which is used for setting the NFMARK field of an skb. */

/* (C) 1999-2001 Marc Boucher <marc@mbsi.ca>
/*
* xt_MARK - Netfilter module to modify the NFMARK field of an skb
*
* (C) 1999-2001 Marc Boucher <marc@mbsi.ca>
* Copyright © CC Computer Consultants GmbH, 2007 - 2008
* Jan Engelhardt <jengelh@computergmbh.de>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/

#include <linux/module.h>
Expand Down Expand Up @@ -33,9 +36,9 @@ mark_tg_v0(struct sk_buff *skb, const struct net_device *in,
}

static unsigned int
mark_tg(struct sk_buff *skb, const struct net_device *in,
const struct net_device *out, unsigned int hooknum,
const struct xt_target *target, const void *targinfo)
mark_tg_v1(struct sk_buff *skb, const struct net_device *in,
const struct net_device *out, unsigned int hooknum,
const struct xt_target *target, const void *targinfo)
{
const struct xt_mark_target_info_v1 *markinfo = targinfo;
int mark = 0;
Expand All @@ -58,6 +61,17 @@ mark_tg(struct sk_buff *skb, const struct net_device *in,
return XT_CONTINUE;
}

static unsigned int
mark_tg(struct sk_buff *skb, const struct net_device *in,
const struct net_device *out, unsigned int hooknum,
const struct xt_target *target, const void *targinfo)
{
const struct xt_mark_tginfo2 *info = targinfo;

skb->mark = (skb->mark & ~info->mask) ^ info->mark;
return XT_CONTINUE;
}

static bool
mark_tg_check_v0(const char *tablename, const void *entry,
const struct xt_target *target, void *targinfo,
Expand All @@ -73,9 +87,9 @@ mark_tg_check_v0(const char *tablename, const void *entry,
}

static bool
mark_tg_check(const char *tablename, const void *entry,
const struct xt_target *target, void *targinfo,
unsigned int hook_mask)
mark_tg_check_v1(const char *tablename, const void *entry,
const struct xt_target *target, void *targinfo,
unsigned int hook_mask)
{
const struct xt_mark_target_info_v1 *markinfo = targinfo;

Expand All @@ -98,7 +112,7 @@ struct compat_xt_mark_target_info {
compat_ulong_t mark;
};

static void mark_tg_compat_from_user(void *dst, void *src)
static void mark_tg_compat_from_user_v0(void *dst, void *src)
{
const struct compat_xt_mark_target_info *cm = src;
struct xt_mark_target_info m = {
Expand All @@ -107,7 +121,7 @@ static void mark_tg_compat_from_user(void *dst, void *src)
memcpy(dst, &m, sizeof(m));
}

static int mark_tg_compat_to_user(void __user *dst, void *src)
static int mark_tg_compat_to_user_v0(void __user *dst, void *src)
{
const struct xt_mark_target_info *m = src;
struct compat_xt_mark_target_info cm = {
Expand Down Expand Up @@ -154,8 +168,8 @@ static struct xt_target mark_tg_reg[] __read_mostly = {
.targetsize = sizeof(struct xt_mark_target_info),
#ifdef CONFIG_COMPAT
.compatsize = sizeof(struct compat_xt_mark_target_info),
.compat_from_user = mark_tg_compat_from_user,
.compat_to_user = mark_tg_compat_to_user,
.compat_from_user = mark_tg_compat_from_user_v0,
.compat_to_user = mark_tg_compat_to_user_v0,
#endif
.table = "mangle",
.me = THIS_MODULE,
Expand All @@ -164,8 +178,8 @@ static struct xt_target mark_tg_reg[] __read_mostly = {
.name = "MARK",
.family = AF_INET,
.revision = 1,
.checkentry = mark_tg_check,
.target = mark_tg,
.checkentry = mark_tg_check_v1,
.target = mark_tg_v1,
.targetsize = sizeof(struct xt_mark_target_info_v1),
#ifdef CONFIG_COMPAT
.compatsize = sizeof(struct compat_xt_mark_target_info_v1),
Expand All @@ -184,8 +198,8 @@ static struct xt_target mark_tg_reg[] __read_mostly = {
.targetsize = sizeof(struct xt_mark_target_info),
#ifdef CONFIG_COMPAT
.compatsize = sizeof(struct compat_xt_mark_target_info),
.compat_from_user = mark_tg_compat_from_user,
.compat_to_user = mark_tg_compat_to_user,
.compat_from_user = mark_tg_compat_from_user_v0,
.compat_to_user = mark_tg_compat_to_user_v0,
#endif
.table = "mangle",
.me = THIS_MODULE,
Expand All @@ -194,8 +208,8 @@ static struct xt_target mark_tg_reg[] __read_mostly = {
.name = "MARK",
.family = AF_INET6,
.revision = 1,
.checkentry = mark_tg_check,
.target = mark_tg,
.checkentry = mark_tg_check_v1,
.target = mark_tg_v1,
.targetsize = sizeof(struct xt_mark_target_info_v1),
#ifdef CONFIG_COMPAT
.compatsize = sizeof(struct compat_xt_mark_target_info_v1),
Expand All @@ -205,6 +219,22 @@ static struct xt_target mark_tg_reg[] __read_mostly = {
.table = "mangle",
.me = THIS_MODULE,
},
{
.name = "MARK",
.revision = 2,
.family = AF_INET,
.target = mark_tg,
.targetsize = sizeof(struct xt_mark_tginfo2),
.me = THIS_MODULE,
},
{
.name = "MARK",
.revision = 2,
.family = AF_INET6,
.target = mark_tg,
.targetsize = sizeof(struct xt_mark_tginfo2),
.me = THIS_MODULE,
},
};

static int __init mark_tg_init(void)
Expand Down

0 comments on commit e0a812a

Please sign in to comment.