diff options
| author | Patrick McHardy <kaber@trash.net> | 2014-01-08 13:02:15 +0000 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2014-01-08 13:02:15 +0000 |
| commit | bc3656ad1e5b5812f916e9c9356785c06ce90936 (patch) | |
| tree | 17dd06f6d317f1cf6657452a12a2c7ceb98fe65f /include | |
| parent | 079041bd477f444d29e02c6442351c0ed6ffaa1e (diff) | |
expr: replace PAYLOAD_PROTOCOL_EXPR by generic flag
Introduce a generic flag to indicate that an expression describes the
upper layer protocol as replacement for the payload specific flag.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/expression.h | 5 | ||||
| -rw-r--r-- | include/payload.h | 9 |
2 files changed, 3 insertions, 11 deletions
diff --git a/include/expression.h b/include/expression.h index f0eb7993..d8f28682 100644 --- a/include/expression.h +++ b/include/expression.h @@ -135,12 +135,14 @@ struct expr_ops { * * @EXPR_F_CONSTANT: constant expression * @EXPR_F_SINGLETON: singleton (implies primary and constant) + * @EXPR_F_PROTOCOL: expressions describes upper layer protocol * @EXPR_F_INTERVAL_END: set member ends an open interval */ enum expr_flags { EXPR_F_CONSTANT = 0x1, EXPR_F_SINGLETON = 0x2, - EXPR_F_INTERVAL_END = 0x4, + EXPR_F_PROTOCOL = 0x4, + EXPR_F_INTERVAL_END = 0x8, }; #include <payload.h> @@ -227,7 +229,6 @@ struct expr { const struct payload_template *tmpl; enum payload_bases base; unsigned int offset; - unsigned int flags; } payload; struct { /* EXPR_EXTHDR */ diff --git a/include/payload.h b/include/payload.h index c9cc84f3..fa8d82e1 100644 --- a/include/payload.h +++ b/include/payload.h @@ -21,15 +21,6 @@ enum payload_bases { #define PAYLOAD_BASE_MAX (__PAYLOAD_BASE_MAX - 1) /** - * enum payload_expr_flags - * - * @PAYLOAD_PROTOCOL_EXPR: payload expression contains upper layer protocol - */ -enum payload_expr_flags { - PAYLOAD_PROTOCOL_EXPR = 0x1, -}; - -/** * struct payload_template - template for a payload header expression * * @token: parser token describing the header field |