Commit Graph

22367 Commits

Author SHA1 Message Date
Dario Lombardo 52801889fc Added HCrt (Hotline Command-Response Transaction) Dissector.
Bug: 10853
Change-Id: Ieddb98b16e47906ba187cf03669b02a3ad397d60
Reviewed-on: https://code.wireshark.org/review/6533
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-25 15:59:03 +00:00
Evan Huus b2a5f15fbe RTPS: Memset entire buffer
Apparently some compilers do sufficient inlining optimization to notice that
there's at least one caller of rtps_util_add_typecode which passes an
indent_level of 0. Such compilers are *also* picky enough to complain about
memset being called with a length of 0, leading to a warning which we turn into
a compile error.

I thought about putting in an "if indent_level > 0" but I figure memsetting the
entire buffer (length >= 1) is simpler and more efficient in the common case.

Change-Id: Ica21ba988eb0c1251e7b4ef2e110336d5ee32837
Reviewed-on: https://code.wireshark.org/review/6766
Reviewed-by: Evan Huus <eapache@gmail.com>
2015-01-24 19:31:20 +00:00
Gerald Combs cf142c6b67 Get Wireshark to compile with afl-gcc.
Fix errors found by American Fuzzy Lop's afl-gcc
(http://lcamtuf.coredump.cx/afl/):

peektagged.c:
error: 'fileVersion' may be used uninitialized in this function

packet-h223.c:
error: variable 'circuit_id' might be clobbered by 'longjmp' or 'vfork'

wslua_proto.c:
error: variable 'd' might be clobbered by 'longjmp' or 'vfork'

wslua_proto.c:
error: variable 'dt' might be clobbered by 'longjmp' or 'vfork'

Change-Id: Idd74a3ad7b236d3a8756c1e7e917b1c74143f381
Reviewed-on: https://code.wireshark.org/review/6767
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-24 19:14:38 +00:00
Martin Mathieson d8d2d8e09c jpeg: Add handling for comment marker
Change-Id: I10ad7021f6535d65d88faf734fb5800e4415a811
Reviewed-on: https://code.wireshark.org/review/6759
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-01-23 16:00:26 +00:00
Petr Gotthard cce3ad281e Correctly dissect the AMQP 0-9 heartbeat frames. The heartbeat frames were
incorrectly highlighted as erroneous.

Change-Id: I94f8ef73e2432543ae3965da3789f27e872951ea
Reviewed-on: https://code.wireshark.org/review/6685
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-23 13:15:56 +00:00
Alexis La Goutte f5c0bd2b76 802.11: Fix encoding for VHT NDP STA Info
Using little endian for encoding

Ping-Bug: 10786
Change-Id: Ic2a7f52ccbba32a801c102df4e5aa0a792654602
Reviewed-on: https://code.wireshark.org/review/6755
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-23 12:28:55 +00:00
Alexis La Goutte bab744784f CAPWAP: Add support of Fortinet Vendor Specific Element
Based from FortiAP/WiFi 5.2.x

Change-Id: Ia78d15d54db01939a3d91947db39e35b3abc2519
Reviewed-on: https://code.wireshark.org/review/5646
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: Anders Broman <a.broman58@gmail.com>
2015-01-23 12:26:12 +00:00
Hadriel Kaplan 888229bebd Make netlink dissector register the attribute length header field info
The header field info variable named hfi_netlink_len isn't registered
by the netlink dissector, but is added to the tree, resulting in a
runtime error. This commit changes the variable name slightly, to
be more accurate, and correctly registers it.

Bug: 10884
Change-Id: Iaa4e556d5bbe87b72a0cdca2fbf397fa95e074cc
Reviewed-on: https://code.wireshark.org/review/6751
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-23 05:33:44 +00:00
Bill Meier 8d1a9848e3 Remove incorrect 'if (tree)'
Incorrect because of one or both of the following:
- col_...()/expert...() called under 'if (tree)'
- vars set under 'if (tree)' used later (not under 'if (tree)'
   as args to col_...()/expert_...()

Change-Id: I89f7d453f2d6eaa40d51cbd794ed2c9be7e549de
Reviewed-on: https://code.wireshark.org/review/6754
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-23 05:30:55 +00:00
Bill Meier 96f9746615 pppoe: col_...()/expert...() shouldn't be under 'if (tree)'
Change-Id: I93726546d86af677153b6b2d46fc072851a33460
Reviewed-on: https://code.wireshark.org/review/6741
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-22 17:08:38 +00:00
Stefan Metzmacher f38a63acab packet-smb2: implement SMB2 NegotiateContexts
Change-Id: I0a2c7ffa2490196989dce96b659337b4fee92c7e
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/6711
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-22 16:13:14 +00:00
Stefan Metzmacher 48c90d16e7 packet-smb2: fix getting the dataoffset in dissect_smb2_write_request()
It's 2 byte only so we need to use tvb_get_letohs().

Change-Id: Idbab6428f4242abbbff089d7e1d1bf4cc86930b1
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/6710
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-22 16:12:56 +00:00
Stefan Metzmacher 97d0f36f17 packet-smb2: correctly dissect dcerpc traffic over different named pipe handles
Change-Id: Id98d1c7e28d88f6cd50f5ef770eec95e57008458
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/6709
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-22 13:29:31 +00:00
Stefan Metzmacher 749c68cb56 packet-dcerpc: change transportsalt to guint64
This will be able to hold also SMB2 file ids and maybe other stuff in future.

Change-Id: Ib55895a346b7dc6562291730693453728c99fe91
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/6708
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-22 12:26:34 +00:00
Bastien Bailly 39a984e649 GTP: Bad bytes read for extended rnc id value
offset+=2; is missing and bytes used for extended rnc id value are the same that for rnc id value.

Bug:10877
Change-Id: I2830191e434812d42ab625e7a6e0478a191b7d95
Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-on: https://code.wireshark.org/review/6738
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-22 09:56:25 +00:00
Marko Hrastovec f8fa70f4e8 Decoding of Asterix categories 063 and 065 extended to item decoding.
Categories 063 and 065 were decoded only partially. Now the dissector
dissects all the items in these two categories.

Change-Id: Ib8fd1d18327cbea668600f7376a6b83a270909a2
Reviewed-on: https://code.wireshark.org/review/6714
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-22 09:01:03 +00:00
Bill Meier f7d9334f06 isakmp: col_...() shouldn't be called under 'if (tree)'
Change-Id: I6fa497ca99e2ad3b675697fd28eeafd61190a17c
Reviewed-on: https://code.wireshark.org/review/6726
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-21 21:57:52 +00:00
Bill Meier bc5c4846cc Remove some dead initializers
Change-Id: I16c88b5e8f6e79a0d9b33b9c3c4d94f77ecfdfa2
Reviewed-on: https://code.wireshark.org/review/6723
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-21 21:09:34 +00:00
Bill Meier b0f37ba3d2 vcdu: minor cleanup
- Remove dead initializers (and localize some vars);
- proto_item_set_len() takes a 'proto_item *';
- Use gboolean for a TRUE/FALSE var;
- Remove a set of unneeded brackets.

Change-Id: Ic7b27e2cd321c9d307c01cc4afdb0fc4c6d3cd55
Reviewed-on: https://code.wireshark.org/review/6722
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-21 21:09:02 +00:00
Bill Meier 0671965679 usb-hid: fix 2 minor bugs and some dead initializers
One bug was introduced in g4d58904

Change-Id: I16a5e83f11f48038945e957c7e6ce9d50b4aec46
Reviewed-on: https://code.wireshark.org/review/6721
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-21 21:08:31 +00:00
Bill Meier 32ab59f8e9 synphasor: General cleanup
- col_...() shouldn't be under 'if (tree)';
- remove dead initializers;
- use proto_tree_add_subtree() in place of ..._add_text()/...add_subtree()
   in one more instance;
- tvb_length() --> tvb_reported_length();
- use 'proto tree *' variable instead of incorrect 'proto_item *' var in
   one instance;
- use SYNP_... for a few macro names to prevent any possible
   namespace collisions;
- fix some long-lines, indentation and whitespace.

Change-Id: I4e0a2e5d0b5e13b72a14ec6dd3779a7104534445
Reviewed-on: https://code.wireshark.org/review/6720
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-21 21:08:02 +00:00
Bill Meier 009ca9fa5e srvloc: fix a very minor bug
Change-Id: I822602c569fd6241757ceb558224c255937f3130
Reviewed-on: https://code.wireshark.org/review/6719
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-21 21:07:05 +00:00
Bill Meier 3dc1b4ee42 ieee802154: (trivial) proto_item_set_len() takes a 'proto_item *'
Change-Id: I83945ccf73e2c8f355a3ff843271d35143758b1d
Reviewed-on: https://code.wireshark.org/review/6718
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-21 21:06:19 +00:00
Dario Lombardo e1f4f53b06 HPFEEDS: cleanup in the dissector code.
Change-Id: Ia675fb703811c4b6be6a278d9396a917dfcf982d
Reviewed-on: https://code.wireshark.org/review/6715
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-21 19:58:13 +00:00
Pascal Quantin 163071e388 GSM SIM: for a FETCH command, a Le of 0 means 256 bytes
Change-Id: Ia8969747c215a5ba7e9242b6266114b0e9e00859
Reviewed-on: https://code.wireshark.org/review/6712
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-21 09:37:50 +00:00
Pascal Quantin 2ee0ea0f1d IEEE 802.15.4: fix display of 64 bits address (broken in gecaa1f8)
Change-Id: I1fc117ac6522b4df53ceafb635aeb3b1f34a54d3
Reviewed-on: https://code.wireshark.org/review/6695
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>
2015-01-21 08:04:57 +00:00
Bill Meier 5f70fd602d dsi: fix a trivial bug
Change-Id: Ieafbd148211154a465ab1ce8fe36d2110882c458
Reviewed-on: https://code.wireshark.org/review/6694
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-20 22:01:45 +00:00
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
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
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
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 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 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