Commit Graph

56315 Commits

Author SHA1 Message Date
Guy Harris a53b67ceb7 Don't include header files that we don't appear to need.
Some don't appear to be necessary at all, as ui/qt/main.cpp doesn't do
very much (most of the work is done in various class implementations,
including WiresharkApplication), and a few only appear to be necessary
on Windows.

Change-Id: Ic9eae65e77e2425144f7fe4885fc865fcf6ab1ff
Reviewed-on: https://code.wireshark.org/review/6196
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-01 00:10:26 +00:00
Guy Harris 9a7d4559ae Use setlocale() to get the current locale.
This:

	1) should work on Windows;

	2) reflects what the C environment is actually set up to use,
	   rather than what the environment variables for locale are
	   set up to use - C programs default to the C locale and only
	   pick up the setting from the environment variables etc. if
	   you explicitly request the system locale with a setlocale()
	   call.

Change-Id: Iee064237e70501a5450d4daa9ab849391f200efd
Reviewed-on: https://code.wireshark.org/review/6195
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-31 23:33:31 +00:00
Guy Harris 1bc2565bff Don't include signal.h unless we need it.
Change-Id: I3965e0951eee919720f780b5e52732fd18fd9786
Reviewed-on: https://code.wireshark.org/review/6194
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-31 22:54:01 +00:00
Gerald Combs 91e4330394 Qt: Convert more dialog titles.
Change-Id: I9c3e3471a92b7af9347a541bece3d9405d37dce0
Reviewed-on: https://code.wireshark.org/review/6193
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-31 22:48:17 +00:00
Guy Harris 0e57ff2ca1 We no longer do anything signal-related, so don't include <signal.h>.
Update a comment pertaining to that, while we're at it.

Change-Id: Ic0a3f8575f8e98ca6032ed3e06e3dd76055d65a1
Reviewed-on: https://code.wireshark.org/review/6192
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-31 22:47:37 +00:00
Guy Harris 23b1127daf Swallow get_glib_version_info() into get_compiled_version_info().
It's not that complicated, so we might as well just do it in line.

Change-Id: I10809db554e668a853d28e7dca48b2de0ed51ad3
Reviewed-on: https://code.wireshark.org/review/6190
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-31 21:43:29 +00:00
Guy Harris 93efc20115 "#else", not "#elif", for the last part of a chain of conditionals.
Also give more details, for future reference, on how to determine
whether the processor supports CPUID.

Change-Id: I01e7173e45b0079f02338e51248238c05302dbd2
Reviewed-on: https://code.wireshark.org/review/6189
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-31 21:26:10 +00:00
Pascal Quantin c15b749946 Qt: fix 'Limit to display filter' functionality in Conversations/Endpoints windows
Change-Id: Ib57df32fbbe820b1105b11200b112d56a112e2a9
Reviewed-on: https://code.wireshark.org/review/6180
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-31 20:10:28 +00:00
Guy Harris d5d2c0e651 ws_cpuid() returns a success/failure indication; make it gboolean.
Change-Id: I03403ce29c4ac343d56fc2cf33aa8da90a082cbb
Reviewed-on: https://code.wireshark.org/review/6185
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-31 19:51:59 +00:00
Guy Harris 35cf7c6b3c Distinguish between IA-32 and non-x86.
In case we make ws_cpuid() work on IA-32 processors, add a separate
"always returns no" version of ws_cpuid() for non-x86 processors.

Change-Id: Id6fbd3e5c7d4f04063bc9bcd8f1644cd617b297e
Reviewed-on: https://code.wireshark.org/review/6184
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-31 19:46:33 +00:00
Guy Harris cb7c949091 Move some routines into ws_version_info.c.
The routines to get compiler, GLib version, CPU, and memory info are
used only in routines in ws_version_info.c; move them into
ws_version_info.c and make them static.

