From 758f8bd61bcad7809d776881bc1f8de0b2fab2e2 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Tue, 11 Sep 2018 22:14:25 +0200 Subject: json: Make inet_service_type_json() respect literal level This brings inet_service_type_json() on par with inet_service_type_print(). Despite datatype_print()'s ability to use the 'print' callback, a dedicated 'json' callback is required to make port numbers appear as numbers in JSON output instead of strings. Therefore go with a bit of code duplication here. Signed-off-by: Phil Sutter Signed-off-by: Florian Westphal --- src/json.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/json.c b/src/json.c index bb1d0f2d..c0fc4226 100644 --- a/src/json.c +++ b/src/json.c @@ -857,7 +857,23 @@ json_t *inet_protocol_type_json(const struct expr *expr, json_t *inet_service_type_json(const struct expr *expr, struct output_ctx *octx) { - return json_integer(ntohs(mpz_get_be16(expr->value))); + struct sockaddr_in sin = { + .sin_family = AF_INET, + .sin_port = mpz_get_be16(expr->value), + }; + char buf[NI_MAXSERV]; + + if (octx->literal < NFT_LITERAL_PORT || + getnameinfo((struct sockaddr *)&sin, sizeof(sin), + NULL, 0, buf, sizeof(buf), 0)) + return json_integer(ntohs(sin.sin_port)); + + if (htons(atoi(buf)) == sin.sin_port || + getnameinfo((struct sockaddr *)&sin, sizeof(sin), + NULL, 0, buf, sizeof(buf), NI_DGRAM)) + return json_integer(ntohs(sin.sin_port)); + + return json_string(buf); } json_t *mark_type_json(const struct expr *expr, struct output_ctx *octx) -- cgit v1.2.3