expr: Pass byteorder to struct expr_ops::set callback

Prepare for storing data reg byteorder, no functional change intended.

Note the odd case in expr/byteorder.c since there is a local variable
with same name already.

Signed-off-by: Phil Sutter <phil@nwl.cc>

diff --git a/include/expr_ops.h b/include/expr_ops.h
index 6cfb3b583208376dd3364ed66274ce64420bf2d6..9c816c085719a5b3c060315cacf9f5fd21949358 100644 (file)
--- a/include/expr_ops.h
+++ b/include/expr_ops.h
@@ -19,7 +19,7 @@ struct expr_ops {
        struct attr_policy *attr_policy;
        void    (*init)(const struct nftnl_expr *e);
        void    (*free)(const struct nftnl_expr *e);
-       int     (*set)(struct nftnl_expr *e, uint16_t type, const void *data, uint32_t data_len);
+       int     (*set)(struct nftnl_expr *e, uint16_t type, const void *data, uint32_t data_len, uint32_t byteorder);
        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);

diff --git a/src/expr.c b/src/expr.c
index 65180d6849cd83abb8ebd935c58a19dfa4134bfd..d07e7332efd7843b115717a47cff69594d0c1f54 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -59,9 +59,9 @@ bool nftnl_expr_is_set(const struct nftnl_expr *expr, uint16_t type)
        return expr->flags & (1 << type);
 }
 
-EXPORT_SYMBOL(nftnl_expr_set);
-int nftnl_expr_set(struct nftnl_expr *expr, uint16_t type,
-                  const void *data, uint32_t data_len)
+static int __nftnl_expr_set(struct nftnl_expr *expr, uint16_t type,
+                           const void *data, uint32_t data_len,
+                           uint32_t byteorder)
 {
        switch(type) {
        case NFTNL_EXPR_NAME:   /* cannot be modified */
@@ -77,13 +77,20 @@ int nftnl_expr_set(struct nftnl_expr *expr, uint16_t type,
                    expr->ops->attr_policy[type].maxlen < data_len)
                        return -1;
 
-               if (expr->ops->set(expr, type, data, data_len) < 0)
+               if (expr->ops->set(expr, type, data, data_len, byteorder) < 0)
                        return -1;
        }
        expr->flags |= (1 << type);
        return 0;
 }
 
+EXPORT_SYMBOL(nftnl_expr_set);
+int nftnl_expr_set(struct nftnl_expr *expr, uint16_t type,
+                  const void *data, uint32_t data_len)
+{
+       return __nftnl_expr_set(expr, type, data, data_len, 0);
+}
+
 EXPORT_SYMBOL(nftnl_expr_set_u8);
 void
 nftnl_expr_set_u8(struct nftnl_expr *expr, uint16_t type, uint8_t data)

