fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libnftnl: adapt upstream update

Browse Source
This commit is contained in:
zxl hhyccc 2024-11-12 20:51:53 +08:00 committed by GitHub
parent 8c87fe1a41
commit 4dc1ec4751
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
package/libs/libnftnl/patches/001-libnftnl-add-fullcone-expression-support.patch
View File

@ -66,7 +66,7 @@ Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
expr/socket.c \ expr/socket.c \
--- /dev/null --- /dev/null
+++ b/src/expr/fullcone.c +++ b/src/expr/fullcone.c
@@ -0,0 +1,165 @@ @@ -0,0 +1,172 @@
+/* +/*
+ * (C) 2022 wongsyrone + * (C) 2022 wongsyrone
+ * + *
@ -103,13 +103,13 @@ Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
+ +
+ switch (type) { + switch (type) {
+ case NFTNL_EXPR_FULLCONE_FLAGS: + case NFTNL_EXPR_FULLCONE_FLAGS:
+ memcpy(&fullcone->flags, data, sizeof(fullcone->flags)); + memcpy(&fullcone->flags, data, data_len);
+ break; + break;
+ case NFTNL_EXPR_FULLCONE_REG_PROTO_MIN: + case NFTNL_EXPR_FULLCONE_REG_PROTO_MIN:
+ memcpy(&fullcone->sreg_proto_min, data, sizeof(fullcone->sreg_proto_min)); + memcpy(&fullcone->sreg_proto_min, data, data_len);
+ break; + break;
+ case NFTNL_EXPR_FULLCONE_REG_PROTO_MAX: + case NFTNL_EXPR_FULLCONE_REG_PROTO_MAX:
+ memcpy(&fullcone->sreg_proto_max, data, sizeof(fullcone->sreg_proto_max)); + memcpy(&fullcone->sreg_proto_max, data, data_len);
+ break; + break;
+ } + }
+ return 0; + return 0;
@ -222,10 +222,17 @@ Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
+ return offset; + return offset;
+} +}
+ +
+static struct attr_policy fullcone_attr_policy[__NFTNL_EXPR_FULLCONE_MAX] = {
+ [NFTNL_EXPR_FULLCONE_FLAGS] = { .maxlen = sizeof(uint32_t) },
+ [NFTNL_EXPR_FULLCONE_REG_PROTO_MIN] = { .maxlen = sizeof(uint32_t) },
+ [NFTNL_EXPR_FULLCONE_REG_PROTO_MAX] = { .maxlen = sizeof(uint32_t) },
+};
+
+struct expr_ops expr_ops_fullcone = { +struct expr_ops expr_ops_fullcone = {
+ .name = "fullcone", + .name = "fullcone",
+ .alloc_len = sizeof(struct nftnl_expr_fullcone), + .alloc_len = sizeof(struct nftnl_expr_fullcone),
+ .nftnl_max_attr = __NFTNL_EXPR_FULLCONE_MAX - 1, + .nftnl_max_attr = __NFTNL_EXPR_FULLCONE_MAX - 1,
+ .attr_policy = fullcone_attr_policy,
+ .set = nftnl_expr_fullcone_set, + .set = nftnl_expr_fullcone_set,
+ .get = nftnl_expr_fullcone_get, + .get = nftnl_expr_fullcone_get,
+ .parse = nftnl_expr_fullcone_parse, + .parse = nftnl_expr_fullcone_parse,