Change-Id: I58edd18da3301095012d2c7a3c5198e5a7073964
Reviewed-on: https://code.wireshark.org/review/6183
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-31 19:34:40 +00:00
Alexis La Goutte ce9ca9df77 rtse.cnf: fix Nesting level does not match indendation (CID 1159214)
Change-Id: I86e6c9103990bedf93c323e1360394a7c0a39db4
Reviewed-on: https://code.wireshark.org/review/6173
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-31 18:04:44 +00:00
Alexis La Goutte f42fe1a898 Zbee ZDP: fix Copy-paste error (CID 1158598)
Change-Id: If98d391f51c9d2aa31b1a3a93b774d91d364cccc
Reviewed-on: https://code.wireshark.org/review/6163
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-31 17:17:35 +00:00
Alexis La Goutte 02f41b1e71 GTPv2: fix Copy-paste error (CID 1158587)
Change-Id: I56eaa2071b4b8042c214cf882d35ebec646d2cb5
Reviewed-on: https://code.wireshark.org/review/6169
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-31 17:13:41 +00:00
Gerald Combs f485b28090 Test suite: Make sure we have a usable locale before we run iconv.
Change-Id: Ib1f3143dc48af4c556b9bcdfafbb477fd59b6359
Reviewed-on: https://code.wireshark.org/review/6181
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-31 17:13:06 +00:00
Alexis La Goutte fad9b76e32 wslua field: fix Copy-paste error (CID 1158590 & 1158589)
Change-Id: I566ddd2930b5c86bc32ca9ba12cd4be7d994bd22
Reviewed-on: https://code.wireshark.org/review/6168
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-31 17:12:24 +00:00
Alexis La Goutte 24c076f143 pcapng (wiretap): fix Copy-paste error (CID 1158591 & 1158592)
Change-Id: I117c007c0a8be573bb3069fc44a490e6e5d2fef8
Reviewed-on: https://code.wireshark.org/review/6167
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-31 17:11:08 +00:00
Bill Meier b0e6fbf2d4 umts_fp: Replace se_new0(...) by wmem_new0(wmem_file_scope(), ...)
Change-Id: I9d40ffd199147fb8b975c493253d5cf796be5983
Reviewed-on: https://code.wireshark.org/review/6179
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-31 16:11:42 +00:00
Hadriel Kaplan f7b6dcc58c Lua: allow a Dissector object to be passed in for register_heuristic
Bug: 10695
Change-Id: I81181b2d00fcb5f0c25ab89bbe4968897f47a3a6
Reviewed-on: https://code.wireshark.org/review/6131
Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-31 16:01:51 +00:00
Alexis La Goutte 11212887a1 GTP: fix Copy-paste error (CID 1158594 & 1158595)
Change-Id: I501c0d666c7b280656e2d7cf7a196d489d452eff
Reviewed-on: https://code.wireshark.org/review/6166
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-31 15:50:23 +00:00
Pascal Quantin a1732dc7a6 GTK: fix 'Limit to display filter' functionality in Conversations/Endpoints windows
Change-Id: I1efb7717c9eb4638fbff292e2953accc3e945ee6
Reviewed-on: https://code.wireshark.org/review/6178
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-31 15:49:29 +00:00
Bill Meier 9e7d69fd86 checkAPIs.pl: Error/warnings output goes to STDERR
Change-Id: Ib6f460147c26c4fbfb9bd0fd8dd0dd12561be9ea
Reviewed-on: https://code.wireshark.org/review/6177
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-31 15:35:49 +00:00
Alexis La Goutte 493e413636 SCTP: fix Nesting level does not match indendation (CID 1159213 & 1159215 )
Change-Id: Icd04c5f1f09b9cf704828e4b6a598cd2c1f6dd15
Reviewed-on: https://code.wireshark.org/review/6172
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-31 15:21:48 +00:00
Alexis La Goutte beb50e627a DHCPv6: fix Nesting level does not match indendation (CID 1159219)
Change-Id: Id57a9f2df6a4011078b0bef359b2cd5503f6f7ce
Reviewed-on: https://code.wireshark.org/review/6171
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-31 15:17:51 +00:00
Alexis La Goutte 784b39cbb4 GTPv2: fix typo in Anders e-mail Address
Change-Id: I2410aa7bce574c9153b971b2d8b0cbfbe24e54dc
Reviewed-on: https://code.wireshark.org/review/6170
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-31 15:17:23 +00:00
Alexis La Goutte 0f6f2bd9cc jxta: fix Copy-paste error (CID 1158599 & 1158600)
Change-Id: Ica4ade2e7de70cefc4e77d421e35ddd72e688c16
Reviewed-on: https://code.wireshark.org/review/6165
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-31 15:01:41 +00:00
Alexis La Goutte aeb10b9156 mount: fix Copy-paste error (CID 1224605)
Don't longer need to check if(tree)

