diff options
| author | Pavel Strnad <pavel_strnad@hotmail.com> | 2017-04-27 13:40:26 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2017-04-27 13:33:34 +0000 |
| commit | 8d72865eb9dba3acb27d1f115d3816971e8c2bf4 (patch) | |
| tree | 97ed154f2676d69e61bf4a6893ca035edbc7be35 /epan | |
| parent | 64712974ed86b4b4a413bf4006fb4cfe4447127c (diff) | |
S1AP: fix dissection of MS Classmark 2 and MS Classmark 3 IEs
Bug: 13666
Change-Id: If65ba54db3541575fb71d1cd88a2fd3c47ef95c3
Reviewed-on: https://code.wireshark.org/review/21364
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/asn1/s1ap/s1ap.cnf | 6 | ||||
| -rw-r--r-- | epan/dissectors/packet-s1ap.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/asn1/s1ap/s1ap.cnf b/epan/dissectors/asn1/s1ap/s1ap.cnf index 9fd4804486..000b3bd8f3 100644 --- a/epan/dissectors/asn1/s1ap/s1ap.cnf +++ b/epan/dissectors/asn1/s1ap/s1ap.cnf @@ -894,7 +894,7 @@ RepetitionPeriod DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds %(DEFAULT_BODY)s if (parameter_tvb) { proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_s1ap_MSClassmark); - de_ms_cm_2(parameter_tvb, subtree, actx->pinfo, 0, tvb_reported_length(tvb), NULL, 0); + de_ms_cm_2(parameter_tvb, subtree, actx->pinfo, 0, tvb_reported_length(parameter_tvb), NULL, 0); } #.FN_BODY MSClassmark3 VAL_PTR = ¶meter_tvb @@ -902,7 +902,7 @@ RepetitionPeriod DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds %(DEFAULT_BODY)s if (parameter_tvb) { proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_s1ap_MSClassmark); - de_ms_cm_3(parameter_tvb, subtree, actx->pinfo, 0, tvb_reported_length(tvb), NULL, 0); + de_ms_cm_3(parameter_tvb, subtree, actx->pinfo, 0, tvb_reported_length(parameter_tvb), NULL, 0); } #.TYPE_ATTR @@ -1933,7 +1933,7 @@ col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UEContextResumeFailure") col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "ConnectionEstablishmentIndication"); #.END -/* Whenever a Cause appears, look up the reason and show it in the Info column */ +# Whenever a Cause appears, look up the reason and show it in the Info column #.FN_BODY CauseRadioNetwork VAL_PTR=&value guint32 value; diff --git a/epan/dissectors/packet-s1ap.c b/epan/dissectors/packet-s1ap.c index 034e089f61..4ac9c25ff8 100644 --- a/epan/dissectors/packet-s1ap.c +++ b/epan/dissectors/packet-s1ap.c @@ -6051,7 +6051,7 @@ dissect_s1ap_MSClassmark2(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U if (parameter_tvb) { proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_s1ap_MSClassmark); - de_ms_cm_2(parameter_tvb, subtree, actx->pinfo, 0, tvb_reported_length(tvb), NULL, 0); + de_ms_cm_2(parameter_tvb, subtree, actx->pinfo, 0, tvb_reported_length(parameter_tvb), NULL, 0); } @@ -6070,7 +6070,7 @@ dissect_s1ap_MSClassmark3(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U if (parameter_tvb) { proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_s1ap_MSClassmark); - de_ms_cm_3(parameter_tvb, subtree, actx->pinfo, 0, tvb_reported_length(tvb), NULL, 0); + de_ms_cm_3(parameter_tvb, subtree, actx->pinfo, 0, tvb_reported_length(parameter_tvb), NULL, 0); } |