diff options
| author | Fernando Fernandez Mancera <ffmancera@riseup.net> | 2019-05-24 15:06:47 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2019-05-24 21:29:54 +0200 |
| commit | f1e8a129ee428419a0d5a45a2f410e8e4008d109 (patch) | |
| tree | 7216ec99ab5873ca6706c766a04b4d0209efef90 /src/datatype.c | |
| parent | 4b0f2a712b5792d2842d89fe68d4230e0eb05c7e (diff) | |
src: Introduce chain_expr in jump and goto statements
Introduce expressions as a chain in jump and goto statements.
This is going to be used to support variables as a chain in the
following patches.
Signed-off-by: Fernando Fernandez Mancera <ffmancera@riseup.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/datatype.c')
| -rw-r--r-- | src/datatype.c | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/src/datatype.c b/src/datatype.c index ac9f2af1..10f185bc 100644 --- a/src/datatype.c +++ b/src/datatype.c @@ -254,6 +254,8 @@ const struct datatype invalid_type = { static void verdict_type_print(const struct expr *expr, struct output_ctx *octx) { + char chain[NFT_CHAIN_MAXNAMELEN]; + switch (expr->verdict) { case NFT_CONTINUE: nft_print(octx, "continue"); @@ -262,10 +264,26 @@ static void verdict_type_print(const struct expr *expr, struct output_ctx *octx) nft_print(octx, "break"); break; case NFT_JUMP: - nft_print(octx, "jump %s", expr->chain); + if (expr->chain->etype == EXPR_VALUE) { + mpz_export_data(chain, expr->chain->value, + BYTEORDER_HOST_ENDIAN, + NFT_CHAIN_MAXNAMELEN); + nft_print(octx, "jump %s", chain); + } else { + nft_print(octx, "jump "); + expr_print(expr->chain, octx); + } break; case NFT_GOTO: - nft_print(octx, "goto %s", expr->chain); + if (expr->chain->etype == EXPR_VALUE) { + mpz_export_data(chain, expr->chain->value, + BYTEORDER_HOST_ENDIAN, + NFT_CHAIN_MAXNAMELEN); + nft_print(octx, "goto %s", chain); + } else { + nft_print(octx, "goto "); + expr_print(expr->chain, octx); + } break; case NFT_RETURN: nft_print(octx, "return"); |