Skip to contentSkip to conversation

src: json: add support for element deletion

PATCH In review Florian Westphal 2 participants 2 messages Aug 29, 2019 netfilter

lore
Share & tools
lore

Florian Westphal

author maintainer
#0 lore raw

PATCH 1/1 src: json: add support for element deletion

also add a test case.

---
 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(+)
src/parser_json.c +2 -0
index a969bd4c3676..8ca07d717b13 100644
@@ -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;
tests/py/ip6/sets.t +1 -0
index 5adec53f56ce..add82eb8feb8 100644
@@ -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
tests/py/ip6/sets.t.json +25 -0
index 9a75dd6fa210..948c1f168d0f 100644
@@ -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"
+        }
+    }
+]
tests/py/ip6/sets.t.payload.inet +7 -0
index 3886db67526c..47ad86a20864 100644
@@ -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 ]
tests/py/ip6/sets.t.payload.ip6 +6 -0
index 0b318f8de97f..a5febb9fe591 100644
@@ -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 ]
+
tests/py/ip6/sets.t.payload.netdev +8 -0
index 0dfabb778a0c..dab74159a098 100644
@@ -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 ]
+
Signature · 1 line
2.21.0