aboutsummaryrefslogtreecommitdiffstats
path: root/asn1
diff options
context:
space:
mode:
authorJeff Morriss <jeff.morriss.ws@gmail.com>2014-08-20 22:47:22 -0400
committerJeff Morriss <jeff.morriss.ws@gmail.com>2014-08-21 13:01:22 +0000
commita3d8f31ad0a48f72cd6d8fa2b0c3659c9ea84745 (patch)
tree48dfaefaf4298963c9a7c132d34e2f08da15ac4e /asn1
parentc7c4abaab00ce1a8bc35e326c80095e9cc47584e (diff)
Add a function to dissect an E.164 (MSISDN) number in UTF8 format and use it
in the Diameter dissector. This new API adds a filter for the MSISDN as well as a subtree and filter for the Country Code. Change-Id: Ibcbf4b5f72178b7e4af63efa7496188d608a9de7 Reviewed-on: https://code.wireshark.org/review/3760 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Diffstat (limited to 'asn1')
-rw-r--r--asn1/gsm_map/gsm_map.cnf2
-rw-r--r--asn1/gsm_map/packet-gsm_map-template.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/asn1/gsm_map/gsm_map.cnf b/asn1/gsm_map/gsm_map.cnf
index 3a88b4e150..ae9b998939 100644
--- a/asn1/gsm_map/gsm_map.cnf
+++ b/asn1/gsm_map/gsm_map.cnf
@@ -965,7 +965,7 @@ if (!actx->value_ptr)
proto_tree_add_string(tree, hf_gsm_map_locationnumber_digits, tvb, 1, -1, digit_str);
if ((na == 3) && (np==1))/*International Number & E164*/
- dissect_e164_cc(tvb, tree, 1, TRUE);
+ dissect_e164_cc(tvb, tree, 1, E164_ENC_BCD);
#.FN_BODY EnhancedCheckIMEI-Arg/locationInformation VAL_PTR = &parameter_tvb
tvbuff_t *parameter_tvb;
diff --git a/asn1/gsm_map/packet-gsm_map-template.c b/asn1/gsm_map/packet-gsm_map-template.c
index 520d6c0833..48917f9dc6 100644
--- a/asn1/gsm_map/packet-gsm_map-template.c
+++ b/asn1/gsm_map/packet-gsm_map-template.c
@@ -836,7 +836,7 @@ dissect_gsm_map_msisdn(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
na = (octet & 0x70)>>4;
np = octet & 0x0f;
if ((na == 1) && (np==1))/*International Number & E164*/
- dissect_e164_cc(tvb, tree, 1, TRUE);
+ dissect_e164_cc(tvb, tree, 1, E164_ENC_BCD);
else if(np==6)
dissect_e212_mcc_mnc_in_address(tvb, pinfo, tree, 1);