diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2007-09-26 08:38:43 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2007-09-26 08:38:43 +0000 |
| commit | 8625cb79388d45378149cb63af33dc76bacf7d13 (patch) | |
| tree | 6622bae938fa2a3e945b8e7ae16ecb40d17cf259 /epan | |
| parent | ec3d698c56832c0cf1ec2fea4f364164f9c267e3 (diff) | |
Decode role on shared link
svn path=/trunk/; revision=22985
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-extreme.c | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/epan/dissectors/packet-extreme.c b/epan/dissectors/packet-extreme.c index 89a426244d..aaf9bcf356 100644 --- a/epan/dissectors/packet-extreme.c +++ b/epan/dissectors/packet-extreme.c @@ -231,6 +231,7 @@ static int hf_edp_eaps2_reserved0 = -1; static int hf_edp_eaps2_sysmac = -1; static int hf_edp_eaps2_reserved1 = -1; static int hf_edp_eaps2_reserved2 = -1; +static int hf_edp_eaps2_linkrole = -1; static int hf_edp_eaps2_linkid1 = -1; static int hf_edp_eaps2_failed1 = -1; static int hf_edp_eaps2_failed2 = -1; @@ -347,6 +348,13 @@ static const value_string eaps_state_vals[] = { { 0, NULL } }; +static const value_string eaps2_role_vals[] = { + { 1, "Controller" }, + { 2, "Partner" }, + + { 0, NULL } +}; + static const value_string elsm_type_vals[] = { { 0x01, "Hello" }, @@ -765,7 +773,7 @@ dissect_eaps2_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, pro offset += 1; length -= 1; - proto_tree_add_item(eaps2_tree, hf_edp_eaps_ctrlvlanid, tvb, offset, 2, + proto_tree_add_item(eaps2_tree, hf_edp_eaps2_ctrlvlanid, tvb, offset, 2, FALSE); offset += 2; length -= 2; @@ -785,10 +793,15 @@ dissect_eaps2_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, pro offset += 4; length -= 4; - proto_tree_add_item(eaps2_tree, hf_edp_eaps2_reserved2, tvb, offset, 2, + proto_tree_add_item(eaps2_tree, hf_edp_eaps2_reserved2, tvb, offset, 1, FALSE); - offset += 2; - length -= 2; + offset += 1; + length -= 1; + + proto_tree_add_item(eaps2_tree, hf_edp_eaps2_linkrole, tvb, offset, 1, + FALSE); + offset += 1; + length -= 1; proto_tree_add_item(eaps2_tree, hf_edp_eaps2_linkid1, tvb, offset, 2, FALSE); @@ -1357,6 +1370,10 @@ proto_register_edp(void) { "Reserved2", "edp.eaps2.reserved2", FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL }}, + { &hf_edp_eaps2_linkrole, + { "Role", "edp.eaps2.role", FT_UINT8, BASE_DEC, VALS(eaps2_role_vals), + 0x0, "", HFILL }}, + { &hf_edp_eaps2_linkid1, { "Link ID 1", "edp.eaps2.linkid1", FT_UINT16, BASE_DEC, NULL, 0x0, "Shared link ID 1", HFILL }}, |