Commit graph

56724 commits

Author SHA1 Message Date
Michael Mann
d2d699aeb0 Move all SigComp functionality to the SigComp dissector.
While it does make packet-sigcomp.c much bigger, there's no reason for it to be in epan directory.

Change-Id: I2d78c32de1d56e76578e610d4df586b5610d1b49
Reviewed-on: https://code.wireshark.org/review/6682
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-20 21:28:18 +00:00
Pascal Quantin
160af3ccf3 HTTP2: fix test failure on Solaris SPARC
Do not make any assumption on the endianness: not all hosts running Wireshark are little endian

Change-Id: I8792904f7000b4f2b9e44ffe41f350ba8b4932d4
Reviewed-on: https://code.wireshark.org/review/6693
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-20 21:26:49 +00:00
Alexis La Goutte
74ed8b5648 Add DNS stats to release-notes
Remove in NEWS by gca174999

Change-Id: I000b7d6421db247dcafacfa73ef049e938d42cc5
Reviewed-on: https://code.wireshark.org/review/6650
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-01-20 21:13:19 +00:00
Bill Meier
0169cc86af Remove some dead initializers
Change-Id: I0478fa5c476a1914ae0c18feafc7720dd3111d84
Reviewed-on: https://code.wireshark.org/review/6690
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-20 20:52:39 +00:00
Bill Meier
eefd529835 bpdu: Fix minor bug introduced in g188aa9a
Change-Id: Ibce8848dded5896223af117a85bc0b6e321160e8
Reviewed-on: https://code.wireshark.org/review/6689
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-20 20:52:09 +00:00
Bill Meier
2c312b65f9 acn: col_...() shouldn't be called under 'if (tree)'
Change-Id: I4d7d1826391b0ac12ef6ad184e7c79d279db5e28
Also: remove some dead initializers.
Reviewed-on: https://code.wireshark.org/review/6688
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-20 20:51:19 +00:00
Bill Meier
c0a403abf3 6lowpan: Fix a few minor bugs; Also: Misc
(Bugs were introduced in gf5e2b42);
Misc:
    Localize a few variables;
    Remove some dead initializers.

Change-Id: Ib7493740ecf29ed9f753475f721b47a64f54a278
Reviewed-on: https://code.wireshark.org/review/6687
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-20 20:49:18 +00:00
Gerald Combs
f63628d9c4 CMake: Use wrapper scripts instead of symlinks.
When building an application bundle, create wrapper scripts at the top
level instead of symlinking to each executable.

