diff options
| author | João Valverde <j@v6e.pt> | 2021-10-14 20:27:32 +0100 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2021-10-14 23:24:57 +0100 |
| commit | 1ace61074eddd2984611924517691c2007b1f1e8 (patch) | |
| tree | 302d0ac4acedc024f0cb665623cdff75f372e8cf | |
| parent | 46f27973cacbe3fabb8fe7bd6c18aafaa6dc629b (diff) | |
dfilter: Display token value for debugging
| -rw-r--r-- | epan/dfilter/dfilter.c | 9 | ||||
| -rw-r--r-- | epan/dfilter/syntax-tree.c | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/epan/dfilter/dfilter.c b/epan/dfilter/dfilter.c index 1c47caa5a6..2741001905 100644 --- a/epan/dfilter/dfilter.c +++ b/epan/dfilter/dfilter.c @@ -374,6 +374,9 @@ dfilter_compile(const gchar *text, dfilter_t **dfp, gchar **err_msg) yyscan_t scanner; YY_BUFFER_STATE in_buffer; gboolean failure = FALSE; +#ifndef WS_DISABLE_DEBUG + unsigned token_count = 0; +#endif ws_assert(dfp); @@ -424,7 +427,11 @@ dfilter_compile(const gchar *text, dfilter_t **dfp, gchar **err_msg) break; } - ws_debug("Token: %d %s", token, tokenstr(token)); + ws_log_full(LOG_DOMAIN_DFILTER, LOG_LEVEL_DEBUG, + NULL, -1, __func__, + "(%u) Token %d %s %s", + ++token_count, token, tokenstr(token), + stnode_token_value(df_lval)); /* Give the token to the parser */ Dfilter(ParserObj, token, df_lval, dfw); diff --git a/epan/dfilter/syntax-tree.c b/epan/dfilter/syntax-tree.c index 398799eef7..a2de3daaeb 100644 --- a/epan/dfilter/syntax-tree.c +++ b/epan/dfilter/syntax-tree.c @@ -239,7 +239,7 @@ stnode_token_value(stnode_t *node) if (node->token_value) { return node->token_value; } - return "<unknown token>"; + return "<null token value>"; } gboolean |