diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2016-12-30 09:48:25 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-12-30 10:18:20 +0000 |
| commit | 5c356aaa836f5df60a96d49c8fe1a8dda592436c (patch) | |
| tree | e03037369f836a56f05e2f0ddff2ac9427c65c6a /epan/dissectors/packet-enc.c | |
| parent | b4afbb24a5e094dc1eb1c10ac81a383c42bf3e93 (diff) | |
enc (openBSD): Add reserved/unused field for flags
and fix also bitmap (32 bits)
Change-Id: I04b7cb64bf7d593648131c09d05eb8e9b1eca8ca
Reviewed-on: https://code.wireshark.org/review/19471
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-enc.c')
| -rw-r--r-- | epan/dissectors/packet-enc.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/epan/dissectors/packet-enc.c b/epan/dissectors/packet-enc.c index 70861bd596..9cbde0e42d 100644 --- a/epan/dissectors/packet-enc.c +++ b/epan/dissectors/packet-enc.c @@ -42,10 +42,12 @@ struct enchdr { }; #define BSD_ENC_HDRLEN 12 -#define BSD_ENC_M_CONF 0x0400 /* payload encrypted */ -#define BSD_ENC_M_AUTH 0x0800 /* payload authenticated */ -#define BSD_ENC_M_COMP 0x1000 /* payload compressed */ -#define BSD_ENC_M_AUTH_AH 0x2000 /* header authenticated */ +#define BSD_ENC_M_CONF 0x00000400 /* payload encrypted */ +#define BSD_ENC_M_AUTH 0x00000800 /* payload authenticated */ +#define BSD_ENC_M_COMP 0x00001000 /* payload compressed */ +#define BSD_ENC_M_AUTH_AH 0x00002000 /* header authenticated */ + +#define BSD_ENC_M_RESERVED 0xFFFFC3FF /* Reserved/unused flags */ static dissector_table_t enc_dissector_table; @@ -58,6 +60,7 @@ static int hf_enc_flags_payload_enc = -1; static int hf_enc_flags_payload_auth = -1; static int hf_enc_flags_payload_compress = -1; static int hf_enc_flags_header_auth = -1; +static int hf_enc_flags_reserved = -1; static gint ett_enc = -1; static gint ett_enc_flag = -1; @@ -93,6 +96,7 @@ dissect_enc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) &hf_enc_flags_payload_auth, &hf_enc_flags_payload_compress, &hf_enc_flags_header_auth, + &hf_enc_flags_reserved, NULL }; @@ -147,6 +151,9 @@ proto_register_enc(void) { &hf_enc_flags_header_auth, { "Header authenticated", "enc.flags.header_auth", FT_BOOLEAN, 32, NULL, BSD_ENC_M_AUTH_AH, NULL, HFILL }}, + { &hf_enc_flags_reserved, + { "Reserved", "enc.flags.reserved", FT_UINT32, BASE_HEX, NULL, BSD_ENC_M_RESERVED, + NULL, HFILL }}, }; static gint *ett[] = { |