diff options
| author | Guy Harris <guy@alum.mit.edu> | 2020-03-31 19:19:59 -0700 |
|---|---|---|
| committer | Guy Harris <gharris@sonic.net> | 2020-04-01 02:21:04 +0000 |
| commit | 9b7a54d86c197af42c7b9a0a7925b42a637acd3c (patch) | |
| tree | 105c4db2e4970f3f996639b0c8c15ee0d14db989 /epan/dissectors/packet-rpcap.c | |
| parent | e2b695ddef18532afd67957debc87eeed60139db (diff) | |
Make the message type values hex.
That's what I'm doing in the rpcap protocol I-D I'm writing, as it makes
it a bit cleaner to do the "uppermost bit means reply" stuff.
Change-Id: Ic6114ff9fe6df5cf6498798281189f1fbe658e60
Reviewed-on: https://code.wireshark.org/review/36647
Reviewed-by: Guy Harris <gharris@sonic.net>
Diffstat (limited to 'epan/dissectors/packet-rpcap.c')
| -rw-r--r-- | epan/dissectors/packet-rpcap.c | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/epan/dissectors/packet-rpcap.c b/epan/dissectors/packet-rpcap.c index 515ef2d5dc..c333552e83 100644 --- a/epan/dissectors/packet-rpcap.c +++ b/epan/dissectors/packet-rpcap.c @@ -30,26 +30,26 @@ #define PSNAME "RPCAP" #define PFNAME "rpcap" -#define RPCAP_MSG_ERROR 1 -#define RPCAP_MSG_FINDALLIF_REQ 2 -#define RPCAP_MSG_OPEN_REQ 3 -#define RPCAP_MSG_STARTCAP_REQ 4 -#define RPCAP_MSG_UPDATEFILTER_REQ 5 -#define RPCAP_MSG_CLOSE 6 -#define RPCAP_MSG_PACKET 7 -#define RPCAP_MSG_AUTH_REQ 8 -#define RPCAP_MSG_STATS_REQ 9 -#define RPCAP_MSG_ENDCAP_REQ 10 -#define RPCAP_MSG_SETSAMPLING_REQ 11 - -#define RPCAP_MSG_FINDALLIF_REPLY (128+RPCAP_MSG_FINDALLIF_REQ) -#define RPCAP_MSG_OPEN_REPLY (128+RPCAP_MSG_OPEN_REQ) -#define RPCAP_MSG_STARTCAP_REPLY (128+RPCAP_MSG_STARTCAP_REQ) -#define RPCAP_MSG_UPDATEFILTER_REPLY (128+RPCAP_MSG_UPDATEFILTER_REQ) -#define RPCAP_MSG_AUTH_REPLY (128+RPCAP_MSG_AUTH_REQ) -#define RPCAP_MSG_STATS_REPLY (128+RPCAP_MSG_STATS_REQ) -#define RPCAP_MSG_ENDCAP_REPLY (128+RPCAP_MSG_ENDCAP_REQ) -#define RPCAP_MSG_SETSAMPLING_REPLY (128+RPCAP_MSG_SETSAMPLING_REQ) +#define RPCAP_MSG_ERROR 0x01 +#define RPCAP_MSG_FINDALLIF_REQ 0x02 +#define RPCAP_MSG_OPEN_REQ 0x03 +#define RPCAP_MSG_STARTCAP_REQ 0x04 +#define RPCAP_MSG_UPDATEFILTER_REQ 0x05 +#define RPCAP_MSG_CLOSE 0x06 +#define RPCAP_MSG_PACKET 0x07 +#define RPCAP_MSG_AUTH_REQ 0x08 +#define RPCAP_MSG_STATS_REQ 0x09 +#define RPCAP_MSG_ENDCAP_REQ 0x0A +#define RPCAP_MSG_SETSAMPLING_REQ 0x0B + +#define RPCAP_MSG_FINDALLIF_REPLY (0x80+RPCAP_MSG_FINDALLIF_REQ) +#define RPCAP_MSG_OPEN_REPLY (0x80+RPCAP_MSG_OPEN_REQ) +#define RPCAP_MSG_STARTCAP_REPLY (0x80+RPCAP_MSG_STARTCAP_REQ) +#define RPCAP_MSG_UPDATEFILTER_REPLY (0x80+RPCAP_MSG_UPDATEFILTER_REQ) +#define RPCAP_MSG_AUTH_REPLY (0x80+RPCAP_MSG_AUTH_REQ) +#define RPCAP_MSG_STATS_REPLY (0x80+RPCAP_MSG_STATS_REQ) +#define RPCAP_MSG_ENDCAP_REPLY (0x80+RPCAP_MSG_ENDCAP_REQ) +#define RPCAP_MSG_SETSAMPLING_REPLY (0x80+RPCAP_MSG_SETSAMPLING_REQ) #define RPCAP_ERR_NETW 1 #define RPCAP_ERR_INITTIMEOUT 2 @@ -942,9 +942,9 @@ dissect_rpcap (tvbuff_t *tvb, packet_info *pinfo, proto_tree *top_tree, void* da offset++; col_append_str (pinfo->cinfo, COL_INFO, - val_to_str (msg_type, message_type, "Unknown: %d")); + val_to_str (msg_type, message_type, "Unknown: 0x%02x")); - proto_item_append_text (ti, ", %s", val_to_str (msg_type, message_type, "Unknown: %d")); + proto_item_append_text (ti, ", %s", val_to_str (msg_type, message_type, "Unknown: 0x%02x")); msg_value = tvb_get_ntohs (tvb, offset); if (msg_type == RPCAP_MSG_ERROR) { @@ -1178,7 +1178,7 @@ proto_register_rpcap (void) { "Version", "rpcap.version", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_type, - { "Message type", "rpcap.type", FT_UINT8, BASE_DEC, + { "Message type", "rpcap.type", FT_UINT8, BASE_HEX, VALS(message_type), 0x0, NULL, HFILL } }, { &hf_value, { "Message value", "rpcap.value", FT_UINT16, BASE_DEC, |