build: fix clang+glibc snprintf substitution error

When building with clang and glibc and -D_FORTIFY_SOURCE=2 is passed to
clang, the snprintf member of the expr_ops and obj_ops structures will
be incorrectly replaced with __builtin_snprintf_chk() which results in
"error: no member named '__builtin___snprintf_chk'" errors at build
time.

This patch changes the member name from 'snprintf' to 'output' to
prevent the replacement.

This bug can be emulated using GCC by undefining the __va_arg_pack macro
before stdio.h is included.

This patch is based on the notes provided in
https://bugs.gentoo.org/807766.

Signed-off-by: Nicholas Vinson <nvinson234@gmail.com>
Signed-off-by: Florian Westphal <fw@strlen.de>

diff --git a/include/expr_ops.h b/include/expr_ops.h
index 7a6aa23f9bd1d53a3e0f09c10439602b4487c470..a7d747a2568a08e42abb96f0981d534b8e7ed940 100644 (file)
--- a/include/expr_ops.h
+++ b/include/expr_ops.h
@@ -18,7 +18,7 @@ struct expr_ops {
        const void *(*get)(const struct nftnl_expr *e, uint16_t type, uint32_t *data_len);
        int     (*parse)(struct nftnl_expr *e, struct nlattr *attr);
        void    (*build)(struct nlmsghdr *nlh, const struct nftnl_expr *e);
-       int     (*snprintf)(char *buf, size_t len, uint32_t flags, const struct nftnl_expr *e);
+       int     (*output)(char *buf, size_t len, uint32_t flags, const struct nftnl_expr *e);
 };
 
 struct expr_ops *nftnl_expr_ops_lookup(const char *name);

diff --git a/include/obj.h b/include/obj.h
index 60dc8533b30f3752109e7841bc868bf78ae462bf..d848ac98979d9e73b2856e54935b941dfa2737fc 100644 (file)
--- a/include/obj.h
+++ b/include/obj.h
@@ -109,7 +109,7 @@ struct obj_ops {
        const void *(*get)(const struct nftnl_obj *e, uint16_t type, uint32_t *data_len);
        int     (*parse)(struct nftnl_obj *e, struct nlattr *attr);
        void    (*build)(struct nlmsghdr *nlh, const struct nftnl_obj *e);
-       int     (*snprintf)(char *buf, size_t len, uint32_t flags, const struct nftnl_obj *e);
+       int     (*output)(char *buf, size_t len, uint32_t flags, const struct nftnl_obj *e);
 };
 
 extern struct obj_ops obj_ops_counter;

