Update E.164 dissection to ITU Operational Bulletin No. 991

svn path=/trunk/; revision=48711

1 files changed, 272 insertions, 219 deletions

diff --git a/epan/dissectors/packet-e164.c b/epan/dissectors/packet-e164.c
index 7d79d83ee8..5d02aaa15e 100644
--- a/epan/dissectors/packet-e164.c
+++ b/epan/dissectors/packet-e164.c
@@ -24,7 +24,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  * Ref ITU-T E.164 05/97
- *     Annex to ITU Operational Bulletin No. 835 - 1.V.2005
+ *     Annex to ITU Operational Bulletin No. 991 - 1.XI.2011
  */
 
 #include "config.h"
@@ -36,92 +36,92 @@
 void proto_register_e164(void);
 
 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.)"},
+	{ 0x00, "Reserved"},
 	{ 0x01, "Americas"},
-	{ 0x020,"Egypt"},
+	{ 0x020,"Egypt (Arab Republic of)"},
 	{ 0x0210,"Spare code"},
-	{ 0x0211,"Spare code"},
-	{ 0x0212,"Morocco"},
-	{ 0x0213,"Algeria"},
-	{ 0x0214,"spare code"},
-	{ 0x0215,"spare code"},
+	{ 0x0211,"South Sudan (Republic of)"},
+	{ 0x0212,"Morocco (Kingdom of)"},
+	{ 0x0213,"Algeria (People's Democratic Republic of)"},
+	{ 0x0214,"Spare code"},
+	{ 0x0215,"Spare code"},
 	{ 0x0216,"Tunisia"},
 	{ 0x0217,"Spare code"},
-	{ 0x0218,"Libya"},
+	{ 0x0218,"Libya (Socialist People's Libyan Arab Jamahiriya)"},
 	{ 0x0219,"Spare code"},
-	{ 0x0220,"Gambia"},
-	{ 0x0221,"Senegal"},
-	{ 0x0222,"Mauritania"},
-	{ 0x0223,"Mali"},
-	{ 0x0224,"Guinea"},
-	{ 0x0225,"Ivory Coast"},
+	{ 0x0220,"Gambia (Republic of the)"},
+	{ 0x0221,"Senegal (Republic of)"},
+	{ 0x0222,"Mauritania (Islamic Republic of)"},
+	{ 0x0223,"Mali (Republic of)"},
+	{ 0x0224,"Guinea (Republic of)"},
+	{ 0x0225,"Cote d'Ivoire (Republic of)"},
 	{ 0x0226,"Burkina Faso"},
-	{ 0x0227,"Niger"},
+	{ 0x0227,"Niger (Republic of the)"},
 	{ 0x0228,"Togolese Republic"},
-	{ 0x0229,"Benin"},
-	{ 0x0230,"Mauritius"},
-	{ 0x0231,"Liberia "},
+	{ 0x0229,"Benin (Republic of)"},
+	{ 0x0230,"Mauritius (Republic of)"},
+	{ 0x0231,"Liberia (Republic of)"},
 	{ 0x0232,"Sierra Leone"},
 	{ 0x0233,"Ghana"},
-	{ 0x0234,"Nigeria"},
-	{ 0x0235,"Chad"},
+	{ 0x0234,"Nigeria (Federal Republic of)"},
+	{ 0x0235,"Chad (Republic of)"},
 	{ 0x0236,"Central African Republic"},
-	{ 0x0237,"Cameroon"},
-	{ 0x0238,"Cape Verde"},
-	{ 0x0239,"Sao Tome and Principe"},
-	{ 0x0240,"Equatorial Guinea"},
+	{ 0x0237,"Cameroon (Republic of)"},
+	{ 0x0238,"Cape Verde (Republic of)"},
+	{ 0x0239,"Sao Tome and Principe (Democratic Republic of)"},
+	{ 0x0240,"Equatorial Guinea (Republic of)"},
 	{ 0x0241,"Gabonese Republic"},
-	{ 0x0242,"Republic of Congo"},
+	{ 0x0242,"Congo (Republic of the)"},
 	{ 0x0243,"Democratic Republic of Congo"},
