From cda5c8c26f329bbd3655fd7d1af4e1eec55ec397 Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Thu, 29 Aug 2019 11:36:20 +0200 Subject: src: json: add support for element deletion also add a test case. Fixes: a87f2a2227be2 ("netfilter: support for element deletion") Signed-off-by: Florian Westphal Acked-by: Phil Sutter --- src/parser_json.c | 2 ++ tests/py/ip6/sets.t | 1 + tests/py/ip6/sets.t.json | 25 +++++++++++++++++++++++++ tests/py/ip6/sets.t.payload.inet | 7 +++++++ tests/py/ip6/sets.t.payload.ip6 | 6 ++++++ tests/py/ip6/sets.t.payload.netdev | 8 ++++++++ 6 files changed, 49 insertions(+) diff --git a/src/parser_json.c b/src/parser_json.c index a969bd4c..8ca07d71 100644 --- a/src/parser_json.c +++ b/src/parser_json.c @@ -2055,6 +2055,8 @@ static struct stmt *json_parse_set_stmt(struct json_ctx *ctx, op = NFT_DYNSET_OP_ADD; } else if (!strcmp(opstr, "update")) { op = NFT_DYNSET_OP_UPDATE; + } else if (!strcmp(opstr, "delete")) { + op = NFT_DYNSET_OP_DELETE; } else { json_error(ctx, "Unknown set statement op '%s'.", opstr); return NULL; diff --git a/tests/py/ip6/sets.t b/tests/py/ip6/sets.t index 5adec53f..add82eb8 100644 --- a/tests/py/ip6/sets.t +++ b/tests/py/ip6/sets.t @@ -40,3 +40,4 @@ ip6 saddr != @set33 drop;fail !set5 type ipv6_addr . ipv6_addr;ok ip6 saddr . ip6 daddr @set5 drop;ok add @set5 { ip6 saddr . ip6 daddr };ok +delete @set5 { ip6 saddr . ip6 daddr };ok diff --git a/tests/py/ip6/sets.t.json b/tests/py/ip6/sets.t.json index 9a75dd6f..948c1f16 100644 --- a/tests/py/ip6/sets.t.json +++ b/tests/py/ip6/sets.t.json @@ -91,3 +91,28 @@ } ] +# delete @set5 { ip6 saddr . ip6 daddr } +[ + { + "set": { + "elem": { + "concat": [ + { + "payload": { + "field": "saddr", + "protocol": "ip6" + } + }, + { + "payload": { + "field": "daddr", + "protocol": "ip6" + } + } + ] + }, + "op": "delete", + "set": "@set5" + } + } +] diff --git a/tests/py/ip6/sets.t.payload.inet b/tests/py/ip6/sets.t.payload.inet index 3886db67..47ad86a2 100644 --- a/tests/py/ip6/sets.t.payload.inet +++ b/tests/py/ip6/sets.t.payload.inet @@ -31,3 +31,10 @@ inet test-inet input [ payload load 16b @ network header + 24 => reg 2 ] [ dynset add reg_key 1 set set5 ] +# delete @set5 { ip6 saddr . ip6 daddr } +inet test-inet input + [ meta load nfproto => reg 1 ] + [ cmp eq reg 1 0x0000000a ] + [ payload load 16b @ network header + 8 => reg 1 ] + [ payload load 16b @ network header + 24 => reg 2 ] + [ dynset delete reg_key 1 set set5 ] diff --git a/tests/py/ip6/sets.t.payload.ip6 b/tests/py/ip6/sets.t.payload.ip6 index 0b318f8d..a5febb9f 100644 --- a/tests/py/ip6/sets.t.payload.ip6 +++ b/tests/py/ip6/sets.t.payload.ip6 @@ -23,3 +23,9 @@ ip6 test-ip6 input [ payload load 16b @ network header + 24 => reg 2 ] [ dynset add reg_key 1 set set5 ] +# delete @set5 { ip6 saddr . ip6 daddr } +ip6 test-ip6 input + [ payload load 16b @ network header + 8 => reg 1 ] + [ payload load 16b @ network header + 24 => reg 2 ] + [ dynset delete reg_key 1 set set5 ] + diff --git a/tests/py/ip6/sets.t.payload.netdev b/tests/py/ip6/sets.t.payload.netdev index 0dfabb77..dab74159 100644 --- a/tests/py/ip6/sets.t.payload.netdev +++ b/tests/py/ip6/sets.t.payload.netdev @@ -31,3 +31,11 @@ netdev test-netdev ingress [ payload load 16b @ network header + 24 => reg 2 ] [ dynset add reg_key 1 set set5 ] +# delete @set5 { ip6 saddr . ip6 daddr } +netdev test-netdev ingress + [ meta load protocol => reg 1 ] + [ cmp eq reg 1 0x0000dd86 ] + [ payload load 16b @ network header + 8 => reg 1 ] + [ payload load 16b @ network header + 24 => reg 2 ] + [ dynset delete reg_key 1 set set5 ] + -- cgit v1.2.3