Commit Graph

56336 Commits

Author SHA1 Message Date
Michael Mann 860cb393d8 tshark: Add endpoints statistics
"stat name" has been official changed to "endpoints" for all dissectors, rather than a mixture of "host"/"endpoints" based on dissector.

Change-Id: If34bcb5165b493948e784ba038ab202803a59843
Reviewed-on: https://code.wireshark.org/review/6154
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-02 00:02:18 +00:00
Michael Mann 07c9492b8d Remove pkt_comment member from packet_info structure.
Change-Id: Ifd3d201a09944e3fc36188f891ea8a584886101d
Reviewed-on: https://code.wireshark.org/review/5884
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-02 00:00:57 +00:00
Guy Harris f384fa07f9 Fix tpyo.
Change-Id: I5b190ee35086664ed053d376def4e21ab9ad9236
Reviewed-on: https://code.wireshark.org/review/6213
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-01 23:35:22 +00:00
Guy Harris 2ce7dfe14f More indentation cleanups.
Change-Id: I6d21bda89f8032d302620e21ac393dc345165ac7
Reviewed-on: https://code.wireshark.org/review/6212
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-01 23:28:35 +00:00
Guy Harris 6c24c7e3a8 Clean up indentation.
Change-Id: I5aa6cafc6249b3a820b1bbf2eddc2ec1fdc88685
Reviewed-on: https://code.wireshark.org/review/6211
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-01 23:15:23 +00:00
Martin Mathieson 43f09e67b4 Remove unneeded includes from ui folder
Change-Id: Ifd1eebff9080cd3867e44e4dcb2d2681370ed60a
Reviewed-on: https://code.wireshark.org/review/6128
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-01-01 23:11:10 +00:00
Guy Harris 5981dab95b Declare read_keytab_file() in epan/dissectors/packet-kerberos.h.
Don't throw its declaration in file.h, as it's not defined in file.c.
Instead, include it in epan/dissectors/packet-kerberos.h and include
that wherever read_keytab_file() is called.

Yes, that means you also have to include <epan/asn1.h> and, therefore,
you have to include <epan/packet.h>.  Yes, that should be cleaned up,
perhaps by splitting the Kerberos support code into "stuff that handles
encryption keys without any reference to dissection" and "stuff that
does dissection-related work".

Change-Id: Ide5c31e6d85e6011d57202f728dbc656e36138ef
Reviewed-on: https://code.wireshark.org/review/6210
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-01 23:05:57 +00:00
Hadriel Kaplan 445ddc8336 Lua: FieldInfo '==' check isn't really equality
The FieldInfo metamethod for equality (letting you use the '==' operator)
doesn't check for equality, but rather if the left-hand side is within
the right-hand side. It should be equality instead. Also, all of the
FieldInfo operate overloads should push a boolean even if they're false
result.

Bug: 10820
Change-Id: Ibddaab29713f26d22ddb4d5804b9edb15e93fd79
Reviewed-on: https://code.wireshark.org/review/6186
Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-01 22:24:38 +00:00
Bill Meier 6d6ba642b9 .gitignore: Add '*.nativecodeanalysis.xml'
Change-Id: I54133af8626125b51e4263d3c77358752bdcf339
Reviewed-on: https://code.wireshark.org/review/6209
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-01 20:05:29 +00:00
Guy Harris 7ed0cd7ba7 wireshark-qt.cpp belongs in, err, umm, the Qt Wireshark - not the GTK+ one.
Change-Id: I101be1967f45bcb56d72784a456e394ca7e51323
Reviewed-on: https://code.wireshark.org/review/6208
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-01 18:28:44 +00:00
Pascal Quantin 72f035d094 Qt: fix crash when opening Preferences window on Windows
Do not use delete on g_allocated memory

Change-Id: I84e0adc65c45520916adb9b2f6d46ca3f144486e
Reviewed-on: https://code.wireshark.org/review/6207
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-01 17:52:36 +00:00
Pascal Quantin 1663c2afe7 Welcome in 2015
Change-Id: Ib581b9383b211ea8dbcea1cadf98a2b8c3548ab5
Reviewed-on: https://code.wireshark.org/review/6204
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-01 13:21:26 +00:00
Guy Harris e8e38b439f wireshark-qt.cpp is only a Qt Wireshark source file.
It's not a GTK+ Wireshark source file, so don't include it in
wireshark-gtk.

Change-Id: I0affa1fab1a29e10e1cf446e49182c9c4f218b87
Reviewed-on: https://code.wireshark.org/review/6203
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-01 12:36:38 +00:00
Guy Harris 6ef4cbd142 Include "file.h" to get read_keytab_file() declared.
Change-Id: I7e9ea47019f259a56a8652d0e003e23a3e1d1366
Reviewed-on: https://code.wireshark.org/review/6202
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-01 12:17:02 +00:00
Guy Harris 219d37e2d1 Let routines from the Kerberos dissector be called from C++.
Wrap its declarations in the usual "extern "C"" stuff.

Change-Id: I353ab334bc08a69fdacaaab5672edf758b14766a
Reviewed-on: https://code.wireshark.org/review/6201
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-01 12:13:34 +00:00
Guy Harris 0a64b55971 Remove wireshark_cxx.
It may have been part of the "build Qt Wireshark as C++" hacks, and is
now causing build problems.

Change-Id: If471bf3dca01f1bc6e9b5b871d0de3159e4c8e1c
Reviewed-on: https://code.wireshark.org/review/6200
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-01 11:29:36 +00:00
Guy Harris 8bf7078f79 Move ui/qt/main.cpp to wireshark-qt.cpp, and get rid of the dummy.cpp hack.
Change-Id: Ib4684264363593372b3bf078cf17cae1a1cb10d6
Reviewed-on: https://code.wireshark.org/review/6199
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-01 10:46:00 +00:00
Guy Harris a4019a357b Rename a variable to avoid a compiler warning.
(Thanks, IBM and AT&T.)

Change-Id: Ifcffd4937f90ca466c01ebc4f3e3bd8555a9b078
Reviewed-on: https://code.wireshark.org/review/6198
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-01 05:03:45 +00:00
Graham Bloice 21697af636 Added DNP3 support for g13 and g43, output command events
Bug: 10347
Change-Id: Ic173f31d8cf3fd002454f4c22b85c19bae42d544
Reviewed-on: https://code.wireshark.org/review/6175
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-01 04:38:34 +00:00
Michael Mann 889c566b9a Eliminate proto_tree_add_text from WiMax plugin.
Most of this was done with a custom perl script that picked out the field names from the XBIT macro and generated an hf_ and filter (that was humanly tweaked from there).

Change-Id: I563db9f8ea216efe37322b784ab0daf25c038d9e
Reviewed-on: https://code.wireshark.org/review/6149
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-01 04:34:44 +00:00
Guy Harris 114e7735b9 Call setlocale() before getting version information.
That way, the setlocale() call used to get the current locale will get
the right answer.

Change-Id: Ib43e16a9d98d08e5ddaff81fd3235f5b64d7b95b
Reviewed-on: https://code.wireshark.org/review/6197
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-01 00:47:17 +00:00
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