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

Fix -v for QtShark 

./Wireshark -v
wireshark 1.7.1 (SVN Rev Unknown from unknown)

Copyright 1998-2012 Gerald Combs <gerald@wireshark.org> and contributors.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

Compiled (64-bit) with Qt 4.7.4 with GLib 2.30.0, with libpcap (version
unknown), with libz 1.2.3.4, with POSIX capabilities (Linux), with SMI 0.4.8,
with c-ares 1.7.4, with Lua 5.1, without Python, with GnuTLS 2.10.5, with Gcrypt
1.5.0, with MIT Kerberos, with GeoIP, with PortAudio V19-devel (built Jul 27
2011 11:52:20), without AirPcap.

Running on Linux 3.0.0-13-generic, with locale fr_FR.UTF-8, with libpcap version
1.1.1, with libz 1.2.3.4, GnuTLS 2.10.5, Gcrypt 1.5.0.

Built using gcc 4.6.1.

get_gui_compiled_info & get_gui_runtime_info copied from ../gtk/main.c 
the function is common to GTK and Qt need to put in version_info.[ch] ?

svn path=/trunk/; revision=40691
This commit is contained in:
Alexis La Goutte 2012-01-24 13:08:07 +00:00
parent a127e69037
commit 4ebdb40338
1 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
epan/dissectors/packet-e212.c
View File

@ -1128,18 +1128,40 @@ static const value_string mcc_mnc_codes[] = {
{ 295050, "Mobilkom (Liechstein) AG" },
{ 295770, "Tele2 AG" },
{ 297030, "MTEL d.o.o. Podgorica" },
{ 302360, "Clearnet" },
{ 302220, "Telus Mobility" },
{ 302221, "Telus Mobility" },
{ 302250, "ALO Mobile Inc" },
{ 302270, "Bragg Comunications" },
{ 302290, "Airtel Wireless" },
{ 302320, "DAVE Wireless" },
{ 302240, "Execulink" },
{ 302360, "Telus Mobility" },
{ 302370, "Microcell" },
{ 302380, "Dryden Mobility" },
{ 302390, "Dryden Mobility" },
{ 302490, "Globalive Wireless" },
{ 302500, "Videotron Ltd" },
{ 302510, "Videotron Ltd" },
{ 302560, "Lynx Mobility" },
{ 302570, "LightSquared" },
{ 302590, "Quadro Communication" },
{ 302610, "Bell Mobility" },
{ 302620, "Ice Wireless" },
{ 302630, "Aliant Mobility" },
{ 302640, "Bell Mobility" },
{ 302656, "Tbay Mobility" },
{ 302660, "MTS Mobility" },
{ 302670, "CityTel Mobility" },
{ 302680, "Sask Tel Mobility" },
{ 302680, "SaskTel Mobility CDMA" },
{ 302710, "Globalstar" },
{ 302720, "Rogers Wireless" },
{ 302730, "TerreStar Solutions" },
{ 302770, "Rural Com" },
{ 302780, "SaskTel Mobility UMTS" },
{ 302860, "Telus Mobility" },
{ 302880, "Telus-Bell-SaskTel Shared" },
{ 302940, "Wightman Telecom" },
{ 302990, "Test Networks" },
{ 308010, "St. Pierre-et-Miquelon Telecom" },
{ 310010, "Verizon Wireless" },
{ 310012, "Verizon Wireless" },
@ -2449,9 +2471,9 @@ proto_register_e212(void)
"Mobile network code", HFILL }
},
{ &hf_E212_msin,
{ "Mobile Subscriber Identification Number (MSIN)", "e212.msin",
FT_STRING, BASE_NONE, NULL, 0,
"Mobile Subscriber Identification Number(MSIN)", HFILL }},
{ "Mobile Subscriber Identification Number (MSIN)", "e212.msin",
FT_STRING, BASE_NONE, NULL, 0,
"Mobile Subscriber Identification Number(MSIN)", HFILL }},
};
/*