Change-Id: I4ec572df28bad3c487c3c744840d97b79781feb3
Reviewed-on: https://code.wireshark.org/review/6164
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-31 15:00:12 +00:00
Alexis La Goutte 7c93e81551 Column utils: Missing varargs init or cleanup (CID 1212122)
Change-Id: I013c737c2cd62e3f1f49b113a7ce0c0616e1ecc4
Reviewed-on: https://code.wireshark.org/review/6119
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-31 14:59:38 +00:00
Alexis La Goutte 60d7413efe prefs: fix typo
Change-Id: Ic4dbbab5e53b5745cb703e6e30b2dc6251c3918e
Reviewed-on: https://code.wireshark.org/review/6161
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-31 14:58:38 +00:00
Pascal Quantin c34c2a61d0 Fix conversations filtering
Change-Id: Ic615830a373deab349a0a5a62f25b131e0bcbf18
Reviewed-on: https://code.wireshark.org/review/6162
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-31 14:35:07 +00:00
Pascal Quantin 3865bcaa97 Update libwsutil symbols
Change-Id: Icddb71202fb44ab3cf2ee5923b5a10f71f078ce5
Reviewed-on: https://code.wireshark.org/review/6176
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-31 14:19:25 +00:00
Pascal Quantin 22701adba1 DNS: ensure that suffix_addr structure is always initialized
Bug: 10816
Change-Id: Ifd036148f9f2e76516913bda11cf07fdb63def94
Reviewed-on: https://code.wireshark.org/review/6174
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-31 12:51:43 +00:00
Guy Harris 37efc4ae77 We do stuff with signals only on UN*Xes.
Change-Id: I1b1a304143cf4e4a14107d1d55057cef24552a70
Reviewed-on: https://code.wireshark.org/review/6160
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-31 10:23:51 +00:00
Luke Mewburn 914dc6c13e E.164: display country_code as decimal not hex
Display and filter e164.country_code and e164.identification_code
as decimal instead of hexadecimal, as that is more natural.
E.g. Use 'e164.country_code == 61' instead of 'e164.country_code == 0x61'
to match Australia (+61...)

If the country_code or identification_code contain BCD digits > 9
add an expert info warning.

Required modifying the various prefix to description value_string
arrays from hex to decimal constants, and converting the decoded BCD
from hex to decimal before adding to the proto tree.

Change-Id: Ibedfc75246fe409b7d63776083379bb028fb784b
Reviewed-on: https://code.wireshark.org/review/6054
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-31 09:18:53 +00:00
Guy Harris 8f75a2ec70 And, again, no more version_info.c.
Change-Id: I0500383aa6c553e995c60fad850553c0ce5a66d9
Reviewed-on: https://code.wireshark.org/review/6159
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-31 08:50:41 +00:00
Ebben Aries a3d946ce56 BGP : Simple typo fix for BGP Attribute
Change-Id: I793eed5c7d63c82e13847c8a6c8fd6def3025b8c
Reviewed-on: https://code.wireshark.org/review/6158
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Tested-by: Hadriel Kaplan <hadrielk@yahoo.com>
2014-12-31 08:03:25 +00:00
Guy Harris 64dd98e903 No version_info.c any more.
Change-Id: I96f4d07ac08d80811bb4ba9469cba8265d288945
Reviewed-on: https://code.wireshark.org/review/6157
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-31 07:10:17 +00:00
Guy Harris 938b6a781c Wrong function name.
Change-Id: I56e6a7dbb7290963548fdd61784554d67fc70bfe
Reviewed-on: https://code.wireshark.org/review/6156
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-31 07:07:54 +00:00
Hadriel Kaplan 0bf38f7aec Lua: getting fieldinfo.value for FT_NONE causes assert
Retrieving an FT_NONE field's value through `fieldinfo.value` or
`fieldinfo()` causes an assert.  It should retrieve the label instead.

