diff options
| author | Michael Mann <mmann78@netscape.net> | 2017-10-09 15:45:43 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-10-10 11:19:19 +0000 |
| commit | 698aa24165d0a51b06117d6d9133c04839fbe40e (patch) | |
| tree | 7807377cef63ab4d77e0794e7ca4a73de2fe19f6 /epan/proto.h | |
| parent | 6b466a9e4fccae694c2ae6607ad5c5b28dfff303 (diff) | |
Change FI_VARINT to account for FI_BITS_XXX flags
FI_BITS_XXX were using bits 5-15 of the field_info->flags bitmask.
Move FI_VARINT to be outside of that range.
Change-Id: I92efcb5644cdbb562537d2813b611e583315874b
Reviewed-on: https://code.wireshark.org/review/23871
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/proto.h')
| -rw-r--r-- | epan/proto.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/proto.h b/epan/proto.h index 6df43936d8..163bbca51b 100644 --- a/epan/proto.h +++ b/epan/proto.h @@ -730,13 +730,13 @@ typedef struct #define FI_LITTLE_ENDIAN 0x00000008 /** The protocol field value is in big endian */ #define FI_BIG_ENDIAN 0x00000010 -/** The protocol field value is a varint */ -#define FI_VARINT 0x00000020 /** Field value start from nth bit (values from 0x20 - 0x100) */ #define FI_BITS_OFFSET(n) (((n) & 7) << 5) /** Field value takes n bits (values from 0x100 - 0x4000) */ /* if 0, it means that field takes fi->length * 8 */ #define FI_BITS_SIZE(n) (((n) & 63) << 8) +/** The protocol field value is a varint */ +#define FI_VARINT 0x00004000 /** convenience macro to get field_info.flags */ #define FI_GET_FLAG(fi, flag) ((fi) ? ((fi)->flags & (flag)) : 0) |