diff --git a/src/expr.c b/src/expr.c
index 277bbdeeb5d029e87397f454fa7bf661363e4d29..b4581f1a79ff6fcd5ec5e8c536fcebca41179958 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -279,10 +279,10 @@ int nftnl_expr_snprintf(char *buf, size_t remain, const struct nftnl_expr *expr,
        if (remain)
                buf[0] = '\0';
 
-       if (!expr->ops->snprintf || type != NFTNL_OUTPUT_DEFAULT)
+       if (!expr->ops->output || type != NFTNL_OUTPUT_DEFAULT)
                return 0;
 
-       ret = expr->ops->snprintf(buf + offset, remain, flags, expr);
+       ret = expr->ops->output(buf + offset, remain, flags, expr);
        SNPRINTF_BUFFER_SIZE(ret, remain, offset);
 
        return offset;

diff --git a/src/expr/bitwise.c b/src/expr/bitwise.c
index d0c7827eacec97b9419a9ef8583d8f9efbf526e6..2d272335e377234ee098ac1991c079f6c9b64ba3 100644 (file)
--- a/src/expr/bitwise.c
+++ b/src/expr/bitwise.c
@@ -282,5 +282,5 @@ struct expr_ops expr_ops_bitwise = {
        .get            = nftnl_expr_bitwise_get,
        .parse          = nftnl_expr_bitwise_parse,
        .build          = nftnl_expr_bitwise_build,
-       .snprintf       = nftnl_expr_bitwise_snprintf,
+       .output         = nftnl_expr_bitwise_snprintf,
 };

diff --git a/src/expr/byteorder.c b/src/expr/byteorder.c
index d299745fc57b49ad6d5e873f5b36dfffe79bcc24..89ed0a8232af15e79c49d4c4407dd6321408307b 100644 (file)
--- a/src/expr/byteorder.c
+++ b/src/expr/byteorder.c
@@ -220,5 +220,5 @@ struct expr_ops expr_ops_byteorder = {
        .get            = nftnl_expr_byteorder_get,
        .parse          = nftnl_expr_byteorder_parse,
        .build          = nftnl_expr_byteorder_build,
-       .snprintf       = nftnl_expr_byteorder_snprintf,
+       .output         = nftnl_expr_byteorder_snprintf,
 };

diff --git a/src/expr/cmp.c b/src/expr/cmp.c
index 6030693f15d860fddaff02608439fd1faa8568d4..f9d15bba3b0fa7e280d5af974d45dbbc34ca0876 100644 (file)
--- a/src/expr/cmp.c
+++ b/src/expr/cmp.c
@@ -202,5 +202,5 @@ struct expr_ops expr_ops_cmp = {
        .get            = nftnl_expr_cmp_get,
        .parse          = nftnl_expr_cmp_parse,
        .build          = nftnl_expr_cmp_build,
-       .snprintf       = nftnl_expr_cmp_snprintf,
+       .output         = nftnl_expr_cmp_snprintf,
 };

diff --git a/src/expr/connlimit.c b/src/expr/connlimit.c
index 3b37587e7e4ec1f614b8ee5177c0750e43d986f7..549417bf31e6b6ea3e6da38f34568de875f346a9 100644 (file)
--- a/src/expr/connlimit.c
+++ b/src/expr/connlimit.c
@@ -135,5 +135,5 @@ struct expr_ops expr_ops_connlimit = {
        .get            = nftnl_expr_connlimit_get,
        .parse          = nftnl_expr_connlimit_parse,
        .build          = nftnl_expr_connlimit_build,
-       .snprintf       = nftnl_expr_connlimit_snprintf,
+       .output         = nftnl_expr_connlimit_snprintf,
 };

diff --git a/src/expr/counter.c b/src/expr/counter.c
index 1676d70a46bda7f589fc323284f0bc0b079ebf59..d139a5f758a0bc0790e1bc55354f0fb7d5428b3c 100644 (file)
--- a/src/expr/counter.c
+++ b/src/expr/counter.c
@@ -133,5 +133,5 @@ struct expr_ops expr_ops_counter = {
        .get            = nftnl_expr_counter_get,
        .parse          = nftnl_expr_counter_parse,
        .build          = nftnl_expr_counter_build,
-       .snprintf       = nftnl_expr_counter_snprintf,
+       .output         = nftnl_expr_counter_snprintf,
 };

diff --git a/src/expr/ct.c b/src/expr/ct.c
index d5dfc81cfe0d1a1572f36bb969c4916dcc530b67..f4a2aeaf31acc721b670f2b9d84901513a4142e6 100644 (file)
--- a/src/expr/ct.c
+++ b/src/expr/ct.c
@@ -258,5 +258,5 @@ struct expr_ops expr_ops_ct = {
        .get            = nftnl_expr_ct_get,
        .parse          = nftnl_expr_ct_parse,
        .build          = nftnl_expr_ct_build,
-       .snprintf       = nftnl_expr_ct_snprintf,
+       .output         = nftnl_expr_ct_snprintf,
 };

diff --git a/src/expr/dup.c b/src/expr/dup.c
index f041b551a7e78c5d3f3f475f1b9cdaa3eeb42041..a239ff35640a62e99d9063ff8a5186ba39ccdb31 100644 (file)
--- a/src/expr/dup.c
+++ b/src/expr/dup.c
@@ -138,5 +138,5 @@ struct expr_ops expr_ops_dup = {
        .get            = nftnl_expr_dup_get,
        .parse          = nftnl_expr_dup_parse,
        .build          = nftnl_expr_dup_build,
-       .snprintf       = nftnl_expr_dup_snprintf,
+       .output         = nftnl_expr_dup_snprintf,
 };

diff --git a/src/expr/dynset.c b/src/expr/dynset.c
index 85d64bb58d5af162ba37f9758768193be9b03680..5bcf1c6f8b06092867d6defaa6d4ff8c19133325 100644 (file)
--- a/src/expr/dynset.c
+++ b/src/expr/dynset.c
@@ -373,5 +373,5 @@ struct expr_ops expr_ops_dynset = {
        .get            = nftnl_expr_dynset_get,
        .parse          = nftnl_expr_dynset_parse,
        .build          = nftnl_expr_dynset_build,
-       .snprintf       = nftnl_expr_dynset_snprintf,
+       .output         = nftnl_expr_dynset_snprintf,
 };

diff --git a/src/expr/exthdr.c b/src/expr/exthdr.c
index 625dd5d3d0a49534a7960ab6760e97b3470ea2b6..739c7ff2179f99fad0c67f6d4bc7748b2db88ca9 100644 (file)
--- a/src/expr/exthdr.c
+++ b/src/expr/exthdr.c
@@ -267,5 +267,5 @@ struct expr_ops expr_ops_exthdr = {
        .get            = nftnl_expr_exthdr_get,
        .parse          = nftnl_expr_exthdr_parse,
        .build          = nftnl_expr_exthdr_build,
-       .snprintf       = nftnl_expr_exthdr_snprintf,
+       .output         = nftnl_expr_exthdr_snprintf,
 };

diff --git a/src/expr/fib.c b/src/expr/fib.c
index aaff52acabdbdd760afa262e2feb759e649eef38..957f929ea912e500b30d87cfeaaa03c99d90bece 100644 (file)
--- a/src/expr/fib.c
+++ b/src/expr/fib.c
@@ -198,5 +198,5 @@ struct expr_ops expr_ops_fib = {
        .get            = nftnl_expr_fib_get,
        .parse          = nftnl_expr_fib_parse,
        .build          = nftnl_expr_fib_build,
-       .snprintf       = nftnl_expr_fib_snprintf,
+       .output         = nftnl_expr_fib_snprintf,
 };

diff --git a/src/expr/flow_offload.c b/src/expr/flow_offload.c
index a826202eb69b9bfadb134a29d9db2e05a8791784..4fc0563bfb53732ca351b645292ab0952f9975f1 100644 (file)
--- a/src/expr/flow_offload.c
+++ b/src/expr/flow_offload.c
@@ -120,5 +120,5 @@ struct expr_ops expr_ops_flow = {
        .get            = nftnl_expr_flow_get,
        .parse          = nftnl_expr_flow_parse,
        .build          = nftnl_expr_flow_build,
-       .snprintf       = nftnl_expr_flow_snprintf,
+       .output         = nftnl_expr_flow_snprintf,
 };

diff --git a/src/expr/fwd.c b/src/expr/fwd.c
index 82e5a418bfae5428f203621134a136cf28a97d73..51f661258900f9bb350f7a99e9bced0f8cd9083f 100644 (file)
--- a/src/expr/fwd.c
+++ b/src/expr/fwd.c
@@ -158,5 +158,5 @@ struct expr_ops expr_ops_fwd = {
        .get            = nftnl_expr_fwd_get,
        .parse          = nftnl_expr_fwd_parse,
        .build          = nftnl_expr_fwd_build,
-       .snprintf       = nftnl_expr_fwd_snprintf,
+       .output         = nftnl_expr_fwd_snprintf,
 };

diff --git a/src/expr/hash.c b/src/expr/hash.c
index 10b4a72d30b0dce7e157e30cbea20808bba81844..6e2dd197fa708af5e6d5eabc0d0fa73d10d41e3e 100644 (file)
--- a/src/expr/hash.c
+++ b/src/expr/hash.c
@@ -226,5 +226,5 @@ struct expr_ops expr_ops_hash = {
        .get            = nftnl_expr_hash_get,
        .parse          = nftnl_expr_hash_parse,
        .build          = nftnl_expr_hash_build,
-       .snprintf       = nftnl_expr_hash_snprintf,
+       .output         = nftnl_expr_hash_snprintf,
 };

diff --git a/src/expr/immediate.c b/src/expr/immediate.c
index 94b043c0fc8abf0704a247774a1eb2a28a749a34..5d477a8b421763b33d1a7f81d45cfd2af1377228 100644 (file)
--- a/src/expr/immediate.c
+++ b/src/expr/immediate.c
@@ -229,5 +229,5 @@ struct expr_ops expr_ops_immediate = {
        .get            = nftnl_expr_immediate_get,
        .parse          = nftnl_expr_immediate_parse,
        .build          = nftnl_expr_immediate_build,
-       .snprintf       = nftnl_expr_immediate_snprintf,
+       .output         = nftnl_expr_immediate_snprintf,
 };

diff --git a/src/expr/last.c b/src/expr/last.c
index e2a60c49b8661c2e0f491d3ba71131b13b3a8a4c..641b713fca66f54d51fa389d970ac002417e5bc0 100644 (file)
--- a/src/expr/last.c
+++ b/src/expr/last.c
@@ -134,5 +134,5 @@ struct expr_ops expr_ops_last = {
        .get            = nftnl_expr_last_get,
        .parse          = nftnl_expr_last_parse,
        .build          = nftnl_expr_last_build,
-       .snprintf       = nftnl_expr_last_snprintf,
+       .output         = nftnl_expr_last_snprintf,
 };

diff --git a/src/expr/limit.c b/src/expr/limit.c
index 3dfd54a8dd112ed2ec46c8066b6c6ee66b924138..1870e0e473a90b58f847ae6bebb3e4c8335dffa6 100644 (file)
--- a/src/expr/limit.c
+++ b/src/expr/limit.c
@@ -202,5 +202,5 @@ struct expr_ops expr_ops_limit = {
        .get            = nftnl_expr_limit_get,
        .parse          = nftnl_expr_limit_parse,
        .build          = nftnl_expr_limit_build,
-       .snprintf       = nftnl_expr_limit_snprintf,
+       .output         = nftnl_expr_limit_snprintf,
 };

diff --git a/src/expr/log.c b/src/expr/log.c
index 86db5484d2173bef062935735ffce1c6f50610f7..180d83973d70610896c1483a5be2681fe82551be 100644 (file)
--- a/src/expr/log.c
+++ b/src/expr/log.c
@@ -253,5 +253,5 @@ struct expr_ops expr_ops_log = {
        .get            = nftnl_expr_log_get,
        .parse          = nftnl_expr_log_parse,
        .build          = nftnl_expr_log_build,
-       .snprintf       = nftnl_expr_log_snprintf,
+       .output         = nftnl_expr_log_snprintf,
 };

diff --git a/src/expr/lookup.c b/src/expr/lookup.c
index 83adce97c98b012ae0f403522100a1213dff3606..a06c3385411ac535a96f1724c465d0a642f7a525 100644 (file)
--- a/src/expr/lookup.c
+++ b/src/expr/lookup.c
@@ -206,5 +206,5 @@ struct expr_ops expr_ops_lookup = {
        .get            = nftnl_expr_lookup_get,
        .parse          = nftnl_expr_lookup_parse,
        .build          = nftnl_expr_lookup_build,
-       .snprintf       = nftnl_expr_lookup_snprintf,
+       .output         = nftnl_expr_lookup_snprintf,
 };

diff --git a/src/expr/masq.c b/src/expr/masq.c
index 684708c758390c9535e315a8153602a49af941e3..e6e528d9acca8d0f0292ccb3219f51c59e5a0ade 100644 (file)
--- a/src/expr/masq.c
+++ b/src/expr/masq.c
@@ -163,5 +163,5 @@ struct expr_ops expr_ops_masq = {
        .get            = nftnl_expr_masq_get,
        .parse          = nftnl_expr_masq_parse,
        .build          = nftnl_expr_masq_build,
-       .snprintf       = nftnl_expr_masq_snprintf,
+       .output         = nftnl_expr_masq_snprintf,
 };

diff --git a/src/expr/match.c b/src/expr/match.c
index 533fdf5c7ac3b885411ed4f2fefb85765e607bc7..f472add1cbc8e3f724e94bd4a284e907d375dbd2 100644 (file)
--- a/src/expr/match.c
+++ b/src/expr/match.c
@@ -189,5 +189,5 @@ struct expr_ops expr_ops_match = {
        .get            = nftnl_expr_match_get,
        .parse          = nftnl_expr_match_parse,
        .build          = nftnl_expr_match_build,
-       .snprintf       = nftnl_expr_match_snprintf,
+       .output         = nftnl_expr_match_snprintf,
 };

diff --git a/src/expr/meta.c b/src/expr/meta.c
index 34fbb9bb63c0304ab3545ea660a54e0a1047c53f..96544a424283cb654250b753ec3a77c749f8326d 100644 (file)
--- a/src/expr/meta.c
+++ b/src/expr/meta.c
@@ -216,5 +216,5 @@ struct expr_ops expr_ops_meta = {
        .get            = nftnl_expr_meta_get,
        .parse          = nftnl_expr_meta_parse,
        .build          = nftnl_expr_meta_build,
-       .snprintf       = nftnl_expr_meta_snprintf,
+       .output         = nftnl_expr_meta_snprintf,
 };

diff --git a/src/expr/nat.c b/src/expr/nat.c
index 0a9cdd7f65f8fef3b06348f585bbad8cd31f59c4..ca727be0cda635aa8dcbcdc79d9071874750bb61 100644 (file)
--- a/src/expr/nat.c
+++ b/src/expr/nat.c
@@ -274,5 +274,5 @@ struct expr_ops expr_ops_nat = {
        .get            = nftnl_expr_nat_get,
        .parse          = nftnl_expr_nat_parse,
        .build          = nftnl_expr_nat_build,
-       .snprintf       = nftnl_expr_nat_snprintf,
+       .output         = nftnl_expr_nat_snprintf,
 };

diff --git a/src/expr/numgen.c b/src/expr/numgen.c
index 159dfeca3618bbd9cc26cdef6712b11f27e04cce..d4020a6978e0c8eb27244b9d1d6b63868e6284ab 100644 (file)
--- a/src/expr/numgen.c
+++ b/src/expr/numgen.c
@@ -180,5 +180,5 @@ struct expr_ops expr_ops_ng = {
        .get            = nftnl_expr_ng_get,
        .parse          = nftnl_expr_ng_parse,
        .build          = nftnl_expr_ng_build,
-       .snprintf       = nftnl_expr_ng_snprintf,
+       .output         = nftnl_expr_ng_snprintf,
 };

diff --git a/src/expr/objref.c b/src/expr/objref.c
index a4b6470bc25e27aa235ec142a470a71917a88ea1..ad0688f46ec62f66f1b8184c4cd1390e1972eade 100644 (file)
--- a/src/expr/objref.c
+++ b/src/expr/objref.c
@@ -205,5 +205,5 @@ struct expr_ops expr_ops_objref = {
        .get            = nftnl_expr_objref_get,
        .parse          = nftnl_expr_objref_parse,
        .build          = nftnl_expr_objref_build,
-       .snprintf       = nftnl_expr_objref_snprintf,
+       .output         = nftnl_expr_objref_snprintf,
 };

diff --git a/src/expr/osf.c b/src/expr/osf.c
index 215a681a97aae8bb18446f4deb92e7a8e18098b5..f15a72223383045ef277bd6f68b9ed1af0bc6435 100644 (file)
--- a/src/expr/osf.c
+++ b/src/expr/osf.c
@@ -147,5 +147,5 @@ struct expr_ops expr_ops_osf = {
        .get            = nftnl_expr_osf_get,
        .parse          = nftnl_expr_osf_parse,
        .build          = nftnl_expr_osf_build,
-       .snprintf       = nftnl_expr_osf_snprintf,
+       .output         = nftnl_expr_osf_snprintf,
 };

diff --git a/src/expr/payload.c b/src/expr/payload.c
index 82747ec8994f7f73f3613865f67fa800427078dd..a0402c8954a3886c9f98732ffe302059866bf0f1 100644 (file)
--- a/src/expr/payload.c
+++ b/src/expr/payload.c
@@ -259,5 +259,5 @@ struct expr_ops expr_ops_payload = {
        .get            = nftnl_expr_payload_get,
        .parse          = nftnl_expr_payload_parse,
        .build          = nftnl_expr_payload_build,
-       .snprintf       = nftnl_expr_payload_snprintf,
+       .output         = nftnl_expr_payload_snprintf,
 };

diff --git a/src/expr/queue.c b/src/expr/queue.c
index 8f70977f7de85a36bea5089b0a46f47e6fc87132..de287f245d9a9c0d50c38178f60c4dc7468f3efb 100644 (file)
--- a/src/expr/queue.c
+++ b/src/expr/queue.c
@@ -193,5 +193,5 @@ struct expr_ops expr_ops_queue = {
        .get            = nftnl_expr_queue_get,
        .parse          = nftnl_expr_queue_parse,
        .build          = nftnl_expr_queue_build,
-       .snprintf       = nftnl_expr_queue_snprintf,
+       .output         = nftnl_expr_queue_snprintf,
 };

diff --git a/src/expr/quota.c b/src/expr/quota.c
index 8c841d8006eb68c6ff27af8accd99b554a16dc1e..835729ceac17b49fcd6638d1903ff395c41a7990 100644 (file)
--- a/src/expr/quota.c
+++ b/src/expr/quota.c
@@ -147,5 +147,5 @@ struct expr_ops expr_ops_quota = {
        .get            = nftnl_expr_quota_get,
        .parse          = nftnl_expr_quota_parse,
        .build          = nftnl_expr_quota_build,
-       .snprintf       = nftnl_expr_quota_snprintf,
+       .output         = nftnl_expr_quota_snprintf,
 };

diff --git a/src/expr/range.c b/src/expr/range.c
index f76843a8afd0cf2d9f1d49e3cca6dbbfaff50920..473add86e4b45b2478b4c9cfa1b841c0de632b9b 100644 (file)
--- a/src/expr/range.c
+++ b/src/expr/range.c
@@ -213,5 +213,5 @@ struct expr_ops expr_ops_range = {
        .get            = nftnl_expr_range_get,
        .parse          = nftnl_expr_range_parse,
        .build          = nftnl_expr_range_build,
-       .snprintf       = nftnl_expr_range_snprintf,
+       .output         = nftnl_expr_range_snprintf,
 };

diff --git a/src/expr/redir.c b/src/expr/redir.c
index 4f56cb4302b30262491fd52977ea312253a702ed..87c2accb923fa6614900dbbd60033dc1d298a724 100644 (file)
--- a/src/expr/redir.c
+++ b/src/expr/redir.c
@@ -167,5 +167,5 @@ struct expr_ops expr_ops_redir = {
        .get            = nftnl_expr_redir_get,
        .parse          = nftnl_expr_redir_parse,
        .build          = nftnl_expr_redir_build,
-       .snprintf       = nftnl_expr_redir_snprintf,
+       .output         = nftnl_expr_redir_snprintf,
 };

diff --git a/src/expr/reject.c b/src/expr/reject.c
index 716d25c77f7e59b6e0bc41d22245af5314a87fe9..c7c944124ca3933abcfe89035451d5d4aacc9ee3 100644 (file)
--- a/src/expr/reject.c
+++ b/src/expr/reject.c
@@ -134,5 +134,5 @@ struct expr_ops expr_ops_reject = {
        .get            = nftnl_expr_reject_get,
        .parse          = nftnl_expr_reject_parse,
        .build          = nftnl_expr_reject_build,
-       .snprintf       = nftnl_expr_reject_snprintf,
+       .output         = nftnl_expr_reject_snprintf,
 };

diff --git a/src/expr/rt.c b/src/expr/rt.c
index 1ad9b2ad4043f06fc5cce5137deb3811fcc9418f..695a6589b5c84c3cbbc7d5fe6789605be2b2fa0b 100644 (file)
--- a/src/expr/rt.c
+++ b/src/expr/rt.c
@@ -162,5 +162,5 @@ struct expr_ops expr_ops_rt = {
        .get            = nftnl_expr_rt_get,
        .parse          = nftnl_expr_rt_parse,
        .build          = nftnl_expr_rt_build,
-       .snprintf       = nftnl_expr_rt_snprintf,
+       .output         = nftnl_expr_rt_snprintf,
 };

diff --git a/src/expr/socket.c b/src/expr/socket.c
index 02d86f8ac57c0ff9b6d41a28ff0a7a9b437498aa..83045c075fb5b0637f15a993e8b6532ef34b5274 100644 (file)
--- a/src/expr/socket.c
+++ b/src/expr/socket.c
@@ -165,5 +165,5 @@ struct expr_ops expr_ops_socket = {
        .get            = nftnl_expr_socket_get,
        .parse          = nftnl_expr_socket_parse,
        .build          = nftnl_expr_socket_build,
-       .snprintf       = nftnl_expr_socket_snprintf,
+       .output         = nftnl_expr_socket_snprintf,
 };

diff --git a/src/expr/synproxy.c b/src/expr/synproxy.c
index 630f3f4c60927892fce06e3e9477e6a674fdc554..47fcaefb23b1b4966777273bdf3de80bb880fe17 100644 (file)
--- a/src/expr/synproxy.c
+++ b/src/expr/synproxy.c
@@ -152,5 +152,5 @@ struct expr_ops expr_ops_synproxy = {
        .get            = nftnl_expr_synproxy_get,
        .parse          = nftnl_expr_synproxy_parse,
        .build          = nftnl_expr_synproxy_build,
-       .snprintf       = nftnl_expr_synproxy_snprintf,
+       .output         = nftnl_expr_synproxy_snprintf,
 };

diff --git a/src/expr/target.c b/src/expr/target.c
index b7c595a7de989677bbc86bd002cefe51bb556807..2a3fe8ae1020d76c370231ace203d24df6e62b41 100644 (file)
--- a/src/expr/target.c
+++ b/src/expr/target.c
@@ -189,5 +189,5 @@ struct expr_ops expr_ops_target = {
        .get            = nftnl_expr_target_get,
        .parse          = nftnl_expr_target_parse,
        .build          = nftnl_expr_target_build,
-       .snprintf       = nftnl_expr_target_snprintf,
+       .output         = nftnl_expr_target_snprintf,
 };

diff --git a/src/expr/tproxy.c b/src/expr/tproxy.c
index d3ee8f89b6db35ca89369ea2ea12ab47edf623f5..bd5ffbf1d93eef3f76e6a726fa9a769aa17ea17b 100644 (file)
--- a/src/expr/tproxy.c
+++ b/src/expr/tproxy.c
@@ -170,5 +170,5 @@ struct expr_ops expr_ops_tproxy = {
        .get            = nftnl_expr_tproxy_get,
        .parse          = nftnl_expr_tproxy_parse,
        .build          = nftnl_expr_tproxy_build,
-       .snprintf       = nftnl_expr_tproxy_snprintf,
+       .output         = nftnl_expr_tproxy_snprintf,
 };

diff --git a/src/expr/tunnel.c b/src/expr/tunnel.c
index 1460fd26b0fbc5070202e67455e5fcf09008fe15..a00f620fa471a9641579f71df642d3483b2b8aa4 100644 (file)
--- a/src/expr/tunnel.c
+++ b/src/expr/tunnel.c
@@ -145,5 +145,5 @@ struct expr_ops expr_ops_tunnel = {
        .get            = nftnl_expr_tunnel_get,
        .parse          = nftnl_expr_tunnel_parse,
        .build          = nftnl_expr_tunnel_build,
-       .snprintf       = nftnl_expr_tunnel_snprintf,
+       .output         = nftnl_expr_tunnel_snprintf,
 };

diff --git a/src/expr/xfrm.c b/src/expr/xfrm.c
index c81d14d638dcd166e98af12902d5db5f412e0210..2db00d50a158a793b9b234ac54c6d563225e89a0 100644 (file)
--- a/src/expr/xfrm.c
+++ b/src/expr/xfrm.c
@@ -196,5 +196,5 @@ struct expr_ops expr_ops_xfrm = {
        .get            = nftnl_expr_xfrm_get,
        .parse          = nftnl_expr_xfrm_parse,
        .build          = nftnl_expr_xfrm_build,
-       .snprintf       = nftnl_expr_xfrm_snprintf,
+       .output         = nftnl_expr_xfrm_snprintf,
 };

diff --git a/src/obj/counter.c b/src/obj/counter.c
index ef0cd203e3a1b7e77ecaacba868e35206fec6abb..ebf3e74f96737e96dbb45228498b42b71e49b54c 100644 (file)
--- a/src/obj/counter.c
+++ b/src/obj/counter.c
@@ -127,5 +127,5 @@ struct obj_ops obj_ops_counter = {
        .get            = nftnl_obj_counter_get,
        .parse          = nftnl_obj_counter_parse,
        .build          = nftnl_obj_counter_build,
-       .snprintf       = nftnl_obj_counter_snprintf,
+       .output         = nftnl_obj_counter_snprintf,
 };

diff --git a/src/obj/ct_expect.c b/src/obj/ct_expect.c
index 8136ad9c21602737bf2753998dfa9c8cc3d1b956..810ba9af98ab8f9b2304ee84546c7724ff24bf82 100644 (file)
--- a/src/obj/ct_expect.c
+++ b/src/obj/ct_expect.c
@@ -196,5 +196,5 @@ struct obj_ops obj_ops_ct_expect = {
        .get            = nftnl_obj_ct_expect_get,
        .parse          = nftnl_obj_ct_expect_parse,
        .build          = nftnl_obj_ct_expect_build,
-       .snprintf       = nftnl_obj_ct_expect_snprintf,
+       .output         = nftnl_obj_ct_expect_snprintf,
 };

diff --git a/src/obj/ct_helper.c b/src/obj/ct_helper.c
index c52032a9895c3b355a12a283a00918372479c040..a31bd6facccf9e4de275329e58617b67b6eb1166 100644 (file)
--- a/src/obj/ct_helper.c
+++ b/src/obj/ct_helper.c
@@ -150,5 +150,5 @@ struct obj_ops obj_ops_ct_helper = {
        .get            = nftnl_obj_ct_helper_get,
        .parse          = nftnl_obj_ct_helper_parse,
        .build          = nftnl_obj_ct_helper_build,
-       .snprintf       = nftnl_obj_ct_helper_snprintf,
+       .output         = nftnl_obj_ct_helper_snprintf,
 };

diff --git a/src/obj/ct_timeout.c b/src/obj/ct_timeout.c
index 1d4f8fb75ea3a7b15e7e2126849630075133359c..65b48bda4a97870c070b2f425c557f34147a6c17 100644 (file)
--- a/src/obj/ct_timeout.c
+++ b/src/obj/ct_timeout.c
@@ -316,5 +316,5 @@ struct obj_ops obj_ops_ct_timeout = {
        .get            = nftnl_obj_ct_timeout_get,
        .parse          = nftnl_obj_ct_timeout_parse,
        .build          = nftnl_obj_ct_timeout_build,
-       .snprintf       = nftnl_obj_ct_timeout_snprintf,
+       .output         = nftnl_obj_ct_timeout_snprintf,
 };

diff --git a/src/obj/limit.c b/src/obj/limit.c
index 8b40f9d0976ff14e7bac630e17533bcfd0d149c9..d7b1aed830d821fffc00f82fbbe133f7c0d613df 100644 (file)
--- a/src/obj/limit.c
+++ b/src/obj/limit.c
@@ -168,5 +168,5 @@ struct obj_ops obj_ops_limit = {
        .get            = nftnl_obj_limit_get,
        .parse          = nftnl_obj_limit_parse,
        .build          = nftnl_obj_limit_build,
-       .snprintf       = nftnl_obj_limit_snprintf,
+       .output         = nftnl_obj_limit_snprintf,
 };

diff --git a/src/obj/quota.c b/src/obj/quota.c
index 8ab33005daeea7780d17781dddfdbdd73c99da69..6c7559a2ce82725a00de946bd7d76d677dffbd19 100644 (file)
--- a/src/obj/quota.c
+++ b/src/obj/quota.c
@@ -144,5 +144,5 @@ struct obj_ops obj_ops_quota = {
        .get            = nftnl_obj_quota_get,
        .parse          = nftnl_obj_quota_parse,
        .build          = nftnl_obj_quota_build,
-       .snprintf       = nftnl_obj_quota_snprintf,
+       .output         = nftnl_obj_quota_snprintf,
 };

diff --git a/src/obj/secmark.c b/src/obj/secmark.c
index 2ccc803bacf4e79e0f508d55d5986afbe926055f..e5c24b35a7eb608e465c19026756e349188cac1c 100644 (file)
--- a/src/obj/secmark.c
+++ b/src/obj/secmark.c
@@ -116,5 +116,5 @@ struct obj_ops obj_ops_secmark = {
        .get            = nftnl_obj_secmark_get,
        .parse          = nftnl_obj_secmark_parse,
        .build          = nftnl_obj_secmark_build,
-       .snprintf       = nftnl_obj_secmark_snprintf,
+       .output         = nftnl_obj_secmark_snprintf,
 };

diff --git a/src/obj/synproxy.c b/src/obj/synproxy.c
index d689fee3757c2e12f9c63d764e27f4f60b49a75b..baef5c201e83ca2d42adaae5cfd8617530859c69 100644 (file)
--- a/src/obj/synproxy.c
+++ b/src/obj/synproxy.c
@@ -143,5 +143,5 @@ struct obj_ops obj_ops_synproxy = {
        .get            = nftnl_obj_synproxy_get,
        .parse          = nftnl_obj_synproxy_parse,
        .build          = nftnl_obj_synproxy_build,
-       .snprintf       = nftnl_obj_synproxy_snprintf,
+       .output         = nftnl_obj_synproxy_snprintf,
 };

diff --git a/src/obj/tunnel.c b/src/obj/tunnel.c
index 5ede6bd545b389853438782ed634ae2f3303d427..d2503dccaf8ddf6a83c85d68a1ccd8207de789d8 100644 (file)
--- a/src/obj/tunnel.c
+++ b/src/obj/tunnel.c
@@ -547,5 +547,5 @@ struct obj_ops obj_ops_tunnel = {
        .get            = nftnl_obj_tunnel_get,
        .parse          = nftnl_obj_tunnel_parse,
        .build          = nftnl_obj_tunnel_build,
-       .snprintf       = nftnl_obj_tunnel_snprintf,
+       .output         = nftnl_obj_tunnel_snprintf,
 };

diff --git a/src/object.c b/src/object.c
index 46e208b666cae9b001d6f21ccbfe6d5a1bf84ebb..232b97a1f57f22db7bc0a23d43e8f21489772f6d 100644 (file)
--- a/src/object.c
+++ b/src/object.c
@@ -396,7 +396,7 @@ static int nftnl_obj_snprintf_dflt(char *buf, size_t remain,
        SNPRINTF_BUFFER_SIZE(ret, remain, offset);
 
        if (obj->ops) {
-               ret = obj->ops->snprintf(buf + offset, remain, flags, obj);
+               ret = obj->ops->output(buf + offset, remain, flags, obj);
                SNPRINTF_BUFFER_SIZE(ret, remain, offset);
        }
        ret = snprintf(buf + offset, remain, "]");