osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

[INAP] In dissect_returnErrorData in the .cnf file the parameter_pdu 

calls must return offset.
Fixes https://ask.wireshark.org/questions/50998/issue-decoding-inap-systemfailure-parameter

Change-Id: Idceb5f2576f8249d4a04b0a3612b5b1ef67f7093
Reviewed-on: https://code.wireshark.org/review/14501
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
AndersBroman 2016-03-17 17:14:16 +01:00 committed by Anders Broman
parent c18736c2e7
commit 34f4b4c17b
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/asn1/inap/inap.cnf
View File

@ -110,7 +110,7 @@ static int dissect_returnErrorData(proto_tree *tree, tvbuff_t *tvb, int offset,a
switch(errorCode) {
#.TABLE2_BODY ERROR.&ParameterType
case %(&errorCode)s: /* %(_ident)s */
%(_parameter_pdu)s(tvb, actx->pinfo , tree , NULL);
offset= %(_parameter_pdu)s(tvb, actx->pinfo , tree , NULL);
break;
#.TABLE2_FTR
default:

12
epan/dissectors/packet-inap.c
View File

@ -9328,22 +9328,22 @@ static int dissect_returnResultData(proto_tree *tree, tvbuff_t *tvb, int offset,
static int dissect_returnErrorData(proto_tree *tree, tvbuff_t *tvb, int offset,asn1_ctx_t *actx) {
switch(errorCode) {
case errcode_cancelFailed: /* cancelFailed */
dissect_PAR_cancelFailed_PDU(tvb, actx->pinfo , tree , NULL);
offset= dissect_PAR_cancelFailed_PDU(tvb, actx->pinfo , tree , NULL);
break;
case errcode_requestedInfoError: /* requestedInfoError */
dissect_PAR_requestedInfoError_PDU(tvb, actx->pinfo , tree , NULL);
offset= dissect_PAR_requestedInfoError_PDU(tvb, actx->pinfo , tree , NULL);
break;
case errcode_scfTaskRefused: /* scfTaskRefused */
dissect_ScfTaskRefusedParameter_PDU(tvb, actx->pinfo , tree , NULL);
offset= dissect_ScfTaskRefusedParameter_PDU(tvb, actx->pinfo , tree , NULL);
break;
case errcode_scfReferral: /* scfReferral */
dissect_ReferralParameter_PDU(tvb, actx->pinfo , tree , NULL);
offset= dissect_ReferralParameter_PDU(tvb, actx->pinfo , tree , NULL);
break;
case errcode_systemFailure: /* systemFailure */
dissect_UnavailableNetworkResource_PDU(tvb, actx->pinfo , tree , NULL);
offset= dissect_UnavailableNetworkResource_PDU(tvb, actx->pinfo , tree , NULL);
break;
case errcode_taskRefused: /* taskRefused */
dissect_PAR_taskRefused_PDU(tvb, actx->pinfo , tree , NULL);
offset= dissect_PAR_taskRefused_PDU(tvb, actx->pinfo , tree , NULL);
break;
default:
proto_tree_add_expert_format(tree, actx->pinfo, &ei_inap_unknown_returnErrorData,