libxt_MARK r2

Add support for xt_MARK target revision 2.
Also consolidate libip6t_MARK.man and libipt_MARK.man.

Signed-off-by: Jan Engelhardt <jengelh@computergmbh.de>

diff --git a/extensions/libip6t_MARK.man b/extensions/libip6t_MARK.man
deleted file mode 100644 (file)
index 1f3260c..0000000
--- a/extensions/libip6t_MARK.man
+++ /dev/null
@@ -1,6 +0,0 @@
-This is used to set the netfilter mark value associated with the
-packet.  It is only valid in the
-.B mangle
-table.
-.TP
-.BI "--set-mark " "mark"

diff --git a/extensions/libipt_MARK.man b/extensions/libipt_MARK.man
deleted file mode 100644 (file)
index 7ddf23e..0000000
--- a/extensions/libipt_MARK.man
+++ /dev/null
@@ -1,13 +0,0 @@
-This is used to set the netfilter mark value associated with the
-packet.  It is only valid in the
-.B mangle
-table.  It can for example be used in conjunction with iproute2.
-.TP
-.BI "--set-mark " "value"
-Set nfmark value
-.TP
-.BI "--and-mark " "value"
-Binary AND the nfmark with value
-.TP
-.BI "--or-mark " "value"
-Binary OR  the nfmark with value

diff --git a/extensions/libxt_MARK.c b/extensions/libxt_MARK.c
index 01872986de036d90f20d475a36078f869500957b..82beb4b06d3f2b17e57bc1cd4125a110216b8b2f 100644 (file)
--- a/extensions/libxt_MARK.c
+++ b/extensions/libxt_MARK.c
@@ -1,4 +1,5 @@
 /* Shared library add-on to iptables to add MARK target support. */
+#include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -8,6 +9,10 @@
 #include <linux/netfilter/x_tables.h>
 #include <linux/netfilter/xt_MARK.h>
 
