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 /epan/dissectors | |
| 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 'epan/dissectors')
| -rw-r--r-- | epan/dissectors/packet-camel.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/epan/dissectors/packet-camel.c b/epan/dissectors/packet-camel.c index 135dd7024e..fda0ad0372 100644 --- a/epan/dissectors/packet-camel.c +++ b/epan/dissectors/packet-camel.c @@ -1294,8 +1294,18 @@ static int dissect_camel_InitialDPArgExtensionV2(gboolean implicit_tag _U_, tvbu static int dissect_camel_AccessPointName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + + tvbuff_t *parameter_tvb; + proto_tree *subtree; + offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + ¶meter_tvb); + + + 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); return offset; } @@ -8505,7 +8515,7 @@ void proto_register_camel(void) { NULL, HFILL }}, { &hf_camel_accessPointName, { "accessPointName", "camel.accessPointName", - FT_STRING, BASE_NONE, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_camel_chargingID, { "chargingID", "camel.chargingID", |