We currently print 'unknown' rather than the raw offset values for unrecognized header values.
If its unknown, prefer to print payload @nh,0,16 set payload @nh,0,16 rather than 'unknown'. Also add a helper to check if payload expression has a description assigned to it. Signed-off-by: Florian Westphal <[email protected]> --- include/payload.h | 1 + src/payload.c | 14 +++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/include/payload.h b/include/payload.h index 37375c1..bda3188 100644 --- a/include/payload.h +++ b/include/payload.h @@ -31,6 +31,7 @@ struct payload_dep_ctx { struct stmt *prev; }; +extern bool payload_is_known(const struct expr *expr); extern bool payload_is_stacked(const struct proto_desc *desc, const struct expr *expr); extern void payload_dependency_store(struct payload_dep_ctx *ctx, diff --git a/src/payload.c b/src/payload.c index 9ba980a..af533b2 100644 --- a/src/payload.c +++ b/src/payload.c @@ -26,6 +26,18 @@ #include <gmputil.h> #include <utils.h> +bool payload_is_known(const struct expr *expr) +{ + const struct proto_hdr_template *tmpl; + const struct proto_desc *desc; + + desc = expr->payload.desc; + tmpl = expr->payload.tmpl; + + return desc && tmpl && desc != &proto_unknown && + tmpl != &proto_unknown_template; +} + static void payload_expr_print(const struct expr *expr) { const struct proto_desc *desc; @@ -33,7 +45,7 @@ static void payload_expr_print(const struct expr *expr) desc = expr->payload.desc; tmpl = expr->payload.tmpl; - if (desc != NULL && tmpl != NULL) + if (payload_is_known(expr)) printf("%s %s", desc->name, tmpl->token); else printf("payload @%s,%u,%u", -- 2.7.3 -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
