diff options
| -rw-r--r-- | AUTHORS | 3 | ||||
| -rw-r--r-- | Makefile.common | 3 | ||||
| -rw-r--r-- | epan/Makefile.common | 3 | ||||
| -rw-r--r-- | packet-e164.c | 433 | ||||
| -rw-r--r-- | packet-e164.h | 50 | ||||
| -rw-r--r-- | packet-isup.c | 26 |
6 files changed, 513 insertions, 5 deletions
@@ -1662,8 +1662,9 @@ Anders Broman <anders.broman [AT] ericsson.com> { Additional SCTP payload protocol identifiers Assorted ISUP enhancements MEGACO updates and fixes - T35 country code support for H245 + T.35 country code support for H.245 Multipart media dissector + E.164 number dissector } Christian Falckenberg <christian.falckenberg [AT] nortelnetworks.com> { diff --git a/Makefile.common b/Makefile.common index fcbafb8524..4bc9f2af65 100644 --- a/Makefile.common +++ b/Makefile.common @@ -3,7 +3,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common,v 1.27 2004/03/04 08:53:01 jmayer Exp $ +# $Id: Makefile.common,v 1.28 2004/03/05 10:29:35 guy Exp $ # # Ethereal - Network traffic analyzer # By Gerald Combs <gerald@ethereal.com> @@ -72,6 +72,7 @@ DISSECTOR_INCLUDES = \ packet-diffserv-mpls-common.h \ packet-dns.h \ packet-dvmrp.h \ + packet-e164.h \ packet-edonkey.h \ packet-esis.h \ packet-eth.h \ diff --git a/epan/Makefile.common b/epan/Makefile.common index 244209edcf..fcf71a33e4 100644 --- a/epan/Makefile.common +++ b/epan/Makefile.common @@ -3,7 +3,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common,v 1.3 2004/03/04 08:53:02 jmayer Exp $ +# $Id: Makefile.common,v 1.4 2004/03/05 10:29:36 guy Exp $ # # Ethereal - Network traffic analyzer # By Gerald Combs <gerald@ethereal.com> @@ -158,6 +158,7 @@ DISSECTOR_SRC = \ ../packet-dns.c \ ../packet-dsi.c \ ../packet-dvmrp.c \ + ../packet-e164.c \ ../packet-eap.c \ ../packet-eapol.c \ ../packet-echo.c \ diff --git a/packet-e164.c b/packet-e164.c new file mode 100644 index 0000000000..e621a48112 --- /dev/null +++ b/packet-e164.c @@ -0,0 +1,433 @@ +/* packet-e164.c + * Routines for output and filtering of E164 numbers common + * to many dissectors. + * Copyright 2004, Anders Broman <anders.broman@ericsson.com> + * + * $Id: packet-e164.c,v 1.1 2004/03/05 10:29:35 guy Exp $ + * + * Ethereal - Network traffic analyzer + * By Gerald Combs <gerald@ethereal.com> + * Copyright 1998 Gerald Combs + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * Ref ITU-T E.164 05/97 + * + */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include <glib.h> +#include <epan/packet.h> +#include "packet-e164.h" + +const value_string E164_country_code_value[] = { + { 0x00, "Reserved (Assignment of all 0XX codes will be feasible after 31 December 2000. This question is currently under study.)"}, + { 0x01, "Americas"}, + { 0x020,"Egypt"}, + { 0x0210,"Spare code"}, + { 0x0211,"Spare code"}, + { 0x0212,"Morocco"}, + { 0x0213,"Algeria"}, + { 0x0214,"spare code"}, + { 0x0215,"spare code"}, + { 0x0216,"Tunisia"}, + { 0x0217,"Spare code"}, + { 0x0218,"Libya"}, + { 0x0219,"Spare code"}, + { 0x0220,"Gambia"}, + { 0x0221,"Senegal"}, + { 0x0222,"Mauritania"}, + { 0x0223,"Mali"}, + { 0x0224,"Guinea"}, + { 0x0225,"Ivory Coast"}, + { 0x0226,"Burkina Faso"}, + { 0x0227,"Niger"}, + { 0x0228,"Togolese Republic"}, + { 0x0229,"Benin"}, + { 0x0230,"Mauritius"}, + { 0x0231,"Liberia "}, + { 0x0232,"Sierra Leone"}, + { 0x0233,"Ghana"}, + { 0x0234,"Nigeria"}, + { 0x0235,"Chad"}, + { 0x0236,"Central African Republic"}, + { 0x0237,"Cameroon"}, + { 0x0238,"Cape Verde"}, + { 0x0239,"Sao Tome and Principe"}, + { 0x0240,"Equatorial Guinea"}, + { 0x0241,"Gabonese Republic"}, + { 0x0242,"Republic of Congo"}, + { 0x0243,"Democratic Republic of Congo"}, + { 0x0244,"Angola"}, + { 0x0245,"Guinea-Bissau"}, + { 0x0246,"Diego Garcia"}, + { 0x0247,"Ascension"}, + { 0x0248,"Seychelles"}, + { 0x0249,"Sudan"}, + { 0x0250,"Rwandese Republic"}, + { 0x0251,"Ethiopia"}, + { 0x0252,"Somali"}, + { 0x0253,"Djibouti"}, + { 0x0254,"Kenya"}, + { 0x0255,"Tanzania"}, + { 0x0256,"Uganda"}, + { 0x0257,"Burundi"}, + { 0x0258,"Mozambique"}, + { 0x0259,"Spare code"}, + { 0x0260,"Zambia"}, + { 0x0261,"Madagascar"}, + { 0x0262,"Reunion Island"}, + { 0x0263,"Zimbabwe"}, + { 0x0264,"Namibia"}, + { 0x0265,"Malawi"}, + { 0x0266,"Lesotho"}, + { 0x0267,"Botswana"}, + { 0x0268,"Swaziland"}, + { 0x0269,"Comoros Mayotte"}, + { 0x027,"South Africa"}, + { 0x0281,"spare code"}, + { 0x0282,"spare code"}, + { 0x0283,"spare code"}, + { 0x0284,"spare code"}, + { 0x0285,"spare code"}, + { 0x0286,"spare code"}, + { 0x0287,"spare code"}, + { 0x0288,"spare code"}, + { 0x0289,"spare code"}, + { 0x0290,"Saint Helena"}, + { 0x0291,"Eritrea"}, + { 0x0292,"spare code"}, + { 0x0293,"spare code"}, + { 0x0294,"spare code"}, + { 0x0295,"spare code"}, + { 0x0296,"spare code"}, + { 0x0297,"Aruba"}, + { 0x0298,"Faroe Islands"}, + { 0x0299,"Greenland"}, + { 0x030,"Greece"}, + { 0x031,"Netherlands"}, + { 0x032,"Belgium"}, + { 0x033,"France"}, + { 0x034,"Spain"}, + { 0x0350,"Gibraltar"}, + { 0x0351,"Portugal"}, + { 0x0352,"Luxembourg"}, + { 0x0353,"Ireland"}, + { 0x0354,"Iceland"}, + { 0x0355,"Albania"}, + { 0x0356,"Malta"}, + { 0x0357,"Cyprus"}, + { 0x0358,"Finland"}, + { 0x0359,"Bulgaria"}, + { 0x036,"Hungary"}, + { 0x0370,"Lithuania"}, + { 0x0371,"Latvia"}, + { 0x0372,"Estonia"}, + { 0x0373,"Moldova"}, + { 0x0374,"Armenia"}, + { 0x0375,"Belarus"}, + { 0x0376,"Andorra"}, + { 0x0377,"Monaco"}, + { 0x0378,"San Marino"}, + { 0x0379,"Vatican"}, + { 0x0380,"Ukraine"}, + { 0x0381,"Yugoslavia"}, + { 0x0382,"spare code"}, + { 0x0383,"spare code"}, + { 0x0384,"spare code"}, + { 0x0385,"Croatia"}, + { 0x0386,"Slovenia"}, + { 0x0387,"Bosnia and Herzegovina"}, + { 0x0388,"Groups of contries:"}, + { 0x0389,"Macedonia"}, + { 0x039,"Italy"}, + { 0x040,"Romania"}, + { 0x041,"Switzerland"}, + { 0x0420,"Czech Republic"}, + { 0x0421,"Slovak Republic"}, + { 0x0422,"Spare code"}, + { 0x0423,"Liechtenstein"}, + { 0x0424,"spare code"}, + { 0x0425,"spare code"}, + { 0x0426,"spare code"}, + { 0x0427,"spare code"}, + { 0x0428,"spare code"}, + { 0x0429,"spare code"}, + { 0x043,"Austria"}, + { 0x044,"United Kingdom"}, + { 0x045,"Denmark"}, + { 0x046,"Sweden"}, + { 0x047,"Norway"}, + { 0x048,"Poland"}, + { 0x049,"Germany"}, + { 0x0500,"Falkland Islands (Malvinas)"}, + { 0x0501,"Belize"}, + { 0x0502,"Guatemala"}, + { 0x0503,"El Salvador"}, + { 0x0504,"Honduras"}, + { 0x0505,"Nicaragua"}, + { 0x0506,"Costa Rica"}, + { 0x0507,"Panama"}, + { 0x0508,"Saint Pierre and Miquelon"}, + { 0x0509,"Haiti"}, + { 0x051,"Peru"}, + { 0x052,"Mexico"}, + { 0x053,"Cuba"}, + { 0x054,"Argentina"}, + { 0x055,"Brazil"}, + { 0x056,"Chile"}, + { 0x057,"Colombia"}, + { 0x058,"Venezuela"}, + { 0x0590,"Guadeloupe"}, + { 0x0591,"Bolivia"}, + { 0x0592,"Guyana"}, + { 0x0593,"Ecuador"}, + { 0x0594,"French Guiana"}, + { 0x0595,"Paraguay"}, + { 0x0596,"Martinique"}, + { 0x0597,"Suriname"}, + { 0x0598,"Uruguay"}, + { 0x0599,"Netherlands Antilles"}, + { 0x060,"Malaysia"}, + { 0x061,"Australia"}, + { 0x062,"Indonesia"}, + { 0x063,"Philippines"}, + { 0x064,"New Zealand"}, + { 0x065,"Singapore"}, + { 0x066,"Thailand"}, + { 0x0670,"East Timor"}, + { 0x0671,"Spare code"}, + { 0x0672,"Australian External Territories"}, + { 0x0673,"Brunei Darussalam"}, + { 0x0674,"Nauru"}, + { 0x0675,"Papua New Guinea"}, + { 0x0676,"Tonga"}, + { 0x0677,"Solomon Islands"}, + { 0x0678,"Vanuatu"}, + { 0x0679,"Fiji"}, + { 0x0680,"Palau"}, + { 0x0681,"Wallis and Futuna"}, + { 0x0682,"Cook Islands"}, + { 0x0683,"Niue"}, + { 0x0684,"American Samoa"}, + { 0x0685,"Samoa"}, + { 0x0686,"Kiribati"}, + { 0x0687,"New Caledonia"}, + { 0x0688,"Tuvalu"}, + { 0x0689,"French Polynesia"}, + { 0x0690,"Tokelau"}, + { 0x0691,"Micronesia"}, + { 0x0692,"Marshall Islands"}, + { 0x0693,"spare code"}, + { 0x0694,"spare code"}, + { 0x0695,"spare code"}, + { 0x0696,"spare code"}, + { 0x0697,"spare code"}, + { 0x0698,"spare code"}, + { 0x0699,"spare code"}, + { 0x07,"Russian Federation,Kazakstan"}, + { 0x0800,"International Freephone Service (see E.169.1)"}, + { 0x0801,"spare code"}, + { 0x0802,"spare code"}, + { 0x0803,"spare code"}, + { 0x0804,"spare code"}, + { 0x0805,"spare code"}, + { 0x0806,"spare code"}, + { 0x0807,"spare code"}, + { 0x0808,"Universal International Shared Cost Number (see E.169.3)"}, + { 0x0809,"Spare code"}, + { 0x081,"Japan"}, + { 0x082,"Korea (Republic of)"}, + { 0x0830,"Spare code"}, + { 0x0831,"Spare code"}, + { 0x0832,"Spare code"}, + { 0x0833,"Spare code"}, + { 0x0834,"Spare code"}, + { 0x0835,"Spare code"}, + { 0x0836,"Spare code"}, + { 0x0837,"Spare code"}, + { 0x0838,"Spare code"}, + { 0x0839,"Spare code"}, + { 0x084,"Viet Nam"}, + { 0x0850,"Democratic People's Republic of Korea"}, + { 0x0851,"Spare code"}, + { 0x0852,"Hongkong, China"}, + { 0x0853,"Macau, China"}, + { 0x0854,"Spare code"}, + { 0x0855,"Cambodia"}, + { 0x0856,"Laos"}, + { 0x0857,"Spare code"}, + { 0x0858,"Spare code"}, + { 0x0859,"Spare code"}, + { 0x086,"China (People's Republic of)"}, + { 0x0870,"Inmarsat SNAC"}, + { 0x0871,"Inmarsat (Atlantic Ocean-East)"}, + { 0x0872,"Inmarsat (Pacific Ocean)"}, + { 0x0873,"Inmarsat (Indian Ocean)"}, + { 0x0874,"Inmarsat (Atlantic Ocean-West)"}, + { 0x0875,"Reserved - Maritime Mobile Service Applications"}, + { 0x0876,"Reserved - Maritime Mobile Service Applications"}, + { 0x0877,"Reserved - Maritime Mobile Service Applications"}, + { 0x0878,"Reserved - Universal Personal Telecommunication Service (UPT)"}, + { 0x0879,"Reserved for national non-commercial purposes"}, + { 0x0880,"Bangladesh"}, + { 0x0881,"Global Mobile Satellite System (GMSS), shared code:"}, + { 0x0882,"International Networks: (see E.164)"}, + { 0x0883,"Spare code"}, + { 0x0884,"Spare code"}, + { 0x0885,"Spare code"}, + { 0x0886,"Reserved"}, + { 0x0887,"Spare code"}, + { 0x0888,"Reserved for future global services (see E.164)"}, + { 0x0889,"Spare code"}, + { 0x0890,"Spare code"}, + { 0x0891,"Spare code"}, + { 0x0892,"Spare code"}, + { 0x0893,"Spare code"}, + { 0x0894,"Spare code"}, + { 0x0895,"Spare code"}, + { 0x0896,"Spare code"}, + { 0x0897,"Spare code"}, + { 0x0898,"Spare code"}, + { 0x0899,"Spare code"}, + { 0x090,"Turkey"}, + { 0x091,"India"}, + { 0x092,"Pakistan"}, + { 0x093,"Afghanistan"}, + { 0x094,"Sri Lanka"}, + { 0x095,"Myanmar"}, + { 0x0960,"Maldives"}, + { 0x0961,"Lebanon"}, + { 0x0962,"Jordan"}, + { 0x0963,"Syrian Arab Republic"}, + { 0x0964,"Iraq"}, + { 0x0965,"Kuwait"}, + { 0x0966,"Saudi Arabia"}, + { 0x0967,"Yemen"}, + { 0x0968,"Oman"}, + { 0x0969,"Reserved"}, + { 0x0970,"Reserved"}, + { 0x0971,"United Arab Emirates"}, + { 0x0972,"Israel"}, + { 0x0973,"Bahrain"}, + { 0x0974,"Qatar"}, + { 0x0975,"Bhutan"}, + { 0x0976,"Mongolia"}, + { 0x0977,"Nepal"}, + { 0x0978,"Spare code"}, + { 0x0979,"Universal International Premium Rate Number (see E.169.2)"}, + { 0x098,"Iran"}, + { 0x0990,"Spare code"}, + { 0x0991,"Trial service (see E.164.2)"}, + { 0x0992,"Tajikstan"}, + { 0x0993,"Turkmenistan"}, + { 0x0994,"Azerbaijani Republic"}, + { 0x0995,"Georgia"}, + { 0x0996,"Kyrgyz Republic"}, + { 0x0997,"Spare code"}, + { 0x0998,"Uzbekistan"}, + { 0x0999,"Spare code"}, + { 0, NULL } +}; +const value_string E164_International_Networks_vals[] = { + { 0x10, "British Telecommunications"}, + { 0x11, "Singapore Telecommunications"}, + { 0x12, "MCIWorldCom"}, + { 0x13, "Telespazio"}, + { 0x14, "GTE"}, + { 0x15, "Telstra"}, + { 0x16, "United Arab Emirates"}, + { 0x17, "AT&T"}, + { 0x18, "Teledesic"}, + { 0x19, "Telecom Italia"}, + { 0x20, "Asia Cellular Satellite"}, + { 0x21, "Ameritech"}, + { 0x22, "Cable & Wireless"}, + { 0x23, "Sita-Equant"}, + { 0x24, "Telia AB"}, + { 0x25, "Constellation Communications"}, + { 0x26, "SBC Communications"}, + { 0, NULL } +}; + +static int proto_e164 = -1; +static int hf_E164_calling_party_number = -1; +static int hf_E164_called_party_number = -1; + + + +void +dissect_e164_number(tvbuff_t *tvb, proto_tree *tree, int offset, + int length,e164_info_t e164_info) +{ + switch (e164_info.e164_number_type){ + case CALLING_PARTY_NUMBER : + proto_tree_add_string(tree, hf_E164_calling_party_number, tvb, offset, + length, e164_info.E164_number_str); + break; + + case CALLED_PARTY_NUMBER : + proto_tree_add_string(tree, hf_E164_called_party_number, tvb, offset, + length, e164_info.E164_number_str); + break; + + + default:; + break; + } + +} +/* + * Register the protocol with Ethereal. + * + * This format is required because a script is used to build the C function + * that calls all the protocol registration. + */ + +void +proto_register_e164(void) +{ + +/* Setup list of header fields See Section 1.6.1 for details */ + static hf_register_info hf[] = { + { &hf_E164_calling_party_number, + { "E164 Calling party number digits", "E164.calling_party_number.digits", + FT_STRING, BASE_NONE, NULL, 0x0, + "", HFILL }}, + + { &hf_E164_called_party_number, + { "E164 Called party number digits", "E164.called_party_number.digits", + FT_STRING, BASE_NONE, NULL, 0x0, + "", HFILL }}, + }; + + /* + * Register the protocol name and description + */ + proto_e164 = proto_register_protocol( + "ITU-T E164 number", + "E164", + "e164"); + + /* + * Required function calls to register + * the header fields and subtrees used. + */ + proto_register_field_array(proto_e164, hf, array_length(hf)); + +} diff --git a/packet-e164.h b/packet-e164.h new file mode 100644 index 0000000000..f8990a8517 --- /dev/null +++ b/packet-e164.h @@ -0,0 +1,50 @@ +/* packet-e164.h + * E164 tables + * Copyright 2004, Anders Broman <anders.broman@ericsson.com> + * + * $Id: packet-e164.h,v 1.1 2004/03/05 10:29:35 guy Exp $ + * + * Ethereal - Network traffic analyzer + * By Gerald Combs <gerald@ethereal.com> + * Copyright 1998 Gerald Combs + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifndef __PACKET_E164_H__ +#define __PACKET_E164_H__ + +#include "epan/value_string.h" + +extern const value_string E164_country_code_value[]; +extern const value_string E164_International_Networks_vals[]; + +typedef enum { + NONE, + CALLING_PARTY_NUMBER, + CALLED_PARTY_NUMBER + } e164_number_type_t; + +typedef struct { + e164_number_type_t e164_number_type; + guint nature_of_address; + char *E164_number_str; /* E164 number string */ + guint E164_number_length; /* Length of the E164_number string */ +} e164_info_t; + + +extern void dissect_e164_number(tvbuff_t *tvb, proto_tree *tree, int offset, int length, + e164_info_t e164_info); +#endif diff --git a/packet-isup.c b/packet-isup.c index da84377f2b..7775132559 100644 --- a/packet-isup.c +++ b/packet-isup.c @@ -9,7 +9,7 @@ * Modified 2004-01-10 by Anders Broman to add abillity to dissect * Content type application/ISUP RFC 3204 used in SIP-T * - * $Id: packet-isup.c,v 1.51 2004/02/29 08:47:10 guy Exp $ + * $Id: packet-isup.c,v 1.52 2004/03/05 10:29:35 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -48,6 +48,7 @@ #include <prefs.h> #include "packet-q931.h" #include "packet-isup.h" +#include "packet-e164.h" #define MTP3_ISUP_SERVICE_INDICATOR 5 #define MTP3_BICC_SERVICE_INDICATOR 13 @@ -1474,11 +1475,14 @@ dissect_isup_called_party_number_parameter(tvbuff_t *parameter_tvb, proto_tree * gint i=0; gint length; char called_number[MAXLENGTH]=""; + e164_info_t e164_info; + gint number_plan; indicators1 = tvb_get_guint8(parameter_tvb, 0); proto_tree_add_boolean(parameter_tree, hf_isup_odd_even_indicator, parameter_tvb, 0, 1, indicators1); proto_tree_add_uint(parameter_tree, hf_isup_called_party_nature_of_address_indicator, parameter_tvb, 0, 1, indicators1); indicators2 = tvb_get_guint8(parameter_tvb, 1); + number_plan = (indicators2 & 0x70)>> 4; proto_tree_add_boolean(parameter_tree, hf_isup_inn_indicator, parameter_tvb, 1, 1, indicators2); proto_tree_add_uint(parameter_tree, hf_isup_numbering_plan_indicator, parameter_tvb, 1, 1, indicators2); offset = 2; @@ -1504,7 +1508,14 @@ dissect_isup_called_party_number_parameter(tvbuff_t *parameter_tvb, proto_tree * called_number[i++] = number_to_char((address_digit_pair & ISUP_EVEN_ADDRESS_SIGNAL_DIGIT_MASK) / 0x10); } called_number[i++] = '\0'; - + if ( number_plan == 1 ) { + e164_info.e164_number_type = CALLED_PARTY_NUMBER; + e164_info.nature_of_address = indicators1 & 0x7f; + e164_info.E164_number_str = called_number; + e164_info.E164_number_length = i - 1; + dissect_e164_number(parameter_tvb, address_digits_tree, 2, + (offset - 2), e164_info); + } proto_item_set_text(address_digits_item, "Called Party Number: %s", called_number); proto_item_set_text(parameter_item, "Called Party Number: %s", called_number); @@ -3192,11 +3203,14 @@ dissect_isup_calling_party_number_parameter(tvbuff_t *parameter_tvb, proto_tree gint i=0; gint length; char calling_number[MAXLENGTH]=""; + e164_info_t e164_info; + gint number_plan; indicators1 = tvb_get_guint8(parameter_tvb, 0); proto_tree_add_boolean(parameter_tree, hf_isup_odd_even_indicator, parameter_tvb, 0, 1, indicators1); proto_tree_add_uint(parameter_tree, hf_isup_calling_party_nature_of_address_indicator, parameter_tvb, 0, 1, indicators1); indicators2 = tvb_get_guint8(parameter_tvb, 1); + number_plan = (indicators2 & 0x70)>> 4; proto_tree_add_boolean(parameter_tree, hf_isup_ni_indicator, parameter_tvb, 1, 1, indicators2); proto_tree_add_uint(parameter_tree, hf_isup_numbering_plan_indicator, parameter_tvb, 1, 1, indicators2); proto_tree_add_uint(parameter_tree, hf_isup_address_presentation_restricted_indicator, parameter_tvb, 1, 1, indicators2); @@ -3227,6 +3241,14 @@ dissect_isup_calling_party_number_parameter(tvbuff_t *parameter_tvb, proto_tree } calling_number[i++] = '\0'; + if ( number_plan == 1 ) { + e164_info.e164_number_type = CALLING_PARTY_NUMBER; + e164_info.nature_of_address = indicators1 & 0x7f; + e164_info.E164_number_str = calling_number; + e164_info.E164_number_length = i - 1; + dissect_e164_number(parameter_tvb, address_digits_tree, 2, + (offset - 2), e164_info); + } proto_item_set_text(address_digits_item, "Calling Party Number: %s", calling_number); proto_item_set_text(parameter_item, "Calling Party Number: %s", calling_number); |