+enum {
+       F_MARK = 1 << 0,
+};
+
 /* Function which prints out usage message. */
 static void MARK_help(void)
 {
@@ -27,6 +32,27 @@ static const struct option MARK_opts[] = {
        { }
 };
 
+static const struct option mark_tg_opts[] = {
+       {.name = "set-xmark", .has_arg = true, .val = 'X'},
+       {.name = "set-mark",  .has_arg = true, .val = '='},
+       {.name = "and-mark",  .has_arg = true, .val = '&'},
+       {.name = "or-mark",   .has_arg = true, .val = '|'},
+       {.name = "xor-mark",  .has_arg = true, .val = '^'},
+       {},
+};
+
+static void mark_tg_help(void)
+{
+       printf(
+"MARK target options:\n"
+"  --set-xmark value[/mask]  Clear bits in mask and XOR value into nfmark\n"
+"  --set-mark value[/mask]   Clear bits in mask and OR value into nfmark\n"
+"  --and-mark bits           Binary AND the nfmark with bits\n"
+"  --or-mark bits            Binary OR the nfmark with bits\n"
+"  --xor-mask bits           Binary XOR the nfmark with bits\n"
+"\n");
+}
+
 /* Function which parses command options; returns true if it
    ate an option */
 static int
@@ -101,6 +127,74 @@ MARK_parse_v1(int c, char **argv, int invert, unsigned int *flags,
        return 1;
 }
 
+static int mark_tg_parse(int c, char **argv, int invert, unsigned int *flags,
+                         const void *entry, struct xt_entry_target **target)
+{
+       struct xt_mark_tginfo2 *info = (void *)(*target)->data;
+       unsigned int value, mask = ~0U;
+       char *end;
+
+       switch (c) {
+       case 'X': /* --set-xmark */
+       case '=': /* --set-mark */
+               param_act(P_ONE_ACTION, "MARK", *flags & F_MARK);
+               param_act(P_NO_INVERT, "MARK", "--set-xmark/--set-mark", invert);
+               if (!strtonum(optarg, &end, &value, 0, ~0U))
+                       param_act(P_BAD_VALUE, "MARK", "--set-xmark/--set-mark", optarg);
+               if (*end == '/')
+                       if (!strtonum(end + 1, &end, &mask, 0, ~0U))
+                               param_act(P_BAD_VALUE, "MARK", "--set-xmark/--set-mark", optarg);
+               if (*end != '\0')
+                       param_act(P_BAD_VALUE, "MARK", "--set-xmark/--set-mark", optarg);
+               info->mark = value;
+               info->mask = mask;
+
+               if (c == '=')
+                       info->mask = value | mask;
+               break;
+
+       case '&': /* --and-mark */
+               param_act(P_ONE_ACTION, "MARK", *flags & F_MARK);
+               param_act(P_NO_INVERT, "MARK", "--and-mark", invert);
+               if (!strtonum(optarg, NULL, &mask, 0, ~0U))
+                       param_act(P_BAD_VALUE, "MARK", "--and-mark", optarg);
+               info->mark = 0;
+               info->mask = ~mask;
+               break;
+
+       case '|': /* --or-mark */
+               param_act(P_ONE_ACTION, "MARK", *flags & F_MARK);
+               param_act(P_NO_INVERT, "MARK", "--or-mark", invert);
+               if (!strtonum(optarg, NULL, &value, 0, ~0U))
+                       param_act(P_BAD_VALUE, "MARK", "--or-mark", optarg);
+               info->mark = value;
+               info->mask = value;
+               break;
+
+       case '^': /* --xor-mark */
+               param_act(P_ONE_ACTION, "MARK", *flags & F_MARK);
+               param_act(P_NO_INVERT, "MARK", "--xor-mark", invert);
+               if (!strtonum(optarg, NULL, &value, 0, ~0U))
+                       param_act(P_BAD_VALUE, "MARK", "--xor-mark", optarg);
+               info->mark = value;
+               info->mask = 0;
+               break;
+
+       default:
+               return false;
+       }
+
+       *flags |= F_MARK;
+       return true;
+}
+
+static void mark_tg_check(unsigned int flags)
+{
+       if (flags == 0)
+               exit_error(PARAMETER_PROBLEM, "MARK: One of the --set-xmark, "
+                          "--{and,or,xor,set}-mark options is required");
+}
+
 static void
 print_mark(unsigned long mark)
 {
@@ -148,6 +242,21 @@ static void MARK_print_v1(const void *ip, const struct xt_entry_target *target,
        print_mark(markinfo->mark);
 }
 
+static void mark_tg_print(const void *ip, const struct xt_entry_target *target,
+                          int numeric)
+{
+       const struct xt_mark_tginfo2 *info = (const void *)target->data;
+
+       if (info->mark == 0)
+               printf("MARK and 0x%x ", (unsigned int)(u_int32_t)~info->mask);
+       else if (info->mark == info->mask)
+               printf("MARK or 0x%x ", info->mark);
+       else if (info->mask == 0)
+               printf("MARK xor 0x%x ", info->mark);
+       else
+               printf("MARK xset 0x%x/0x%x ", info->mark, info->mask);
+}
+
 /* Saves the union ipt_targinfo in parsable form to stdout. */
 static void MARK_save_v1(const void *ip, const struct xt_entry_target *target)
 {
@@ -168,6 +277,13 @@ static void MARK_save_v1(const void *ip, const struct xt_entry_target *target)
        print_mark(markinfo->mark);
 }
 
+static void mark_tg_save(const void *ip, const struct xt_entry_target *target)
+{
+       const struct xt_mark_tginfo2 *info = (const void *)target->data;
+
+       printf("--set-xmark 0x%x/0x%x ", info->mark, info->mask);
+}
+
 static struct xtables_target mark_target_v0 = {
        .family         = AF_INET,
        .name           = "MARK",
@@ -213,9 +329,41 @@ static struct xtables_target mark_target6_v0 = {
        .extra_opts     = MARK_opts,
 };
 
+static struct xtables_target mark_tg_reg_v2 = {
+       .version       = IPTABLES_VERSION,
+       .name          = "MARK",
+       .revision      = 2,
+       .family        = AF_INET,
+       .size          = XT_ALIGN(sizeof(struct xt_mark_tginfo2)),
+       .userspacesize = XT_ALIGN(sizeof(struct xt_mark_tginfo2)),
+       .help          = mark_tg_help,
+       .parse         = mark_tg_parse,
+       .final_check   = mark_tg_check,
+       .print         = mark_tg_print,
+       .save          = mark_tg_save,
+       .extra_opts    = mark_tg_opts,
+};
+
+static struct xtables_target mark_tg6_reg_v2 = {
+       .version       = IPTABLES_VERSION,
+       .name          = "MARK",
+       .revision      = 2,
+       .family        = AF_INET6,
+       .size          = XT_ALIGN(sizeof(struct xt_mark_tginfo2)),
+       .userspacesize = XT_ALIGN(sizeof(struct xt_mark_tginfo2)),
+       .help          = mark_tg_help,
+       .parse         = mark_tg_parse,
+       .final_check   = mark_tg_check,
+       .print         = mark_tg_print,
+       .save          = mark_tg_save,
+       .extra_opts    = mark_tg_opts,
+};
+
 void _init(void)
 {
        xtables_register_target(&mark_target_v0);
        xtables_register_target(&mark_target_v1);
        xtables_register_target(&mark_target6_v0);
+       xtables_register_target(&mark_tg_reg_v2);
+       xtables_register_target(&mark_tg6_reg_v2);
 }

diff --git a/extensions/libxt_MARK.man b/extensions/libxt_MARK.man
new file mode 100644 (file)
index 0000000..9585f02
--- /dev/null
+++ b/extensions/libxt_MARK.man
@@ -0,0 +1,25 @@
+This target is used to set the Netfilter mark value associated with the packet.
+The target can only be used in the \fBmangle\fR table. It can, for example, be
+used in conjunction with routing based on fwmark (needs iproute2).
+.TP
+\fB--set-xmark\fR \fIvalue\fR[\fB/\fR\fImask\fR]
+Zeroes out the bits given by \fImask\fR and XORs \fIvalue\fR into the packet
+mark ("nfmark"). If \fImask\fR is omitted, 0xFFFFFFFF is assumed.
+.TP
+\fB--set-mark\fR \fIvalue\fR[\fB/\fR\fImask\fR]
+Zeroes out the bits given by \fImask\fR and ORs \fIvalue\fR into the packet
+mark. If \fImask\fR is omitted, 0xFFFFFFFF is assumed.
+.PP
+The following mnemonics are available:
+.TP
+\fB--and-mark\fR \fIbits\fR
+Binary AND the nfmark with \fIbits\fR. (Mnemonic for \fB--set-xmark
+0/\fR\fIinvbits\fR, where \fIinvbits\fR is the binary negation of \fIbits\fR.)
+.TP
+\fB--or-mark\fR \fIbits\fR
+Binary OR the nfmark with \fIbits\fR. (Mnemonic for \fB--set-xmark\fR
+\fIbits\fR\fB/\fR\fIbits\fR.)
+.TP
+\fB--xor-mark\fR \fIbits\fR
+Binary XOR the nfmark with \fIbits\fR. (Mnemonic for \fB--set-xmark\fR
+\fIbits\fR\fB/0\fR.)

diff --git a/include/linux/netfilter/xt_MARK.h b/include/linux/netfilter/xt_MARK.h
index b021e93ee5d64d2c7524abe40300a610dfdfcbff..778b278fd9f278e825a1caae596e11c3b4c47ae7 100644 (file)
--- a/include/linux/netfilter/xt_MARK.h
+++ b/include/linux/netfilter/xt_MARK.h
@@ -18,4 +18,8 @@ struct xt_mark_target_info_v1 {
        u_int8_t mode;
 };
 
+struct xt_mark_tginfo2 {
+       u_int32_t mark, mask;
+};
+
 #endif /*_XT_MARK_H_target */