Bug: 10815
Change-Id: Ia80443f3dd046b2cc31d1dff70d599e96d6f6fe3
Reviewed-on: https://code.wireshark.org/review/6150
Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Tested-by: Hadriel Kaplan <hadrielk@yahoo.com>
2014-12-31 06:34:21 +00:00
Guy Harris 27be466c9b Do the full string in get_{compiled,runtime}_version_info().
Have them start the string with "Compiled" or "Running on", and return
the string when done.

Change-Id: Ic4d290c963621fa0385dc5aab766fd4ad31d3810
Reviewed-on: https://code.wireshark.org/review/6155
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-31 06:29:11 +00:00
Pascal Quantin 84110d2981 tshark: endpoints statistics are not supported for now, do not list them in -z
Move statistics registration to "GUI" callback registration

Change-Id: Id27c049dc8f91d311e9231342ae40749ca0ff5fc
Reviewed-on: https://code.wireshark.org/review/6151
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-31 04:24:18 +00:00
Guy Harris c1f30471ca Move the version_info.c stuff to wsutil/ws_version_info.c.
Change-Id: I3a5c7e219974bfb924819b43b4d445eaf00e5bde
Reviewed-on: https://code.wireshark.org/review/6153
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-31 03:41:02 +00:00
Michael Mann 4eeb440b70 Remove proto_tree_add_text from packet-dcerpc-pn-io.c
Change-Id: Ia144061dc8c394d9ae89135009d06457e2aabb7d
Reviewed-on: https://code.wireshark.org/review/6152
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-31 00:28:38 +00:00
Gerald Combs dcbebe0eac Test suite: Start testing our output for valid UTF-8.
Feed the output of `tshark -G <glossary>` to `iconv -f UTF-8`. Adjust a
couple of the Bluetooth dissectors and X11 keysyms accordingly.

Change-Id: I5b04dc3fa4734c8f0a795daf44bd398fe5ebc1bd
Reviewed-on: https://code.wireshark.org/review/6146
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-30 21:20:28 +00:00
Gerald Combs 3b57861909 Qt: More WiresharkDialog conversions.
Convert the Follow Stream and Export Objects dialogs.

Change-Id: I8a4dda634f2f0475a24cf09601f76fb52069fe50
Reviewed-on: https://code.wireshark.org/review/6126
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-30 20:44:02 +00:00
Martin Kaiser 97f5f39c96 free the temporary buffers allocated by gnutls_x509_privkey_export_rsa_raw()
Bug: 10740
Change-Id: Idd4afab1bca6204d17c4bd4345661ec821f209e0
Reviewed-on: https://code.wireshark.org/review/6145
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-12-30 18:34:40 +00:00
Pascal Quantin bc7a9e55fd Fix IPv6/IPX statistics generation
Use a doubly-linked list and iterate on the reversed statistics list to always test the bigger strings first

Bug: 10813
Change-Id: Ibfedac9648db58e6dadc2334eec678e26daca906
Reviewed-on: https://code.wireshark.org/review/6140
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-30 18:27:29 +00:00
Pascal Quantin 935c8bf87b Websocket: use pinfo pool and not packet one for the unmasked data tvb
As indicated in README.wmem, pinfo pool must be used for anything that might
end up being passed to add_new_data_source

Change-Id: I4a6396fc52e6c70c771390f502d58199c38c172a
Reviewed-on: https://code.wireshark.org/review/6144
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-30 17:18:45 +00:00
Martin Kaiser f3f736c67f clean up the part where dissect_websocket() is called recursively
Change-Id: Ia94ddb2c4cb03fe5d1af9f8d316e1cdb18fe8283
Reviewed-on: https://code.wireshark.org/review/6143
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-12-30 17:04:33 +00:00
Martin Kaiser 246f727789 use packet-scoped memory for the unmasked data tvb
Change-Id: I5f9b769e26c16072a1656dfe9094487d6dfe76f4
Reviewed-on: https://code.wireshark.org/review/6142
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-12-30 17:04:09 +00:00