On Dec 11 2007 11:27, Patrick McHardy wrote: > Jan Engelhardt wrote: >> Introduce the xt_MARK target revision 2. It uses fixed types, with the >> goal of obsoleting revision 0 and 1 some day (uses nonfixed types). >> xt_MARK rev 2 also uses more expressive XOR logic. > > Can I see a userspace patch for this please? :) > Yes, it will be a reply to this mail (which contains a small update to the kernel part.) === Introduce the xt_MARK target revision 2. It uses fixed types, with the goal of obsoleting revision 0 and 1 some day (uses nonfixed types). xt_MARK rev 2 also uses more expressive XOR logic. Signed-off-by: Jan Engelhardt <jengelh@xxxxxxxxxxxxxxx> --- include/linux/netfilter/xt_MARK.h | 4 ++ net/netfilter/xt_MARK.c | 51 +++++++++++++++++++++++++++++--------- 2 files changed, 43 insertions(+), 12 deletions(-) Index: linux-2.6/include/linux/netfilter/xt_MARK.h =================================================================== --- linux-2.6.orig/include/linux/netfilter/xt_MARK.h +++ linux-2.6/include/linux/netfilter/xt_MARK.h @@ -18,4 +18,8 @@ struct xt_mark_target_info_v1 { u_int8_t mode; }; +struct xt_mark_target_info_v2 { + u_int32_t mark, mask; +}; + #endif /*_XT_MARK_H_target */ Index: linux-2.6/net/netfilter/xt_MARK.c =================================================================== --- linux-2.6.orig/net/netfilter/xt_MARK.c +++ linux-2.6/net/netfilter/xt_MARK.c @@ -33,9 +33,9 @@ mark_tg_v0(struct sk_buff *skb, const st } 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; @@ -58,6 +58,17 @@ mark_tg(struct sk_buff *skb, const struc 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_target_info_v2 *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, @@ -73,9 +84,9 @@ mark_tg_check_v0(const char *tablename, } 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; @@ -101,7 +112,7 @@ struct compat_xt_mark_target_info_v1 { u_int16_t __pad2; }; -static void mark_tg_compat_from_user(void *dst, void *src) +static void mark_tg_compat_from_user_v1(void *dst, void *src) { const struct compat_xt_mark_target_info_v1 *cm = src; struct xt_mark_target_info_v1 m = { @@ -111,7 +122,7 @@ static void mark_tg_compat_from_user(voi memcpy(dst, &m, sizeof(m)); } -static int mark_tg_compat_to_user(void __user *dst, void *src) +static int mark_tg_compat_to_user_v1(void __user *dst, void *src) { const struct xt_mark_target_info_v1 *m = src; struct compat_xt_mark_target_info_v1 cm = { @@ -137,13 +148,13 @@ static struct xt_target mark_tg_reg[] __ .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), - .compat_from_user = mark_tg_compat_from_user, - .compat_to_user = mark_tg_compat_to_user, + .compat_from_user = mark_tg_compat_from_user_v1, + .compat_to_user = mark_tg_compat_to_user_v1, #endif .table = "mangle", .me = THIS_MODULE, @@ -158,6 +169,22 @@ static struct xt_target mark_tg_reg[] __ .table = "mangle", .me = THIS_MODULE, }, + { + .name = "MARK", + .revision = 2, + .family = AF_INET, + .target = mark_tg, + .targetsize = sizeof(struct xt_mark_target_info_v2), + .me = THIS_MODULE, + }, + { + .name = "MARK", + .revision = 2, + .family = AF_INET6, + .target = mark_tg, + .targetsize = sizeof(struct xt_mark_target_info_v2), + .me = THIS_MODULE, + }, }; static int __init mark_tg_init(void) - To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html