Change-Id: I080e43de545a709b29c1d6b6c6ec416e5a5a8247
Reviewed-on: https://code.wireshark.org/review/6683
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-20 17:58:07 +00:00
Bill Meier
5268d7f632 cattp: Minor tweaks and whitespace changes
Change-Id: I128318ffb385930f00675030227e0048306a9f4c
Reviewed-on: https://code.wireshark.org/review/6684
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-20 17:56:40 +00:00
Gerald Combs
6e6a1291d0 CMake: Set an output directory for plugins.
Redefine PLUGIN_DIR similar to DATAFILE_DIR and use it on all
platforms. Add WiresharkPlugin.cmake so that we can start defining common
macros for plugins/*/CMakeLists.txt. Load plugins in out-of-tree builds.

Change-Id: I8c1359ed3cf8a71788b8320ff89dfe2d3969def2
Reviewed-on: https://code.wireshark.org/review/6640
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-20 16:12:20 +00:00
Alexis La Goutte
af3924a333 HTTP2: Add HPACK decode to test suite
Change-Id: Ic84942b78a795974d6e2023751245ad98b8f1142
Reviewed-on: https://code.wireshark.org/review/6415
Reviewed-by: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-20 07:31:23 +00:00
Alexis La Goutte
b2e172a238 DHCP/BOOTP: Option 125 Suboption: (5) fix display Modem Capabilities
Only display dissect of Modem Capabilites when sub option = 5
Actually, it is always display when ftype == special (like sub option = 0)

Change-Id: I5b75654b750bae5ae5022adcb5e8dd055ce6b291
Reviewed-on: https://code.wireshark.org/review/6519
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-20 07:29:59 +00:00
Evan Huus
f3cbee6aab NCP2222: fix possible buffer-overflow
Caught by ASAN (thanks Alexis!)

Change-Id: Ibbe2c405ba1a3ba0d5a5b9ffff9e95282526028b
Reviewed-on: https://code.wireshark.org/review/6652
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-20 07:27:17 +00:00
Dario Lombardo
1af7b97927 Bug fix in json dissector that made the heuristic fail.
Change-Id: Iff53cfd8fd9d760b04c638c87f8a44587b268cd7
Reviewed-on: https://code.wireshark.org/review/6674
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-20 05:57:02 +00:00
Matthieu Texier
11e557a794 ISIS: Making a segregated function for sub-tlv used by multiple tlv
Change-Id: Ifda28dea4b5282ea01a51cdcb3297aeeeb2a848d
Reviewed-on: https://code.wireshark.org/review/6550
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-20 05:43:22 +00:00
Guy Harris
8c15ac4636 Possibility -> certainty.
Change-Id: I03440a9b4ca13399aa14f3baaabd7aa40a843f28
Reviewed-on: https://code.wireshark.org/review/6678
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-20 02:33:15 +00:00
Gerald Combs
f16e8fbebf pdb_zip_package: Enable multithreaded compression.
Change-Id: If72c65663abb7e3bf1a436d1ecb5eb84f67ad3f8
Reviewed-on: https://code.wireshark.org/review/6677
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-20 01:28:09 +00:00
Guy Harris
c3ad53f9ad Fix one item.
We *do* get the absolute path of the executable, so we *could* look for
"run" right before the executable name.  The issue is that there's not
the stronger libtool-imposed convention that the executable is in
".libs", so the chances of a false positive or false negative are
higher.

Change-Id: Ib2d5f370d50fee07479c4ffe6f90ba4a91c7f271
Reviewed-on: https://code.wireshark.org/review/6676
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-20 00:49:01 +00:00
Gerald Combs
7c69079fb9 CMake: Add a pdb_zip_package target.
Add a "pdb_zip_package" target similar to the NMake pdb_zip target.

Change-Id: I23d114a63fa05f722ee90b77ea458d9e496e5bf9
Reviewed-on: https://code.wireshark.org/review/6673
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-19 21:50:36 +00:00
Guy Harris
bea25fa0d4 The times in question are local, not UTC.
Revert to the older code, but just show the time as "Not representable"
if gmtime() fails.

Change-Id: I435facc042e3ca35fb07292a4b2657ccdfd02abb
Reviewed-on: https://code.wireshark.org/review/6672
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-19 21:11:01 +00:00
Martin Kaiser
58d9ca80ac add some more apdus to the apdu table
Change-Id: Id5e5efea46e9ff6196607e56f0212fb083e8635c
Reviewed-on: https://code.wireshark.org/review/6670
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-01-19 20:59:40 +00:00
Martin Kaiser
6c02abf2d9 start dissecting the ZVT authentication apdu
add a length paramenter to the body dissection functions in the apdu table

Change-Id: I4abbd9078fd36385a816963ab042f443e3c26b60
Reviewed-on: https://code.wireshark.org/review/6669
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-01-19 20:59:06 +00:00
Martin Kaiser
4fc8286195 display the control field text in the info col
Change-Id: I3dc0f58b4861a08be687214cae9c6681ebcac286
Reviewed-on: https://code.wireshark.org/review/6668
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-01-19 20:58:36 +00:00
Martin Kaiser
c846af14b6 continue the dissection of ZVT APDUs
define an apdu table with the direction, minimum length
and a fuction to dissect the apdu payload

set the source and destination address columns depending on the apdu

add some entries to the apdu table

Change-Id: I52bd15bfab7bbe6c97dfe64084e69a51e65a8a6e
Reviewed-on: https://code.wireshark.org/review/6667
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-01-19 20:57:35 +00:00
Martin Kaiser
71d83aa0c3 tvb_length() -> tvb_captured_length()
Change-Id: I520b38ed37b2d16d9a15f57b8e83b0b59c9a528c
Reviewed-on: https://code.wireshark.org/review/6666
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-01-19 20:56:57 +00:00
Bill Meier
0dcb91dd85 synphasor: (trivial) Do dissector_add_uint("rtacser.data",...) only once
and not each time prefs are changed.

  Also: do minor whitespace changes.

Change-Id: I04bfc212e288473a78113e8b124ce4a13ad74ad1
Reviewed-on: https://code.wireshark.org/review/6663
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-19 20:51:36 +00:00
Bill Meier
5fa13c6a19 README.dissector: Minor update re date/time display.
Change-Id: Iae467efeccd2e51ea66aab029100c958de7d374e
Reviewed-on: https://code.wireshark.org/review/6662
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-19 20:51:14 +00:00
Bill Meier
7a81add848 synphasor: prevent possible crash; gmtime() can return NULL;
Don't do manual conversion of a time-field to UTC using gmtime().
Use the standard Wireshark mechanisms.

Change-Id: I2eaee074a590ecab492336bb6ad794bdd036f699
Reviewed-on: https://code.wireshark.org/review/6661
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-19 20:50:51 +00:00
Bill Meier
7e1d73d0d4 dmp, gmhdr, vssmonitoring: prevent possible crashes;
gmtime()/localtime() can return NULL.

Change-Id: If0589261429ee15d0c07972a99d94f9fe83626f6
Reviewed-on: https://code.wireshark.org/review/6660
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-19 20:50:26 +00:00
Bill Meier
d1cace99e5 smb-pipe: prevent possible crash; gmtime() can return NULL.
For FT_ABSOLUTE_TIME fields:

Instead of calling gmtime()/mktime() to convert a time to UTC time
which is then displayed using proto_tree_add_time(),

Use ABSOLUTE_TIME_UTC as the 'display' value for the field and then
display the field using proto_tree_add_item().

Change-Id: I1926c40de76a86072437902cb7621d3873827b11
Reviewed-on: https://code.wireshark.org/review/6659
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-19 20:49:58 +00:00
Alexis La Goutte
b41065e223 BGP: EVPN - Route Type 4 - "Invalid length of IP Address" - "Expert Info" shows a false error
Wrong offset (14 -> 20) to get IP Address Legnth

Issue Reported by Rui
Bug: 10873

Change-Id: Ib7aa80ac78028a2c8d548f4030278166be9ed0cc
Reviewed-on: https://code.wireshark.org/review/6657
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-19 20:34:21 +00:00
Alexis La Goutte
9fd507827e BGP: fix field bgp.evpn.nlri.mpls_ls is not of type FT_STRING, FT_STRINGZ, or FT_STRINGZPAD
Change-Id: Ida14611dee9eb01e1eab13a96c15ab3d759ed1cd
Reviewed-on: https://code.wireshark.org/review/6656
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-19 20:33:39 +00:00
Guy Harris
ab8a13dde8 Don't mix declarations and code - it's not legal C90.
Change-Id: I1a89c729255560d596e4d7701468cca3e9000357
Reviewed-on: https://code.wireshark.org/review/6655
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-19 20:27:04 +00:00
Pascal Quantin
c0fd5392af ZigBee: fix dissection of epoch time in OTA cluster
Bug: 10872
Change-Id: I25275ecb76cc03774ab210fb33a3bef5b1982585
Reviewed-on: https://code.wireshark.org/review/6653
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-19 20:07:00 +00:00
AndersBroman
de4164fefb On my system NSIS installs in the path defined in environment variable
ProgramFiles(x86)=C:\Program Files (x86)
Add that to the locations where we look for it. I couldn't use
ProgramFiles(x86) as a constant so put the path verbatim.

Change-Id: Ibad9d4e2544e5b3924e10c68f02e072b0012226f
Reviewed-on: https://code.wireshark.org/review/6651
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-19 17:30:11 +00:00
Josip Medved
c8bca4fa9a Updated company name from Nokia Siemens Networks to Nokia Solutions and Networks.
Change-Id: I93782facc2e3f9ff6358cf617968fac30bac1f7a
Reviewed-on: https://code.wireshark.org/review/6647
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-19 16:53:04 +00:00
Alexis La Goutte
1b5a965bab JSMN : fix typo (it will be fix make distcheck)
Change-Id: I188be77b77a5a52b233d482d6d8ea8b97adc00db
Reviewed-on: https://code.wireshark.org/review/6649
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-19 08:49:31 +00:00
Alexis La Goutte
48e90daaba Fix make dist on Ubuntu buildbot
Change-Id: Id3a5ed08fb8b7c721f8eeabbba723a9de0d47b0f
Reviewed-on: https://code.wireshark.org/review/6648
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-19 07:38:51 +00:00
Josef Baumgartner
f90a10a0d5 epl: Rework POWERLINK (EPL) dissector
With this patch we want to enable a better support of POWERLINK
 as a protocol for people who have to perform network diagnostics using
 analyzing tools. Up until now, the main tool used was Omnipeek.
 Now wireshark will be used more and more, due to the new extcap
 infrastructure, which supports debug tools to be added as capture
 devices.

 To better facilitate that change, we have adapted the textual
 representation of the Omnipeek dissector for POWERLINK, as it
 allows for a faster and simpler diagnosis routine.

 Additionally the name of the protocol has been changed to it's
 correct name "POWERLINK" as this is the official name used by
 EPSG for describing the protocol.

Changelog:
 - Add error code definitions and string values.
 - Change name for protocol column to POWERLINK which is more commonly
   used than EPL.
 - Reformat output in info column to look like output the output of
   the POWERLINK plugin for Omnipeek. This facilitates the transition
   to Wireshark. The added information and changed output improves the
   debugging of POWERLINK nerworks.

Change-Id: I795e2487f2ae7af6b90c29366a1843c9fabffa85
Reviewed-on: https://code.wireshark.org/review/5581
Reviewed-by: Roland Knall <rknall@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-19 07:18:48 +00:00
Dario Lombardo
f53be88408 JSON dissector changed into heuristic dissector.
To check if a payload is json, the library libjsmn has been added to the source tree, with its licence (MIT).
TODO: the libjsmn can be used to extract tokens in the standard dissection other than heurisitic part.

HPFEEDS dissector has also been changed in order to leverage the new json dissector.

Bug: 10834
Change-Id: Ib1df2a699982dbdd2b5418e97edbdb5cbd9c8978
Reviewed-on: https://code.wireshark.org/review/6350
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-19 03:12:01 +00:00
Luke Mewburn
119416ef27 TCAP: support dialogue confirmation
TCAP permits the changing of the originating address on the first
backwards continue (i.e. the establishment of the dialogue).
See ITU-T Q.771 (06/97) clause 3.1.2.2.2.2 Confirmation of the dialogue.
In practice, a BEGIN replied to with an END can also exhibit this behaviour.

For example, a BEGIN from GT A TID TA -> GT B,
and the reply CONTINUE from GT B2 TID TB -> GT A TID TA.
To support this, only support a single address hash in
tcaphash_begin_info_key_t and tcaphash_end_info_key_t.
The match of the first CONTINUE should find the appropriate
tcaphash_begin and create the appropriate tcaphash_end entries.

Also fix compile warning with DEBUG_TCAPSRT.

Bug: 10841
Change-Id: Ibe75e3940e757727357b20be10f9c195c5888fdd
Reviewed-on: https://code.wireshark.org/review/6446
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-19 03:08:54 +00:00
Diederik de Groot
c4297e6391 Skinny: packet-skinny.c
Changes: Number of small changes to the xml file:
	- some fields being connected to the wrong message version
	- some header field naming

Change-Id: I062c31777a4193de3d5c44b0ba733dd9d1702352
Reviewed-on: https://code.wireshark.org/review/6602
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-19 02:57:49 +00:00
Sergio Moreno Mozota
199cb062e1 RTP: Parse problem in dissect_rtp_hext_rfc5215_onebyte
some commercial IPTV streamers send bogus info in the extension headers, add some sanity check to skip the erroneous bytes.

Bug: 10513
Change-Id: I6f20073a00ed0f791fa99701534360d304060053
Reviewed-on: https://code.wireshark.org/review/6606
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-19 02:57:13 +00:00
Michael Mann
e333e4c90f Convert OID APIs to use wmem.
There are a few oid functions that are only called in oids_test.c.  I'll presume the APIs are used in proprietary dissectors rather than just remove them.

Change-Id: I4595e00f93bf9ab8cf2493fe0432b91960f55a3f
Reviewed-on: https://code.wireshark.org/review/6592
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-19 02:52:11 +00:00
Guy Harris
59155d1d1c Eliminate ep_strdup(), as it's no longer used.
Also, remove some no-longer-existent functions from checkAPIs.pl.

Change-Id: I2bf11e3ec03a34f9e89d58d560e340d76fd3ddc1
Reviewed-on: https://code.wireshark.org/review/6645
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-19 01:49:24 +00:00
Bill Meier
5162b7f146 smpp: Prevent crash if invalid date/time field.
gmtime()/localtime() can return NULL;

Bug 10868
Change-Id: I496bab62555c7741b3d159726e74a3d14c4b51cb
Reviewed-on: https://code.wireshark.org/review/6644
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-19 00:07:31 +00:00
Guy Harris
b2b640f02b Reflect the disappearance of the seasonal allocator.
Change-Id: I1c76bf9eed516aa9afbc04b1b9236a04b0b1988c
Reviewed-on: https://code.wireshark.org/review/6643
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-18 23:48:58 +00:00
Guy Harris
4cea624bd7 This currently requires emem.h.
Change-Id: I55cca8de9be07fbec4e771c0f6d50075fc75bef8
Reviewed-on: https://code.wireshark.org/review/6642
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-18 23:46:57 +00:00
AndersBroman
ae92cd48a9 [Qt] Run windeployqt for Qt versions greater than 5.2
Change-Id: I3c7e7ed35ffead280c1ac394a4ef8172a89fe3a6
Reviewed-on: https://code.wireshark.org/review/6622
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-18 22:49:59 +00:00
Guy Harris
59702234b9 Put back ep_alloc0(), accidentally deleted in the removal of the se_ stuff.
(The se_ stuff wasn't as contiguous as I thought.)

Also fix some comments to no longer refer to #defines for se_ stuff.

Change-Id: Ibc53e6f0f135bee9795f98550d5242e8e58afb16
Reviewed-on: https://code.wireshark.org/review/6641
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-18 22:17:19 +00:00