diff options
| author | Alexander Clouter <aclouter@networkradius.com> | 2022-08-30 10:39:58 +0100 |
|---|---|---|
| committer | A Wireshark GitLab Utility <gerald+gitlab-utility@wireshark.org> | 2022-08-30 19:36:33 +0000 |
| commit | bed5b0e02521e93f94b7ddf475ae9067b934dc71 (patch) | |
| tree | f3ec7f88a1c6170b58744b09e7c42ea5f34eba0d | |
| parent | 940010336e9f66232f7b3d2b6677238c316dde39 (diff) | |
EAP: TEAP support for sub-TLVs in TLVs
| -rw-r--r-- | epan/dissectors/packet-teap.c | 38 |
1 files changed, 34 insertions, 4 deletions
diff --git a/epan/dissectors/packet-teap.c b/epan/dissectors/packet-teap.c index fd446149ed..ac24f8cfde 100644 --- a/epan/dissectors/packet-teap.c +++ b/epan/dissectors/packet-teap.c @@ -250,6 +250,9 @@ static int hf_pac_attr_pac_type = -1; static int hf_pac_attr_val = -1; static int +dissect_teap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_); + +static int dissect_teap_tlv_pac(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, guint16 len); static int @@ -387,6 +390,12 @@ dissect_teap_tlv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset offset += 4; proto_tree_add_item(tlv_tree, hf_teap_nak_type, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; + + if (len > 6) { + next_tvb = tvb_new_subset_length(tvb, offset, len - 6); + offset += dissect_teap(next_tvb, pinfo, tlv_tree, NULL); + } + break; case TEAP_ERROR: @@ -404,17 +413,38 @@ dissect_teap_tlv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset offset += 1; proto_tree_add_item(tlv_tree, hf_teap_request_action_action, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; + + if (len > 2) { + next_tvb = tvb_new_subset_length(tvb, offset, len - 2); + offset += dissect_teap(next_tvb, pinfo, tlv_tree, NULL); + } + break; case TEAP_EAP_PAYLOAD: - next_tvb = tvb_new_subset_length(tvb, offset, len); + { + guint16 eaplen = tvb_get_guint16(tvb, offset + 2, ENC_BIG_ENDIAN); + + next_tvb = tvb_new_subset_length(tvb, offset, eaplen); call_dissector(eap_handle, next_tvb, pinfo, tlv_tree); - offset += len; - break; + offset += eaplen; + + if (len > eaplen) { + next_tvb = tvb_new_subset_length(tvb, offset, len - eaplen); + offset += dissect_teap(next_tvb, pinfo, tlv_tree, NULL); + } + } + break; case TEAP_INTERMEDIATE_RESULT: proto_tree_add_item(tlv_tree, hf_teap_status, tvb, offset, 2, ENC_BIG_ENDIAN); - offset += len; + offset += 2; + + if (len > 2) { + next_tvb = tvb_new_subset_length(tvb, offset, len - 2); + offset += dissect_teap(next_tvb, pinfo, tlv_tree, NULL); + } + break; case TEAP_PAC: |