diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2012-09-28 16:31:08 +0000 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2012-09-28 16:31:08 +0000 |
| commit | da4b39e720b46046ee5c0d42fd2c16f163f334d5 (patch) | |
| tree | 422957425712831d1d29f318299cf563d29f3ddd /asn1/camel | |
| parent | 559a26361a2e1316c0a956a7cad34d383e158026 (diff) | |
Revert r21471: previous decoding of APN was matching 3GPP 23.003 chapter 9.1 and the pcap file attached to bug 1543 is not valid
svn path=/trunk/; revision=45194
Diffstat (limited to 'asn1/camel')
| -rw-r--r-- | asn1/camel/camel.cnf | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/asn1/camel/camel.cnf b/asn1/camel/camel.cnf index 43ab9f59df..2ed2407687 100644 --- a/asn1/camel/camel.cnf +++ b/asn1/camel/camel.cnf @@ -457,6 +457,22 @@ proto_tree *subtree; dissect_isup_redirecting_number_parameter(parameter_tvb, tree, NULL); #.END +#---------------------------------------------------------------------------------------- +#.FN_PARS AccessPointName + VAL_PTR = ¶meter_tvb + +#.FN_BODY AccessPointName + + tvbuff_t *parameter_tvb; + proto_tree *subtree; + +%(DEFAULT_BODY)s + + if (!parameter_tvb) + return offset; + subtree = proto_item_add_subtree(actx->created_item, ett_camel_AccessPointName); + de_sm_apn(parameter_tvb, subtree, actx->pinfo, 0, tvb_length(parameter_tvb), NULL, 0); +#.END #---------------------------------------------------------------------------------------- #.FN_BODY EndUserAddress/pDPTypeOrganization VAL_PTR = ¶meter_tvb @@ -654,7 +670,6 @@ proto_tree *subtree; #.TYPE_ATTR PDPTypeOrganization TYPE = FT_UINT8 DISPLAY = BASE_DEC BITMASK = 0x0f STRINGS = VALS(gsm_map_PDP_Type_Organisation_vals) DateAndTime TYPE = FT_STRING DISPLAY = BASE_NONE -AccessPointName TYPE = FT_STRING DISPLAY = BASE_NONE Code/local TYPE = FT_INT32 DISPLAY = BASE_DEC STRINGS = VALS(camel_opr_code_strings) ServiceInteractionIndicatorsTwo/holdTreatmentIndicator TYPE = FT_INT32 DISPLAY = BASE_DEC STRINGS = VALS(camel_holdTreatmentIndicator_values) ServiceInteractionIndicatorsTwo/cwTreatmentIndicator TYPE = FT_INT32 DISPLAY = BASE_DEC STRINGS = VALS(camel_cwTreatmentIndicator_values) |