diff options
| author | Jan Engelhardt <jengelh@medozas.de> | 2011-08-21 08:52:56 +0200 |
|---|---|---|
| committer | Jan Engelhardt <jengelh@medozas.de> | 2011-08-21 09:49:45 +0200 |
| commit | 83c342b36a7048ab86827e09a4916064837293d3 (patch) | |
| tree | 90b1eb59fbd2be0bfd7efa5d61fbeb9ac32ac2f2 | |
| parent | f17fd48448aafdc762a3b439864bcb1127b0da6c (diff) | |
libxt_dscp: restore inversion support
References: Dave Täht via netfilter-devel on 2011-08-20 14:40:11 -0700
References: <CAA93jw6mpDL6rLXM+9SpAhafkDdKoSfhAxU8UM87vUqjuzjYJw@mail.gmail.com>
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| -rw-r--r-- | extensions/libxt_dscp.c | 5 | ||||
| -rw-r--r-- | tests/options-most.rules | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/extensions/libxt_dscp.c b/extensions/libxt_dscp.c index 69533d6b..02b22a4e 100644 --- a/extensions/libxt_dscp.c +++ b/extensions/libxt_dscp.c @@ -43,9 +43,10 @@ static void dscp_help(void) static const struct xt_option_entry dscp_opts[] = { {.name = "dscp", .id = O_DSCP, .excl = F_DSCP_CLASS, .type = XTTYPE_UINT8, .min = 0, .max = XT_DSCP_MAX, - .flags = XTOPT_PUT, XTOPT_POINTER(struct xt_dscp_info, dscp)}, + .flags = XTOPT_INVERT | XTOPT_PUT, + XTOPT_POINTER(struct xt_dscp_info, dscp)}, {.name = "dscp-class", .id = O_DSCP_CLASS, .excl = F_DSCP, - .type = XTTYPE_STRING}, + .type = XTTYPE_STRING, .flags = XTOPT_INVERT}, XTOPT_TABLEEND, }; diff --git a/tests/options-most.rules b/tests/options-most.rules index ab7f5866..4becc2ae 100644 --- a/tests/options-most.rules +++ b/tests/options-most.rules @@ -20,8 +20,8 @@ -A INPUT -p tcp -m connmark --mark 0x99 -A INPUT -p tcp -m conntrack --ctstate INVALID --ctproto 6 --ctorigsrc fe80::/64 --ctorigdst fe80::/64 --ctreplsrc fe80::/64 --ctrepldst fe80::/64 --ctorigsrcport 12 --ctorigdstport 13 --ctreplsrcport 14 --ctrepldstport 15 --ctstatus EXPECTED --ctexpire 1:2 --ctdir REPLY -A INPUT -p tcp -m cpu --cpu 2 --A INPUT -p tcp -m dscp --dscp 0x04 --A INPUT -p tcp -m dscp --dscp 0x00 +-A INPUT -p tcp -m dscp --dscp 0x04 -m dscp ! --dscp 0x04 +-A INPUT -p tcp -m dscp --dscp 0x00 -m dscp ! --dscp 0x00 -A INPUT -p tcp -m hashlimit --hashlimit-upto 1/sec --hashlimit-burst 5 --hashlimit-mode srcip,dstip --hashlimit-name f1 --hashlimit-htable-size 64 --hashlimit-htable-max 128 --hashlimit-htable-gcinterval 60 --hashlimit-htable-expire 120 --hashlimit-srcmask 24 --hashlimit-dstmask 24 -A INPUT -p tcp -m hashlimit --hashlimit-above 5/sec --hashlimit-burst 5 --hashlimit-name f1 -A INPUT -p tcp -m helper --helper ftp |