diff options
Diffstat (limited to 'src/expr')
| -rw-r--r-- | src/expr/bitwise.c | 6 | ||||
| -rw-r--r-- | src/expr/cmp.c | 2 | ||||
| -rw-r--r-- | src/expr/data_reg.c | 4 | ||||
| -rw-r--r-- | src/expr/immediate.c | 2 | ||||
| -rw-r--r-- | src/expr/range.c | 6 |
5 files changed, 12 insertions, 8 deletions
diff --git a/src/expr/bitwise.c b/src/expr/bitwise.c index da2b6d2..a775285 100644 --- a/src/expr/bitwise.c +++ b/src/expr/bitwise.c @@ -51,11 +51,11 @@ nftnl_expr_bitwise_set(struct nftnl_expr *e, uint16_t type, memcpy(&bitwise->len, data, data_len); break; case NFTNL_EXPR_BITWISE_MASK: - return nftnl_data_cpy(&bitwise->mask, data, data_len); + return nftnl_data_cpy(&bitwise->mask, data, data_len, byteorder); case NFTNL_EXPR_BITWISE_XOR: - return nftnl_data_cpy(&bitwise->xor, data, data_len); + return nftnl_data_cpy(&bitwise->xor, data, data_len, byteorder); case NFTNL_EXPR_BITWISE_DATA: - return nftnl_data_cpy(&bitwise->data, data, data_len); + return nftnl_data_cpy(&bitwise->data, data, data_len, byteorder); } return 0; } diff --git a/src/expr/cmp.c b/src/expr/cmp.c index 4bcf2e4..c88e06a 100644 --- a/src/expr/cmp.c +++ b/src/expr/cmp.c @@ -38,7 +38,7 @@ nftnl_expr_cmp_set(struct nftnl_expr *e, uint16_t type, memcpy(&cmp->op, data, data_len); break; case NFTNL_EXPR_CMP_DATA: - return nftnl_data_cpy(&cmp->data, data, data_len); + return nftnl_data_cpy(&cmp->data, data, data_len, byteorder); } return 0; } diff --git a/src/expr/data_reg.c b/src/expr/data_reg.c index bf4153c..45f2d94 100644 --- a/src/expr/data_reg.c +++ b/src/expr/data_reg.c @@ -201,7 +201,8 @@ int nftnl_parse_data(union nftnl_data_reg *data, struct nlattr *attr, int *type) return ret; } -int nftnl_data_cpy(union nftnl_data_reg *dreg, const void *src, uint32_t len) +int nftnl_data_cpy(union nftnl_data_reg *dreg, const void *src, + uint32_t len, uint32_t byteorder) { int ret = 0; @@ -212,5 +213,6 @@ int nftnl_data_cpy(union nftnl_data_reg *dreg, const void *src, uint32_t len) memcpy(dreg->val, src, len); dreg->len = len; + dreg->byteorder = byteorder; return ret; } diff --git a/src/expr/immediate.c b/src/expr/immediate.c index 27ee600..f27b6e6 100644 --- a/src/expr/immediate.c +++ b/src/expr/immediate.c @@ -32,7 +32,7 @@ nftnl_expr_immediate_set(struct nftnl_expr *e, uint16_t type, memcpy(&imm->dreg, data, data_len); break; case NFTNL_EXPR_IMM_DATA: - return nftnl_data_cpy(&imm->data, data, data_len); + return nftnl_data_cpy(&imm->data, data, data_len, byteorder); case NFTNL_EXPR_IMM_VERDICT: memcpy(&imm->data.verdict, data, data_len); break; diff --git a/src/expr/range.c b/src/expr/range.c index cd6d6fb..4b3101e 100644 --- a/src/expr/range.c +++ b/src/expr/range.c @@ -37,9 +37,11 @@ nftnl_expr_range_set(struct nftnl_expr *e, uint16_t type, memcpy(&range->op, data, data_len); break; case NFTNL_EXPR_RANGE_FROM_DATA: - return nftnl_data_cpy(&range->data_from, data, data_len); + return nftnl_data_cpy(&range->data_from, data, + data_len, byteorder); case NFTNL_EXPR_RANGE_TO_DATA: - return nftnl_data_cpy(&range->data_to, data, data_len); + return nftnl_data_cpy(&range->data_to, data, + data_len, byteorder); } return 0; } |