git://git.onelab.eu
/
iptables.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
iptables-1.3.2-20050720
[iptables.git]
/
extensions
/
libipt_mark.c
diff --git
a/extensions/libipt_mark.c
b/extensions/libipt_mark.c
index
4aa780b
..
1922768
100644
(file)
--- a/
extensions/libipt_mark.c
+++ b/
extensions/libipt_mark.c
@@
-6,7
+6,8
@@
#include <getopt.h>
#include <iptables.h>
#include <getopt.h>
#include <iptables.h>
-#include <linux/netfilter_ipv4/ipt_mark.h>
+/* For 64bit kernel / 32bit userspace */
+#include "../include/linux/netfilter_ipv4/ipt_mark.h"
/* Function which prints out usage message. */
static void
/* Function which prints out usage message. */
static void
@@
-24,14
+25,6
@@
static struct option opts[] = {
{0}
};
{0}
};
-/* Initialize the match. */
-static void
-init(struct ipt_entry_match *m, unsigned int *nfcache)
-{
- /* Can't cache this. */
- *nfcache |= NFC_UNKNOWN;
-}
-
/* Function which parses command options; returns true if it
ate an option */
static int
/* Function which parses command options; returns true if it
ate an option */
static int
@@
-46,11
+39,19
@@
parse(int c, char **argv, int invert, unsigned int *flags,
char *end;
case '1':
check_inverse(optarg, &invert, &optind, 0);
char *end;
case '1':
check_inverse(optarg, &invert, &optind, 0);
+#ifdef KERNEL_64_USERSPACE_32
+ markinfo->mark = strtoull(optarg, &end, 0);
+ if (*end == '/') {
+ markinfo->mask = strtoull(end+1, &end, 0);
+ } else
+ markinfo->mask = 0xffffffffffffffffULL;
+#else
markinfo->mark = strtoul(optarg, &end, 0);
if (*end == '/') {
markinfo->mask = strtoul(end+1, &end, 0);
} else
markinfo->mask = 0xffffffff;
markinfo->mark = strtoul(optarg, &end, 0);
if (*end == '/') {
markinfo->mask = strtoul(end+1, &end, 0);
} else
markinfo->mask = 0xffffffff;
+#endif
if (*end != '\0' || end == optarg)
exit_error(PARAMETER_PROBLEM, "Bad MARK value `%s'", optarg);
if (invert)
if (*end != '\0' || end == optarg)
exit_error(PARAMETER_PROBLEM, "Bad MARK value `%s'", optarg);
if (invert)
@@
-64,6
+65,16
@@
parse(int c, char **argv, int invert, unsigned int *flags,
return 1;
}
return 1;
}
+#ifdef KERNEL_64_USERSPACE_32
+static void
+print_mark(unsigned long long mark, unsigned long long mask, int numeric)
+{
+ if(mask != 0xffffffffffffffffULL)
+ 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)
{
static void
print_mark(unsigned long mark, unsigned long mask, int numeric)
{
@@
-72,6
+83,7
@@
print_mark(unsigned long mark, unsigned long mask, int numeric)
else
printf("0x%lx ", mark);
}
else
printf("0x%lx ", mark);
}
+#endif
/* Final check; must have specified --mark. */
static void
/* Final check; must have specified --mark. */
static void
@@
-111,20
+123,18
@@
save(const struct ipt_ip *ip, const struct ipt_entry_match *match)
print_mark(info->mark, info->mask, 0);
}
print_mark(info->mark, info->mask, 0);
}
-static
-struct iptables_match mark
-= { NULL,
- "mark",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ipt_mark_info)),
- IPT_ALIGN(sizeof(struct ipt_mark_info)),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+static struct iptables_match mark = {
+ .next = NULL,
+ .name = "mark",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ipt_mark_info)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ipt_mark_info)),
+ .help = &help,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
void _init(void)
};
void _init(void)