diff options
| author | João Valverde <j@v6e.pt> | 2021-10-09 16:40:08 +0100 |
|---|---|---|
| committer | Wireshark GitLab Utility <gerald+gitlab-utility@wireshark.org> | 2021-10-17 22:53:36 +0000 |
| commit | a975d478badf9e3cf1e5faa894197eb27b26fc41 (patch) | |
| tree | 3af83c1fefaa1440ba96c868dbffe54c79f885c5 /wsutil | |
| parent | 4e5e8066044f830407678c60b6b8b1c5aa21873b (diff) | |
dfilter: Require double-quoted strings with "matches"
Matches is a special case that looks on the RHS and tries
to convert every unparsed value to a string, regardless
of the LHS type. This is not how types work in the display
filter. Require double-quotes to avoid ambiguity, because
matches doesn't follow normal Wireshark display filter
type rules. It doesn't need nor benefit from the flexibility
provided by unparsed strings in the syntax.
For matches the RHS is always a literal strings except
if the RHS is also a field name, then it complains of an
incompatible type. This is confusing. No type can be compatible
because no type rules are ever considered. Every unparsed value is
a text string except if it happens to coincide with a field
name it also requires double-quoting or it throws a syntax error,
just to be difficult. We could remove this odd quirk but requiring
double-quotes for regular expressions is a better, more elegant
fix.
Before:
Filter: tcp matches "udp"
Constants:
00000 PUT_PCRE udp -> reg#1
Instructions:
00000 READ_TREE tcp -> reg#0
00001 IF-FALSE-GOTO 3
00002 ANY_MATCHES reg#0 matches reg#1
00003 RETURN
Filter: tcp matches udp
Constants:
00000 PUT_PCRE udp -> reg#1
Instructions:
00000 READ_TREE tcp -> reg#0
00001 IF-FALSE-GOTO 3
00002 ANY_MATCHES reg#0 matches reg#1
00003 RETURN
Filter: tcp matches udp.srcport
dftest: tcp and udp.srcport are not of compatible types.
Filter: tcp matches udp.srcportt
Constants:
00000 PUT_PCRE udp.srcportt -> reg#1
Instructions:
00000 READ_TREE tcp -> reg#0
00001 IF-FALSE-GOTO 3
00002 ANY_MATCHES reg#0 matches reg#1
00003 RETURN
After:
Filter: tcp matches "udp"
Constants:
00000 PUT_PCRE udp -> reg#1
Instructions:
00000 READ_TREE tcp -> reg#0
00001 IF-FALSE-GOTO 3
00002 ANY_MATCHES reg#0 matches reg#1
00003 RETURN
Filter: tcp matches udp
dftest: "udp" was unexpected in this context.
Filter: tcp matches udp.srcport
dftest: "udp.srcport" was unexpected in this context.
Filter: tcp matches udp.srcportt
dftest: "udp.srcportt" was unexpected in this context.
The error message could still be improved.
Diffstat (limited to 'wsutil')
| -rw-r--r-- | wsutil/ws_assert.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/wsutil/ws_assert.h b/wsutil/ws_assert.h index e2727b589c..90e4647279 100644 --- a/wsutil/ws_assert.h +++ b/wsutil/ws_assert.h @@ -13,6 +13,7 @@ #include <ws_symbol_export.h> #include <ws_attributes.h> #include <stdbool.h> +#include <string.h> #ifdef WS_LOG_DOMAIN #define _ASSERT_DOMAIN WS_LOG_DOMAIN @@ -58,6 +59,9 @@ void ws_assert_failed(const char *file, int line, const char *function, #define ws_assert(expr) ws_abort_if_fail(expr) #endif +#define ws_assert_streq(s1, s2) \ + ws_assert((s1) && (s2) && strcmp((s1), (s2)) == 0) + /* * We don't want to disable ws_assert_not_reached() with WS_DISABLE_ASSERT. * That would blast compiler warnings everywhere for no benefit, not |