diff options
| author | Jeremy Martin <boardermartin@gmail.com> | 2018-10-31 09:18:11 -0700 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-11-01 06:25:31 +0000 |
| commit | 0457e6041942776ecff9d4377fc0ce5a340dbb7a (patch) | |
| tree | f2561ed0340b7ea3acbc76fe94fe8958279000bd /epan/proto.h | |
| parent | 8b977a43d68d8fd9c2c7e7b8ccc0711df13c64ee (diff) | |
FT_BYTES: fix dissection of FT_BYTES when using SEP_SPACE and "NONE" options
SEP_SPACE and BASE_NONE both default to colon (:). Fix SEP_SPACE and add SEP_NONE
Bug: 15253
Change-Id: Ib5db997714414370b08ffb9458c73d4aeef6aacf
Reviewed-on: https://code.wireshark.org/review/30447
Reviewed-by: Jeremy Martin <boardermartin@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/proto.h')
| -rw-r--r-- | epan/proto.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/epan/proto.h b/epan/proto.h index d972189393..f4b237913b 100644 --- a/epan/proto.h +++ b/epan/proto.h @@ -583,18 +583,19 @@ typedef enum { SEP_DASH = 9, /**< hexadecimal bytes with a dash (-) between each byte */ SEP_COLON = 10, /**< hexadecimal bytes with a colon (:) between each byte */ SEP_SPACE = 11, /**< hexadecimal bytes with a space between each byte */ + SEP_NONE = 12, /**< hexadecimal bytes with no separator between each byte */ /* Address types */ - BASE_NETMASK = 12, /**< Used for IPv4 address that shouldn't be resolved (like for netmasks) */ + BASE_NETMASK = 13, /**< Used for IPv4 address that shouldn't be resolved (like for netmasks) */ /* Port types */ - BASE_PT_UDP = 13, /**< UDP port */ - BASE_PT_TCP = 14, /**< TCP port */ - BASE_PT_DCCP = 15, /**< DCCP port */ - BASE_PT_SCTP = 16, /**< SCTP port */ + BASE_PT_UDP = 14, /**< UDP port */ + BASE_PT_TCP = 15, /**< TCP port */ + BASE_PT_DCCP = 16, /**< DCCP port */ + BASE_PT_SCTP = 17, /**< SCTP port */ /* OUI types */ - BASE_OUI = 17 /**< OUI resolution */ + BASE_OUI = 18 /**< OUI resolution */ } field_display_e; |