diff options
| author | /C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org </C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org> | 2005-11-03 18:43:14 +0000 |
|---|---|---|
| committer | /C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org </C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org> | 2005-11-03 18:43:14 +0000 |
| commit | 4cafb49887285c209f5126ffeb6f8482c99ab82d (patch) | |
| tree | a6c0f9b756c240965026bfb015d5e2978159c0a8 /extensions/libipt_connmark.c | |
| parent | 615b41d12df58fd3d395f2822a413df2617fcc99 (diff) | |
fix connmark, it's now only 32bits (Deti Fliegl <deti@fliegl.de)svn_t_iptables_1_3_4
We'ver screwed this up with the 2.6.14 release. It refuses any mask that
extends 32bits. We should have fixed this by adding a new target/match
revision, but now it's too late anyway :(
Diffstat (limited to 'extensions/libipt_connmark.c')
| -rw-r--r-- | extensions/libipt_connmark.c | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/extensions/libipt_connmark.c b/extensions/libipt_connmark.c index 5bb2491..bc15f0d 100644 --- a/extensions/libipt_connmark.c +++ b/extensions/libipt_connmark.c @@ -66,17 +66,13 @@ parse(int c, char **argv, int invert, unsigned int *flags, char *end; case '1': check_inverse(optarg, &invert, &optind, 0); -#ifdef KERNEL_64_USERSPACE_32 - markinfo->mark = strtoull(optarg, &end, 0); - markinfo->mask = ~0ULL; - if (*end == '/') - markinfo->mask = strtoull(end+1, &end, 0); -#else + markinfo->mark = strtoul(optarg, &end, 0); - markinfo->mask = ~0UL; + markinfo->mask = 0xffffffffUL; + if (*end == '/') markinfo->mask = strtoul(end+1, &end, 0); -#endif + if (*end != '\0' || end == optarg) exit_error(PARAMETER_PROBLEM, "Bad MARK value `%s'", optarg); if (invert) @@ -90,25 +86,14 @@ parse(int c, char **argv, int invert, unsigned int *flags, return 1; } -#ifdef KERNEL_64_USERSPACE_32 -static void -print_mark(unsigned long long mark, unsigned long long mask, int numeric) -{ - if(mask != ~0ULL) - printf("0x%llx/0x%llx ", mark, mask); - else - printf("0x%llx ", mark); -} -#else static void print_mark(unsigned long mark, unsigned long mask, int numeric) { - if(mask != ~0UL) + if(mask != 0xffffffffUL) printf("0x%lx/0x%lx ", mark, mask); else printf("0x%lx ", mark); } -#endif /* Final check; must have specified --mark. */ static void |