diff options
| -rw-r--r-- | packet-dcerpc-nt.c | 112 | ||||
| -rw-r--r-- | packet-dcerpc-nt.h | 4 | ||||
| -rw-r--r-- | packet-smb-pipe.c | 4 | ||||
| -rw-r--r-- | packet-smb.c | 113 | ||||
| -rw-r--r-- | smb.h | 4 |
5 files changed, 119 insertions, 118 deletions
diff --git a/packet-dcerpc-nt.c b/packet-dcerpc-nt.c index 9dc30a896f..205bb6cd50 100644 --- a/packet-dcerpc-nt.c +++ b/packet-dcerpc-nt.c @@ -2,7 +2,7 @@ * Routines for DCERPC over SMB packet disassembly * Copyright 2001, Tim Potter <tpot@samba.org> * - * $Id: packet-dcerpc-nt.c,v 1.16 2002/03/14 10:04:02 sahlberg Exp $ + * $Id: packet-dcerpc-nt.c,v 1.17 2002/03/15 08:59:52 sahlberg Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -663,113 +663,3 @@ dissect_ndr_nt_NTTIME (tvbuff_t *tvb, int offset, return offset; } - -/* These are the MS country codes from www.unicode.org/unicode/onlinedat/countries.html - For countries that share teh same number I choose to use only the name of the largest - country. Appologies for this. If this offends you, here is the table to change that. - - There might be more info in winnls.h for those that have wincompilers -*/ -const value_string ms_country_codes[] = { - { 1, "USA"}, - { 2, "Canada"}, - { 7, "Russia"}, - { 20, "Egypt"}, - { 27, "South Africa"}, - { 30, "Greece"}, - { 31, "Netherlands"}, - { 32, "Belgium"}, - { 33, "France"}, - { 34, "Spain"}, - { 36, "Hungary"}, - { 39, "Italy"}, - { 40, "Romania"}, - { 41, "Switzerland"}, - { 43, "Austria"}, - { 44, "United Kingdom"}, - { 45, "Denmark"}, - { 46, "Sweden"}, - { 47, "Norway"}, - { 48, "Poland"}, - { 49, "Germany"}, - { 51, "Peru"}, - { 52, "Mexico"}, - { 54, "Argentina"}, - { 55, "Brazil"}, - { 56, "Chile"}, - { 57, "Colombia"}, - { 58, "Venezuela"}, - { 60, "Malaysia"}, - { 62, "Australia"}, - { 63, "Philippines"}, - { 64, "New Zealand"}, - { 65, "Singapore"}, - { 66, "Thailand"}, - { 81, "Japan"}, - { 82, "South Korea"}, - { 84, "Viet Nam"}, - { 86, "China"}, - { 90, "Turkey"}, - { 91, "India"}, - { 92, "Pakistan"}, - {212, "Morocco"}, - {213, "Algeria"}, - {216, "Tunisia"}, - {218, "Libya"}, - {254, "Kenya"}, - {263, "Zimbabwe"}, - {298, "Faroe Islands"}, - {351, "Portugal"}, - {352, "Luxembourg"}, - {353, "Ireland"}, - {354, "Iceland"}, - {355, "Albania"}, - {358, "Finland"}, - {359, "Bulgaria"}, - {370, "Lithuania"}, - {371, "Latvia"}, - {372, "Estonia"}, - {374, "Armenia"}, - {375, "Belarus"}, - {380, "Ukraine"}, - {381, "Serbia"}, - {385, "Croatia"}, - {386, "Slovenia"}, - {389, "Macedonia"}, - {420, "Czech Republic"}, - {421, "Slovak Republic"}, - {501, "Belize"}, - {502, "Guatemala"}, - {503, "El Salvador"}, - {504, "Honduras"}, - {505, "Nicaragua"}, - {506, "Costa Rica"}, - {507, "Panama"}, - {591, "Bolivia"}, - {593, "Ecuador"}, - {595, "Paraguay"}, - {598, "Uruguay"}, - {673, "Brunei Darussalam"}, - {852, "Hong Kong"}, - {853, "Macau"}, - {886, "Taiwan"}, - {960, "Maldives"}, - {961, "Lebanon"}, - {962, "Jordan"}, - {963, "Syria"}, - {964, "Iraq"}, - {965, "Kuwait"}, - {966, "Saudi Arabia"}, - {967, "Yemen"}, - {968, "Oman"}, - {972, "Israel"}, - {973, "Bahrain/United Arab Emirates"}, - {974, "Qatar"}, - {976, "Mongolia"}, - {981, "Iran"}, - {994, "Azerbaijan"}, - {995, "Georgia"}, - {996, "Kyrgyzstan"}, - - {0, NULL} -}; diff --git a/packet-dcerpc-nt.h b/packet-dcerpc-nt.h index bcdc4cadca..ca1bc18d2b 100644 --- a/packet-dcerpc-nt.h +++ b/packet-dcerpc-nt.h @@ -2,7 +2,7 @@ * Routines for DCERPC over SMB packet disassembly * Copyright 2001, Tim Potter <tpot@samba.org> * - * $Id: packet-dcerpc-nt.h,v 1.12 2002/03/14 10:04:02 sahlberg Exp $ + * $Id: packet-dcerpc-nt.h,v 1.13 2002/03/15 08:59:52 sahlberg Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -75,8 +75,6 @@ guint32 prs_pop_ptr(GList **ptr_list, char *name); -extern const value_string ms_country_codes[]; - #define ALIGN_TO_4_BYTES {if(offset&0x03)offset=(offset&0xfffffffc)+4;} int diff --git a/packet-smb-pipe.c b/packet-smb-pipe.c index c3f55c7b17..7a3fad7d54 100644 --- a/packet-smb-pipe.c +++ b/packet-smb-pipe.c @@ -8,7 +8,7 @@ XXX Fixme : shouldnt show [malformed frame] for long packets * significant rewrite to tvbuffify the dissector, Ronnie Sahlberg and * Guy Harris 2001 * - * $Id: packet-smb-pipe.c,v 1.69 2002/02/18 01:08:36 guy Exp $ + * $Id: packet-smb-pipe.c,v 1.70 2002/03/15 08:59:52 sahlberg Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -3102,7 +3102,7 @@ proto_register_pipe_lanman(void) /* XXX - we should have a value_string table for this */ { &hf_country_code, { "Country Code", "lanman.country_code", FT_UINT16, BASE_DEC, - NULL, 0, "LANMAN Country Code", HFILL }}, + VALS(ms_country_codes), 0, "LANMAN Country Code", HFILL }}, { &hf_workstations, { "Workstations", "lanman.workstations", FT_STRING, BASE_NONE, diff --git a/packet-smb.c b/packet-smb.c index 8f145e75af..e7b9c7f3ce 100644 --- a/packet-smb.c +++ b/packet-smb.c @@ -3,7 +3,7 @@ * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com> * 2001 Rewrite by Ronnie Sahlberg and Guy Harris * - * $Id: packet-smb.c,v 1.217 2002/03/15 04:46:42 tpot Exp $ + * $Id: packet-smb.c,v 1.218 2002/03/15 08:59:52 sahlberg Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -12788,6 +12788,117 @@ static char *decode_smb_error(guint8 errcls, guint16 errcode) } + +/* These are the MS country codes from www.unicode.org/unicode/onlinedat/countries.html + For countries that share teh same number I choose to use only the name of the largest + country. Appologies for this. If this offends you, here is the table to change that. + + There might be more info in winnls.h for those that have wincompilers +*/ +const value_string ms_country_codes[] = { + { 1, "USA"}, + { 2, "Canada"}, + { 7, "Russia"}, + { 20, "Egypt"}, + { 27, "South Africa"}, + { 30, "Greece"}, + { 31, "Netherlands"}, + { 32, "Belgium"}, + { 33, "France"}, + { 34, "Spain"}, + { 36, "Hungary"}, + { 39, "Italy"}, + { 40, "Romania"}, + { 41, "Switzerland"}, + { 43, "Austria"}, + { 44, "United Kingdom"}, + { 45, "Denmark"}, + { 46, "Sweden"}, + { 47, "Norway"}, + { 48, "Poland"}, + { 49, "Germany"}, + { 51, "Peru"}, + { 52, "Mexico"}, + { 54, "Argentina"}, + { 55, "Brazil"}, + { 56, "Chile"}, + { 57, "Colombia"}, + { 58, "Venezuela"}, + { 60, "Malaysia"}, + { 62, "Australia"}, + { 63, "Philippines"}, + { 64, "New Zealand"}, + { 65, "Singapore"}, + { 66, "Thailand"}, + { 81, "Japan"}, + { 82, "South Korea"}, + { 84, "Viet Nam"}, + { 86, "China"}, + { 90, "Turkey"}, + { 91, "India"}, + { 92, "Pakistan"}, + {212, "Morocco"}, + {213, "Algeria"}, + {216, "Tunisia"}, + {218, "Libya"}, + {254, "Kenya"}, + {263, "Zimbabwe"}, + {298, "Faroe Islands"}, + {351, "Portugal"}, + {352, "Luxembourg"}, + {353, "Ireland"}, + {354, "Iceland"}, + {355, "Albania"}, + {358, "Finland"}, + {359, "Bulgaria"}, + {370, "Lithuania"}, + {371, "Latvia"}, + {372, "Estonia"}, + {374, "Armenia"}, + {375, "Belarus"}, + {380, "Ukraine"}, + {381, "Serbia"}, + {385, "Croatia"}, + {386, "Slovenia"}, + {389, "Macedonia"}, + {420, "Czech Republic"}, + {421, "Slovak Republic"}, + {501, "Belize"}, + {502, "Guatemala"}, + {503, "El Salvador"}, + {504, "Honduras"}, + {505, "Nicaragua"}, + {506, "Costa Rica"}, + {507, "Panama"}, + {591, "Bolivia"}, + {593, "Ecuador"}, + {595, "Paraguay"}, + {598, "Uruguay"}, + {673, "Brunei Darussalam"}, + {852, "Hong Kong"}, + {853, "Macau"}, + {886, "Taiwan"}, + {960, "Maldives"}, + {961, "Lebanon"}, + {962, "Jordan"}, + {963, "Syria"}, + {964, "Iraq"}, + {965, "Kuwait"}, + {966, "Saudi Arabia"}, + {967, "Yemen"}, + {968, "Oman"}, + {972, "Israel"}, + {973, "Bahrain/United Arab Emirates"}, + {974, "Qatar"}, + {976, "Mongolia"}, + {981, "Iran"}, + {994, "Azerbaijan"}, + {995, "Georgia"}, + {996, "Kyrgyzstan"}, + + {0, NULL} +}; + /* * NT error codes. * @@ -2,7 +2,7 @@ * Defines for smb packet dissection * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com> * - * $Id: smb.h,v 1.34 2002/03/15 04:46:43 tpot Exp $ + * $Id: smb.h,v 1.35 2002/03/15 08:59:53 sahlberg Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -302,4 +302,6 @@ extern GHashTable *dcerpc_fragment_table; */ extern const value_string NT_errors[]; extern const value_string DOS_errors[]; +extern const value_string ms_country_codes[]; + #endif |