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