From f1e8a129ee428419a0d5a45a2f410e8e4008d109 Mon Sep 17 00:00:00 2001 From: Fernando Fernandez Mancera Date: Fri, 24 May 2019 15:06:47 +0200 Subject: 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 Signed-off-by: Pablo Neira Ayuso --- src/datatype.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) (limited to 'src/datatype.c') 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"); -- cgit v1.2.3