summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-networking/recipes-filter/libnftnl/libnftnl/0001-avoid-naming-local-function-as-one-of-printf-family.patch256
-rw-r--r--meta-networking/recipes-filter/libnftnl/libnftnl_1.2.0.bb (renamed from meta-networking/recipes-filter/libnftnl/libnftnl_1.1.9.bb)2
2 files changed, 131 insertions, 127 deletions
diff --git a/meta-networking/recipes-filter/libnftnl/libnftnl/0001-avoid-naming-local-function-as-one-of-printf-family.patch b/meta-networking/recipes-filter/libnftnl/libnftnl/0001-avoid-naming-local-function-as-one-of-printf-family.patch
index f49ef2a78c..62328203dd 100644
--- a/meta-networking/recipes-filter/libnftnl/libnftnl/0001-avoid-naming-local-function-as-one-of-printf-family.patch
+++ b/meta-networking/recipes-filter/libnftnl/libnftnl/0001-avoid-naming-local-function-as-one-of-printf-family.patch
@@ -1,6 +1,6 @@
1From e03b003610a176d608da9a02e433e7ded7e4b75f Mon Sep 17 00:00:00 2001 1From c29959e045dd09d0b5727682d4e9dbc10923ac4f Mon Sep 17 00:00:00 2001
2From: Todd Cunningham <tcunningham07@gmail.com> 2From: Trevor Gamblin <trevor.gamblin@windriver.com>
3Date: Wed, 11 Dec 2019 10:18:56 +1000 3Date: Wed, 2 Jun 2021 11:08:51 -0400
4Subject: [PATCH] avoid naming local function as one of printf family 4Subject: [PATCH] avoid naming local function as one of printf family
5 5
6Fixes build issues with clang 6Fixes build issues with clang
@@ -11,6 +11,10 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
11 11
12Signed-off-by: Yuan Chao <yuanc.fnst@cn.fujitsu.com> 12Signed-off-by: Yuan Chao <yuanc.fnst@cn.fujitsu.com>
13Signed-off-by: Todd Cunningham <tcunningham07@gmail.com> 13Signed-off-by: Todd Cunningham <tcunningham07@gmail.com>
14
15Use wiggle to get the patch to apply for version 1.2.0.
16
17Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
14--- 18---
15 include/expr_ops.h | 2 +- 19 include/expr_ops.h | 2 +-
16 include/obj.h | 2 +- 20 include/obj.h | 2 +-
@@ -62,56 +66,56 @@ Signed-off-by: Todd Cunningham <tcunningham07@gmail.com>
62 src/obj/synproxy.c | 2 +- 66 src/obj/synproxy.c | 2 +-
63 src/obj/tunnel.c | 2 +- 67 src/obj/tunnel.c | 2 +-
64 src/object.c | 2 +- 68 src/object.c | 2 +-
65 49 files changed, 50 insertions(+), 50 deletions(-) 69 50 files changed, 51 insertions(+), 51 deletions(-)
66 70
67diff --git a/include/expr_ops.h b/include/expr_ops.h 71diff --git a/include/expr_ops.h b/include/expr_ops.h
68index a7f1b9a..d2946de 100644 72index 7a6aa23..d3a2855 100644
69--- a/include/expr_ops.h 73--- a/include/expr_ops.h
70+++ b/include/expr_ops.h 74+++ b/include/expr_ops.h
71@@ -17,7 +17,7 @@ struct expr_ops { 75@@ -18,7 +18,7 @@ struct expr_ops {
72 const void *(*get)(const struct nftnl_expr *e, uint16_t type, uint32_t *data_len); 76 const void *(*get)(const struct nftnl_expr *e, uint16_t type, uint32_t *data_len);
73 int (*parse)(struct nftnl_expr *e, struct nlattr *attr); 77 int (*parse)(struct nftnl_expr *e, struct nlattr *attr);
74 void (*build)(struct nlmsghdr *nlh, const struct nftnl_expr *e); 78 void (*build)(struct nlmsghdr *nlh, const struct nftnl_expr *e);
75- int (*snprintf)(char *buf, size_t len, uint32_t type, uint32_t flags, const struct nftnl_expr *e); 79- int (*snprintf)(char *buf, size_t len, uint32_t flags, const struct nftnl_expr *e);
76+ int (*snprintf_)(char *buf, size_t len, uint32_t type, uint32_t flags, const struct nftnl_expr *e); 80+ int (*snprintf_)(char *buf, size_t len, uint32_t flags, const struct nftnl_expr *e);
77 }; 81 };
78 82
79 struct expr_ops *nftnl_expr_ops_lookup(const char *name); 83 struct expr_ops *nftnl_expr_ops_lookup(const char *name);
80diff --git a/include/obj.h b/include/obj.h 84diff --git a/include/obj.h b/include/obj.h
81index 9394d79..08610d7 100644 85index 60dc853..1c1c3c1 100644
82--- a/include/obj.h 86--- a/include/obj.h
83+++ b/include/obj.h 87+++ b/include/obj.h
84@@ -99,7 +99,7 @@ struct obj_ops { 88@@ -109,7 +109,7 @@ struct obj_ops {
85 const void *(*get)(const struct nftnl_obj *e, uint16_t type, uint32_t *data_len); 89 const void *(*get)(const struct nftnl_obj *e, uint16_t type, uint32_t *data_len);
86 int (*parse)(struct nftnl_obj *e, struct nlattr *attr); 90 int (*parse)(struct nftnl_obj *e, struct nlattr *attr);
87 void (*build)(struct nlmsghdr *nlh, const struct nftnl_obj *e); 91 void (*build)(struct nlmsghdr *nlh, const struct nftnl_obj *e);
88- int (*snprintf)(char *buf, size_t len, uint32_t type, uint32_t flags, const struct nftnl_obj *e); 92- int (*snprintf)(char *buf, size_t len, uint32_t flags, const struct nftnl_obj *e);
89+ int (*snprintf_)(char *buf, size_t len, uint32_t type, uint32_t flags, const struct nftnl_obj *e); 93+ int (*snprintf_)(char *buf, size_t len, uint32_t flags, const struct nftnl_obj *e);
90 }; 94 };
91 95
92 extern struct obj_ops obj_ops_counter; 96 extern struct obj_ops obj_ops_counter;
93diff --git a/src/expr.c b/src/expr.c 97diff --git a/src/expr.c b/src/expr.c
94index 80c4c36..b698a60 100644 98index 277bbde..2231b21 100644
95--- a/src/expr.c 99--- a/src/expr.c
96+++ b/src/expr.c 100+++ b/src/expr.c
97@@ -275,10 +275,10 @@ int nftnl_expr_snprintf(char *buf, size_t size, const struct nftnl_expr *expr, 101@@ -279,10 +279,10 @@ int nftnl_expr_snprintf(char *buf, size_t remain, const struct nftnl_expr *expr,
98 if (size) 102 if (remain)
99 buf[0] = '\0'; 103 buf[0] = '\0';
100 104
101- if (!expr->ops->snprintf) 105- if (!expr->ops->snprintf || type != NFTNL_OUTPUT_DEFAULT)
102+ if (!expr->ops->snprintf_) 106+ if (!expr->ops->snprintf_ || type != NFTNL_OUTPUT_DEFAULT)
103 return 0; 107 return 0;
104 108
105- ret = expr->ops->snprintf(buf + offset, remain, type, flags, expr); 109- ret = expr->ops->snprintf(buf + offset, remain, flags, expr);
106+ ret = expr->ops->snprintf_(buf + offset, remain, type, flags, expr); 110+ ret = expr->ops->snprintf_(buf + offset, remain, flags, expr);
107 SNPRINTF_BUFFER_SIZE(ret, remain, offset); 111 SNPRINTF_BUFFER_SIZE(ret, remain, offset);
108 112
109 return offset; 113 return offset;
110diff --git a/src/expr/bitwise.c b/src/expr/bitwise.c 114diff --git a/src/expr/bitwise.c b/src/expr/bitwise.c
111index c9d40df..27d644b 100644 115index d0c7827..eded505 100644
112--- a/src/expr/bitwise.c 116--- a/src/expr/bitwise.c
113+++ b/src/expr/bitwise.c 117+++ b/src/expr/bitwise.c
114@@ -219,5 +219,5 @@ struct expr_ops expr_ops_bitwise = { 118@@ -282,5 +282,5 @@ struct expr_ops expr_ops_bitwise = {
115 .get = nftnl_expr_bitwise_get, 119 .get = nftnl_expr_bitwise_get,
116 .parse = nftnl_expr_bitwise_parse, 120 .parse = nftnl_expr_bitwise_parse,
117 .build = nftnl_expr_bitwise_build, 121 .build = nftnl_expr_bitwise_build,
@@ -119,10 +123,10 @@ index c9d40df..27d644b 100644
119+ .snprintf_ = nftnl_expr_bitwise_snprintf, 123+ .snprintf_ = nftnl_expr_bitwise_snprintf,
120 }; 124 };
121diff --git a/src/expr/byteorder.c b/src/expr/byteorder.c 125diff --git a/src/expr/byteorder.c b/src/expr/byteorder.c
122index efdfa2b..7ae9dfb 100644 126index d299745..0068ab2 100644
123--- a/src/expr/byteorder.c 127--- a/src/expr/byteorder.c
124+++ b/src/expr/byteorder.c 128+++ b/src/expr/byteorder.c
125@@ -234,5 +234,5 @@ struct expr_ops expr_ops_byteorder = { 129@@ -220,5 +220,5 @@ struct expr_ops expr_ops_byteorder = {
126 .get = nftnl_expr_byteorder_get, 130 .get = nftnl_expr_byteorder_get,
127 .parse = nftnl_expr_byteorder_parse, 131 .parse = nftnl_expr_byteorder_parse,
128 .build = nftnl_expr_byteorder_build, 132 .build = nftnl_expr_byteorder_build,
@@ -130,10 +134,10 @@ index efdfa2b..7ae9dfb 100644
130+ .snprintf_ = nftnl_expr_byteorder_snprintf, 134+ .snprintf_ = nftnl_expr_byteorder_snprintf,
131 }; 135 };
132diff --git a/src/expr/cmp.c b/src/expr/cmp.c 136diff --git a/src/expr/cmp.c b/src/expr/cmp.c
133index 86d7842..e3be442 100644 137index 6030693..7e548e6 100644
134--- a/src/expr/cmp.c 138--- a/src/expr/cmp.c
135+++ b/src/expr/cmp.c 139+++ b/src/expr/cmp.c
136@@ -216,5 +216,5 @@ struct expr_ops expr_ops_cmp = { 140@@ -202,5 +202,5 @@ struct expr_ops expr_ops_cmp = {
137 .get = nftnl_expr_cmp_get, 141 .get = nftnl_expr_cmp_get,
138 .parse = nftnl_expr_cmp_parse, 142 .parse = nftnl_expr_cmp_parse,
139 .build = nftnl_expr_cmp_build, 143 .build = nftnl_expr_cmp_build,
@@ -141,10 +145,10 @@ index 86d7842..e3be442 100644
141+ .snprintf_ = nftnl_expr_cmp_snprintf, 145+ .snprintf_ = nftnl_expr_cmp_snprintf,
142 }; 146 };
143diff --git a/src/expr/connlimit.c b/src/expr/connlimit.c 147diff --git a/src/expr/connlimit.c b/src/expr/connlimit.c
144index 53af93b..6c8bc40 100644 148index 3b37587..39b7092 100644
145--- a/src/expr/connlimit.c 149--- a/src/expr/connlimit.c
146+++ b/src/expr/connlimit.c 150+++ b/src/expr/connlimit.c
147@@ -149,5 +149,5 @@ struct expr_ops expr_ops_connlimit = { 151@@ -135,5 +135,5 @@ struct expr_ops expr_ops_connlimit = {
148 .get = nftnl_expr_connlimit_get, 152 .get = nftnl_expr_connlimit_get,
149 .parse = nftnl_expr_connlimit_parse, 153 .parse = nftnl_expr_connlimit_parse,
150 .build = nftnl_expr_connlimit_build, 154 .build = nftnl_expr_connlimit_build,
@@ -152,10 +156,10 @@ index 53af93b..6c8bc40 100644
152+ .snprintf_ = nftnl_expr_connlimit_snprintf, 156+ .snprintf_ = nftnl_expr_connlimit_snprintf,
153 }; 157 };
154diff --git a/src/expr/counter.c b/src/expr/counter.c 158diff --git a/src/expr/counter.c b/src/expr/counter.c
155index 89a602e..a32a69e 100644 159index 1676d70..42c96d9 100644
156--- a/src/expr/counter.c 160--- a/src/expr/counter.c
157+++ b/src/expr/counter.c 161+++ b/src/expr/counter.c
158@@ -147,5 +147,5 @@ struct expr_ops expr_ops_counter = { 162@@ -133,5 +133,5 @@ struct expr_ops expr_ops_counter = {
159 .get = nftnl_expr_counter_get, 163 .get = nftnl_expr_counter_get,
160 .parse = nftnl_expr_counter_parse, 164 .parse = nftnl_expr_counter_parse,
161 .build = nftnl_expr_counter_build, 165 .build = nftnl_expr_counter_build,
@@ -163,10 +167,10 @@ index 89a602e..a32a69e 100644
163+ .snprintf_ = nftnl_expr_counter_snprintf, 167+ .snprintf_ = nftnl_expr_counter_snprintf,
164 }; 168 };
165diff --git a/src/expr/ct.c b/src/expr/ct.c 169diff --git a/src/expr/ct.c b/src/expr/ct.c
166index 124de9d..7bde179 100644 170index d5dfc81..8c15db1 100644
167--- a/src/expr/ct.c 171--- a/src/expr/ct.c
168+++ b/src/expr/ct.c 172+++ b/src/expr/ct.c
169@@ -273,5 +273,5 @@ struct expr_ops expr_ops_ct = { 173@@ -258,5 +258,5 @@ struct expr_ops expr_ops_ct = {
170 .get = nftnl_expr_ct_get, 174 .get = nftnl_expr_ct_get,
171 .parse = nftnl_expr_ct_parse, 175 .parse = nftnl_expr_ct_parse,
172 .build = nftnl_expr_ct_build, 176 .build = nftnl_expr_ct_build,
@@ -174,10 +178,10 @@ index 124de9d..7bde179 100644
174+ .snprintf_ = nftnl_expr_ct_snprintf, 178+ .snprintf_ = nftnl_expr_ct_snprintf,
175 }; 179 };
176diff --git a/src/expr/dup.c b/src/expr/dup.c 180diff --git a/src/expr/dup.c b/src/expr/dup.c
177index 2bb35e5..d9bd4b1 100644 181index f041b55..6238a43 100644
178--- a/src/expr/dup.c 182--- a/src/expr/dup.c
179+++ b/src/expr/dup.c 183+++ b/src/expr/dup.c
180@@ -154,5 +154,5 @@ struct expr_ops expr_ops_dup = { 184@@ -138,5 +138,5 @@ struct expr_ops expr_ops_dup = {
181 .get = nftnl_expr_dup_get, 185 .get = nftnl_expr_dup_get,
182 .parse = nftnl_expr_dup_parse, 186 .parse = nftnl_expr_dup_parse,
183 .build = nftnl_expr_dup_build, 187 .build = nftnl_expr_dup_build,
@@ -185,10 +189,10 @@ index 2bb35e5..d9bd4b1 100644
185+ .snprintf_ = nftnl_expr_dup_snprintf, 189+ .snprintf_ = nftnl_expr_dup_snprintf,
186 }; 190 };
187diff --git a/src/expr/dynset.c b/src/expr/dynset.c 191diff --git a/src/expr/dynset.c b/src/expr/dynset.c
188index 68115ba..6e43bb4 100644 192index 85d64bb..9afbb94 100644
189--- a/src/expr/dynset.c 193--- a/src/expr/dynset.c
190+++ b/src/expr/dynset.c 194+++ b/src/expr/dynset.c
191@@ -288,5 +288,5 @@ struct expr_ops expr_ops_dynset = { 195@@ -373,5 +373,5 @@ struct expr_ops expr_ops_dynset = {
192 .get = nftnl_expr_dynset_get, 196 .get = nftnl_expr_dynset_get,
193 .parse = nftnl_expr_dynset_parse, 197 .parse = nftnl_expr_dynset_parse,
194 .build = nftnl_expr_dynset_build, 198 .build = nftnl_expr_dynset_build,
@@ -196,10 +200,10 @@ index 68115ba..6e43bb4 100644
196+ .snprintf_ = nftnl_expr_dynset_snprintf, 200+ .snprintf_ = nftnl_expr_dynset_snprintf,
197 }; 201 };
198diff --git a/src/expr/exthdr.c b/src/expr/exthdr.c 202diff --git a/src/expr/exthdr.c b/src/expr/exthdr.c
199index e5f714b..e68792b 100644 203index 1b813b1..25f1491 100644
200--- a/src/expr/exthdr.c 204--- a/src/expr/exthdr.c
201+++ b/src/expr/exthdr.c 205+++ b/src/expr/exthdr.c
202@@ -276,5 +276,5 @@ struct expr_ops expr_ops_exthdr = { 206@@ -262,5 +262,5 @@ struct expr_ops expr_ops_exthdr = {
203 .get = nftnl_expr_exthdr_get, 207 .get = nftnl_expr_exthdr_get,
204 .parse = nftnl_expr_exthdr_parse, 208 .parse = nftnl_expr_exthdr_parse,
205 .build = nftnl_expr_exthdr_build, 209 .build = nftnl_expr_exthdr_build,
@@ -207,10 +211,10 @@ index e5f714b..e68792b 100644
207+ .snprintf_ = nftnl_expr_exthdr_snprintf, 211+ .snprintf_ = nftnl_expr_exthdr_snprintf,
208 }; 212 };
209diff --git a/src/expr/fib.c b/src/expr/fib.c 213diff --git a/src/expr/fib.c b/src/expr/fib.c
210index 9475af4..8e7090d 100644 214index aaff52a..3916e18 100644
211--- a/src/expr/fib.c 215--- a/src/expr/fib.c
212+++ b/src/expr/fib.c 216+++ b/src/expr/fib.c
213@@ -213,5 +213,5 @@ struct expr_ops expr_ops_fib = { 217@@ -198,5 +198,5 @@ struct expr_ops expr_ops_fib = {
214 .get = nftnl_expr_fib_get, 218 .get = nftnl_expr_fib_get,
215 .parse = nftnl_expr_fib_parse, 219 .parse = nftnl_expr_fib_parse,
216 .build = nftnl_expr_fib_build, 220 .build = nftnl_expr_fib_build,
@@ -218,10 +222,10 @@ index 9475af4..8e7090d 100644
218+ .snprintf_ = nftnl_expr_fib_snprintf, 222+ .snprintf_ = nftnl_expr_fib_snprintf,
219 }; 223 };
220diff --git a/src/expr/flow_offload.c b/src/expr/flow_offload.c 224diff --git a/src/expr/flow_offload.c b/src/expr/flow_offload.c
221index 6ccec9a..c2f2478 100644 225index a826202..c1ca678 100644
222--- a/src/expr/flow_offload.c 226--- a/src/expr/flow_offload.c
223+++ b/src/expr/flow_offload.c 227+++ b/src/expr/flow_offload.c
224@@ -134,5 +134,5 @@ struct expr_ops expr_ops_flow = { 228@@ -120,5 +120,5 @@ struct expr_ops expr_ops_flow = {
225 .get = nftnl_expr_flow_get, 229 .get = nftnl_expr_flow_get,
226 .parse = nftnl_expr_flow_parse, 230 .parse = nftnl_expr_flow_parse,
227 .build = nftnl_expr_flow_build, 231 .build = nftnl_expr_flow_build,
@@ -229,10 +233,10 @@ index 6ccec9a..c2f2478 100644
229+ .snprintf_ = nftnl_expr_flow_snprintf, 233+ .snprintf_ = nftnl_expr_flow_snprintf,
230 }; 234 };
231diff --git a/src/expr/fwd.c b/src/expr/fwd.c 235diff --git a/src/expr/fwd.c b/src/expr/fwd.c
232index cff8235..bcd7d3f 100644 236index 82e5a41..4e80687 100644
233--- a/src/expr/fwd.c 237--- a/src/expr/fwd.c
234+++ b/src/expr/fwd.c 238+++ b/src/expr/fwd.c
235@@ -174,5 +174,5 @@ struct expr_ops expr_ops_fwd = { 239@@ -158,5 +158,5 @@ struct expr_ops expr_ops_fwd = {
236 .get = nftnl_expr_fwd_get, 240 .get = nftnl_expr_fwd_get,
237 .parse = nftnl_expr_fwd_parse, 241 .parse = nftnl_expr_fwd_parse,
238 .build = nftnl_expr_fwd_build, 242 .build = nftnl_expr_fwd_build,
@@ -240,10 +244,10 @@ index cff8235..bcd7d3f 100644
240+ .snprintf_ = nftnl_expr_fwd_snprintf, 244+ .snprintf_ = nftnl_expr_fwd_snprintf,
241 }; 245 };
242diff --git a/src/expr/hash.c b/src/expr/hash.c 246diff --git a/src/expr/hash.c b/src/expr/hash.c
243index 2c801d2..a9f6e7e 100644 247index 10b4a72..84ace31 100644
244--- a/src/expr/hash.c 248--- a/src/expr/hash.c
245+++ b/src/expr/hash.c 249+++ b/src/expr/hash.c
246@@ -241,5 +241,5 @@ struct expr_ops expr_ops_hash = { 250@@ -226,5 +226,5 @@ struct expr_ops expr_ops_hash = {
247 .get = nftnl_expr_hash_get, 251 .get = nftnl_expr_hash_get,
248 .parse = nftnl_expr_hash_parse, 252 .parse = nftnl_expr_hash_parse,
249 .build = nftnl_expr_hash_build, 253 .build = nftnl_expr_hash_build,
@@ -251,10 +255,10 @@ index 2c801d2..a9f6e7e 100644
251+ .snprintf_ = nftnl_expr_hash_snprintf, 255+ .snprintf_ = nftnl_expr_hash_snprintf,
252 }; 256 };
253diff --git a/src/expr/immediate.c b/src/expr/immediate.c 257diff --git a/src/expr/immediate.c b/src/expr/immediate.c
254index 47106ae..ea86c88 100644 258index 94b043c..a8a3c1f 100644
255--- a/src/expr/immediate.c 259--- a/src/expr/immediate.c
256+++ b/src/expr/immediate.c 260+++ b/src/expr/immediate.c
257@@ -235,5 +235,5 @@ struct expr_ops expr_ops_immediate = { 261@@ -229,5 +229,5 @@ struct expr_ops expr_ops_immediate = {
258 .get = nftnl_expr_immediate_get, 262 .get = nftnl_expr_immediate_get,
259 .parse = nftnl_expr_immediate_parse, 263 .parse = nftnl_expr_immediate_parse,
260 .build = nftnl_expr_immediate_build, 264 .build = nftnl_expr_immediate_build,
@@ -262,10 +266,10 @@ index 47106ae..ea86c88 100644
262+ .snprintf_ = nftnl_expr_immediate_snprintf, 266+ .snprintf_ = nftnl_expr_immediate_snprintf,
263 }; 267 };
264diff --git a/src/expr/limit.c b/src/expr/limit.c 268diff --git a/src/expr/limit.c b/src/expr/limit.c
265index 5872e27..0ce482f 100644 269index 3dfd54a..f652df0 100644
266--- a/src/expr/limit.c 270--- a/src/expr/limit.c
267+++ b/src/expr/limit.c 271+++ b/src/expr/limit.c
268@@ -216,5 +216,5 @@ struct expr_ops expr_ops_limit = { 272@@ -202,5 +202,5 @@ struct expr_ops expr_ops_limit = {
269 .get = nftnl_expr_limit_get, 273 .get = nftnl_expr_limit_get,
270 .parse = nftnl_expr_limit_parse, 274 .parse = nftnl_expr_limit_parse,
271 .build = nftnl_expr_limit_build, 275 .build = nftnl_expr_limit_build,
@@ -273,10 +277,10 @@ index 5872e27..0ce482f 100644
273+ .snprintf_ = nftnl_expr_limit_snprintf, 277+ .snprintf_ = nftnl_expr_limit_snprintf,
274 }; 278 };
275diff --git a/src/expr/log.c b/src/expr/log.c 279diff --git a/src/expr/log.c b/src/expr/log.c
276index bbe43d2..5506bc2 100644 280index 86db548..d96b7ce 100644
277--- a/src/expr/log.c 281--- a/src/expr/log.c
278+++ b/src/expr/log.c 282+++ b/src/expr/log.c
279@@ -267,5 +267,5 @@ struct expr_ops expr_ops_log = { 283@@ -253,5 +253,5 @@ struct expr_ops expr_ops_log = {
280 .get = nftnl_expr_log_get, 284 .get = nftnl_expr_log_get,
281 .parse = nftnl_expr_log_parse, 285 .parse = nftnl_expr_log_parse,
282 .build = nftnl_expr_log_build, 286 .build = nftnl_expr_log_build,
@@ -284,10 +288,10 @@ index bbe43d2..5506bc2 100644
284+ .snprintf_ = nftnl_expr_log_snprintf, 288+ .snprintf_ = nftnl_expr_log_snprintf,
285 }; 289 };
286diff --git a/src/expr/lookup.c b/src/expr/lookup.c 290diff --git a/src/expr/lookup.c b/src/expr/lookup.c
287index a495ac0..678868c 100644 291index 83adce9..1fbace4 100644
288--- a/src/expr/lookup.c 292--- a/src/expr/lookup.c
289+++ b/src/expr/lookup.c 293+++ b/src/expr/lookup.c
290@@ -221,5 +221,5 @@ struct expr_ops expr_ops_lookup = { 294@@ -206,5 +206,5 @@ struct expr_ops expr_ops_lookup = {
291 .get = nftnl_expr_lookup_get, 295 .get = nftnl_expr_lookup_get,
292 .parse = nftnl_expr_lookup_parse, 296 .parse = nftnl_expr_lookup_parse,
293 .build = nftnl_expr_lookup_build, 297 .build = nftnl_expr_lookup_build,
@@ -295,10 +299,10 @@ index a495ac0..678868c 100644
295+ .snprintf_ = nftnl_expr_lookup_snprintf, 299+ .snprintf_ = nftnl_expr_lookup_snprintf,
296 }; 300 };
297diff --git a/src/expr/masq.c b/src/expr/masq.c 301diff --git a/src/expr/masq.c b/src/expr/masq.c
298index f6f3ceb..88292a6 100644 302index 684708c..1ce099c 100644
299--- a/src/expr/masq.c 303--- a/src/expr/masq.c
300+++ b/src/expr/masq.c 304+++ b/src/expr/masq.c
301@@ -169,5 +169,5 @@ struct expr_ops expr_ops_masq = { 305@@ -163,5 +163,5 @@ struct expr_ops expr_ops_masq = {
302 .get = nftnl_expr_masq_get, 306 .get = nftnl_expr_masq_get,
303 .parse = nftnl_expr_masq_parse, 307 .parse = nftnl_expr_masq_parse,
304 .build = nftnl_expr_masq_build, 308 .build = nftnl_expr_masq_build,
@@ -306,10 +310,10 @@ index f6f3ceb..88292a6 100644
306+ .snprintf_ = nftnl_expr_masq_snprintf, 310+ .snprintf_ = nftnl_expr_masq_snprintf,
307 }; 311 };
308diff --git a/src/expr/match.c b/src/expr/match.c 312diff --git a/src/expr/match.c b/src/expr/match.c
309index 4fa74b2..249c6b5 100644 313index 533fdf5..8561986 100644
310--- a/src/expr/match.c 314--- a/src/expr/match.c
311+++ b/src/expr/match.c 315+++ b/src/expr/match.c
312@@ -198,5 +198,5 @@ struct expr_ops expr_ops_match = { 316@@ -189,5 +189,5 @@ struct expr_ops expr_ops_match = {
313 .get = nftnl_expr_match_get, 317 .get = nftnl_expr_match_get,
314 .parse = nftnl_expr_match_parse, 318 .parse = nftnl_expr_match_parse,
315 .build = nftnl_expr_match_build, 319 .build = nftnl_expr_match_build,
@@ -317,10 +321,10 @@ index 4fa74b2..249c6b5 100644
317+ .snprintf_ = nftnl_expr_match_snprintf, 321+ .snprintf_ = nftnl_expr_match_snprintf,
318 }; 322 };
319diff --git a/src/expr/meta.c b/src/expr/meta.c 323diff --git a/src/expr/meta.c b/src/expr/meta.c
320index 73f6efa..35d5ec5 100644 324index 34fbb9b..1ef79a4 100644
321--- a/src/expr/meta.c 325--- a/src/expr/meta.c
322+++ b/src/expr/meta.c 326+++ b/src/expr/meta.c
323@@ -226,5 +226,5 @@ struct expr_ops expr_ops_meta = { 327@@ -216,5 +216,5 @@ struct expr_ops expr_ops_meta = {
324 .get = nftnl_expr_meta_get, 328 .get = nftnl_expr_meta_get,
325 .parse = nftnl_expr_meta_parse, 329 .parse = nftnl_expr_meta_parse,
326 .build = nftnl_expr_meta_build, 330 .build = nftnl_expr_meta_build,
@@ -328,10 +332,10 @@ index 73f6efa..35d5ec5 100644
328+ .snprintf_ = nftnl_expr_meta_snprintf, 332+ .snprintf_ = nftnl_expr_meta_snprintf,
329 }; 333 };
330diff --git a/src/expr/nat.c b/src/expr/nat.c 334diff --git a/src/expr/nat.c b/src/expr/nat.c
331index 6b7d50e..be4a579 100644 335index 0a9cdd7..bc4a3fa 100644
332--- a/src/expr/nat.c 336--- a/src/expr/nat.c
333+++ b/src/expr/nat.c 337+++ b/src/expr/nat.c
334@@ -279,5 +279,5 @@ struct expr_ops expr_ops_nat = { 338@@ -274,5 +274,5 @@ struct expr_ops expr_ops_nat = {
335 .get = nftnl_expr_nat_get, 339 .get = nftnl_expr_nat_get,
336 .parse = nftnl_expr_nat_parse, 340 .parse = nftnl_expr_nat_parse,
337 .build = nftnl_expr_nat_build, 341 .build = nftnl_expr_nat_build,
@@ -339,10 +343,10 @@ index 6b7d50e..be4a579 100644
339+ .snprintf_ = nftnl_expr_nat_snprintf, 343+ .snprintf_ = nftnl_expr_nat_snprintf,
340 }; 344 };
341diff --git a/src/expr/numgen.c b/src/expr/numgen.c 345diff --git a/src/expr/numgen.c b/src/expr/numgen.c
342index 4e0d541..5995ee3 100644 346index 159dfec..99bb442 100644
343--- a/src/expr/numgen.c 347--- a/src/expr/numgen.c
344+++ b/src/expr/numgen.c 348+++ b/src/expr/numgen.c
345@@ -195,5 +195,5 @@ struct expr_ops expr_ops_ng = { 349@@ -180,5 +180,5 @@ struct expr_ops expr_ops_ng = {
346 .get = nftnl_expr_ng_get, 350 .get = nftnl_expr_ng_get,
347 .parse = nftnl_expr_ng_parse, 351 .parse = nftnl_expr_ng_parse,
348 .build = nftnl_expr_ng_build, 352 .build = nftnl_expr_ng_build,
@@ -350,10 +354,10 @@ index 4e0d541..5995ee3 100644
350+ .snprintf_ = nftnl_expr_ng_snprintf, 354+ .snprintf_ = nftnl_expr_ng_snprintf,
351 }; 355 };
352diff --git a/src/expr/objref.c b/src/expr/objref.c 356diff --git a/src/expr/objref.c b/src/expr/objref.c
353index 7388b18..e673ffd 100644 357index a4b6470..1b2d387 100644
354--- a/src/expr/objref.c 358--- a/src/expr/objref.c
355+++ b/src/expr/objref.c 359+++ b/src/expr/objref.c
356@@ -210,5 +210,5 @@ struct expr_ops expr_ops_objref = { 360@@ -205,5 +205,5 @@ struct expr_ops expr_ops_objref = {
357 .get = nftnl_expr_objref_get, 361 .get = nftnl_expr_objref_get,
358 .parse = nftnl_expr_objref_parse, 362 .parse = nftnl_expr_objref_parse,
359 .build = nftnl_expr_objref_build, 363 .build = nftnl_expr_objref_build,
@@ -361,10 +365,10 @@ index 7388b18..e673ffd 100644
361+ .snprintf_ = nftnl_expr_objref_snprintf, 365+ .snprintf_ = nftnl_expr_objref_snprintf,
362 }; 366 };
363diff --git a/src/expr/osf.c b/src/expr/osf.c 367diff --git a/src/expr/osf.c b/src/expr/osf.c
364index 98d0df9..618b46e 100644 368index 215a681..75a6b3c 100644
365--- a/src/expr/osf.c 369--- a/src/expr/osf.c
366+++ b/src/expr/osf.c 370+++ b/src/expr/osf.c
367@@ -161,5 +161,5 @@ struct expr_ops expr_ops_osf = { 371@@ -147,5 +147,5 @@ struct expr_ops expr_ops_osf = {
368 .get = nftnl_expr_osf_get, 372 .get = nftnl_expr_osf_get,
369 .parse = nftnl_expr_osf_parse, 373 .parse = nftnl_expr_osf_parse,
370 .build = nftnl_expr_osf_build, 374 .build = nftnl_expr_osf_build,
@@ -372,10 +376,10 @@ index 98d0df9..618b46e 100644
372+ .snprintf_ = nftnl_expr_osf_snprintf, 376+ .snprintf_ = nftnl_expr_osf_snprintf,
373 }; 377 };
374diff --git a/src/expr/payload.c b/src/expr/payload.c 378diff --git a/src/expr/payload.c b/src/expr/payload.c
375index 2192dad..37aacc4 100644 379index 9ccb78e..aa17025 100644
376--- a/src/expr/payload.c 380--- a/src/expr/payload.c
377+++ b/src/expr/payload.c 381+++ b/src/expr/payload.c
378@@ -266,5 +266,5 @@ struct expr_ops expr_ops_payload = { 382@@ -258,5 +258,5 @@ struct expr_ops expr_ops_payload = {
379 .get = nftnl_expr_payload_get, 383 .get = nftnl_expr_payload_get,
380 .parse = nftnl_expr_payload_parse, 384 .parse = nftnl_expr_payload_parse,
381 .build = nftnl_expr_payload_build, 385 .build = nftnl_expr_payload_build,
@@ -383,10 +387,10 @@ index 2192dad..37aacc4 100644
383+ .snprintf_ = nftnl_expr_payload_snprintf, 387+ .snprintf_ = nftnl_expr_payload_snprintf,
384 }; 388 };
385diff --git a/src/expr/queue.c b/src/expr/queue.c 389diff --git a/src/expr/queue.c b/src/expr/queue.c
386index 051ef71..b06feff 100644 390index 8f70977..6bc76ef 100644
387--- a/src/expr/queue.c 391--- a/src/expr/queue.c
388+++ b/src/expr/queue.c 392+++ b/src/expr/queue.c
389@@ -207,5 +207,5 @@ struct expr_ops expr_ops_queue = { 393@@ -193,5 +193,5 @@ struct expr_ops expr_ops_queue = {
390 .get = nftnl_expr_queue_get, 394 .get = nftnl_expr_queue_get,
391 .parse = nftnl_expr_queue_parse, 395 .parse = nftnl_expr_queue_parse,
392 .build = nftnl_expr_queue_build, 396 .build = nftnl_expr_queue_build,
@@ -394,10 +398,10 @@ index 051ef71..b06feff 100644
394+ .snprintf_ = nftnl_expr_queue_snprintf, 398+ .snprintf_ = nftnl_expr_queue_snprintf,
395 }; 399 };
396diff --git a/src/expr/quota.c b/src/expr/quota.c 400diff --git a/src/expr/quota.c b/src/expr/quota.c
397index 39a92e6..41797be 100644 401index 8c841d8..1a5f2fa 100644
398--- a/src/expr/quota.c 402--- a/src/expr/quota.c
399+++ b/src/expr/quota.c 403+++ b/src/expr/quota.c
400@@ -161,5 +161,5 @@ struct expr_ops expr_ops_quota = { 404@@ -147,5 +147,5 @@ struct expr_ops expr_ops_quota = {
401 .get = nftnl_expr_quota_get, 405 .get = nftnl_expr_quota_get,
402 .parse = nftnl_expr_quota_parse, 406 .parse = nftnl_expr_quota_parse,
403 .build = nftnl_expr_quota_build, 407 .build = nftnl_expr_quota_build,
@@ -405,10 +409,10 @@ index 39a92e6..41797be 100644
405+ .snprintf_ = nftnl_expr_quota_snprintf, 409+ .snprintf_ = nftnl_expr_quota_snprintf,
406 }; 410 };
407diff --git a/src/expr/range.c b/src/expr/range.c 411diff --git a/src/expr/range.c b/src/expr/range.c
408index d1d5083..b619cdf 100644 412index f76843a..73a1930 100644
409--- a/src/expr/range.c 413--- a/src/expr/range.c
410+++ b/src/expr/range.c 414+++ b/src/expr/range.c
411@@ -227,5 +227,5 @@ struct expr_ops expr_ops_range = { 415@@ -213,5 +213,5 @@ struct expr_ops expr_ops_range = {
412 .get = nftnl_expr_range_get, 416 .get = nftnl_expr_range_get,
413 .parse = nftnl_expr_range_parse, 417 .parse = nftnl_expr_range_parse,
414 .build = nftnl_expr_range_build, 418 .build = nftnl_expr_range_build,
@@ -416,10 +420,10 @@ index d1d5083..b619cdf 100644
416+ .snprintf_ = nftnl_expr_range_snprintf, 420+ .snprintf_ = nftnl_expr_range_snprintf,
417 }; 421 };
418diff --git a/src/expr/redir.c b/src/expr/redir.c 422diff --git a/src/expr/redir.c b/src/expr/redir.c
419index 477659a..5c4ebeb 100644 423index 4f56cb4..51ec71c 100644
420--- a/src/expr/redir.c 424--- a/src/expr/redir.c
421+++ b/src/expr/redir.c 425+++ b/src/expr/redir.c
422@@ -181,5 +181,5 @@ struct expr_ops expr_ops_redir = { 426@@ -167,5 +167,5 @@ struct expr_ops expr_ops_redir = {
423 .get = nftnl_expr_redir_get, 427 .get = nftnl_expr_redir_get,
424 .parse = nftnl_expr_redir_parse, 428 .parse = nftnl_expr_redir_parse,
425 .build = nftnl_expr_redir_build, 429 .build = nftnl_expr_redir_build,
@@ -427,10 +431,10 @@ index 477659a..5c4ebeb 100644
427+ .snprintf_ = nftnl_expr_redir_snprintf, 431+ .snprintf_ = nftnl_expr_redir_snprintf,
428 }; 432 };
429diff --git a/src/expr/reject.c b/src/expr/reject.c 433diff --git a/src/expr/reject.c b/src/expr/reject.c
430index 141942e..a98990d 100644 434index 716d25c..acf32c2 100644
431--- a/src/expr/reject.c 435--- a/src/expr/reject.c
432+++ b/src/expr/reject.c 436+++ b/src/expr/reject.c
433@@ -148,5 +148,5 @@ struct expr_ops expr_ops_reject = { 437@@ -134,5 +134,5 @@ struct expr_ops expr_ops_reject = {
434 .get = nftnl_expr_reject_get, 438 .get = nftnl_expr_reject_get,
435 .parse = nftnl_expr_reject_parse, 439 .parse = nftnl_expr_reject_parse,
436 .build = nftnl_expr_reject_build, 440 .build = nftnl_expr_reject_build,
@@ -438,10 +442,10 @@ index 141942e..a98990d 100644
438+ .snprintf_ = nftnl_expr_reject_snprintf, 442+ .snprintf_ = nftnl_expr_reject_snprintf,
439 }; 443 };
440diff --git a/src/expr/rt.c b/src/expr/rt.c 444diff --git a/src/expr/rt.c b/src/expr/rt.c
441index 0fce72d..32ace19 100644 445index 1ad9b2a..9f2fdf3 100644
442--- a/src/expr/rt.c 446--- a/src/expr/rt.c
443+++ b/src/expr/rt.c 447+++ b/src/expr/rt.c
444@@ -177,5 +177,5 @@ struct expr_ops expr_ops_rt = { 448@@ -162,5 +162,5 @@ struct expr_ops expr_ops_rt = {
445 .get = nftnl_expr_rt_get, 449 .get = nftnl_expr_rt_get,
446 .parse = nftnl_expr_rt_parse, 450 .parse = nftnl_expr_rt_parse,
447 .build = nftnl_expr_rt_build, 451 .build = nftnl_expr_rt_build,
@@ -449,10 +453,10 @@ index 0fce72d..32ace19 100644
449+ .snprintf_ = nftnl_expr_rt_snprintf, 453+ .snprintf_ = nftnl_expr_rt_snprintf,
450 }; 454 };
451diff --git a/src/expr/socket.c b/src/expr/socket.c 455diff --git a/src/expr/socket.c b/src/expr/socket.c
452index 96550d5..2394dbf 100644 456index 02d86f8..49a126b 100644
453--- a/src/expr/socket.c 457--- a/src/expr/socket.c
454+++ b/src/expr/socket.c 458+++ b/src/expr/socket.c
455@@ -174,5 +174,5 @@ struct expr_ops expr_ops_socket = { 459@@ -165,5 +165,5 @@ struct expr_ops expr_ops_socket = {
456 .get = nftnl_expr_socket_get, 460 .get = nftnl_expr_socket_get,
457 .parse = nftnl_expr_socket_parse, 461 .parse = nftnl_expr_socket_parse,
458 .build = nftnl_expr_socket_build, 462 .build = nftnl_expr_socket_build,
@@ -460,10 +464,10 @@ index 96550d5..2394dbf 100644
460+ .snprintf_ = nftnl_expr_socket_snprintf, 464+ .snprintf_ = nftnl_expr_socket_snprintf,
461 }; 465 };
462diff --git a/src/expr/synproxy.c b/src/expr/synproxy.c 466diff --git a/src/expr/synproxy.c b/src/expr/synproxy.c
463index 245f4fb..9721029 100644 467index 630f3f4..b22ad2f 100644
464--- a/src/expr/synproxy.c 468--- a/src/expr/synproxy.c
465+++ b/src/expr/synproxy.c 469+++ b/src/expr/synproxy.c
466@@ -166,5 +166,5 @@ struct expr_ops expr_ops_synproxy = { 470@@ -152,5 +152,5 @@ struct expr_ops expr_ops_synproxy = {
467 .get = nftnl_expr_synproxy_get, 471 .get = nftnl_expr_synproxy_get,
468 .parse = nftnl_expr_synproxy_parse, 472 .parse = nftnl_expr_synproxy_parse,
469 .build = nftnl_expr_synproxy_build, 473 .build = nftnl_expr_synproxy_build,
@@ -471,10 +475,10 @@ index 245f4fb..9721029 100644
471+ .snprintf_ = nftnl_expr_synproxy_snprintf, 475+ .snprintf_ = nftnl_expr_synproxy_snprintf,
472 }; 476 };
473diff --git a/src/expr/target.c b/src/expr/target.c 477diff --git a/src/expr/target.c b/src/expr/target.c
474index 9100038..7180085 100644 478index b7c595a..31a039c 100644
475--- a/src/expr/target.c 479--- a/src/expr/target.c
476+++ b/src/expr/target.c 480+++ b/src/expr/target.c
477@@ -198,5 +198,5 @@ struct expr_ops expr_ops_target = { 481@@ -189,5 +189,5 @@ struct expr_ops expr_ops_target = {
478 .get = nftnl_expr_target_get, 482 .get = nftnl_expr_target_get,
479 .parse = nftnl_expr_target_parse, 483 .parse = nftnl_expr_target_parse,
480 .build = nftnl_expr_target_build, 484 .build = nftnl_expr_target_build,
@@ -482,10 +486,10 @@ index 9100038..7180085 100644
482+ .snprintf_ = nftnl_expr_target_snprintf, 486+ .snprintf_ = nftnl_expr_target_snprintf,
483 }; 487 };
484diff --git a/src/expr/tproxy.c b/src/expr/tproxy.c 488diff --git a/src/expr/tproxy.c b/src/expr/tproxy.c
485index 3827b75..feabbbe 100644 489index d3ee8f8..1b01591 100644
486--- a/src/expr/tproxy.c 490--- a/src/expr/tproxy.c
487+++ b/src/expr/tproxy.c 491+++ b/src/expr/tproxy.c
488@@ -183,5 +183,5 @@ struct expr_ops expr_ops_tproxy = { 492@@ -170,5 +170,5 @@ struct expr_ops expr_ops_tproxy = {
489 .get = nftnl_expr_tproxy_get, 493 .get = nftnl_expr_tproxy_get,
490 .parse = nftnl_expr_tproxy_parse, 494 .parse = nftnl_expr_tproxy_parse,
491 .build = nftnl_expr_tproxy_build, 495 .build = nftnl_expr_tproxy_build,
@@ -493,10 +497,10 @@ index 3827b75..feabbbe 100644
493+ .snprintf_ = nftnl_expr_tproxy_snprintf, 497+ .snprintf_ = nftnl_expr_tproxy_snprintf,
494 }; 498 };
495diff --git a/src/expr/tunnel.c b/src/expr/tunnel.c 499diff --git a/src/expr/tunnel.c b/src/expr/tunnel.c
496index b2b8d72..1ed46d3 100644 500index 1460fd2..6c2f653 100644
497--- a/src/expr/tunnel.c 501--- a/src/expr/tunnel.c
498+++ b/src/expr/tunnel.c 502+++ b/src/expr/tunnel.c
499@@ -173,5 +173,5 @@ struct expr_ops expr_ops_tunnel = { 503@@ -145,5 +145,5 @@ struct expr_ops expr_ops_tunnel = {
500 .get = nftnl_expr_tunnel_get, 504 .get = nftnl_expr_tunnel_get,
501 .parse = nftnl_expr_tunnel_parse, 505 .parse = nftnl_expr_tunnel_parse,
502 .build = nftnl_expr_tunnel_build, 506 .build = nftnl_expr_tunnel_build,
@@ -504,10 +508,10 @@ index b2b8d72..1ed46d3 100644
504+ .snprintf_ = nftnl_expr_tunnel_snprintf, 508+ .snprintf_ = nftnl_expr_tunnel_snprintf,
505 }; 509 };
506diff --git a/src/expr/xfrm.c b/src/expr/xfrm.c 510diff --git a/src/expr/xfrm.c b/src/expr/xfrm.c
507index 8fe5438..b6b2772 100644 511index c81d14d..e648ee5 100644
508--- a/src/expr/xfrm.c 512--- a/src/expr/xfrm.c
509+++ b/src/expr/xfrm.c 513+++ b/src/expr/xfrm.c
510@@ -239,5 +239,5 @@ struct expr_ops expr_ops_xfrm = { 514@@ -196,5 +196,5 @@ struct expr_ops expr_ops_xfrm = {
511 .get = nftnl_expr_xfrm_get, 515 .get = nftnl_expr_xfrm_get,
512 .parse = nftnl_expr_xfrm_parse, 516 .parse = nftnl_expr_xfrm_parse,
513 .build = nftnl_expr_xfrm_build, 517 .build = nftnl_expr_xfrm_build,
@@ -515,10 +519,10 @@ index 8fe5438..b6b2772 100644
515+ .snprintf_ = nftnl_expr_xfrm_snprintf, 519+ .snprintf_ = nftnl_expr_xfrm_snprintf,
516 }; 520 };
517diff --git a/src/obj/counter.c b/src/obj/counter.c 521diff --git a/src/obj/counter.c b/src/obj/counter.c
518index 1baba4e..3710bce 100644 522index ef0cd20..0c199f7 100644
519--- a/src/obj/counter.c 523--- a/src/obj/counter.c
520+++ b/src/obj/counter.c 524+++ b/src/obj/counter.c
521@@ -145,5 +145,5 @@ struct obj_ops obj_ops_counter = { 525@@ -127,5 +127,5 @@ struct obj_ops obj_ops_counter = {
522 .get = nftnl_obj_counter_get, 526 .get = nftnl_obj_counter_get,
523 .parse = nftnl_obj_counter_parse, 527 .parse = nftnl_obj_counter_parse,
524 .build = nftnl_obj_counter_build, 528 .build = nftnl_obj_counter_build,
@@ -526,10 +530,10 @@ index 1baba4e..3710bce 100644
526+ .snprintf_ = nftnl_obj_counter_snprintf, 530+ .snprintf_ = nftnl_obj_counter_snprintf,
527 }; 531 };
528diff --git a/src/obj/ct_expect.c b/src/obj/ct_expect.c 532diff --git a/src/obj/ct_expect.c b/src/obj/ct_expect.c
529index c0bb5ba..953c08c 100644 533index 8136ad9..b3e1d70 100644
530--- a/src/obj/ct_expect.c 534--- a/src/obj/ct_expect.c
531+++ b/src/obj/ct_expect.c 535+++ b/src/obj/ct_expect.c
532@@ -209,5 +209,5 @@ struct obj_ops obj_ops_ct_expect = { 536@@ -196,5 +196,5 @@ struct obj_ops obj_ops_ct_expect = {
533 .get = nftnl_obj_ct_expect_get, 537 .get = nftnl_obj_ct_expect_get,
534 .parse = nftnl_obj_ct_expect_parse, 538 .parse = nftnl_obj_ct_expect_parse,
535 .build = nftnl_obj_ct_expect_build, 539 .build = nftnl_obj_ct_expect_build,
@@ -537,10 +541,10 @@ index c0bb5ba..953c08c 100644
537+ .snprintf_ = nftnl_obj_ct_expect_snprintf, 541+ .snprintf_ = nftnl_obj_ct_expect_snprintf,
538 }; 542 };
539diff --git a/src/obj/ct_helper.c b/src/obj/ct_helper.c 543diff --git a/src/obj/ct_helper.c b/src/obj/ct_helper.c
540index d91f636..2037461 100644 544index c52032a..12b783c 100644
541--- a/src/obj/ct_helper.c 545--- a/src/obj/ct_helper.c
542+++ b/src/obj/ct_helper.c 546+++ b/src/obj/ct_helper.c
543@@ -166,5 +166,5 @@ struct obj_ops obj_ops_ct_helper = { 547@@ -150,5 +150,5 @@ struct obj_ops obj_ops_ct_helper = {
544 .get = nftnl_obj_ct_helper_get, 548 .get = nftnl_obj_ct_helper_get,
545 .parse = nftnl_obj_ct_helper_parse, 549 .parse = nftnl_obj_ct_helper_parse,
546 .build = nftnl_obj_ct_helper_build, 550 .build = nftnl_obj_ct_helper_build,
@@ -548,10 +552,10 @@ index d91f636..2037461 100644
548+ .snprintf_ = nftnl_obj_ct_helper_snprintf, 552+ .snprintf_ = nftnl_obj_ct_helper_snprintf,
549 }; 553 };
550diff --git a/src/obj/ct_timeout.c b/src/obj/ct_timeout.c 554diff --git a/src/obj/ct_timeout.c b/src/obj/ct_timeout.c
551index e2e9991..a4f2dd2 100644 555index 1d4f8fb..0a12883 100644
552--- a/src/obj/ct_timeout.c 556--- a/src/obj/ct_timeout.c
553+++ b/src/obj/ct_timeout.c 557+++ b/src/obj/ct_timeout.c
554@@ -330,5 +330,5 @@ struct obj_ops obj_ops_ct_timeout = { 558@@ -316,5 +316,5 @@ struct obj_ops obj_ops_ct_timeout = {
555 .get = nftnl_obj_ct_timeout_get, 559 .get = nftnl_obj_ct_timeout_get,
556 .parse = nftnl_obj_ct_timeout_parse, 560 .parse = nftnl_obj_ct_timeout_parse,
557 .build = nftnl_obj_ct_timeout_build, 561 .build = nftnl_obj_ct_timeout_build,
@@ -559,10 +563,10 @@ index e2e9991..a4f2dd2 100644
559+ .snprintf_ = nftnl_obj_ct_timeout_snprintf, 563+ .snprintf_ = nftnl_obj_ct_timeout_snprintf,
560 }; 564 };
561diff --git a/src/obj/limit.c b/src/obj/limit.c 565diff --git a/src/obj/limit.c b/src/obj/limit.c
562index 60b0159..538f37a 100644 566index 8b40f9d..2f049b8 100644
563--- a/src/obj/limit.c 567--- a/src/obj/limit.c
564+++ b/src/obj/limit.c 568+++ b/src/obj/limit.c
565@@ -185,5 +185,5 @@ struct obj_ops obj_ops_limit = { 569@@ -168,5 +168,5 @@ struct obj_ops obj_ops_limit = {
566 .get = nftnl_obj_limit_get, 570 .get = nftnl_obj_limit_get,
567 .parse = nftnl_obj_limit_parse, 571 .parse = nftnl_obj_limit_parse,
568 .build = nftnl_obj_limit_build, 572 .build = nftnl_obj_limit_build,
@@ -570,10 +574,10 @@ index 60b0159..538f37a 100644
570+ .snprintf_ = nftnl_obj_limit_snprintf, 574+ .snprintf_ = nftnl_obj_limit_snprintf,
571 }; 575 };
572diff --git a/src/obj/quota.c b/src/obj/quota.c 576diff --git a/src/obj/quota.c b/src/obj/quota.c
573index 1914037..585a088 100644 577index 8ab3300..8666334 100644
574--- a/src/obj/quota.c 578--- a/src/obj/quota.c
575+++ b/src/obj/quota.c 579+++ b/src/obj/quota.c
576@@ -161,5 +161,5 @@ struct obj_ops obj_ops_quota = { 580@@ -144,5 +144,5 @@ struct obj_ops obj_ops_quota = {
577 .get = nftnl_obj_quota_get, 581 .get = nftnl_obj_quota_get,
578 .parse = nftnl_obj_quota_parse, 582 .parse = nftnl_obj_quota_parse,
579 .build = nftnl_obj_quota_build, 583 .build = nftnl_obj_quota_build,
@@ -581,21 +585,32 @@ index 1914037..585a088 100644
581+ .snprintf_ = nftnl_obj_quota_snprintf, 585+ .snprintf_ = nftnl_obj_quota_snprintf,
582 }; 586 };
583diff --git a/src/obj/secmark.c b/src/obj/secmark.c 587diff --git a/src/obj/secmark.c b/src/obj/secmark.c
584index e27b5fa..6241bee 100644 588index 2ccc803..e96e06f 100644
585--- a/src/obj/secmark.c 589--- a/src/obj/secmark.c
586+++ b/src/obj/secmark.c 590+++ b/src/obj/secmark.c
587@@ -133,5 +133,5 @@ struct obj_ops obj_ops_secmark = { 591@@ -116,5 +116,5 @@ struct obj_ops obj_ops_secmark = {
588 .get = nftnl_obj_secmark_get, 592 .get = nftnl_obj_secmark_get,
589 .parse = nftnl_obj_secmark_parse, 593 .parse = nftnl_obj_secmark_parse,
590 .build = nftnl_obj_secmark_build, 594 .build = nftnl_obj_secmark_build,
591- .snprintf = nftnl_obj_secmark_snprintf, 595- .snprintf = nftnl_obj_secmark_snprintf,
592+ .snprintf_ = nftnl_obj_secmark_snprintf, 596+ .snprintf_ = nftnl_obj_secmark_snprintf,
593 }; 597 };
598diff --git a/src/obj/synproxy.c b/src/obj/synproxy.c
599index d689fee..d06cb6d 100644
600--- a/src/obj/synproxy.c
601+++ b/src/obj/synproxy.c
602@@ -143,5 +143,5 @@ struct obj_ops obj_ops_synproxy = {
603 .get = nftnl_obj_synproxy_get,
604 .parse = nftnl_obj_synproxy_parse,
605 .build = nftnl_obj_synproxy_build,
606- .snprintf = nftnl_obj_synproxy_snprintf,
607+ .snprintf_ = nftnl_obj_synproxy_snprintf,
608 };
594diff --git a/src/obj/tunnel.c b/src/obj/tunnel.c 609diff --git a/src/obj/tunnel.c b/src/obj/tunnel.c
595index 7ffade8..800eb3e 100644 610index 5ede6bd..d3743ff 100644
596--- a/src/obj/tunnel.c 611--- a/src/obj/tunnel.c
597+++ b/src/obj/tunnel.c 612+++ b/src/obj/tunnel.c
598@@ -564,5 +564,5 @@ struct obj_ops obj_ops_tunnel = { 613@@ -547,5 +547,5 @@ struct obj_ops obj_ops_tunnel = {
599 .get = nftnl_obj_tunnel_get, 614 .get = nftnl_obj_tunnel_get,
600 .parse = nftnl_obj_tunnel_parse, 615 .parse = nftnl_obj_tunnel_parse,
601 .build = nftnl_obj_tunnel_build, 616 .build = nftnl_obj_tunnel_build,
@@ -603,29 +618,18 @@ index 7ffade8..800eb3e 100644
603+ .snprintf_ = nftnl_obj_tunnel_snprintf, 618+ .snprintf_ = nftnl_obj_tunnel_snprintf,
604 }; 619 };
605diff --git a/src/object.c b/src/object.c 620diff --git a/src/object.c b/src/object.c
606index d8c87ee..5307d7e 100644 621index 46e208b..d321c50 100644
607--- a/src/object.c 622--- a/src/object.c
608+++ b/src/object.c 623+++ b/src/object.c
609@@ -370,7 +370,7 @@ static int nftnl_obj_snprintf_dflt(char *buf, size_t size, 624@@ -396,7 +396,7 @@ static int nftnl_obj_snprintf_dflt(char *buf, size_t remain,
610 SNPRINTF_BUFFER_SIZE(ret, remain, offset); 625 SNPRINTF_BUFFER_SIZE(ret, remain, offset);
611 626
612 if (obj->ops) { 627 if (obj->ops) {
613- ret = obj->ops->snprintf(buf + offset, offset, type, flags, 628- ret = obj->ops->snprintf(buf + offset, remain, flags, obj);
614+ ret = obj->ops->snprintf_(buf + offset, offset, type, flags, 629+ ret = obj->ops->snprintf_(buf + offset, remain, flags, obj);
615 obj);
616 SNPRINTF_BUFFER_SIZE(ret, remain, offset); 630 SNPRINTF_BUFFER_SIZE(ret, remain, offset);
617 } 631 }
618diff --git a/src/obj/synproxy.c b/src/obj/synproxy.c 632 ret = snprintf(buf + offset, remain, "]");
619index 56ebc85..6b5380f 100644
620--- a/src/obj/synproxy.c
621+++ b/src/obj/synproxy.c
622@@ -157,5 +157,5 @@ struct obj_ops obj_ops_synproxy = {
623 .get = nftnl_obj_synproxy_get,
624 .parse = nftnl_obj_synproxy_parse,
625 .build = nftnl_obj_synproxy_build,
626- .snprintf = nftnl_obj_synproxy_snprintf,
627+ .snprintf_ = nftnl_obj_synproxy_snprintf,
628 };
629-- 633--
6302.17.1 6342.31.1
631 635
diff --git a/meta-networking/recipes-filter/libnftnl/libnftnl_1.1.9.bb b/meta-networking/recipes-filter/libnftnl/libnftnl_1.2.0.bb
index 5532af8d9c..2b90fdd1bd 100644
--- a/meta-networking/recipes-filter/libnftnl/libnftnl_1.1.9.bb
+++ b/meta-networking/recipes-filter/libnftnl/libnftnl_1.2.0.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=79808397c3355f163c012616125c9e26"
4SECTION = "libs" 4SECTION = "libs"
5DEPENDS = "libmnl" 5DEPENDS = "libmnl"
6 6
7SRCREV = "c3fdda6ac8675aea9b35772458544f03157be415" 7SRCREV = "d45be40eef72f0d42a1ba82efddbb0970d4c760a"
8SRC_URI = "git://git.netfilter.org/libnftnl \ 8SRC_URI = "git://git.netfilter.org/libnftnl \
9 file://0001-avoid-naming-local-function-as-one-of-printf-family.patch \ 9 file://0001-avoid-naming-local-function-as-one-of-printf-family.patch \
10 " 10 "
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-11-13 09:37:45 +0000