-	{ 0x0244,"Angola"},
-	{ 0x0245,"Guinea-Bissau"},
+	{ 0x0244,"Angola (Republic of)"},
+	{ 0x0245,"Guinea-Bissau (Republic of)"},
 	{ 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"},
+	{ 0x0247,"Saint Helena, Ascension and Tristan da Cunha"},
+	{ 0x0248,"Seychelles (Republic of)"},
+	{ 0x0249,"Sudan (Republic of the)"},
+	{ 0x0250,"Rwanda (Republic of)"},
+	{ 0x0251,"Ethiopia (Federal Democratic Republic of)"},
+	{ 0x0252,"Somali Democratic Republic"},
+	{ 0x0253,"Djibouti (Republic of)"},
+	{ 0x0254,"Kenya (Republic of)"},
+	{ 0x0255,"Tanzania (United Republic of)"},
+	{ 0x0256,"Uganda (Republic of)"},
+	{ 0x0257,"Burundi (Republic of)"},
+	{ 0x0258,"Mozambique (Republic of)"},
 	{ 0x0259,"Spare code"},
-	{ 0x0260,"Zambia"},
-	{ 0x0261,"Madagascar"},
-	{ 0x0262,"Reunion Island"},
-	{ 0x0263,"Zimbabwe"},
-	{ 0x0264,"Namibia"},
+	{ 0x0260,"Zambia (Republic of)"},
+	{ 0x0261,"Madagascar (Republic of)"},
+	{ 0x0262,"French Departments and Territories in the Indian Ocean"},
+	{ 0x0263,"Zimbabwe (Republic of)"},
+	{ 0x0264,"Namibia (Republic of)"},
 	{ 0x0265,"Malawi"},
-	{ 0x0266,"Lesotho"},
-	{ 0x0267,"Botswana"},
-	{ 0x0268,"Swaziland"},
-	{ 0x0269,"Comoros Mayotte"},
-	{ 0x027,"South Africa"},
-	{ 0x0280,"spare code"},
-	{ 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"},
+	{ 0x0266,"Lesotho (Kingdom of)"},
+	{ 0x0267,"Botswana (Republic of)"},
+	{ 0x0268,"Swaziland (Kingdom of)"},
+	{ 0x0269,"Comoros (Union of the)"},
+	{ 0x027,"South Africa (Republic of)"},
+	{ 0x0280,"Spare code"},
+	{ 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, Ascension and Tristan da Cunha"},
 	{ 0x0291,"Eritrea"},
-	{ 0x0292,"spare code"},
-	{ 0x0293,"spare code"},
-	{ 0x0294,"spare code"},
-	{ 0x0295,"spare code"},
-	{ 0x0296,"spare code"},
+	{ 0x0292,"Spare code"},
+	{ 0x0293,"Spare code"},
+	{ 0x0294,"Spare code"},
+	{ 0x0295,"Spare code"},
+	{ 0x0296,"Spare code"},
 	{ 0x0297,"Aruba"},
 	{ 0x0298,"Faroe Islands"},
-	{ 0x0299,"Greenland"},
+	{ 0x0299,"Greenland (Denmark)"},
 	{ 0x030,"Greece"},
-	{ 0x031,"Netherlands"},
+	{ 0x031,"Netherlands (Kingdom of the)"},
 	{ 0x032,"Belgium"},
 	{ 0x033,"France"},
 	{ 0x034,"Spain"},
@@ -130,127 +130,127 @@ const value_string E164_country_code_value[] = {
 	{ 0x0352,"Luxembourg"},
 	{ 0x0353,"Ireland"},
 	{ 0x0354,"Iceland"},
-	{ 0x0355,"Albania"},
+	{ 0x0355,"Albania (Republic of)"},
 	{ 0x0356,"Malta"},
-	{ 0x0357,"Cyprus"},
+	{ 0x0357,"Cyprus (Republic of)"},
 	{ 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"},
+	{ 0x0359,"Bulgaria (Republic of)"},
+	{ 0x036,"Hungary (Republic of)"},
+	{ 0x0370,"Lithuania (Republic of)"},
+	{ 0x0371,"Latvia (Republic of)"},
+	{ 0x0372,"Estonia (Republic of)"},
+	{ 0x0373,"Moldova (Republic of)"},
+	{ 0x0374,"Armenia (Republic of)"},
+	{ 0x0375,"Belarus (Republic of)"},
+	{ 0x0376,"Andorra (Principality of)"},
+	{ 0x0377,"Monaco (Principality of)"},
+	{ 0x0378,"San Marino (Republic of)"},
+	{ 0x0379,"Vatican City State"},
 	{ 0x0380,"Ukraine"},
-	{ 0x0381,"Serbia and Montenegro"},
-	{ 0x0382,"spare code"},
-	{ 0x0383,"spare code"},
-	{ 0x0384,"spare code"},
-	{ 0x0385,"Croatia"},
-	{ 0x0386,"Slovenia"},
+	{ 0x0381,"Serbia (Republic of)"},
+	{ 0x0382,"Montenegro (Republic of)"},
+	{ 0x0383,"Spare code"},
+	{ 0x0384,"Spare code"},
+	{ 0x0385,"Croatia (Republic of)"},
+	{ 0x0386,"Slovenia (Republic of)"},
 	{ 0x0387,"Bosnia and Herzegovina"},
-	{ 0x0388,"Groups of countries:"},
-	{ 0x0389,"Macedonia"},
+	{ 0x0388,"Group of countries, shared code"},
+	{ 0x0389,"The Former Yugoslav Republic of Macedonia"},
 	{ 0x039,"Italy"},
 	{ 0x040,"Romania"},
-	{ 0x041,"Switzerland"},
+	{ 0x041,"Switzerland (Confederation of)"},
 	{ 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"},
+	{ 0x0423,"Liechtenstein (Principality of)"},
+	{ 0x0424,"Spare code"},
+	{ 0x0425,"Spare code"},
+	{ 0x0426,"Spare code"},
+	{ 0x0427,"Spare code"},
+	{ 0x0428,"Spare code"},
+	{ 0x0429,"Spare code"},
 	{ 0x043,"Austria"},
-	{ 0x044,"United Kingdom"},
+	{ 0x044,"United Kingdom of Great Britain and Northern Ireland"},
 	{ 0x045,"Denmark"},
 	{ 0x046,"Sweden"},
 	{ 0x047,"Norway"},
-	{ 0x048,"Poland"},
-	{ 0x049,"Germany"},
+	{ 0x048,"Poland (Republic of)"},
+	{ 0x049,"Germany (Federal Republic of)"},
 	{ 0x0500,"Falkland Islands (Malvinas)"},
 	{ 0x0501,"Belize"},
-	{ 0x0502,"Guatemala"},
-	{ 0x0503,"El Salvador"},
-	{ 0x0504,"Honduras"},
+	{ 0x0502,"Guatemala (Republic of)"},
+	{ 0x0503,"El Salvador (Republic of)"},
+	{ 0x0504,"Honduras (Republic of)"},
 	{ 0x0505,"Nicaragua"},
 	{ 0x0506,"Costa Rica"},
-	{ 0x0507,"Panama"},
-	{ 0x0508,"Saint Pierre and Miquelon"},
-	{ 0x0509,"Haiti"},
+	{ 0x0507,"Panama (Republic of)"},
+	{ 0x0508,"Saint Pierre and Miquelon (Collectivite territoriale de la Republique francaise)"},
+	{ 0x0509,"Haiti (Republic of)"},
 	{ 0x051,"Peru"},
 	{ 0x052,"Mexico"},
 	{ 0x053,"Cuba"},
-	{ 0x054,"Argentina"},
-	{ 0x055,"Brazil"},
+	{ 0x054,"Argentine Republic"},
+	{ 0x055,"Brazil (Federative Republic of)"},
 	{ 0x056,"Chile"},
-	{ 0x057,"Colombia"},
-	{ 0x058,"Venezuela"},
-	{ 0x0590,"Guadeloupe"},
-	{ 0x0591,"Bolivia"},
+	{ 0x057,"Colombia (Republic of)"},
+	{ 0x058,"Venezuela(Bolivarian Republic of)"},
+	{ 0x0590,"Guadeloupe (French Department of)"},
+	{ 0x0591,"Bolivia (Plurinational State of)"},
 	{ 0x0592,"Guyana"},
 	{ 0x0593,"Ecuador"},
-	{ 0x0594,"French Guiana"},
-	{ 0x0595,"Paraguay"},
-	{ 0x0596,"Martinique"},
-	{ 0x0597,"Suriname"},
-	{ 0x0598,"Uruguay"},
-	{ 0x0599,"Netherlands Antilles"},
+	{ 0x0594,"French Guiana (French Department of)"},
+	{ 0x0595,"Paraguay (Republic of)"},
+	{ 0x0596,"Martinique (French Department of)"},
+	{ 0x0597,"Suriname (Republic of)"},
+	{ 0x0598,"Uruguay (Eastern Republic of)"},
+	{ 0x0599,"Bonaire, Saint Eustatius and Saba, Curacao"},
 	{ 0x060,"Malaysia"},
 	{ 0x061,"Australia"},
-	{ 0x062,"Indonesia"},
-	{ 0x063,"Philippines"},
+	{ 0x062,"Indonesia (Republic of)"},
+	{ 0x063,"Philippines (Republic of the)"},
 	{ 0x064,"New Zealand"},
-	{ 0x065,"Singapore"},
+	{ 0x065,"Singapore (Republic of)"},
 	{ 0x066,"Thailand"},
-	{ 0x0670,"East Timor"},
+	{ 0x0670,"Democratic Republic of Timor-Leste"},
 	{ 0x0671,"Spare code"},
 	{ 0x0672,"Australian External Territories"},
 	{ 0x0673,"Brunei Darussalam"},
-	{ 0x0674,"Nauru"},
+	{ 0x0674,"Nauru (Republic of)"},
 	{ 0x0675,"Papua New Guinea"},
-	{ 0x0676,"Tonga"},
+	{ 0x0676,"Tonga (Kingdom of)"},
 	{ 0x0677,"Solomon Islands"},
-	{ 0x0678,"Vanuatu"},
-	{ 0x0679,"Fiji"},
-	{ 0x0680,"Palau"},
-	{ 0x0681,"Wallis and Futuna"},
+	{ 0x0678,"Vanuatu (Republic of)"},
+	{ 0x0679,"Fiji (Republic of)"},
+	{ 0x0680,"Palau (Republic of)"},
+	{ 0x0681,"Wallis and Futuna (Territoire francais d'outre-mer)"},
 	{ 0x0682,"Cook Islands"},
 	{ 0x0683,"Niue"},
 	{ 0x0684,"Spare code"},
-	{ 0x0685,"Samoa"},
-	{ 0x0686,"Kiribati"},
-	{ 0x0687,"New Caledonia"},
+	{ 0x0685,"Samoa (Independent State of)"},
+	{ 0x0686,"Kiribati (Republic of)"},
+	{ 0x0687,"New Caledonia (Territoire francais d'outre-mer)"},
 	{ 0x0688,"Tuvalu"},
-	{ 0x0689,"French Polynesia"},
+	{ 0x0689,"French Polynesia (Territoire francais d'outre-mer)"},
 	{ 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)"},
+	{ 0x0691,"Micronesia (Federated States of)"},
+	{ 0x0692,"Marshall Islands (Republic of the)"},
+	{ 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 (Republic of)"},
+	{ 0x0800,"International Freephone Service"},
+	{ 0x0801,"Spare code"},
+	{ 0x0802,"Spare code"},
+	{ 0x0803,"Spare code"},
+	{ 0x0804,"Spare code"},
+	{ 0x0805,"Spare code"},
+	{ 0x0806,"Spare code"},
+	{ 0x0807,"Spare code"},
+	{ 0x0808,"International Shared Cost Service (ISCS)"},
 	{ 0x0809,"Spare code"},
 	{ 0x081,"Japan"},
 	{ 0x082,"Korea (Republic of)"},
@@ -264,37 +264,37 @@ const value_string E164_country_code_value[] = {
 	{ 0x0837,"Spare code"},
 	{ 0x0838,"Spare code"},
 	{ 0x0839,"Spare code"},
-	{ 0x084,"Viet Nam"},
+	{ 0x084,"Viet Nam (Socialist Republic of)"},
 	{ 0x0850,"Democratic People's Republic of Korea"},
 	{ 0x0851,"Spare code"},
 	{ 0x0852,"Hong Kong, China"},
 	{ 0x0853,"Macau, China"},
 	{ 0x0854,"Spare code"},
-	{ 0x0855,"Cambodia"},
-	{ 0x0856,"Laos"},
+	{ 0x0855,"Cambodia (Kingdom of)"},
+	{ 0x0856,"Lao People's Democratic Republic"},
 	{ 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)"},
+	{ 0x0871,"Spare code"},
+	{ 0x0872,"Spare code"},
+	{ 0x0873,"Spare code"},
+	{ 0x0874,"Spare code"},
 	{ 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)"},
+	{ 0x0878,"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"},
+	{ 0x0881,"Global Mobile Satellite System (GMSS), shared code"},
+	{ 0x0882,"International Networks, shared code"},
+	{ 0x0883,"International Networks, shared code"},
 	{ 0x0884,"Spare code"},
 	{ 0x0885,"Spare code"},
-	{ 0x0886,"Reserved"},
+	{ 0x0886,"Taiwan, China"},
 	{ 0x0887,"Spare code"},
-	{ 0x0888,"Reserved for future global services (see E.164)"},
+	{ 0x0888,"Telecommunications for Disaster Relief (TDR)"},
 	{ 0x0889,"Spare code"},
 	{ 0x0890,"Spare code"},
 	{ 0x0891,"Spare code"},
@@ -307,71 +307,88 @@ const value_string E164_country_code_value[] = {
 	{ 0x0898,"Spare code"},
 	{ 0x0899,"Spare code"},
 	{ 0x090,"Turkey"},
-	{ 0x091,"India"},
-	{ 0x092,"Pakistan"},
+	{ 0x091,"India (Republic of)"},
+	{ 0x092,"Pakistan (Islamic Republic of)"},
 	{ 0x093,"Afghanistan"},
-	{ 0x094,"Sri Lanka"},
-	{ 0x095,"Myanmar"},
-	{ 0x0960,"Maldives"},
+	{ 0x094,"Sri Lanka (Democratic Socialist Republic of)"},
+	{ 0x095,"Myanmar (the Republic of the Union of)"},
+	{ 0x0960,"Maldives (Republic of)"},
 	{ 0x0961,"Lebanon"},
-	{ 0x0962,"Jordan"},
+	{ 0x0962,"Jordan (Hashemite Kingdom of)"},
 	{ 0x0963,"Syrian Arab Republic"},
-	{ 0x0964,"Iraq"},
-	{ 0x0965,"Kuwait"},
-	{ 0x0966,"Saudi Arabia"},
-	{ 0x0967,"Yemen"},
-	{ 0x0968,"Oman"},
-	{ 0x0969,"Reserved"},
+	{ 0x0964,"Iraq (Republic of)"},
+	{ 0x0965,"Kuwait (State of)"},
+	{ 0x0966,"Saudi Arabia (Kingdom of)"},
+	{ 0x0967,"Yemen (Republic of)"},
+	{ 0x0968,"Oman (Sultanate of)"},
+	{ 0x0969,"Reserved - reservation currently under investigation"},
 	{ 0x0970,"Reserved"},
 	{ 0x0971,"United Arab Emirates"},
-	{ 0x0972,"Israel"},
-	{ 0x0973,"Bahrain"},
-	{ 0x0974,"Qatar"},
-	{ 0x0975,"Bhutan"},
+	{ 0x0972,"Israel (State of)"},
+	{ 0x0973,"Bahrain (Kingdom of)"},
+	{ 0x0974,"Qatar (State of)"},
+	{ 0x0975,"Bhutan (Kingdom of)"},
 	{ 0x0976,"Mongolia"},
-	{ 0x0977,"Nepal"},
+	{ 0x0977,"Nepal (Federal Democratic Republic of)"},
 	{ 0x0978,"Spare code"},
-	{ 0x0979,"Universal International Premium Rate Number (see E.169.2)"},
-	{ 0x098,"Iran"},
+	{ 0x0979,"International Premium Rate Service (IPRS)"},
+	{ 0x098,"Iran (Islamic Republic of)"},
 	{ 0x0990,"Spare code"},
-	{ 0x0991,"Trial service (see E.164.2)"},
-	{ 0x0992,"Tajikstan"},
+	{ 0x0991,"Trial of a proposed new international telecommunication public correspondence service, shared code"},
+	{ 0x0992,"Tajikstan (Republic of)"},
 	{ 0x0993,"Turkmenistan"},
 	{ 0x0994,"Azerbaijani Republic"},
 	{ 0x0995,"Georgia"},
 	{ 0x0996,"Kyrgyz Republic"},
 	{ 0x0997,"Spare code"},
-	{ 0x0998,"Uzbekistan"},
-	{ 0x0999,"Reserved"},
+	{ 0x0998,"Uzbekistan (Republic of)"},
+	{ 0x0999,"Reserved for future global service"},
 	{ 0,	NULL }
 };
-const value_string E164_International_Networks_vals[] = {
-	{   0x10, "British Telecommunications"},
-	{   0x11, "Singapore Telecommunications"},
-	{   0x12, "MCI"},
-	{   0x13, "Telespazio"},
-	{   0x14, "GTE"},
-	{   0x15, "Reach"},
-	{   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, "TeliaSonera AB"},
-	{   0x25, "Constellation Communications"},
-	{   0x26, "SBC Communications"},
-	{   0x28, "Deutsche Telekom"},
-	{   0x29, "Q-Tel"},
-	{   0x30, "Singapore Telecom"},
-	{   0x31, "Telekom Malaysia"},
-	{   0x32, "Maritime Communications Partners"},
-	{   0x33, "Oration Technologies"},
-	{   0x34, "Global Networks"},
-	{   0x98, "SITA"},
-	{   0x99, "Telenor"},
+const value_string E164_GMSS_vals[] = {
+	{ 0x6, "Iridium Satellite LLC"},
+	{ 0x7, "Iridium Satellite LLC"},
+	{ 0x8, "Globalstar"},
+	{ 0x9, "Globalstar"},
+	{ 0,	NULL }
+};
+const value_string E164_International_Networks_882_vals[] = {
+	{ 0x10, "Global Office Application"},
+	{ 0x12, "HyperStream International (HSI) Data Network"},
+	{ 0x13, "EMS Regional Mobile Satellite System"},
+	{ 0x15, "Global international ATM Network"},
+	{ 0x16, "Thuraya RMSS Network"},
+	{ 0x20, "Garuda Mobile Telecommunication Satellite System"},
+	{ 0x22, "Cable & Wireless Global Network"},
+	{ 0x23, "Sita-Equant Network"},
+	{ 0x24, "TeliaSonera multinational ATM Network"},
+	{ 0x28, "Deutsche Telekom's Next Generation Network"},
+	{ 0x31, "Global International ATM Network"},
+	{ 0x32, "MCP network"},
+	{ 0x33, "Oration Technologies Network"},
+	{ 0x34, "BebbiCell AG"},
+	{ 0x35, "Jasper System"},
+	{ 0x36, "Jersey Telecom"},
+	{ 0x37, "Cingular Wireless netwok"},
+	{ 0x39, "Vodafone Malta"},
+	{ 0x40, "Oy Communication"},
+	{ 0x41, "Intermatica"},
+	{ 0x42, "Seanet Maritime Communication"},
+	{ 0x43, "Ukrainian Radiosystems (Beeline)"},
+	{ 0x45, "Telecom Italia"},
+	{ 0x97, "Smart Communications Inc"},
+	{ 0x98, "Onair GSM services"},
+	{ 0x99, "Telenor GSM network - services in aircraft"},
+	{ 0,	NULL }
+};
+const value_string E164_International_Networks_883_vals[] = {
+	{ 0x100, "MediaLincc Ltd"},
+	{ 0x110, "Aicent Inc"},
+	{ 0x120, "Telenor Connexion AB"},
+	{ 0x130, "France Telecom Orange"},
+	{ 0x140, "Multiregional TransitTelecom (MTT)"},
+	{ 0x5100, "Voxbone SA"},
+	{ 0x5110, "Bandwith.com Inc"},
 	{ 0,	NULL }
 };
 
@@ -564,14 +581,50 @@ dissect_e164_cc(tvbuff_t *tvb, proto_tree *tree, int offset, gboolean bcd_coded)
 	}/* end switch cc_length */
 
 	proto_tree_add_text(tree, tvb, cc_offset, length,"Country Code: %x %s (length %u)", cc,
-			    val_to_str(cc,E164_country_code_value,"unknown (%x)"), cc_length);
+			    val_to_str_const(cc,E164_country_code_value,"Unknown"), cc_length);
 
 	switch ( cc ) {
+	case 0x881 :
+		if (!bcd_coded) {
+			id_code = tvb_get_guint8(tvb, cc_offset + 1) & 0x0f;
+		} else {
+			id_code = (tvb_get_guint8(tvb, cc_offset + 1) & 0xf0) >> 4;
+		}
+		proto_tree_add_text(tree,tvb, (cc_offset + 1), 1,"Identification Code: %x %s ",id_code,
+				    val_to_str_const(id_code,E164_GMSS_vals,"Unknown"));
+		break;
 	case 0x882 :
-		id_code = tvb_get_ntohs(tvb, cc_offset + 1);
-		id_code = (id_code & 0x0fff) >> 4;
+		if (!bcd_coded) {
+			id_code = tvb_get_ntohs(tvb, cc_offset + 1);
+			id_code = (id_code & 0x0ff0) >> 4;
+		} else {
+			id_code  = tvb_get_guint8(tvb, cc_offset + 1) & 0xf0;
+			id_code |= tvb_get_guint8(tvb, cc_offset + 2) & 0x0f;
+		}
 		proto_tree_add_text(tree,tvb, (cc_offset + 1), 2,"Identification Code: %x %s ",id_code,
-				    val_to_str(id_code,E164_International_Networks_vals,"unknown (%x)"));
+				    val_to_str_const(id_code,E164_International_Networks_882_vals,"Unknown"));
+		break;
+	case 0x883 :
+		if (!bcd_coded) {
+			id_code = tvb_get_ntohs(tvb, cc_offset + 1);
+			id_code = id_code & 0x0fff;
+		} else {
+			id_code  = (tvb_get_guint8(tvb, cc_offset + 1) & 0xf0) << 4;
+			id_code |= (tvb_get_guint8(tvb, cc_offset + 2) & 0x0f) << 4;
+			id_code |= (tvb_get_guint8(tvb, cc_offset + 2) & 0xf0) >> 4;
+		}
+		if ((id_code & 0x0ff0) == 0x510) {
+			if (!bcd_coded) {
+				id_code = (id_code << 4) | ((tvb_get_guint8(tvb, cc_offset + 3) & 0xf0) >> 4);
+			} else {
+				id_code = (id_code << 4) | (tvb_get_guint8(tvb, cc_offset + 3) & 0x0f);
+			}
+			proto_tree_add_text(tree,tvb, (cc_offset + 1), 3,"Identification Code: %x %s ",id_code,
+					    val_to_str_const(id_code,E164_International_Networks_883_vals,"Unknown"));
+		} else {
+			proto_tree_add_text(tree,tvb, (cc_offset + 1), 2,"Identification Code: %x %s ",id_code,
+					    val_to_str_const(id_code,E164_International_Networks_883_vals,"Unknown"));
+		}
 		break;
 	default:
 		break;