Merge to iptables-1.3.5

[iptables.git] / extensions / libipt_connmark.c

diff --git a/extensions/libipt_connmark.c b/extensions/libipt_connmark.c
index 5bb2491..bc15f0d 100644 (file)
--- 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