diff options
author | Anders Broman <anders.broman@ericsson.com> | 2007-07-23 23:02:54 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2007-07-23 23:02:54 +0000 |
commit | ba2549b83a896d3705b9380fdbe4a918c3aaf2b7 (patch) | |
tree | 253df4e53d408eb27c1384632197617a4845124c /asn1/camel/camel.cnf | |
parent | 43966696b96e392d41ad1950e6d8840d7dfde06d (diff) | |
download | wireshark-ba2549b83a896d3705b9380fdbe4a918c3aaf2b7.tar.gz |
Fix bug
http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1699 Bad decoding of Camel PromptAndCollectUserInfo
By fixing up the generation of HF vars for Arg etc
Add an OID name to INAP.
svn path=/trunk/; revision=22391
Diffstat (limited to 'asn1/camel/camel.cnf')
-rw-r--r-- | asn1/camel/camel.cnf | 73 |
1 files changed, 29 insertions, 44 deletions
diff --git a/asn1/camel/camel.cnf b/asn1/camel/camel.cnf index 1de4720d79..0f1c2d2fe2 100644 --- a/asn1/camel/camel.cnf +++ b/asn1/camel/camel.cnf @@ -1,5 +1,6 @@ # camel.cnf # camel conformation file +# Anders Broman 2007 # $Id$ #.INCLUDE ../gsmmap/gsm_map-exp.cnf @@ -9,18 +10,35 @@ CS1-DataTypes inap CS2-datatypes inap -#.PDU +#.ASSIGNED_OBJECT_IDENTIFIER classes +#.ASSIGNED_OBJECT_IDENTIFIER ros-InformationObjects +#.ASSIGNED_OBJECT_IDENTIFIER tc-Messages +#.ASSIGNED_OBJECT_IDENTIFIER tc-NotationExtensions +#.ASSIGNED_OBJECT_IDENTIFIER gprsSSF-gsmSCF-Operations +#.ASSIGNED_OBJECT_IDENTIFIER gsmSCF-gsmSRF-Operations +#.ASSIGNED_OBJECT_IDENTIFIER gsmSSF-gsmSCF-Operations +#.ASSIGNED_OBJECT_IDENTIFIER sms-Operations +#.ASSIGNED_OBJECT_IDENTIFIER gsmSSF-gsmSCF-Protocol +#.ASSIGNED_OBJECT_IDENTIFIER gsmSCF-gsmSRF-Protocol #.OMIT_ASSIGNMENT Remote-Operations-Information-Objects Bind Unbind #.END - #.OMIT_ASSIGNMENT # Removed as they are giving 'defined but not used' warnings currently. RejectProblem TariffSwitchInterval Priority +#.END + +#.PDU_NEW +# This list is "created" by TABLEx (manual copy paste from the created file) +ERROR.&ParameterType +OPERATION.&ArgumentType +OPERATION.&ResultType +#.END + #.REGISTER CAP-GPRS-ReferenceNumber B "0.4.0.0.1.1.5.2" "id-CAP-GPRS-ReferenceNumber" @@ -62,7 +80,9 @@ CAMEL-AChBillingChargingCharacteristics/timeDurationCharging/tariffSwitchInterva ApplyChargingGPRSArg/tariffSwitchInterval applyChargingGPRS-tariffSwitchInterval TimeIfTariffSwitch/tariffSwitchInterval timeIfTariffSwitch-tariffSwitchInterval - +# This table creates the value_sting to name Camel operation codes and errors +# in file packet-camel-table.c which is included in the template file +# #.TABLE_HDR /* CAMEL OPERATIONS */ const value_string camel_opr_code_strings[] = { @@ -83,6 +103,9 @@ static const value_string camel_err_code_string_vals[] = { }; #.END +# This table creates the switch() to branch on Camel operation codes and errors +# in file packet-camel-table2.c which is included in the template file +# #.TABLE2_HDR static int dissect_invokeData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx) { proto_item *cause; @@ -90,7 +113,7 @@ static int dissect_invokeData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ switch(opcode){ #.TABLE2_BODY OPERATION.&ArgumentType case %(&operationCode)s: /* %(_ident)s */ - offset= %(_argument_fn)s(FALSE, tvb, offset, actx, tree, hf_camel_%(_ident)s); + offset= %(_argument_pdu)s(tvb, actx->pinfo , tree); break; #.TABLE2_FTR cause=proto_tree_add_text(tree, tvb, offset, -1, "Unknown invokeData blob"); @@ -108,7 +131,7 @@ static int dissect_returnResultData(proto_tree *tree, tvbuff_t *tvb, int offset, switch(opcode){ #.TABLE2_BODY OPERATION.&ResultType case %(&operationCode)s: /* %(_ident)s */ - offset= %(_result_fn)s(FALSE, tvb, offset, actx, tree, hf_camel_%(_ident)s); + offset= %(_result_pdu)s(tvb, actx->pinfo , tree); break; #.TABLE2_FTR default: @@ -126,7 +149,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_fn)s(FALSE, tvb, offset, actx, tree, hf_camel_%(_ident)s); + %(_parameter_pdu)s(tvb, actx->pinfo , tree); break; #.TABLE2_FTR default: @@ -138,44 +161,6 @@ static int dissect_returnErrorData(proto_tree *tree, tvbuff_t *tvb, int offset,a } #.END -#.TABLE3_HDR -/* CAMEL OPERATIONS hf filelds */ -#.TABLE3_BODY OPERATION - { &hf_camel_%(_ident)s, - { "%(_ident)s", "camel.%(_ident)s", - FT_NONE, BASE_NONE, NULL, 0, - "camel.%(_ident)s", HFILL }}, - -#.TABLE3_FTR -/* END CAMEL OPERATIONS hf filelds */ -#.END -#.TABLE3_HDR -/* CAMEL ERRORS hf filelds */ -#.TABLE3_BODY ERROR.&ParameterType - { &hf_camel_%(_ident)s, - { "%(_ident)s", "camel.%(_ident)s", - FT_NONE, BASE_NONE, NULL, 0, - "camel.%(_ident)s", HFILL }}, -#.TABLE3_FTR -/* END CAMEL ERRORS hf filelds */ -#.END - -#.TABLE4_HDR -/* CAMEL OPERATIONS hf filelds */ -#.TABLE4_BODY OPERATION -int hf_camel_%(_ident)s = -1; -#.TABLE4_FTR -/* END CAMEL OPERATIONS hf filelds */ -#.END - -#.TABLE4_HDR -/* CAMEL ERRORS hf filelds */ -#.TABLE4_BODY ERROR.&ParameterType -int hf_camel_%(_ident)s = -1; -#.TABLE4_FTR -/* END CAMEL ERRORS hf filelds */ -#.END - # ROS stuff here XXX change when TCAP is redone. #.FN_BODY Code/local VAL_PTR = &opcode |