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

Use a common hf for international E164 numbers (MSISDN). 

Change-Id: Ie0103c04033d7bf69c92947b789ba4f5a300a74b
Reviewed-on: https://code.wireshark.org/review/3863
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
AndersBroman 2014-08-26 14:49:24 +02:00 committed by Anders Broman
parent 5e6e0600c5
commit a11b7bfc34
4 changed files with 67 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
asn1/gsm_map/packet-gsm_map-template.c
View File

@ -778,7 +778,7 @@ dissect_cbs_data_coding_scheme(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree
return sms_encoding;
}
void
dissect_gsm_map_msisdn(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
dissect_gsm_map_msisdn(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
const char *digit_str;
guint8 octet;
@ -792,17 +792,34 @@ dissect_gsm_map_msisdn(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
if(tvb_reported_length(tvb)==1)
return;
digit_str = tvb_bcd_dig_to_wmem_packet_str(tvb, 1, -1, NULL, FALSE);
proto_tree_add_string(tree, hf_gsm_map_address_digits, tvb, 1, -1, digit_str);
octet = tvb_get_guint8(tvb,0);
/* nature of address indicator */
na = (octet & 0x70)>>4;
/* numbering plan indicator */
np = octet & 0x0f;
if ((na == 1) && (np==1))/*International Number & E164*/
dissect_e164_cc(tvb, tree, 1, E164_ENC_BCD);
else if(np==6)
dissect_e212_mcc_mnc_in_address(tvb, pinfo, tree, 1);
switch(np){
case 1:
/* ISDN/Telephony Numbering Plan (Rec ITU-T E.164) */
switch(na){
case 1:
/* international number */
dissect_e164_msisdn(tvb, tree, 1, tvb_reported_length(tvb)-1, E164_ENC_BCD);
break;
default:
digit_str = tvb_bcd_dig_to_wmem_packet_str(tvb, 1, -1, NULL, FALSE);
proto_tree_add_string(tree, hf_gsm_map_address_digits, tvb, 1, -1, digit_str);
break;
}
break;
case 6:
/* land mobile numbering plan (ITU-T Rec E.212) */
dissect_e212_imsi(tvb, pinfo, tree, 1, tvb_reported_length(tvb)-1, FALSE);
break;
default:
digit_str = tvb_bcd_dig_to_wmem_packet_str(tvb, 1, -1, NULL, FALSE);
proto_tree_add_string(tree, hf_gsm_map_address_digits, tvb, 1, -1, digit_str);
break;
}
}

8
epan/dissectors/packet-e164.c
View File

@ -415,8 +415,10 @@ static int hf_E164_country_code = -1;
static int ett_e164_msisdn = -1;
void
dissect_e164_number(tvbuff_t *tvb, proto_tree *tree, int offset, int length,e164_info_t e164_info)
dissect_e164_number(tvbuff_t *tvb, proto_tree *tree, int offset, int length, e164_info_t e164_info)
{
proto_item *pi;
switch (e164_info.e164_number_type) {
case CALLING_PARTY_NUMBER:
proto_tree_add_string(tree, hf_E164_calling_party_number, tvb, offset,
@ -432,6 +434,10 @@ dissect_e164_number(tvbuff_t *tvb, proto_tree *tree, int offset, int length,e164
break;
}
if(e164_info.nature_of_address == E164_NA_INTERNATIONAL_NUMBER){
pi = proto_tree_add_string(tree, hf_E164_number, tvb, offset, length, e164_info.E164_number_str);
PROTO_ITEM_SET_HIDDEN(pi);
}
}
void

2
epan/dissectors/packet-e164.h
View File

@ -30,6 +30,8 @@
extern const value_string E164_country_code_value[];
extern const value_string E164_International_Networks_vals[];
#define E164_NA_INTERNATIONAL_NUMBER 4
typedef enum {
NONE,
CALLING_PARTY_NUMBER,

47
epan/dissectors/packet-gsm_map.c
View File

@ -3200,7 +3200,7 @@ dissect_cbs_data_coding_scheme(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree
return sms_encoding;
}
void
dissect_gsm_map_msisdn(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
dissect_gsm_map_msisdn(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
const char *digit_str;
guint8 octet;
@ -3214,17 +3214,34 @@ dissect_gsm_map_msisdn(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
if(tvb_reported_length(tvb)==1)
return;
digit_str = tvb_bcd_dig_to_wmem_packet_str(tvb, 1, -1, NULL, FALSE);
proto_tree_add_string(tree, hf_gsm_map_address_digits, tvb, 1, -1, digit_str);
octet = tvb_get_guint8(tvb,0);
/* nature of address indicator */
na = (octet & 0x70)>>4;
/* numbering plan indicator */
np = octet & 0x0f;
if ((na == 1) && (np==1))/*International Number & E164*/
dissect_e164_cc(tvb, tree, 1, E164_ENC_BCD);
else if(np==6)
dissect_e212_mcc_mnc_in_address(tvb, pinfo, tree, 1);
switch(np){
case 1:
/* ISDN/Telephony Numbering Plan (Rec ITU-T E.164) */
switch(na){
case 1:
/* international number */
dissect_e164_msisdn(tvb, tree, 1, tvb_reported_length(tvb)-1, E164_ENC_BCD);
break;
default:
digit_str = tvb_bcd_dig_to_wmem_packet_str(tvb, 1, -1, NULL, FALSE);
proto_tree_add_string(tree, hf_gsm_map_address_digits, tvb, 1, -1, digit_str);
break;
}
break;
case 6:
/* land mobile numbering plan (ITU-T Rec E.212) */
dissect_e212_imsi(tvb, pinfo, tree, 1, tvb_reported_length(tvb)-1, FALSE);
break;
default:
digit_str = tvb_bcd_dig_to_wmem_packet_str(tvb, 1, -1, NULL, FALSE);
proto_tree_add_string(tree, hf_gsm_map_address_digits, tvb, 1, -1, digit_str);
break;
}
}
@ -20245,7 +20262,7 @@ dissect_NokiaMAP_Extensions_AllowedServiceData(gboolean implicit_tag _U_, tvbuff
/*--- End of included file: packet-gsm_map-fn.c ---*/
#line 810 "../../asn1/gsm_map/packet-gsm_map-template.c"
#line 827 "../../asn1/gsm_map/packet-gsm_map-template.c"
/* Specific translation for MAP V3 */
const value_string gsm_map_V1V2_opr_code_strings[] = {
@ -20467,7 +20484,7 @@ const value_string gsm_map_opr_code_strings[] = {
/* Unknown or empty loop list OPERATION */
/*--- End of included file: packet-gsm_map-table.c ---*/
#line 821 "../../asn1/gsm_map/packet-gsm_map-template.c"
#line 838 "../../asn1/gsm_map/packet-gsm_map-template.c"
{ 0, NULL }
};
@ -20684,7 +20701,7 @@ static const value_string gsm_map_err_code_string_vals[] = {
/* Unknown or empty loop list OPERATION */
/*--- End of included file: packet-gsm_map-table.c ---*/
#line 827 "../../asn1/gsm_map/packet-gsm_map-template.c"
#line 844 "../../asn1/gsm_map/packet-gsm_map-template.c"
{ 0, NULL }
};
#endif
@ -29472,7 +29489,7 @@ void proto_register_gsm_map(void) {
NULL, HFILL }},
/*--- End of included file: packet-gsm_map-hfarr.c ---*/
#line 2845 "../../asn1/gsm_map/packet-gsm_map-template.c"
#line 2862 "../../asn1/gsm_map/packet-gsm_map-template.c"
};
/* List of subtrees */
@ -30181,7 +30198,7 @@ void proto_register_gsm_map(void) {
&ett_NokiaMAP_Extensions_AllowedServiceData,
/*--- End of included file: packet-gsm_map-ettarr.c ---*/
#line 2877 "../../asn1/gsm_map/packet-gsm_map-template.c"
#line 2894 "../../asn1/gsm_map/packet-gsm_map-template.c"
};
static ei_register_info ei[] = {
@ -30284,7 +30301,7 @@ void proto_register_gsm_map(void) {
/*--- End of included file: packet-gsm_map-dis-tab.c ---*/
#line 2914 "../../asn1/gsm_map/packet-gsm_map-template.c"
#line 2931 "../../asn1/gsm_map/packet-gsm_map-template.c"
oid_add_from_string("ericsson-gsm-Map-Ext","1.2.826.0.1249.58.1.0" );
oid_add_from_string("accessTypeNotAllowed-id","1.3.12.2.1107.3.66.1.2");
/*oid_add_from_string("map-ac networkLocUp(1) version3(3)","0.4.0.0.1.0.1.3" );