From 3971e95140f7352834898b313d812727db5f6f77 Mon Sep 17 00:00:00 2001 From: Bill Meier Date: Mon, 10 Dec 2012 19:12:05 +0000 Subject: Re-generate value_string array for MIBenum mapping char set names from latest IANA document; Adds new values and fixes an incorrect value in the previous value_string array. Note: names used as specified (with capitalization) in the document. (Previously all the names in the value_string array were lower case). Also: rename the value_string array to have a less generic name. svn path=/trunk/; revision=46490 --- epan/dissectors/packet-wap.c | 561 +++++++++++++++++++++-------------------- epan/dissectors/packet-wap.h | 2 +- epan/dissectors/packet-wbxml.c | 148 +++++------ epan/dissectors/packet-wsp.c | 263 +++++++++---------- epan/dissectors/packet-wtls.c | 6 +- 5 files changed, 504 insertions(+), 476 deletions(-) diff --git a/epan/dissectors/packet-wap.c b/epan/dissectors/packet-wap.c index 141812045d..36456a75ad 100644 --- a/epan/dissectors/packet-wap.c +++ b/epan/dissectors/packet-wap.c @@ -43,284 +43,311 @@ guint tvb_get_guintvar (tvbuff_t *tvb, guint offset, guint *octetCount) { - guint value = 0; - guint octet; - guint counter = 0; - char cont = 1; + guint value = 0; + guint octet; + guint counter = 0; + char cont = 1; #ifdef DEBUG - if (octetCount != NULL) - { - fprintf (stderr, "dissect_wap: Starting tvb_get_guintvar at offset %d, count=%d\n", offset, *octetCount); - /* counter = *octetCount; */ - } - else - { - fprintf (stderr, "dissect_wap: Starting tvb_get_guintvar at offset %d, count=NULL\n", offset); - } + if (octetCount != NULL) + { + fprintf (stderr, "dissect_wap: Starting tvb_get_guintvar at offset %d, count=%d\n", offset, *octetCount); + /* counter = *octetCount; */ + } + else + { + fprintf (stderr, "dissect_wap: Starting tvb_get_guintvar at offset %d, count=NULL\n", offset); + } #endif - while (cont != 0) - { - value<<=7; /* Value only exists in 7 of the 8 bits */ - octet = tvb_get_guint8 (tvb, offset+counter); - counter++; - value += (octet & 0x7F); - cont = (octet & 0x80); + while (cont != 0) + { + value <<= 7; /* Value only exists in 7 of the 8 bits */ + octet = tvb_get_guint8 (tvb, offset+counter); + counter += 1; + value += (octet & 0x7F); + cont = (octet & 0x80); #ifdef DEBUG - fprintf (stderr, "dissect_wap: computing: octet is %d (0x%02x), count=%d, value=%d, cont=%d\n", octet, octet, counter, value, cont); + fprintf (stderr, "dissect_wap: computing: octet is %d (0x%02x), count=%d, value=%d, cont=%d\n", + octet, octet, counter, value, cont); #endif - } + } - if (octetCount != NULL) - { - *octetCount = counter; + if (octetCount != NULL) + { + *octetCount = counter; #ifdef DEBUG - fprintf (stderr, "dissect_wap: Leaving tvb_get_guintvar count=%d, value=%u\n", *octetCount, value); + fprintf (stderr, "dissect_wap: Leaving tvb_get_guintvar count=%d, value=%u\n", *octetCount, value); #endif - } + } - return (value); + return (value); } /* See http://www.iana.org/assignments/character-sets for the MIBenum mapping */ -static const value_string vals_character_sets[] = { - { 0x0000, "*" }, - { 0x0003, "us-ascii" }, - { 0x0004, "iso-8859-1" }, - { 0x0005, "iso-8859-2" }, - { 0x0006, "iso-8859-3" }, - { 0x0007, "iso-8859-4" }, - { 0x0008, "iso-8859-5" }, - { 0x0009, "iso-8859-6" }, - { 0x000A, "iso-8859-7" }, - { 0x000B, "iso-8859-8" }, - { 0x000C, "iso-8859-9" }, - { 0x000D, "iso-8859-10" }, - { 0x000E, "iso_6937-2-add" }, - { 0x000F, "jis_x0201" }, - { 0x0010, "jis_encoding" }, - { 0x0011, "shift_jis" }, - { 0x0012, "euc-jp" }, - { 0x0013, "extended_unix_code_fixed_width_for_japanese" }, - { 0x0014, "bs_4730" }, - { 0x0015, "sen_850200_c" }, - { 0x0016, "it" }, - { 0x0017, "es" }, - { 0x0018, "din_66003" }, - { 0x0019, "ns_4551-1" }, - { 0x001A, "nf_z_62-010" }, - { 0x001B, "iso-10646-utf-1" }, - { 0x001C, "iso_646.basic:1983" }, - { 0x001D, "invariant" }, - { 0x001E, "iso_646.irv:1983" }, - { 0x001F, "nats-sefi" }, - { 0x0020, "nats-sefi-add" }, - { 0x0021, "nats-dano" }, - { 0x0022, "nats-dano-add" }, - { 0x0023, "sen_850200_b" }, - { 0x0024, "ks_c_5601-1987" }, - { 0x0025, "iso-2022-kr" }, - { 0x0026, "euc-kr" }, - { 0x0027, "iso-2022-jp" }, - { 0x0028, "iso-2022-jp-2" }, - { 0x0029, "jis_c6220-1969-jp" }, - { 0x002A, "jis_c6220-1969-ro" }, - { 0x002B, "pt" }, - { 0x002C, "greek7-old" }, - { 0x002D, "latin-greek" }, - { 0x002E, "nf_z_62-010_(1973)" }, - { 0x002F, "latin-greek-1" }, - { 0x0030, "iso_5427" }, - { 0x0031, "jis_c6226-1978" }, - { 0x0032, "bs_viewdata" }, - { 0x0033, "inis" }, - { 0x0034, "inis-8" }, - { 0x0035, "inis-cyrillic" }, - { 0x0036, "iso_5427:1981" }, - { 0x0037, "iso_5428:1980" }, - { 0x0038, "gb_1988-80" }, - { 0x0039, "gb_2312-80" }, - { 0x003A, "ns_4551-2" }, - { 0x003B, "videotex-suppl" }, - { 0x003C, "pt2" }, - { 0x003D, "es2" }, - { 0x003E, "msz_7795.3" }, - { 0x003F, "jis_c6226-1983" }, - { 0x0040, "greek7" }, - { 0x0041, "asmo_449" }, - { 0x0042, "iso-ir-90" }, - { 0x0043, "jis_c6229-1984-a" }, - { 0x0044, "jis_c6229-1984-b" }, - { 0x0045, "jis_c6229-1984-b-add" }, - { 0x0046, "jis_c6229-1984-hand" }, - { 0x0047, "jis_c6229-1984-hand-add" }, - { 0x0048, "jis_c6229-1984-kana" }, - { 0x0049, "iso_2033-1983" }, - { 0x004A, "ansi_x3.110-1983" }, - { 0x004B, "t.61-7bit" }, - { 0x004C, "t.61-8bit" }, - { 0x004D, "ecma-cyrillic" }, - { 0x004E, "csa_z243.4-1985-1" }, - { 0x004F, "csa_z243.4-1985-2" }, - { 0x0050, "csa_z243.4-1985-gr" }, - { 0x0051, "iso_8859-6-e" }, - { 0x0052, "iso_8859-6-i" }, - { 0x0053, "t.101-g2" }, - { 0x0054, "iso_8859-8-e" }, - { 0x0055, "iso_8859-8-i" }, - { 0x0056, "csn_369103" }, - { 0x0057, "jus_i.b1.002" }, - { 0x0058, "iec_p27-1" }, - { 0x0059, "jus_i.b1.003-serb" }, - { 0x005A, "jus_i.b1.003-mac" }, - { 0x005B, "greek-ccitt" }, - { 0x005C, "nc_nc00-10:81" }, - { 0x005D, "iso_6937-2-25" }, - { 0x005E, "gost_19768-74" }, - { 0x005F, "iso_8859-supp" }, - { 0x0060, "iso_10367-box" }, - { 0x0061, "latin-lap" }, - { 0x0062, "jis_x0212-1990" }, - { 0x0063, "ds_2089" }, - { 0x0064, "us-dk" }, - { 0x0065, "dk-us" }, - { 0x0066, "ksc5636" }, - { 0x0067, "unicode-1-1-utf-7" }, - { 0x0068, "iso-2022-cn" }, - { 0x0069, "iso-2022-cn-ext" }, - { 0x006A, "utf-8" }, - { 0x006D, "iso-8859-13" }, - { 0x006E, "iso-8859-14" }, - { 0x006F, "iso-8859-15" }, - { 0x03E8, "iso-10646-ucs-2" }, - { 0x03E9, "iso-10646-ucs-4" }, - { 0x03EA, "iso-10646-ucs-basic" }, - { 0x03EB, "iso-10646-j-1" }, - { 0x03EB, "iso-10646-unicode-latin1" }, - { 0x03ED, "iso-unicode-ibm-1261" }, - { 0x03EE, "iso-unicode-ibm-1268" }, - { 0x03EF, "iso-unicode-ibm-1276" }, - { 0x03F0, "iso-unicode-ibm-1264" }, - { 0x03F1, "iso-unicode-ibm-1265" }, - { 0x03F2, "unicode-1-1" }, - { 0x03F3, "scsu" }, - { 0x03F4, "utf-7" }, - { 0x03F5, "utf-16be" }, - { 0x03F6, "utf-16le" }, - { 0x03F7, "utf-16" }, - { 0x07D0, "iso-8859-1-windows-3.0-latin-1" }, - { 0x07D1, "iso-8859-1-windows-3.1-latin-1" }, - { 0x07D2, "iso-8859-2-windows-latin-2" }, - { 0x07D3, "iso-8859-9-windows-latin-5" }, - { 0x07D4, "hp-roman8" }, - { 0x07D5, "adobe-standard-encoding" }, - { 0x07D6, "ventura-us" }, - { 0x07D7, "ventura-international" }, - { 0x07D8, "dec-mcs" }, - { 0x07D9, "ibm850" }, - { 0x07DA, "ibm852" }, - { 0x07DB, "ibm437" }, - { 0x07DC, "pc8-danish-norwegian" }, - { 0x07DD, "ibm862" }, - { 0x07DE, "pc8-turkish" }, - { 0x07DF, "ibm-symbols" }, - { 0x07E0, "ibm-thai" }, - { 0x07E1, "hp-legal" }, - { 0x07E2, "hp-pi-font" }, - { 0x07E3, "hp-math8" }, - { 0x07E4, "adobe-symbol-encoding" }, - { 0x07E5, "hp-desktop" }, - { 0x07E6, "ventura-math" }, - { 0x07E7, "microsoft-publishing" }, - { 0x07E8, "windows-31j" }, - { 0x07E9, "gb2312" }, - { 0x07EA, "big5" }, - { 0x07EB, "macintosh" }, - { 0x07EC, "ibm037" }, - { 0x07ED, "ibm038" }, - { 0x07EE, "ibm273" }, - { 0x07EF, "ibm274" }, - { 0x07F0, "ibm275" }, - { 0x07F1, "ibm277" }, - { 0x07F2, "ibm278" }, - { 0x07F3, "ibm280" }, - { 0x07F4, "ibm281" }, - { 0x07F5, "ibm284" }, - { 0x07F6, "ibm285" }, - { 0x07F7, "ibm290" }, - { 0x07F8, "ibm297" }, - { 0x07F9, "ibm420" }, - { 0x07FA, "ibm423" }, - { 0x07FB, "ibm424" }, - { 0x07FC, "ibm500" }, - { 0x07FD, "ibm851" }, - { 0x07FE, "ibm855" }, - { 0x07FF, "ibm857" }, - { 0x0800, "ibm860" }, - { 0x0801, "ibm861" }, - { 0x0802, "ibm863" }, - { 0x0803, "ibm864" }, - { 0x0804, "ibm865" }, - { 0x0805, "ibm868" }, - { 0x0806, "ibm869" }, - { 0x0807, "ibm870" }, - { 0x0808, "ibm871" }, - { 0x0809, "ibm880" }, - { 0x080A, "ibm891" }, - { 0x080B, "ibm903" }, - { 0x080C, "ibm904" }, - { 0x080D, "ibm905" }, - { 0x080E, "ibm918" }, - { 0x080F, "ibm1026" }, - { 0x0810, "ebcdic-at-de" }, - { 0x0811, "ebcdic-at-de-a" }, - { 0x0812, "ebcdic-ca-fr" }, - { 0x0813, "ebcdic-dk-no" }, - { 0x0814, "ebcdic-dk-no-a" }, - { 0x0815, "ebcdic-fi-se" }, - { 0x0816, "ebcdic-fi-se-a" }, - { 0x0817, "ebcdic-fr" }, - { 0x0818, "ebcdic-it" }, - { 0x0819, "ebcdic-pt" }, - { 0x081A, "ebcdic-es" }, - { 0x081B, "ebcdic-es-a" }, - { 0x081C, "ebcdic-es-s" }, - { 0x081D, "ebcdic-uk" }, - { 0x081E, "ebcdic-us" }, - { 0x081F, "unknown-8bit" }, - { 0x0820, "mnemonic" }, - { 0x0821, "mnem" }, - { 0x0822, "viscii" }, - { 0x0823, "viqr" }, - { 0x0824, "koi8-r" }, - { 0x0825, "hz-gb-2312" }, - { 0x0826, "ibm866" }, - { 0x0827, "ibm775" }, - { 0x0828, "koi8-u" }, - { 0x0829, "ibm00858" }, - { 0x082A, "ibm00924" }, - { 0x082B, "ibm01140" }, - { 0x082C, "ibm01141" }, - { 0x082D, "ibm01142" }, - { 0x082E, "ibm01143" }, - { 0x082F, "ibm01144" }, - { 0x0830, "ibm01145" }, - { 0x0831, "ibm01146" }, - { 0x0832, "ibm01147" }, - { 0x0833, "ibm01148" }, - { 0x0834, "ibm01149" }, - { 0x0835, "big5-hkscs" }, - { 0x08CA, "windows-1250" }, - { 0x08CB, "windows-1251" }, - { 0x08CC, "windows-1252" }, - { 0x08CD, "windows-1253" }, - { 0x08CE, "windows-1254" }, - { 0x08CF, "windows-1255" }, - { 0x08D0, "windows-1256" }, - { 0x08D1, "windows-1257" }, - { 0x08D2, "windows-1258" }, - { 0x08D3, "tis-620" }, - { 0x0000, NULL } +/* Updated from 10/04/2012 version */ +static const value_string wap_mib_enum_vals_character_sets[] = { + { 0, "*" }, + { 3, "US-ASCII" }, + { 4, "ISO-8859-1" }, + { 5, "ISO-8859-2" }, + { 6, "ISO-8859-3" }, + { 7, "ISO-8859-4" }, + { 8, "ISO-8859-5" }, + { 9, "ISO-8859-6" }, + { 10, "ISO-8859-7" }, + { 11, "ISO-8859-8" }, + { 12, "ISO-8859-9" }, + { 13, "ISO-8859-10" }, + { 14, "ISO_6937-2-add" }, + { 15, "JIS_X0201" }, + { 16, "JIS_Encoding" }, + { 17, "Shift_JIS" }, + { 18, "EUC-JP" }, + { 19, "Extended_UNIX_Code_Fixed_Width_for_Japanese" }, + { 20, "BS_4730" }, + { 21, "SEN_850200_C" }, + { 22, "IT" }, + { 23, "ES" }, + { 24, "DIN_66003" }, + { 25, "NS_4551-1" }, + { 26, "NF_Z_62-010" }, + { 27, "ISO-10646-UTF-1" }, + { 28, "ISO_646.basic:1983" }, + { 29, "INVARIANT" }, + { 30, "ISO_646.irv:1983" }, + { 31, "NATS-SEFI" }, + { 32, "NATS-SEFI-ADD" }, + { 33, "NATS-DANO" }, + { 34, "NATS-DANO-ADD" }, + { 35, "SEN_850200_B" }, + { 36, "KS_C_5601-1987" }, + { 37, "ISO-2022-KR" }, + { 38, "EUC-KR" }, + { 39, "ISO-2022-JP" }, + { 40, "ISO-2022-JP-2" }, + { 41, "JIS_C6220-1969-jp" }, + { 42, "JIS_C6220-1969-ro" }, + { 43, "PT" }, + { 44, "greek7-old" }, + { 45, "latin-greek" }, + { 46, "NF_Z_62-010_(1973)" }, + { 47, "Latin-greek-1" }, + { 48, "ISO_5427" }, + { 49, "JIS_C6226-1978" }, + { 50, "BS_viewdata" }, + { 51, "INIS" }, + { 52, "INIS-8" }, + { 53, "INIS-cyrillic" }, + { 54, "ISO_5427:1981" }, + { 55, "ISO_5428:1980" }, + { 56, "GB_1988-80" }, + { 57, "GB_2312-80" }, + { 58, "NS_4551-2" }, + { 59, "videotex-suppl" }, + { 60, "PT2" }, + { 61, "ES2" }, + { 62, "MSZ_7795.3" }, + { 63, "JIS_C6226-1983" }, + { 64, "greek7" }, + { 65, "ASMO_449" }, + { 66, "iso-ir-90" }, + { 67, "JIS_C6229-1984-a" }, + { 68, "JIS_C6229-1984-b" }, + { 69, "JIS_C6229-1984-b-add" }, + { 70, "JIS_C6229-1984-hand" }, + { 71, "JIS_C6229-1984-hand-add" }, + { 72, "JIS_C6229-1984-kana" }, + { 73, "ISO_2033-1983" }, + { 74, "ANSI_X3.110-1983" }, + { 75, "T.61-7bit" }, + { 76, "T.61-8bit" }, + { 77, "ECMA-cyrillic" }, + { 78, "CSA_Z243.4-1985-1" }, + { 79, "CSA_Z243.4-1985-2" }, + { 80, "CSA_Z243.4-1985-gr" }, + { 81, "ISO-8859-6-E" }, + { 82, "ISO-8859-6-I" }, + { 83, "T.101-G2" }, + { 84, "ISO-8859-8-E" }, + { 85, "ISO-8859-8-I" }, + { 86, "CSN_369103" }, + { 87, "JUS_I.B1.002" }, + { 88, "IEC_P27-1" }, + { 89, "JUS_I.B1.003-serb" }, + { 90, "JUS_I.B1.003-mac" }, + { 91, "greek-ccitt" }, + { 92, "NC_NC00-10:81" }, + { 93, "ISO_6937-2-25" }, + { 94, "GOST_19768-74" }, + { 95, "ISO_8859-supp" }, + { 96, "ISO_10367-box" }, + { 97, "latin-lap" }, + { 98, "JIS_X0212-1990" }, + { 99, "DS_2089" }, + { 100, "us-dk" }, + { 101, "dk-us" }, + { 102, "KSC5636" }, + { 103, "UNICODE-1-1-UTF-7" }, + { 104, "ISO-2022-CN" }, + { 105, "ISO-2022-CN-EXT" }, + { 106, "UTF-8" }, + { 109, "ISO-8859-13" }, + { 110, "ISO-8859-14" }, + { 111, "ISO-8859-15" }, + { 112, "ISO-8859-16" }, + { 113, "GBK" }, + { 114, "GB18030" }, + { 115, "OSD_EBCDIC_DF04_15" }, + { 116, "OSD_EBCDIC_DF03_IRV" }, + { 117, "OSD_EBCDIC_DF04_1" }, + { 118, "ISO-11548-1" }, + { 119, "KZ-1048" }, + + { 1000, "ISO-10646-UCS-2" }, + { 1001, "ISO-10646-UCS-4" }, + { 1002, "ISO-10646-UCS-Basic" }, + { 1003, "ISO-10646-Unicode-Latin1" }, + { 1004, "ISO-10646-J-1" }, + { 1005, "ISO-Unicode-IBM-1261" }, + { 1006, "ISO-Unicode-IBM-1268" }, + { 1007, "ISO-Unicode-IBM-1276" }, + { 1008, "ISO-Unicode-IBM-1264" }, + { 1009, "ISO-Unicode-IBM-1265" }, + { 1010, "UNICODE-1-1" }, + { 1011, "SCSU" }, + { 1012, "UTF-7" }, + { 1013, "UTF-16BE" }, + { 1014, "UTF-16LE" }, + { 1015, "UTF-16" }, + { 1016, "CESU-8" }, + { 1017, "UTF-32" }, + { 1018, "UTF-32BE" }, + { 1019, "UTF-32LE" }, + { 1020, "BOCU-1" }, + + { 2000, "ISO-8859-1-Windows-3.0-Latin-1" }, + { 2001, "ISO-8859-1-Windows-3.1-Latin-1" }, + { 2002, "ISO-8859-2-Windows-Latin-2" }, + { 2003, "ISO-8859-9-Windows-Latin-5" }, + { 2004, "hp-roman8" }, + { 2005, "Adobe-Standard-Encoding" }, + { 2006, "Ventura-US" }, + { 2007, "Ventura-International" }, + { 2008, "DEC-MCS" }, + { 2009, "IBM850" }, + { 2010, "IBM852" }, + { 2011, "IBM437" }, + { 2012, "PC8-Danish-Norwegian" }, + { 2013, "IBM862" }, + { 2014, "PC8-Turkish" }, + { 2015, "IBM-Symbols" }, + { 2016, "IBM-Thai" }, + { 2017, "HP-Legal" }, + { 2018, "HP-Pi-font" }, + { 2019, "HP-Math8" }, + { 2020, "Adobe-Symbol-Encoding" }, + { 2021, "HP-DeskTop" }, + { 2022, "Ventura-Math" }, + { 2023, "Microsoft-Publishing" }, + { 2024, "Windows-31J" }, + { 2025, "GB2312" }, + { 2026, "Big5" }, + { 2027, "macintosh" }, + { 2028, "IBM037" }, + { 2029, "IBM038" }, + { 2030, "IBM273" }, + { 2031, "IBM274" }, + { 2032, "IBM275" }, + { 2033, "IBM277" }, + { 2034, "IBM278" }, + { 2035, "IBM280" }, + { 2036, "IBM281" }, + { 2037, "IBM284" }, + { 2038, "IBM285" }, + { 2039, "IBM290" }, + { 2040, "IBM297" }, + { 2041, "IBM420" }, + { 2042, "IBM423" }, + { 2043, "IBM424" }, + { 2044, "IBM500" }, + { 2045, "IBM851" }, + { 2046, "IBM855" }, + { 2047, "IBM857" }, + { 2048, "IBM860" }, + { 2049, "IBM861" }, + { 2050, "IBM863" }, + { 2051, "IBM864" }, + { 2052, "IBM865" }, + { 2053, "IBM868" }, + { 2054, "IBM869" }, + { 2055, "IBM870" }, + { 2056, "IBM871" }, + { 2057, "IBM880" }, + { 2058, "IBM891" }, + { 2059, "IBM903" }, + { 2060, "IBM904" }, + { 2061, "IBM905" }, + { 2062, "IBM918" }, + { 2063, "IBM1026" }, + { 2064, "EBCDIC-AT-DE" }, + { 2065, "EBCDIC-AT-DE-A" }, + { 2066, "EBCDIC-CA-FR" }, + { 2067, "EBCDIC-DK-NO" }, + { 2068, "EBCDIC-DK-NO-A" }, + { 2069, "EBCDIC-FI-SE" }, + { 2070, "EBCDIC-FI-SE-A" }, + { 2071, "EBCDIC-FR" }, + { 2072, "EBCDIC-IT" }, + { 2073, "EBCDIC-PT" }, + { 2074, "EBCDIC-ES" }, + { 2075, "EBCDIC-ES-A" }, + { 2076, "EBCDIC-ES-S" }, + { 2077, "EBCDIC-UK" }, + { 2078, "EBCDIC-US" }, + { 2079, "UNKNOWN-8BIT" }, + { 2080, "MNEMONIC" }, + { 2081, "MNEM" }, + { 2082, "VISCII" }, + { 2083, "VIQR" }, + { 2084, "KOI8-R" }, + { 2085, "HZ-GB-2312" }, + { 2086, "IBM866" }, + { 2087, "IBM775" }, + { 2088, "KOI8-U" }, + { 2089, "IBM00858" }, + { 2090, "IBM00924" }, + { 2091, "IBM01140" }, + { 2092, "IBM01141" }, + { 2093, "IBM01142" }, + { 2094, "IBM01143" }, + { 2095, "IBM01144" }, + { 2096, "IBM01145" }, + { 2097, "IBM01146" }, + { 2098, "IBM01147" }, + { 2099, "IBM01148" }, + { 2100, "IBM01149" }, + { 2101, "Big5-HKSCS" }, + { 2102, "IBM1047" }, + { 2103, "PTCP154" }, + { 2104, "Amiga-1251" }, + { 2105, "KOI7-switched" }, + { 2106, "BRF" }, + { 2107, "TSCII" }, + { 2108, "CP51932" }, + { 2109, "windows-874" }, + + { 2250, "windows-1250" }, + { 2251, "windows-1251" }, + { 2252, "windows-1252" }, + { 2253, "windows-1253" }, + { 2254, "windows-1254" }, + { 2255, "windows-1255" }, + { 2256, "windows-1256" }, + { 2257, "windows-1257" }, + { 2258, "windows-1258" }, + { 2259, "TIS-620" }, + { 2260, "CP50220" }, + { 0, NULL } }; -value_string_ext vals_character_sets_ext = VALUE_STRING_EXT_INIT(vals_character_sets); +value_string_ext wap_mib_enum_vals_character_sets_ext = VALUE_STRING_EXT_INIT(wap_mib_enum_vals_character_sets); diff --git a/epan/dissectors/packet-wap.h b/epan/dissectors/packet-wap.h index 2ea4bd442b..1dcd291400 100644 --- a/epan/dissectors/packet-wap.h +++ b/epan/dissectors/packet-wap.h @@ -77,7 +77,7 @@ guint tvb_get_guintvar (tvbuff_t *, guint , guint *); /* Character set encoding */ -extern value_string_ext vals_character_sets_ext; +extern value_string_ext wap_mib_enum_vals_character_sets_ext; /* * Misc TODO: diff --git a/epan/dissectors/packet-wbxml.c b/epan/dissectors/packet-wbxml.c index 7f6226ce41..50823622b7 100644 --- a/epan/dissectors/packet-wbxml.c +++ b/epan/dissectors/packet-wbxml.c @@ -6878,17 +6878,17 @@ static const wbxml_decoding *get_wbxml_decoding_from_content_type ( * 4. If exists, retrieve token mapping */ -#define wbxml_UNDEFINED_TOKEN \ +#define wbxml_UNDEFINED_TOKEN \ "(Requested token not defined for this content type)" -#define wbxml_UNDEFINED_TOKEN_CODE_PAGE \ +#define wbxml_UNDEFINED_TOKEN_CODE_PAGE \ "(Requested token code page not defined for this content type)" -#define wbxml_UNDEFINED_TOKEN_MAP \ +#define wbxml_UNDEFINED_TOKEN_MAP \ "(Requested token map not defined for this content type)" /* Return token mapping for a given content mapping entry. */ static const char * map_token (const value_valuestring *token_map, guint8 codepage, guint8 token) { const value_string *vs; - const char *s; + const char *s; if (token_map) { /* Found map */ if ((vs = val_to_valstr (codepage, token_map))) { @@ -6985,26 +6985,26 @@ dissect_wbxml_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, const wbxml_decoding *override_content_map) { /* Set up structures needed to add the protocol subtree and manage it */ - proto_item *ti; - proto_tree *wbxml_tree; /* Main WBXML tree */ - proto_tree *wbxml_str_tbl_tree; /* String table subtree */ - proto_tree *wbxml_content_tree; /* Content subtree */ - guint8 version; - guint offset = 0; - guint32 len; - guint32 charset = 0; - guint32 charset_len = 0; - guint32 publicid; - guint32 publicid_index = 0; - guint32 publicid_len; - guint32 str_tbl; - guint32 str_tbl_len; - guint32 str_tbl_len_len = 0; - guint8 level = 0; /* WBXML recursion level */ - const wbxml_decoding *content_map = NULL; - gchar *summary = NULL; - guint8 codepage_stag = 0; - guint8 codepage_attr = 0; + proto_item *ti; + proto_tree *wbxml_tree; /* Main WBXML tree */ + proto_tree *wbxml_str_tbl_tree; /* String table subtree */ + proto_tree *wbxml_content_tree; /* Content subtree */ + guint8 version; + guint offset = 0; + guint32 len; + guint32 charset = 0; + guint32 charset_len = 0; + guint32 publicid; + guint32 publicid_index = 0; + guint32 publicid_len; + guint32 str_tbl; + guint32 str_tbl_len; + guint32 str_tbl_len_len = 0; + guint8 level = 0; /* WBXML recursion level */ + const wbxml_decoding *content_map = NULL; + gchar *summary = NULL; + guint8 codepage_stag = 0; + guint8 codepage_attr = 0; DebugLog(("dissect_wbxml: Dissecting packet %u\n", pinfo->fd->num)); /* WBXML format @@ -7307,24 +7307,24 @@ parse_wbxml_tag_defined (proto_tree *tree, tvbuff_t *tvb, guint32 offset, guint32 str_tbl, guint8 *level, guint8 *codepage_stag, guint8 *codepage_attr, const wbxml_decoding *map) { - guint32 tvb_len = tvb_reported_length (tvb); - guint32 off = offset; - guint32 len; - guint str_len; - guint32 ent; - guint32 idx; - guint8 peek; - guint32 tag_len; /* Length of the index (uintvar) from a LITERAL tag */ - guint8 tag_save_known = 0; /* Will contain peek & 0x3F (tag identity) */ - guint8 tag_new_known = 0; /* Will contain peek & 0x3F (tag identity) */ - const char *tag_save_literal; /* Will contain the LITERAL tag identity */ - const char *tag_new_literal; /* Will contain the LITERAL tag identity */ - guint8 parsing_tag_content = FALSE; /* Are we parsing content from a - tag with content: Content - - The initial state is FALSE. - This state will trigger recursion. */ - tag_save_literal = NULL; /* Prevents compiler warning */ + guint32 tvb_len = tvb_reported_length (tvb); + guint32 off = offset; + guint32 len; + guint str_len; + guint32 ent; + guint32 idx; + guint8 peek; + guint32 tag_len; /* Length of the index (uintvar) from a LITERAL tag */ + guint8 tag_save_known = 0; /* Will contain peek & 0x3F (tag identity) */ + guint8 tag_new_known = 0; /* Will contain peek & 0x3F (tag identity) */ + const char *tag_save_literal; /* Will contain the LITERAL tag identity */ + const char *tag_new_literal; /* Will contain the LITERAL tag identity */ + guint8 parsing_tag_content = FALSE; /* Are we parsing content from a + tag with content: Content + + The initial state is FALSE. + This state will trigger recursion. */ + tag_save_literal = NULL; /* Prevents compiler warning */ DebugLog(("parse_wbxml_tag_defined (level = %u, offset = %u)\n", *level, offset)); while (off < tvb_len) { @@ -7714,26 +7714,26 @@ parse_wbxml_tag (proto_tree *tree, tvbuff_t *tvb, guint32 offset, guint32 str_tbl, guint8 *level, guint8 *codepage_stag, guint8 *codepage_attr) { - guint32 tvb_len = tvb_reported_length (tvb); - guint32 off = offset; - guint32 len; - guint str_len; - guint32 ent; - guint32 idx; - guint8 peek; - guint32 tag_len; /* Length of the idx (uintvar) from a LITERAL tag */ - guint8 tag_save_known = 0; /* Will contain peek & 0x3F (tag identity) */ - guint8 tag_new_known = 0; /* Will contain peek & 0x3F (tag identity) */ - const char *tag_save_literal; /* Will contain the LITERAL tag identity */ - const char *tag_new_literal; /* Will contain the LITERAL tag identity */ - char *tag_save_buf=NULL; /* Will contain "tag_0x%02X" */ - char *tag_new_buf=NULL; /* Will contain "tag_0x%02X" */ - guint8 parsing_tag_content = FALSE; /* Are we parsing content from a - tag with content: Content - - The initial state is FALSE. - This state will trigger recursion. */ - tag_save_literal = NULL; /* Prevents compiler warning */ + guint32 tvb_len = tvb_reported_length (tvb); + guint32 off = offset; + guint32 len; + guint str_len; + guint32 ent; + guint32 idx; + guint8 peek; + guint32 tag_len; /* Length of the idx (uintvar) from a LITERAL tag */ + guint8 tag_save_known = 0; /* Will contain peek & 0x3F (tag identity) */ + guint8 tag_new_known = 0; /* Will contain peek & 0x3F (tag identity) */ + const char *tag_save_literal; /* Will contain the LITERAL tag identity */ + const char *tag_new_literal; /* Will contain the LITERAL tag identity */ + char *tag_save_buf = NULL; /* Will contain "tag_0x%02X" */ + char *tag_new_buf = NULL; /* Will contain "tag_0x%02X" */ + guint8 parsing_tag_content = FALSE; /* Are we parsing content from a + tag with content: Content + + The initial state is FALSE. + This state will trigger recursion. */ + tag_save_literal = NULL; /* Prevents compiler warning */ DebugLog(("parse_wbxml_tag (level = %u, offset = %u)\n", *level, offset)); while (off < tvb_len) { @@ -8129,14 +8129,14 @@ parse_wbxml_attribute_list_defined (proto_tree *tree, tvbuff_t *tvb, guint32 offset, guint32 str_tbl, guint8 level, guint8 *codepage_attr, const wbxml_decoding *map) { - guint32 tvb_len = tvb_reported_length (tvb); - guint32 off = offset; - guint32 len; - guint str_len; - guint32 ent; - guint32 idx; - guint8 peek; - guint8 attr_save_known = 0; /* Will contain peek & 0x3F (attr identity) */ + guint32 tvb_len = tvb_reported_length (tvb); + guint32 off = offset; + guint32 len; + guint str_len; + guint32 ent; + guint32 idx; + guint8 peek; + guint8 attr_save_known = 0; /* Will contain peek & 0x3F (attr identity) */ const char *attr_save_literal = NULL; /* Will contain the LITERAL attr identity */ DebugLog(("parse_wbxml_attr_defined (level = %u, offset = %u)\n", @@ -8354,12 +8354,12 @@ parse_wbxml_attribute_list (proto_tree *tree, tvbuff_t *tvb, guint32 offset, guint32 str_tbl, guint8 level, guint8 *codepage_attr) { guint32 tvb_len = tvb_reported_length (tvb); - guint32 off = offset; + guint32 off = offset; guint32 len; - guint str_len; + guint str_len; guint32 ent; guint32 idx; - guint8 peek; + guint8 peek; DebugLog(("parse_wbxml_attr (level = %u, offset = %u)\n", level, offset)); /* Parse attributes */ @@ -8565,7 +8565,7 @@ proto_register_wbxml(void) { "Character Set", "wbxml.charset", FT_UINT32, BASE_HEX|BASE_EXT_STRING, - &vals_character_sets_ext, 0x00, + &wap_mib_enum_vals_character_sets_ext, 0x00, "WBXML Character Set", HFILL } }, }; diff --git a/epan/dissectors/packet-wsp.c b/epan/dissectors/packet-wsp.c index ee4e6a448d..a7a2e7824b 100644 --- a/epan/dissectors/packet-wsp.c +++ b/epan/dissectors/packet-wsp.c @@ -1069,17 +1069,17 @@ static value_string_ext vals_cache_control_ext = VALUE_STRING_EXT_INIT(vals_cach static const value_string vals_wap_application_ids[] = { /* Well-known WAP applications */ - { 0x00, "x-wap-application:*"}, - { 0x01, "x-wap-application:push.sia"}, - { 0x02, "x-wap-application:wml.ua"}, - { 0x03, "x-wap-application:wta.ua"}, - { 0x04, "x-wap-application:mms.ua"}, - { 0x05, "x-wap-application:push.syncml"}, - { 0x06, "x-wap-application:loc.ua"}, - { 0x07, "x-wap-application:syncml.dm"}, - { 0x08, "x-wap-application:drm.ua"}, - { 0x09, "x-wap-application:emn.ua"}, - { 0x0A, "x-wap-application:wv.ua"}, + { 0x0000, "x-wap-application:*"}, + { 0x0001, "x-wap-application:push.sia"}, + { 0x0002, "x-wap-application:wml.ua"}, + { 0x0003, "x-wap-application:wta.ua"}, + { 0x0004, "x-wap-application:mms.ua"}, + { 0x0005, "x-wap-application:push.syncml"}, + { 0x0006, "x-wap-application:loc.ua"}, + { 0x0007, "x-wap-application:syncml.dm"}, + { 0x0008, "x-wap-application:drm.ua"}, + { 0x0009, "x-wap-application:emn.ua"}, + { 0x000A, "x-wap-application:wv.ua"}, /* Registered by 3rd parties */ { 0x8000, "x-wap-microsoft:localcontent.ua"}, { 0x8001, "x-wap-microsoft:IMclient.ua"}, @@ -1736,15 +1736,16 @@ static const hdr_parse_func_ptr WellKnownOpenwaveHeader[128] = { static void add_headers (proto_tree *tree, tvbuff_t *tvb, int hf, packet_info *pinfo) { - guint8 hdr_id, val_id, codepage = 1; - gint32 tvb_len = tvb_length(tvb); - gint32 offset = 0, hdr_len, hdr_start; - gint32 val_len, val_start; - gchar *hdr_str, *val_str; + guint8 hdr_id, val_id, codepage = 1; + gint32 tvb_len = tvb_length(tvb); + gint32 offset = 0; + gint32 hdr_len, hdr_start; + gint32 val_len, val_start; + gchar *hdr_str, *val_str; proto_tree *wsp_headers; proto_item *ti, *hidden_item; - guint8 ok; - guint32 val = 0; + guint8 ok; + guint32 val = 0; if (! tree) return; @@ -2272,7 +2273,7 @@ wkh_ ## underscored (proto_tree *tree, tvbuff_t *tvb, guint32 hdr_start, packet_ * | ( Value-length ( Token-text | Integer-value ) [ Q-value ] ) */ wkh_accept_x_q_header(accept_charset, "Accept-Charset", - &vals_character_sets_ext, "character set") + &wap_mib_enum_vals_character_sets_ext, "character set") /* * Accept-language-value = * Short-integer @@ -2329,7 +2330,7 @@ static guint32 wkh_profile_diff_wbxml (proto_tree *tree, tvbuff_t *tvb, guint32 hdr_start, packet_info *pinfo) { wkh_0a_Declarations; - tvbuff_t *tmp_tvb; + tvbuff_t *tmp_tvb; proto_tree *subtree; ok = TRUE; /* Bypass error checking as we don't parse the values! */ @@ -2594,9 +2595,9 @@ static guint32 wkh_accept_encoding(proto_tree *tree, tvbuff_t *tvb, guint32 hdr_start, packet_info *pinfo _U_) { wkh_0_Declarations; - guint32 len, off; - guint8 peek; - gchar *str; + guint32 len, off; + guint8 peek; + gchar *str; proto_tree *parameter_tree = NULL; wkh_1_WellKnownValue; @@ -2695,9 +2696,9 @@ static guint32 wkh_content_disposition(proto_tree *tree, tvbuff_t *tvb, guint32 hdr_start, packet_info *pinfo _U_) { wkh_0a_Declarations; - guint32 len, off; - guint8 peek; - gchar *str; + guint32 len, off; + guint8 peek; + gchar *str; proto_tree *parameter_tree = NULL; wkh_1_WellKnownValue; @@ -3481,9 +3482,9 @@ static guint32 wkh_warning(proto_tree *tree, tvbuff_t *tvb, guint32 hdr_start, packet_info *pinfo _U_) { wkh_0_Declarations; - guint32 off, len, val; - guint8 warn_code; - gchar *str; + guint32 off, len, val; + guint8 warn_code; + gchar *str; proto_tree *subtree; /* TODO - subtree with values */ @@ -3550,9 +3551,9 @@ static guint32 wkh_profile_warning(proto_tree *tree, tvbuff_t *tvb, guint32 hdr_start, packet_info *pinfo _U_) { wkh_0_Declarations; - guint32 off, len, val = 0; - guint8 warn_code; - gchar *str; + guint32 off, len, val = 0; + guint8 warn_code; + gchar *str; wkh_1_WellKnownValue; val = val_id & 0x7F; @@ -3610,8 +3611,8 @@ static guint32 wkh_encoding_version (proto_tree *tree, tvbuff_t *tvb, guint32 hdr_start, packet_info *pinfo _U_) { wkh_0_Declarations; - guint32 off, val, len; - gchar *str; + guint32 off, val, len; + gchar *str; wkh_1_WellKnownValue; val = val_id & 0x7F; @@ -3655,7 +3656,7 @@ static guint32 wkh_content_range(proto_tree *tree, tvbuff_t *tvb, guint32 hdr_start, packet_info *pinfo _U_) { wkh_0_Declarations; - guint32 off, val, len; + guint32 off, val, len; proto_tree *subtree = NULL; wkh_1_WellKnownValue; @@ -3703,7 +3704,7 @@ static guint32 wkh_range(proto_tree *tree, tvbuff_t *tvb, guint32 hdr_start, packet_info *pinfo _U_) { wkh_0_Declarations; - guint32 off, val, len; + guint32 off, val, len; proto_tree *subtree = NULL; wkh_1_WellKnownValue; @@ -3949,7 +3950,7 @@ wkh_tod_value_header(openwave_x_up_proxy_tod, /* Openwave accept_x_q header */ wkh_accept_x_q_header(openwave_x_up_proxy_trans_charset, "x-up-proxy-trans-charset", - &vals_character_sets_ext, "character set") + &wap_mib_enum_vals_character_sets_ext, "character set") /* Openwave content type header */ wkh_content_type_header(openwave_x_up_proxy_push_accept, @@ -4126,7 +4127,7 @@ parameter (proto_tree *tree, proto_item *ti, tvbuff_t *tvb, int start, int len) case 0x01: /* WSP 1.1 encoding - Charset: Well-known-charset */ get_integer_value(val, tvb, offset, val_len, ok); if (ok) { - val_str = val_to_str_ext(val, &vals_character_sets_ext, + val_str = val_to_str_ext(val, &wap_mib_enum_vals_character_sets_ext, ""); proto_tree_add_string(tree, hf_parameter_charset, tvb, start, type_len + val_len, val_str); @@ -4380,10 +4381,10 @@ parameter (proto_tree *tree, proto_item *ti, tvbuff_t *tvb, int start, int len) static int parameter_value_q (proto_tree *tree, proto_item *ti, tvbuff_t *tvb, int start) { - int offset = start; - guint32 val = 0, val_len; - gchar *str = NULL, *s = NULL; - guint8 ok; + int offset = start; + guint32 val = 0, val_len; + gchar *str = NULL, *s = NULL; + guint8 ok; get_uintvar_integer (val, tvb, offset, val_len, ok); if (ok && (val < 1100)) { @@ -4420,22 +4421,22 @@ static void dissect_redirect(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dissector_handle_t dissector_handle) { - guint8 flags; - proto_item *ti; - proto_tree *addresses_tree = NULL; - proto_tree *addr_tree = NULL; - proto_tree *flags_tree; - guint8 bearer_type; - guint8 address_flags_len; - int address_len; - proto_tree *address_flags_tree; - guint16 port_num; - guint32 address_ipv4; - struct e_in6_addr address_ipv6; - address redir_address; - conversation_t *conv; - guint32 idx = 0; /* Address index */ - guint32 address_record_len; /* Length of the entire address record */ + guint8 flags; + proto_item *ti; + proto_tree *addresses_tree = NULL; + proto_tree *addr_tree = NULL; + proto_tree *flags_tree; + guint8 bearer_type; + guint8 address_flags_len; + int address_len; + proto_tree *address_flags_tree; + guint16 port_num; + guint32 address_ipv4; + struct e_in6_addr address_ipv6; + address redir_address; + conversation_t *conv; + guint32 idx = 0; /* Address index */ + guint32 address_record_len; /* Length of the entire address record */ /* * Redirect flags. @@ -4635,20 +4636,20 @@ dissect_redirect(tvbuff_t *tvb, int offset, packet_info *pinfo, static void add_addresses(proto_tree *tree, tvbuff_t *tvb, int hf) { - proto_item *ti; - proto_tree *addresses_tree; - proto_tree *addr_tree; - guint8 bearer_type; - guint8 address_flags_len; - int address_len; - proto_tree *address_flags_tree; - guint16 port_num; - guint32 address_ipv4; - struct e_in6_addr address_ipv6; - guint32 tvb_len = tvb_length(tvb); - guint32 offset = 0; - guint32 idx = 0; /* Address index */ - guint32 address_record_len; /* Length of the entire address record */ + proto_item *ti; + proto_tree *addresses_tree; + proto_tree *addr_tree; + guint8 bearer_type; + guint8 address_flags_len; + int address_len; + proto_tree *address_flags_tree; + guint16 port_num; + guint32 address_ipv4; + struct e_in6_addr address_ipv6; + guint32 tvb_len = tvb_length(tvb); + guint32 offset = 0; + guint32 idx = 0; /* Address index */ + guint32 address_record_len; /* Length of the entire address record */ /* Skip needless processing */ if (! tree) @@ -4798,13 +4799,13 @@ static const value_string vals_sir_protocol_options[] = { static void dissect_sir(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - guint8 version; - guint32 val_len; - guint32 val_len_save; - guint32 len; - guint32 offset = 0; - guint32 i; - tvbuff_t *tmp_tvb; + guint8 version; + guint32 val_len; + guint32 val_len_save; + guint32 len; + guint32 offset = 0; + guint32 i; + tvbuff_t *tmp_tvb; proto_tree *subtree; proto_item *ti; @@ -4913,22 +4914,22 @@ dissect_wsp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, { int offset = 0; - guint8 pdut; - guint count = 0; - guint value = 0; - guint uriLength = 0; - guint uriStart = 0; - guint capabilityLength = 0; - guint capabilityStart = 0; - guint headersLength = 0; - guint headerLength = 0; - guint headerStart = 0; - guint nextOffset = 0; - guint contentTypeStart = 0; - guint contentType = 0; + guint8 pdut; + guint count = 0; + guint value = 0; + guint uriLength = 0; + guint uriStart = 0; + guint capabilityLength = 0; + guint capabilityStart = 0; + guint headersLength = 0; + guint headerLength = 0; + guint headerStart = 0; + guint nextOffset = 0; + guint contentTypeStart = 0; + guint contentType = 0; const char *contentTypeStr; - tvbuff_t *tmp_tvb; - gboolean found_match; + tvbuff_t *tmp_tvb; + gboolean found_match; /* Set up structures we will need to add the protocol subtree and manage it */ proto_item *proto_ti = NULL; /* for the proto entry */ @@ -5426,9 +5427,9 @@ static void add_uri (proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, guint URILenOffset, guint URIOffset, proto_item *proto_ti) { - guint count = 0; - guint uriLen = tvb_get_guintvar (tvb, URILenOffset, &count); - gchar *str = NULL; + guint count = 0; + guint uriLen = tvb_get_guintvar (tvb, URILenOffset, &count); + gchar *str = NULL; if (tree) proto_tree_add_uint (tree, hf_wsp_header_uri_len, @@ -5474,16 +5475,16 @@ add_capabilities (proto_tree *tree, tvbuff_t *tvb, guint8 pdu_type) proto_tree *wsp_capabilities; proto_tree *capa_subtree; proto_item *ti; - char *capaName, *str, *valStr; - guint32 offset = 0; - guint32 len = 0; - guint32 capaStart = 0; /* Start offset of the capability */ - guint32 capaLen = 0; /* Length of the entire capability */ - guint32 capaValueLen = 0; /* Length of the capability value & type */ - guint32 tvb_len = tvb_reported_length(tvb); - gboolean ok = FALSE; - guint8 peek; - guint32 value; + char *capaName, *str, *valStr; + guint32 offset = 0; + guint32 len = 0; + guint32 capaStart = 0; /* Start offset of the capability */ + guint32 capaLen = 0; /* Length of the entire capability */ + guint32 capaValueLen = 0; /* Length of the capability value & type */ + guint32 tvb_len = tvb_reported_length(tvb); + gboolean ok = FALSE; + guint8 peek; + guint32 value; if (tvb_len == 0) { DebugLog(("add_capabilities(): Capabilities = 0\n")); @@ -5768,13 +5769,13 @@ void add_post_data (proto_tree *tree, tvbuff_t *tvb, guint contentType, const char *contentTypeStr, packet_info *pinfo) { - guint offset = 0; - guint variableStart = 0; - guint variableEnd = 0; - guint valueStart = 0; - guint8 peek = 0; + guint offset = 0; + guint variableStart = 0; + guint variableEnd = 0; + guint valueStart = 0; + guint8 peek = 0; proto_item *ti; - proto_tree *sub_tree = NULL; + proto_tree *sub_tree = NULL; DebugLog(("add_post_data() - START\n")); @@ -5833,8 +5834,8 @@ add_post_data (proto_tree *tree, tvbuff_t *tvb, guint contentType, static void add_post_variable (proto_tree *tree, tvbuff_t *tvb, guint variableStart, guint variableEnd, guint valueStart, guint valueEnd) { - int variableLength = variableEnd-variableStart; - int valueLength = 0; + int variableLength = variableEnd-variableStart; + int valueLength = 0; char *variableBuffer; char *valueBuffer; @@ -5869,22 +5870,22 @@ add_post_variable (proto_tree *tree, tvbuff_t *tvb, guint variableStart, guint v static void add_multipart_data (proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo) { - int offset = 0; - guint nextOffset; - guint nEntries = 0; - guint count; - guint HeadersLen; - guint DataLen; - guint contentType = 0; - const char *contentTypeStr; - tvbuff_t *tmp_tvb; - int partnr = 1; - int part_start; - gboolean found_match = FALSE; - - proto_item *sub_tree = NULL; - proto_item *ti = NULL; - proto_tree *mpart_tree = NULL; + int offset = 0; + guint nextOffset; + guint nEntries = 0; + guint count; + guint HeadersLen; + guint DataLen; + guint contentType = 0; + const char *contentTypeStr; + tvbuff_t *tmp_tvb; + int partnr = 1; + int part_start; + gboolean found_match = FALSE; + + proto_item *sub_tree = NULL; + proto_item *ti = NULL; + proto_tree *mpart_tree = NULL; DebugLog(("add_multipart_data(): offset = %u, byte = 0x%02x: ", offset, tvb_get_guint8(tvb,offset))); diff --git a/epan/dissectors/packet-wtls.c b/epan/dissectors/packet-wtls.c index fb28c2806a..33930f4379 100644 --- a/epan/dissectors/packet-wtls.c +++ b/epan/dissectors/packet-wtls.c @@ -1236,7 +1236,7 @@ proto_register_wtls(void) { &hf_wtls_hands_cli_hello_key_identifier_charset, { "Identifier CharSet", "wtls.handshake.client_hello.ident_charset", - FT_UINT16, BASE_HEX|BASE_EXT_STRING, &vals_character_sets_ext, 0x00, + FT_UINT16, BASE_HEX|BASE_EXT_STRING, &wap_mib_enum_vals_character_sets_ext, 0x00, NULL, HFILL } }, @@ -1446,7 +1446,7 @@ proto_register_wtls(void) { &hf_wtls_hands_certificate_wtls_issuer_charset, { "Charset", "wtls.handshake.certificate.issuer.charset", - FT_UINT16, BASE_HEX|BASE_EXT_STRING, &vals_character_sets_ext, 0x00, + FT_UINT16, BASE_HEX|BASE_EXT_STRING, &wap_mib_enum_vals_character_sets_ext, 0x00, NULL, HFILL } }, @@ -1488,7 +1488,7 @@ proto_register_wtls(void) { &hf_wtls_hands_certificate_wtls_subject_charset, { "Charset", "wtls.handshake.certificate.subject.charset", - FT_UINT16, BASE_HEX|BASE_EXT_STRING, &vals_character_sets_ext, 0x00, + FT_UINT16, BASE_HEX|BASE_EXT_STRING, &wap_mib_enum_vals_character_sets_ext, 0x00, NULL, HFILL } }, -- cgit v1.2.3