diff options
author | Jaap Keuter <jaap.keuter@xs4all.nl> | 2017-04-18 23:42:33 +0200 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2017-04-19 01:04:36 +0000 |
commit | fe003f1321ba1aec5a66859ca60352f33019ca50 (patch) | |
tree | ac4e5feb87d1c6982ca374894593a761704b2a59 /epan/dissectors/packet-mka.c | |
parent | 111973c294a575ca201f955c5775dd0be1023467 (diff) |
EAPOL-MKA: differentiate between actor and peers
Actor member identifier and message numbers are something else than peer
member identifiers and message numbers. Give them their own header
field.
Change-Id: I9ee0073447f861084e81ab2e23cf587005184686
Reviewed-on: https://code.wireshark.org/review/21208
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/dissectors/packet-mka.c')
-rw-r--r-- | epan/dissectors/packet-mka.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/epan/dissectors/packet-mka.c b/epan/dissectors/packet-mka.c index aea9f42ef0..c7b675e02d 100644 --- a/epan/dissectors/packet-mka.c +++ b/epan/dissectors/packet-mka.c @@ -69,6 +69,9 @@ static int hf_mka_cak_name = -1; static int hf_mka_padding = -1; +static int hf_mka_peer_mi = -1; +static int hf_mka_peer_mn = -1; + static int hf_mka_latest_key_an = -1; static int hf_mka_latest_key_tx = -1; static int hf_mka_latest_key_rx = -1; @@ -253,11 +256,11 @@ dissect_peer_list(proto_tree *mka_tree, packet_info *pinfo, tvbuff_t *tvb, int * offset += 2; while (peer_list_len >= 16) { - proto_tree_add_item(peer_list_set_tree, hf_mka_actor_mi, + proto_tree_add_item(peer_list_set_tree, hf_mka_peer_mi, tvb, offset, 12, ENC_NA); offset += 12; - proto_tree_add_item(peer_list_set_tree, hf_mka_actor_mn, + proto_tree_add_item(peer_list_set_tree, hf_mka_peer_mn, tvb, offset, 4, ENC_NA); offset += 4; @@ -825,6 +828,16 @@ proto_register_mka(void) FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_mka_peer_mi, { + "Peer Member Identifier", "mka.peer_mi", + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL }}, + + { &hf_mka_peer_mn, { + "Peer Message Number", "mka.peer_mn", + FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL }}, + { &hf_mka_latest_key_an, { "Latest Key AN", "mka.latest_key_an", FT_UINT8, BASE_DEC, NULL, 0xc0, |