diff options
| author | Pascal Quantin <pascal@wireshark.org> | 2021-07-07 16:26:06 +0200 |
|---|---|---|
| committer | Wireshark GitLab Utility <gerald+gitlab-utility@wireshark.org> | 2021-07-07 14:27:58 +0000 |
| commit | 1c3739c36048a2abc285499491c8e02a1bcbd064 (patch) | |
| tree | 7f3078c92a87511436fe2b2385af6eefe9c83fa7 /epan/dissectors/asn1 | |
| parent | c2d77d910dd201afc263bd9fcdb0f4e10862c1b3 (diff) | |
NGAP: fix dissection of gNB/ng-eNB transparent container
Diffstat (limited to 'epan/dissectors/asn1')
| -rw-r--r-- | epan/dissectors/asn1/ngap/ngap.cnf | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/epan/dissectors/asn1/ngap/ngap.cnf b/epan/dissectors/asn1/ngap/ngap.cnf index 6500f87b96..4a69cec075 100644 --- a/epan/dissectors/asn1/ngap/ngap.cnf +++ b/epan/dissectors/asn1/ngap/ngap.cnf @@ -343,11 +343,7 @@ UE-NGAP-IDs/aMF-UE-NGAP-ID ABBREV=AMF_UE_NGAP_ID break; } } else { - if (ngap_dissect_target_ng_ran_container_as == NGAP_NG_RAN_CONTAINER_GNB) { - dissect_ngap_TargetNGRANNode_ToSourceNGRANNode_TransparentContainer_PDU(parameter_tvb, actx->pinfo, subtree, NULL); - } else if (ngap_dissect_target_ng_ran_container_as == NGAP_NG_RAN_CONTAINER_NG_ENB) { - dissect_s1ap_TargeteNB_ToSourceeNB_TransparentContainer_PDU(parameter_tvb, actx->pinfo, subtree, NULL); - } + dissect_ngap_TargetNGRANNode_ToSourceNGRANNode_TransparentContainer_PDU(parameter_tvb, actx->pinfo, subtree, NULL); } /* Enable writing of the column again */ col_set_writable(actx->pinfo->cinfo, COL_INFO, TRUE); @@ -691,10 +687,12 @@ PortNumber TYPE = FT_UINT16 DISPLAY = BASE_DEC proto_tree *subtree; GlobalRANNodeID_enum ranmode_id; - if (ngap_data->transparent_container_type == SOURCE_TO_TARGET_TRANSPARENT_CONTAINER) { - ranmode_id = ngap_get_ranmode_id(&actx->pinfo->dst, actx->pinfo->destport, actx->pinfo); - } else if (ngap_data->transparent_container_type == TARGET_TO_SOURCE_TRANSPARENT_CONTAINER) { - ranmode_id = ngap_get_ranmode_id(&actx->pinfo->src, actx->pinfo->srcport, actx->pinfo); + if (ngap_data->transparent_container_type == SOURCE_TO_TARGET_TRANSPARENT_CONTAINER || + ngap_data->transparent_container_type == TARGET_TO_SOURCE_TRANSPARENT_CONTAINER) { + if (actx->pinfo->destport == gbl_ngapSctpPort) + ranmode_id = ngap_get_ranmode_id(&actx->pinfo->src, actx->pinfo->srcport, actx->pinfo); + else + ranmode_id = ngap_get_ranmode_id(&actx->pinfo->dst, actx->pinfo->destport, actx->pinfo); } else { ranmode_id = (GlobalRANNodeID_enum)-1; } |