X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=extensions%2Flibipt_CONNMARK.c;h=bc739fcae0f07818c3ef05eb9bf48d9d02568895;hb=6afea0b41dfbc3824956d11d960ad80097218feb;hp=52221821a4a23c216bb6d2690acbeaf1004e606f;hpb=f7b70cf9e00324b89b02de213bcd0dde7044d035;p=iptables.git diff --git a/extensions/libipt_CONNMARK.c b/extensions/libipt_CONNMARK.c index 5222182..bc739fc 100644 --- a/extensions/libipt_CONNMARK.c +++ b/extensions/libipt_CONNMARK.c @@ -1,4 +1,24 @@ -/* Shared library add-on to iptables to add CONNMARK target support. */ +/* Shared library add-on to iptables to add CONNMARK target support. + * + * (C) 2002,2004 MARA Systems AB + * by Henrik Nordstrom + * + * Version 1.1 + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ #include #include #include @@ -6,7 +26,7 @@ #include #include -#include +#include "../include/linux/netfilter_ipv4/ipt_CONNMARK.h" #if 0 struct markinfo { @@ -21,9 +41,9 @@ help(void) { printf( "CONNMARK target v%s options:\n" -" --set-mark value Set conntrack mark value\n" -" --save-mark Save the packet nfmark on the connection\n" -" --restore-mark Restore saved nfmark value\n" +" --set-mark value[/mask] Set conntrack mark value\n" +" --save-mark [--mask mask] Save the packet nfmark in the connection\n" +" --restore-mark [--mask mask] Restore saved nfmark value\n" "\n", IPTABLES_VERSION); } @@ -32,6 +52,7 @@ static struct option opts[] = { { "set-mark", 1, 0, '1' }, { "save-mark", 0, 0, '2' }, { "restore-mark", 0, 0, '3' }, + { "mask", 1, 0, '4' }, { 0 } }; @@ -51,11 +72,25 @@ parse(int c, char **argv, int invert, unsigned int *flags, struct ipt_connmark_target_info *markinfo = (struct ipt_connmark_target_info *)(*target)->data; +#ifdef KERNEL_64_USERSPACE_32 + markinfo->mask = ~0ULL; +#else + markinfo->mask = ~0UL; +#endif + switch (c) { char *end; case '1': markinfo->mode = IPT_CONNMARK_SET; +#ifdef KERNEL_64_USERSPACE_32 + markinfo->mark = strtoull(optarg, &end, 0); + if (*end == '/' && end[1] != '\0') + markinfo->mask = strtoull(end+1, &end, 0); +#else markinfo->mark = strtoul(optarg, &end, 0); + if (*end == '/' && end[1] != '\0') + markinfo->mask = strtoul(end+1, &end, 0); +#endif if (*end != '\0' || end == optarg) exit_error(PARAMETER_PROBLEM, "Bad MARK value `%s'", optarg); if (*flags) @@ -77,6 +112,18 @@ parse(int c, char **argv, int invert, unsigned int *flags, "CONNMARK target: Can't specify --restore-mark twice"); *flags = 1; break; + case '4': + if (!*flags) + exit_error(PARAMETER_PROBLEM, + "CONNMARK target: Can't specify --mask without a operation"); +#ifdef KERNEL_64_USERSPACE_32 + markinfo->mask = strtoull(optarg, &end, 0); +#else + markinfo->mask = strtoul(optarg, &end, 0); +#endif + if (*end != '\0' || end == optarg) + exit_error(PARAMETER_PROBLEM, "Bad MASK value `%s'", optarg); + break; default: return 0; } @@ -89,16 +136,41 @@ final_check(unsigned int flags) { if (!flags) exit_error(PARAMETER_PROBLEM, - "CONNMARK target: Parameter --set-mark is required"); + "CONNMARK target: No operation specified"); +} + +#ifdef KERNEL_64_USERSPACE_32 +static void +print_mark(unsigned long long mark) +{ + printf("0x%llx", mark); } static void -print_mark(unsigned long mark, int numeric) +print_mask(const char *text, unsigned long long mask) { - printf("0x%lx ", mark); + if (mask != ~0ULL) + printf("%s0x%llx", text, mask); } -/* Prints out the targinfo. */ +#else + +static void +print_mark(unsigned long mark) +{ + printf("0x%lx", mark); +} + +static void +print_mask(const char *text, unsigned long mask) +{ + if (mask != ~0UL) + printf("%s0x%lx", text, mask); +} +#endif + + +/* Prints out the target info. */ static void print(const struct ipt_ip *ip, const struct ipt_entry_target *target, @@ -109,13 +181,18 @@ print(const struct ipt_ip *ip, switch (markinfo->mode) { case IPT_CONNMARK_SET: printf("CONNMARK set "); - print_mark(markinfo->mark, numeric); + print_mark(markinfo->mark); + print_mask("/", markinfo->mask); + printf(" "); break; case IPT_CONNMARK_SAVE: printf("CONNMARK save "); + print_mask("mask ", markinfo->mask); + printf(" "); break; case IPT_CONNMARK_RESTORE: printf("CONNMARK restore "); + print_mask("mask ", markinfo->mask); break; default: printf("ERROR: UNKNOWN CONNMARK MODE "); @@ -123,7 +200,7 @@ print(const struct ipt_ip *ip, } } -/* Saves the union ipt_targinfo in parsable form to stdout. */ +/* Saves the target into in parsable form to stdout. */ static void save(const struct ipt_ip *ip, const struct ipt_entry_target *target) { @@ -132,13 +209,18 @@ save(const struct ipt_ip *ip, const struct ipt_entry_target *target) switch (markinfo->mode) { case IPT_CONNMARK_SET: - printf("--set-mark 0x%lx ", markinfo->mark); + printf("--set-mark "); + print_mark(markinfo->mark); + print_mask("/", markinfo->mask); + printf(" "); break; case IPT_CONNMARK_SAVE: printf("--save-mark "); + print_mask("--mask ", markinfo->mask); break; case IPT_CONNMARK_RESTORE: printf("--restore-mark "); + print_mask("--mask ", markinfo->mask); break; default: printf("ERROR: UNKNOWN CONNMARK MODE "); @@ -146,23 +228,21 @@ save(const struct ipt_ip *ip, const struct ipt_entry_target *target) } } -static -struct iptables_target mark -= { NULL, - "CONNMARK", - IPTABLES_VERSION, - IPT_ALIGN(sizeof(struct ipt_connmark_target_info)), - IPT_ALIGN(sizeof(struct ipt_connmark_target_info)), - &help, - &init, - &parse, - &final_check, - &print, - &save, - opts +static struct iptables_target connmark_target = { + .name = "CONNMARK", + .version = IPTABLES_VERSION, + .size = IPT_ALIGN(sizeof(struct ipt_connmark_target_info)), + .userspacesize = IPT_ALIGN(sizeof(struct ipt_connmark_target_info)), + .help = &help, + .init = &init, + .parse = &parse, + .final_check = &final_check, + .print = &print, + .save = &save, + .extra_opts = opts }; void _init(void) { - register_target(&mark); + register_target(&connmark_target); }