diff --git a/src/expr/bitwise.c b/src/expr/bitwise.c
index 2da83b7ba0441593eb6396dadfb5e382a49d5b4f..da2b6d2ee57ecf54c11323130bd6b872389676a8 100644 (file)
--- a/src/expr/bitwise.c
+++ b/src/expr/bitwise.c
@@ -30,7 +30,7 @@ struct nftnl_expr_bitwise {
 
 static int
 nftnl_expr_bitwise_set(struct nftnl_expr *e, uint16_t type,
-                      const void *data, uint32_t data_len)
+                      const void *data, uint32_t data_len, uint32_t byteorder)
 {
        struct nftnl_expr_bitwise *bitwise = nftnl_expr_data(e);
 

diff --git a/src/expr/byteorder.c b/src/expr/byteorder.c
index 4171d0633728caa3e14a9ccaf31cf9d4b6dd0692..baa11a140101936733e1e6053a2c2996a57b9aab 100644 (file)
--- a/src/expr/byteorder.c
+++ b/src/expr/byteorder.c
@@ -27,7 +27,7 @@ struct nftnl_expr_byteorder {
 
 static int
 nftnl_expr_byteorder_set(struct nftnl_expr *e, uint16_t type,
-                         const void *data, uint32_t data_len)
+                         const void *data, uint32_t data_len, uint32_t byteorderp)
 {
        struct nftnl_expr_byteorder *byteorder = nftnl_expr_data(e);
 

diff --git a/src/expr/cmp.c b/src/expr/cmp.c
index ec1dc318947712536faa58ff648ef58562941a66..4bcf2e4bce83e0f1318c3c6957cc7bc372332f98 100644 (file)
--- a/src/expr/cmp.c
+++ b/src/expr/cmp.c
@@ -26,7 +26,7 @@ struct nftnl_expr_cmp {
 
 static int
 nftnl_expr_cmp_set(struct nftnl_expr *e, uint16_t type,
-                     const void *data, uint32_t data_len)
+                  const void *data, uint32_t data_len, uint32_t byteorder)
 {
        struct nftnl_expr_cmp *cmp = nftnl_expr_data(e);
 

diff --git a/src/expr/connlimit.c b/src/expr/connlimit.c
index 02b9ecc87d25863bf4e467249d75e19bee510a4b..f45129d60486d755da960b7e935002706aa37616 100644 (file)
--- a/src/expr/connlimit.c
+++ b/src/expr/connlimit.c
@@ -23,7 +23,7 @@ struct nftnl_expr_connlimit {
 
 static int
 nftnl_expr_connlimit_set(struct nftnl_expr *e, uint16_t type,
-                         const void *data, uint32_t data_len)
+                         const void *data, uint32_t data_len, uint32_t byteorder)
 {
        struct nftnl_expr_connlimit *connlimit = nftnl_expr_data(e);
 

diff --git a/src/expr/counter.c b/src/expr/counter.c
index 80f21d7a177ea6ea0ba24d75ad521dd724b5cca9..21e641b0b939a480fdbc94045d5201ed38ec80f1 100644 (file)
--- a/src/expr/counter.c
+++ b/src/expr/counter.c
@@ -25,7 +25,7 @@ struct nftnl_expr_counter {
 
 static int
 nftnl_expr_counter_set(struct nftnl_expr *e, uint16_t type,
-                         const void *data, uint32_t data_len)
+                      const void *data, uint32_t data_len, uint32_t byteorder)
 {
        struct nftnl_expr_counter *ctr = nftnl_expr_data(e);
 

diff --git a/src/expr/ct.c b/src/expr/ct.c
index 8f8c2a6e73713545564121d24e3bfc83c3669409..4117eeeb938636961e2ee1d6f0faa0dd76071cb6 100644 (file)
--- a/src/expr/ct.c
+++ b/src/expr/ct.c
@@ -29,7 +29,7 @@ struct nftnl_expr_ct {
 
 static int
 nftnl_expr_ct_set(struct nftnl_expr *e, uint16_t type,
-                      const void *data, uint32_t data_len)
+                 const void *data, uint32_t data_len, uint32_t byteorder)
 {
        struct nftnl_expr_ct *ct = nftnl_expr_data(e);
 

diff --git a/src/expr/dup.c b/src/expr/dup.c
index d49cdb77c1081118457d3f54446a73be9bbc7ab7..bb0f9c6c0be7ebc8ca58dc5a41ce191184c22fe4 100644 (file)
--- a/src/expr/dup.c
+++ b/src/expr/dup.c
@@ -21,8 +21,9 @@ struct nftnl_expr_dup {
        enum nft_registers      sreg_dev;
 };
 
-static int nftnl_expr_dup_set(struct nftnl_expr *e, uint16_t type,
-                             const void *data, uint32_t data_len)
+static int
+nftnl_expr_dup_set(struct nftnl_expr *e, uint16_t type,
+                  const void *data, uint32_t data_len, uint32_t byteorder)
 {
        struct nftnl_expr_dup *dup = nftnl_expr_data(e);
 

diff --git a/src/expr/dynset.c b/src/expr/dynset.c
index dc74fbbe75b3c3106c257ed92dda18f997e2b32e..f513b3736b43c44f298103fda17d087ed4b9d2da 100644 (file)
--- a/src/expr/dynset.c
+++ b/src/expr/dynset.c
@@ -30,7 +30,7 @@ struct nftnl_expr_dynset {
 
 static int
 nftnl_expr_dynset_set(struct nftnl_expr *e, uint16_t type,
-                        const void *data, uint32_t data_len)
+                     const void *data, uint32_t data_len, uint32_t byteorder)
 {
        struct nftnl_expr_dynset *dynset = nftnl_expr_data(e);
        struct nftnl_expr *expr, *next;

diff --git a/src/expr/exthdr.c b/src/expr/exthdr.c
index ddebe43eabf52dfcef0ee14de6c694852afb7d4d..c936ac0928200f2aa00043eda5a232dca3c7751e 100644 (file)
--- a/src/expr/exthdr.c
+++ b/src/expr/exthdr.c
@@ -36,7 +36,7 @@ struct nftnl_expr_exthdr {
 
 static int
 nftnl_expr_exthdr_set(struct nftnl_expr *e, uint16_t type,
-                         const void *data, uint32_t data_len)
+                     const void *data, uint32_t data_len, uint32_t byteorder)
 {
        struct nftnl_expr_exthdr *exthdr = nftnl_expr_data(e);
 

diff --git a/src/expr/fib.c b/src/expr/fib.c
index c378f4f51bb11196a1d0ee171441c50b0bc4402d..31750da05fabef851e99c9e33c32373e0d03f7c1 100644 (file)
--- a/src/expr/fib.c
+++ b/src/expr/fib.c
@@ -25,7 +25,7 @@ struct nftnl_expr_fib {
 
 static int
 nftnl_expr_fib_set(struct nftnl_expr *e, uint16_t result,
-                   const void *data, uint32_t data_len)
+                  const void *data, uint32_t data_len, uint32_t byteorder)
 {
        struct nftnl_expr_fib *fib = nftnl_expr_data(e);
 

diff --git a/src/expr/flow_offload.c b/src/expr/flow_offload.c
index ce22ec419a944326e6b726bc16f0a910c53d82b3..f9a999bd484322bc9638800ec00e756c1c6eae27 100644 (file)
--- a/src/expr/flow_offload.c
+++ b/src/expr/flow_offload.c
@@ -14,8 +14,9 @@ struct nftnl_expr_flow {
        char                    *table_name;
 };
 
-static int nftnl_expr_flow_set(struct nftnl_expr *e, uint16_t type,
-                              const void *data, uint32_t data_len)
+static int
+nftnl_expr_flow_set(struct nftnl_expr *e, uint16_t type,
+                   const void *data, uint32_t data_len, uint32_t byteorder)
 {
        struct nftnl_expr_flow *flow = nftnl_expr_data(e);
 

diff --git a/src/expr/fwd.c b/src/expr/fwd.c
index d543e2239af207047666ad8faeea9f170afec140..5f6a56c7e939ce1c774fc6425f46e6dc28fc9974 100644 (file)
--- a/src/expr/fwd.c
+++ b/src/expr/fwd.c
@@ -22,8 +22,9 @@ struct nftnl_expr_fwd {
        uint32_t                nfproto;
 };
 
-static int nftnl_expr_fwd_set(struct nftnl_expr *e, uint16_t type,
-                                 const void *data, uint32_t data_len)
+static int
+nftnl_expr_fwd_set(struct nftnl_expr *e, uint16_t type,
+                  const void *data, uint32_t data_len, uint32_t byteorder)
 {
        struct nftnl_expr_fwd *fwd = nftnl_expr_data(e);
 

diff --git a/src/expr/hash.c b/src/expr/hash.c
index 050e4b9b1c5993841ec1e0b4d04c65fc54f07807..c0cf8d943ba50172974d17eeb74ccd950ec8f24b 100644 (file)
--- a/src/expr/hash.c
+++ b/src/expr/hash.c
@@ -27,7 +27,7 @@ struct nftnl_expr_hash {
 
 static int
 nftnl_expr_hash_set(struct nftnl_expr *e, uint16_t type,
-                   const void *data, uint32_t data_len)
+                   const void *data, uint32_t data_len, uint32_t byteorder)
 {
        struct nftnl_expr_hash *hash = nftnl_expr_data(e);
        switch (type) {

diff --git a/src/expr/immediate.c b/src/expr/immediate.c
index 6dffaf9ce4ad930dc0968bdff4a61f25758ce503..27ee6003d3f08470d533bf4304f7f8724e352c1e 100644 (file)
--- a/src/expr/immediate.c
+++ b/src/expr/immediate.c
@@ -23,7 +23,7 @@ struct nftnl_expr_immediate {
 
 static int
 nftnl_expr_immediate_set(struct nftnl_expr *e, uint16_t type,
-                           const void *data, uint32_t data_len)
+                        const void *data, uint32_t data_len, uint32_t byteorder)
 {
        struct nftnl_expr_immediate *imm = nftnl_expr_data(e);
 

diff --git a/src/expr/inner.c b/src/expr/inner.c
index 8a56bb336cff52053f4094c9c8f446456e94fb99..516cda62985d8e15da6a86357ce9c0f1512a9d25 100644 (file)
--- a/src/expr/inner.c
+++ b/src/expr/inner.c
@@ -35,7 +35,7 @@ static void nftnl_expr_inner_free(const struct nftnl_expr *e)
 
 static int
 nftnl_expr_inner_set(struct nftnl_expr *e, uint16_t type,
-                    const void *data, uint32_t data_len)
+                    const void *data, uint32_t data_len, uint32_t byteorder)
 {
        struct nftnl_expr_inner *inner = nftnl_expr_data(e);
 

diff --git a/src/expr/last.c b/src/expr/last.c
index 427d4b52a1aec163086c49fbc5e661d7a752667f..ebdaf2a75d40d693687b2fc77f62cafabcc45b14 100644 (file)
--- a/src/expr/last.c
+++ b/src/expr/last.c
@@ -21,8 +21,9 @@ struct nftnl_expr_last {
        uint32_t        set;
 };
 
-static int nftnl_expr_last_set(struct nftnl_expr *e, uint16_t type,
-                               const void *data, uint32_t data_len)
+static int
+nftnl_expr_last_set(struct nftnl_expr *e, uint16_t type,
+                   const void *data, uint32_t data_len, uint32_t byteorder)
 {
        struct nftnl_expr_last *last = nftnl_expr_data(e);
 

diff --git a/src/expr/limit.c b/src/expr/limit.c
index b77b27e024acb0550fc2c7ef6d2ddcba67de02ac..36444975db045a0346785c123914c05cea27a287 100644 (file)
--- a/src/expr/limit.c
+++ b/src/expr/limit.c
@@ -28,7 +28,7 @@ struct nftnl_expr_limit {
 
 static int
 nftnl_expr_limit_set(struct nftnl_expr *e, uint16_t type,
-                      const void *data, uint32_t data_len)
+                    const void *data, uint32_t data_len, uint32_t byteorder)
 {
        struct nftnl_expr_limit *limit = nftnl_expr_data(e);
 

diff --git a/src/expr/log.c b/src/expr/log.c
index ead243799863c6e0774df40164b01561e4c75ee5..f8456bcce4bf191fedf24c2fda7d347e99cc13a2 100644 (file)
--- a/src/expr/log.c
+++ b/src/expr/log.c
@@ -27,8 +27,9 @@ struct nftnl_expr_log {
        const char              *prefix;
 };
 
-static int nftnl_expr_log_set(struct nftnl_expr *e, uint16_t type,
-                                const void *data, uint32_t data_len)
+static int
+nftnl_expr_log_set(struct nftnl_expr *e, uint16_t type,
+                  const void *data, uint32_t data_len, uint32_t byteorder)
 {
        struct nftnl_expr_log *log = nftnl_expr_data(e);
 

diff --git a/src/expr/lookup.c b/src/expr/lookup.c
index 4f76c5b71bb2b4ab9ef2285a570e2ec1c213f4bd..c6a36a68d0b08d351d1ac83f8b9362f291814de3 100644 (file)
--- a/src/expr/lookup.c
+++ b/src/expr/lookup.c
@@ -27,7 +27,7 @@ struct nftnl_expr_lookup {
 
 static int
 nftnl_expr_lookup_set(struct nftnl_expr *e, uint16_t type,
-                         const void *data, uint32_t data_len)
+                     const void *data, uint32_t data_len, uint32_t byteorder)
 {
        struct nftnl_expr_lookup *lookup = nftnl_expr_data(e);
 

diff --git a/src/expr/masq.c b/src/expr/masq.c
index da4f437f136c0472a5630bfbe9da0d0a9f210360..e0d9eb698bf8052a62c7e903c52aa0326ba832c0 100644 (file)
--- a/src/expr/masq.c
+++ b/src/expr/masq.c
@@ -24,7 +24,7 @@ struct nftnl_expr_masq {
 
 static int
 nftnl_expr_masq_set(struct nftnl_expr *e, uint16_t type,
-                      const void *data, uint32_t data_len)
+                   const void *data, uint32_t data_len, uint32_t byteorder)
 {
        struct nftnl_expr_masq *masq = nftnl_expr_data(e);
 

diff --git a/src/expr/match.c b/src/expr/match.c
index 2c5bd6bb74d19da40371de0ffa8a0fcbacff99db..b7e99b8869aff074739158b01eae765b694d4b8e 100644 (file)
--- a/src/expr/match.c
+++ b/src/expr/match.c
@@ -32,7 +32,7 @@ struct nftnl_expr_match {
 
 static int
 nftnl_expr_match_set(struct nftnl_expr *e, uint16_t type,
-                        const void *data, uint32_t data_len)
+                    const void *data, uint32_t data_len, uint32_t byteorder)
 {
        struct nftnl_expr_match *mt = nftnl_expr_data(e);
 

diff --git a/src/expr/meta.c b/src/expr/meta.c
index 7c56fdca08451034f5b4fe83bc777f55ee5d9ca0..753975d988187c34bbdd3b836565362ef05b9782 100644 (file)
--- a/src/expr/meta.c
+++ b/src/expr/meta.c
@@ -29,7 +29,7 @@ struct nftnl_expr_meta {
 
 static int
 nftnl_expr_meta_set(struct nftnl_expr *e, uint16_t type,
-                      const void *data, uint32_t data_len)
+                   const void *data, uint32_t data_len, uint32_t byteorder)
 {
        struct nftnl_expr_meta *meta = nftnl_expr_data(e);
 

diff --git a/src/expr/nat.c b/src/expr/nat.c
index f7e24cb34d515820d1c9d6d820e7144b4da6685d..89e7f15d656c9152e4e0640478b3414f5ae362e5 100644 (file)
--- a/src/expr/nat.c
+++ b/src/expr/nat.c
@@ -32,7 +32,7 @@ struct nftnl_expr_nat {
 
 static int
 nftnl_expr_nat_set(struct nftnl_expr *e, uint16_t type,
-                     const void *data, uint32_t data_len)
+                  const void *data, uint32_t data_len, uint32_t byteorder)
 {
        struct nftnl_expr_nat *nat = nftnl_expr_data(e);
 

diff --git a/src/expr/numgen.c b/src/expr/numgen.c
index e3af37241072056a87e7c082856dcc99ab0cd047..5243d9d996f7f8b9eb84f8f9d1ff53678bf91cfd 100644 (file)
--- a/src/expr/numgen.c
+++ b/src/expr/numgen.c
@@ -24,7 +24,7 @@ struct nftnl_expr_ng {
 
 static int
 nftnl_expr_ng_set(struct nftnl_expr *e, uint16_t type,
-                 const void *data, uint32_t data_len)
+                 const void *data, uint32_t data_len, uint32_t byteorder)
 {
        struct nftnl_expr_ng *ng = nftnl_expr_data(e);
 

diff --git a/src/expr/objref.c b/src/expr/objref.c
index 1b27e94a6fa2c18fb0517fcf882391e81f40b397..481103e7883c09247b21130d0822b05a4bc84b04 100644 (file)
--- a/src/expr/objref.c
+++ b/src/expr/objref.c
@@ -28,8 +28,9 @@ struct nftnl_expr_objref {
        } set;
 };
 
-static int nftnl_expr_objref_set(struct nftnl_expr *e, uint16_t type,
-                                const void *data, uint32_t data_len)
+static int
+nftnl_expr_objref_set(struct nftnl_expr *e, uint16_t type,
+                     const void *data, uint32_t data_len, uint32_t byteorder)
 {
        struct nftnl_expr_objref *objref = nftnl_expr_data(e);
 

diff --git a/src/expr/osf.c b/src/expr/osf.c
index 293a81420a322550e8498a205b01985e48ee3f17..35a31cf13bd0951475e2d10e4d015f42d450c0db 100644 (file)
--- a/src/expr/osf.c
+++ b/src/expr/osf.c
@@ -18,8 +18,9 @@ struct nftnl_expr_osf {
        uint32_t                flags;
 };
 
-static int nftnl_expr_osf_set(struct nftnl_expr *e, uint16_t type,
-                             const void *data, uint32_t data_len)
+static int
+nftnl_expr_osf_set(struct nftnl_expr *e, uint16_t type,
+                  const void *data, uint32_t data_len, uint32_t byteorder)
 {
        struct nftnl_expr_osf *osf = nftnl_expr_data(e);
 

diff --git a/src/expr/payload.c b/src/expr/payload.c
index 593b8422c44e6c393032799fef5a8f1a8535a989..476eaab0afd14f452cc018b019485ab9151bb195 100644 (file)
--- a/src/expr/payload.c
+++ b/src/expr/payload.c
@@ -33,7 +33,7 @@ struct nftnl_expr_payload {
 
 static int
 nftnl_expr_payload_set(struct nftnl_expr *e, uint16_t type,
-                         const void *data, uint32_t data_len)
+                      const void *data, uint32_t data_len, uint32_t byteorder)
 {
        struct nftnl_expr_payload *payload = nftnl_expr_data(e);
 

diff --git a/src/expr/queue.c b/src/expr/queue.c
index 0160d5e25f83612bef500a3bdc60b7512192f257..f5e3f3284de70535800b3e2daaec836467b97350 100644 (file)
--- a/src/expr/queue.c
+++ b/src/expr/queue.c
@@ -22,8 +22,9 @@ struct nftnl_expr_queue {
        uint16_t                flags;
 };
 
-static int nftnl_expr_queue_set(struct nftnl_expr *e, uint16_t type,
-                                   const void *data, uint32_t data_len)
+static int
+nftnl_expr_queue_set(struct nftnl_expr *e, uint16_t type,
+                    const void *data, uint32_t data_len, uint32_t byteorder)
 {
        struct nftnl_expr_queue *queue = nftnl_expr_data(e);
 

diff --git a/src/expr/quota.c b/src/expr/quota.c
index 108c87c04530d9b175f09f8888e3c459d4e7624a..6a8dc948530cbf9388ef036bb5e40f845e71f79e 100644 (file)
--- a/src/expr/quota.c
+++ b/src/expr/quota.c
@@ -22,8 +22,9 @@ struct nftnl_expr_quota {
        uint32_t        flags;
 };
 
-static int nftnl_expr_quota_set(struct nftnl_expr *e, uint16_t type,
-                               const void *data, uint32_t data_len)
+static int
+nftnl_expr_quota_set(struct nftnl_expr *e, uint16_t type,
+                    const void *data, uint32_t data_len, uint32_t byteorder)
 {
        struct nftnl_expr_quota *quota = nftnl_expr_data(e);
 

diff --git a/src/expr/range.c b/src/expr/range.c
index 564d14f0edbbb93a46081e20cc870469232f1c05..cd6d6fbeb4ea21d55d841b599001b5a1d43e5d1a 100644 (file)
--- a/src/expr/range.c
+++ b/src/expr/range.c
@@ -23,8 +23,9 @@ struct nftnl_expr_range {
        enum nft_range_ops      op;
 };
 
-static int nftnl_expr_range_set(struct nftnl_expr *e, uint16_t type,
-                               const void *data, uint32_t data_len)
+static int
+nftnl_expr_range_set(struct nftnl_expr *e, uint16_t type,
+                    const void *data, uint32_t data_len, uint32_t byteorder)
 {
        struct nftnl_expr_range *range = nftnl_expr_data(e);
 

diff --git a/src/expr/redir.c b/src/expr/redir.c
index be38f6257a8f131323e67a3852f37eef3dd4a1dc..3565d3ffa74e9c7576ab3f6209ebf35c05b48e01 100644 (file)
--- a/src/expr/redir.c
+++ b/src/expr/redir.c
@@ -24,7 +24,7 @@ struct nftnl_expr_redir {
 
 static int
 nftnl_expr_redir_set(struct nftnl_expr *e, uint16_t type,
-                       const void *data, uint32_t data_len)
+                    const void *data, uint32_t data_len, uint32_t byteorder)
 {
        struct nftnl_expr_redir *redir = nftnl_expr_data(e);
 

diff --git a/src/expr/reject.c b/src/expr/reject.c
index 5d8763ebb5ef0f8ab7c1be42b08849c09f01c513..df8f92635ca446f2ad0eebcf314f72bc3523e46f 100644 (file)
--- a/src/expr/reject.c
+++ b/src/expr/reject.c
@@ -22,8 +22,9 @@ struct nftnl_expr_reject {
        uint8_t                 icmp_code;
 };
 
-static int nftnl_expr_reject_set(struct nftnl_expr *e, uint16_t type,
-                                   const void *data, uint32_t data_len)
+static int
+nftnl_expr_reject_set(struct nftnl_expr *e, uint16_t type,
+                     const void *data, uint32_t data_len, uint32_t byteorder)
 {
        struct nftnl_expr_reject *reject = nftnl_expr_data(e);
 

diff --git a/src/expr/rt.c b/src/expr/rt.c
index 4f2e96b53cad41474167a5b47d109b41ae322da1..c0d43110eaf8c26de06b4817ef2435c9586f54c8 100644 (file)
--- a/src/expr/rt.c
+++ b/src/expr/rt.c
@@ -22,7 +22,7 @@ struct nftnl_expr_rt {
 
 static int
 nftnl_expr_rt_set(struct nftnl_expr *e, uint16_t type,
-                      const void *data, uint32_t data_len)
+                 const void *data, uint32_t data_len, uint32_t byteorder)
 {
        struct nftnl_expr_rt *rt = nftnl_expr_data(e);
 

diff --git a/src/expr/socket.c b/src/expr/socket.c
index 822ee8b9b832e0a6ab6ec02b132b1dba84feb35b..98a8565024df6957d5d759ed0a028c668bb56dd5 100644 (file)
--- a/src/expr/socket.c
+++ b/src/expr/socket.c
@@ -23,7 +23,7 @@ struct nftnl_expr_socket {
 
 static int
 nftnl_expr_socket_set(struct nftnl_expr *e, uint16_t type,
-                      const void *data, uint32_t data_len)
+                      const void *data, uint32_t data_len, uint32_t byteorder)
 {
        struct nftnl_expr_socket *socket = nftnl_expr_data(e);
 

diff --git a/src/expr/synproxy.c b/src/expr/synproxy.c
index b5a1fef9f406409ed9150262ce7d68d3a16bd00d..ad2f0f0d20305b1cfc0c5b5a5ed284a894ee5486 100644 (file)
--- a/src/expr/synproxy.c
+++ b/src/expr/synproxy.c
@@ -16,8 +16,9 @@ struct nftnl_expr_synproxy {
        uint32_t        flags;
 };
 
-static int nftnl_expr_synproxy_set(struct nftnl_expr *e, uint16_t type,
-                                  const void *data, uint32_t data_len)
+static int
+nftnl_expr_synproxy_set(struct nftnl_expr *e, uint16_t type,
+                       const void *data, uint32_t data_len, uint32_t byteorder)
 {
        struct nftnl_expr_synproxy *synproxy = nftnl_expr_data(e);
 

diff --git a/src/expr/target.c b/src/expr/target.c
index 3549456b430ffde7c9ccf3e7fc29def9e1212bf3..6b590f5a4b767119385962ddc44cc65d9607400c 100644 (file)
--- a/src/expr/target.c
+++ b/src/expr/target.c
@@ -32,7 +32,7 @@ struct nftnl_expr_target {
 
 static int
 nftnl_expr_target_set(struct nftnl_expr *e, uint16_t type,
-                        const void *data, uint32_t data_len)
+                     const void *data, uint32_t data_len, uint32_t byteorder)
 {
        struct nftnl_expr_target *tg = nftnl_expr_data(e);
 

diff --git a/src/expr/tproxy.c b/src/expr/tproxy.c
index 4cc9125f1de65c8f76a0776f04d973353785ff4e..630dffe040c7d57b6d570cda503f9fe8fcba4c97 100644 (file)
--- a/src/expr/tproxy.c
+++ b/src/expr/tproxy.c
@@ -24,7 +24,7 @@ struct nftnl_expr_tproxy {
 
 static int
 nftnl_expr_tproxy_set(struct nftnl_expr *e, uint16_t type,
-                     const void *data, uint32_t data_len)
+                     const void *data, uint32_t data_len, uint32_t byteorder)
 {
        struct nftnl_expr_tproxy *tproxy = nftnl_expr_data(e);
 

diff --git a/src/expr/tunnel.c b/src/expr/tunnel.c
index b51b6c75130869a38974e70c4322ba64ed4927b1..bdfbc290a8872b20570be5859b6955daeb8727b5 100644 (file)
--- a/src/expr/tunnel.c
+++ b/src/expr/tunnel.c
@@ -20,8 +20,9 @@ struct nftnl_expr_tunnel {
        enum nft_registers      dreg;
 };
 
-static int nftnl_expr_tunnel_set(struct nftnl_expr *e, uint16_t type,
-                                const void *data, uint32_t data_len)
+static int
+nftnl_expr_tunnel_set(struct nftnl_expr *e, uint16_t type,
+                     const void *data, uint32_t data_len, uint32_t byteorder)
 {
        struct nftnl_expr_tunnel *tunnel = nftnl_expr_data(e);
 

diff --git a/src/expr/xfrm.c b/src/expr/xfrm.c
index ba2107d63c0822e58d7c130705d7f390c48f41dd..d247b74e01e22c57ca0ea68b2afb4032104fa174 100644 (file)
--- a/src/expr/xfrm.c
+++ b/src/expr/xfrm.c
@@ -22,7 +22,7 @@ struct nftnl_expr_xfrm {
 
 static int
 nftnl_expr_xfrm_set(struct nftnl_expr *e, uint16_t type,
-                   const void *data, uint32_t data_len)
+                   const void *data, uint32_t data_len, uint32_t byteorder)
 {
        struct nftnl_expr_xfrm *x = nftnl_expr_data(e);