Commit Graph

25305 Commits

Author SHA1 Message Date
Alexis La Goutte db4f7fcdea PIDL: Remove _U_ and remove unused-parameter via pragma
Change-Id: Ic40f86850dc94338a8c2205e04679793f368672f
Reviewed-on: https://code.wireshark.org/review/14967
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-05-02 05:57:20 +00:00
Juanjo Martin f494298d37 RTPS: Added PT PID parameters and infrastructure to dissect
Before, the dissector didn't have any code path to dissect the PT
discovery parameters. The code path necessary as well as the
parameter definitions have been added.

Change-Id: I17665a56d033ffbfd16d47fe2e7374111aff9530
Reviewed-on: https://code.wireshark.org/review/14804
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-05-02 02:23:28 +00:00
João Valverde f69b3b1f0e IMAP: Add heuristic check for TLS
If the IMAP TCP stream doesn't include the STARTTLS command/response
the IMAP dissector will try to dissect TLS ciphertext as IMAP protocol
plaintext.

Add heuristic check for SSLv3/TLS and if the heuristic matches register
dissect_ssl() as the dissector for that IMAP session.

Change-Id: If84eca22315193a306e93e66c608de6634e6cd85
Reviewed-on: https://code.wireshark.org/review/13570
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
2016-05-01 23:32:41 +00:00
João Valverde 85d57b53e8 ICMPv6: Observe "Redirected Header" option length
Bug: 12400
Change-Id: Ic4116082b0f6c119172b222aadefab821f1b0971
Reviewed-on: https://code.wireshark.org/review/15205
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: João Valverde <j@v6e.pt>
2016-05-01 23:19:18 +00:00
Michael Mann 2cb5985bf4 Make class "type" for USB conversations.
USB dissectors can't assume that only their class type has been passed around in the conversation.  Make explicit check that class type expected matches the dissector and stop/prevent dissection if there isn't a match.

Bug: 12356
Change-Id: Ib23973a4ebd0fbb51952ffc118daf95e3389a209
Reviewed-on: https://code.wireshark.org/review/15212
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-05-01 20:16:15 +00:00
Martin Kaiser 66d019959b zvt: return -1 if we need more data from tcp
0 means that the dissector rejected the packet.

Change-Id: I9e04443a5f378198f94038e0e67b2e1fde8054be
Reviewed-on: https://code.wireshark.org/review/15210
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-05-01 16:25:01 +00:00
Martin Kaiser 7013418e55 ldss: remove if (tree) checks
Change-Id: Ib453a247eb1a2b6e88b3a4abab301bdc7c18bdb0
Reviewed-on: https://code.wireshark.org/review/15209
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-05-01 15:56:48 +00:00
Martin Kaiser bdcc802f89 ldss: return -1 (not 0) if we need more data from TCP
If a dissector returns 0, it rejects the packet ("this is not my
protocol"). This is in contradiction to requesting more data from TCP.

Bug: 12359
Change-Id: Ib0da7fc3ef92b35b3950e74f50484d9e21a93a6f
Reviewed-on: https://code.wireshark.org/review/15198
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-05-01 15:40:29 +00:00
Pascal Quantin f29d1da0fb IPv4: use calculated value for Header Length display filter
Bug: 12387
Change-Id: I63370ea884b6fb75a0743fecc06af2e213700645
Reviewed-on: https://code.wireshark.org/review/15163
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
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>
Reviewed-by: João Valverde <j@v6e.pt>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-30 07:22:16 +00:00
Deep Datta 8ac0293cba Netflow: Updating the list of Ixia IxFlow fields
Change-Id: I38c2b337bf276f6edc6b5d3f10e47ae81a1610b5
Reviewed-on: https://code.wireshark.org/review/15167
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>
2016-04-30 07:13:09 +00:00
Michael Mann 7838ee9d1a Add TCP preference for Process information from IPFIX
The preference is disabled by default and saves a little
bit of memory for those that don't get process information
from IPFIX.

Change-Id: I4b6a106d156862a8d53bf2ad5ee88ea857637815
Reviewed-on: https://code.wireshark.org/review/15139
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>
2016-04-30 07:11:14 +00:00
Pascal Quantin e65ab3cd94 ANSI IS-637 A: fix display of reserved bits when using 7bits GSM encoding
Change-Id: Ida59c339d174e8f9a3b8bf108374875d12c51b21
Reviewed-on: https://code.wireshark.org/review/15153
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>
2016-04-29 05:48:32 +00:00
Michael Mann cefea72034 Separate out the members of tcp_flow_t structure that are only used for sequence analysis.
That way they only need to be allocated if analysis is being done.

Inspired by https://www.wireshark.org/lists/wireshark-dev/201604/msg00218.html
Ping-Bug: 12367

Change-Id: I797e5b305133d85a2a89688109cc3a218d0a9e88
Reviewed-on: https://code.wireshark.org/review/15138
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-29 04:52:26 +00:00
Michael Mann 3eef66b2c2 Add support for ModbusRTU over UDP.
Bug: 12374
Change-Id: I2df806c902b932d87e82f6f097f7acce814e5040
Reviewed-on: https://code.wireshark.org/review/15126
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-28 20:28:58 +00:00
AndersBroman 94200b3961 [NAS EPS] Displat Tracking area code(TAC) as decimal.
Change-Id: I8698a14e68d800e697f246b67856fd363fee52e3
Reviewed-on: https://code.wireshark.org/review/15142
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-04-28 14:06:35 +00:00
Jeff Morriss ab6c9f2e2b Fix "Follow TCP stream" when TCP desegmentation is disabled.
Bug: 12382
Change-Id: I52a4c78cd0d901b8c28106bf33627a3f956b5e48
Reviewed-on: https://code.wireshark.org/review/15133
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-27 21:43:08 +00:00
Michael Mann b1d6f39b53 Add expert info when Modbus/TCP packet can't be classified.
The common case for this is using Decode As over the Modbus/TCP port preference.  Here the port preference is used to determine request/response because the protocol itself doesn't have any indications (so Decode As can't be helpful).  Looking into the packet itself can lead to too many false positives.

Bug: 10933
Change-Id: Ic6b4304f062f55ff273105edbb0d272c30e53506
Reviewed-on: https://code.wireshark.org/review/15127
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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-04-27 07:48:09 +00:00
Dominic Chen 5b655d01ff mp2t: support forced tcp decoding
Change-Id: I82a2908f513bff2f6452abffeb818e1f943fc67c
Reviewed-on: https://code.wireshark.org/review/15124
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-27 07:45:52 +00:00
IWASE Yusuke e899c3eb61 OpenFlow: fix flow_monitor_request dissector
This patch fixes:
 - offset calculation
 - monitor_id field description

Change-Id: I9568b8897ca9ebbc6203db6640b88e1b1676448d
Reviewed-on: https://code.wireshark.org/review/15128
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-04-27 01:01:28 +00:00
Alexis La Goutte 657c54a993 USB Audio: Add feature Unit
Change-Id: Id23d1c945df3c0b7392b5c807ef04c85309999de
Ping-Bug: 11858
Reviewed-on: https://code.wireshark.org/review/15118
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-27 00:40:39 +00:00
Michael Mann 83a547682b Treat JXTA URI address type like AT_STRINGZ.
An "empty" address should still have a size of 1 for NULL string character.

Bug: 12354
Change-Id: I32e3217cba2802be90244f8579acacf524162e2a
Reviewed-on: https://code.wireshark.org/review/15070
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-25 23:03:42 +00:00
Alexis La Goutte 4d635bcfe8 USB Audio: Add Input/Output Terminal
Change-Id: Id71015673d8ad0d40afdf926a3610a7544f4e1b8
Ping-Bug:11858
Reviewed-on: https://code.wireshark.org/review/15045
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>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-25 20:07:32 +00:00
Michael Mann a4da88a3d0 J1939 can have 0 bytes of "packet data" (i.e. just CAN ID), so use tvb_reported_length instead of -1.
Bug: 12366
Change-Id: Id702572b95c3500906ce12ee9658ded132611247
Reviewed-on: https://code.wireshark.org/review/15108
Petri-Dish: Michael Mann <mmann78@netscape.net>
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>
2016-04-25 17:17:12 +00:00
Michael Mann 15cf4be55e J1939 can legitimately have 0 data bytes so don't give the impression data is "missing".
Change-Id: I285ba0d1aba3cbe230831ed41e7bcf8d6d9f74f3
Reviewed-on: https://code.wireshark.org/review/15109
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-25 15:42:55 +00:00
Alexis La Goutte 15074e2bf5 gpef: fix 'pinfo' was marked unused but was used [-Werror,-Wused-but-marked-unused]
Change-Id: I6a302ce6dc18850e6ccc0995c60c4a010e46ad30
Reviewed-on: https://code.wireshark.org/review/15104
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>
2016-04-25 11:00:28 +00:00
Alexis La Goutte 6c392ce8f2 gmr1_bcch: fix 'tree' was marked unused but was used [-Werror,-Wused-but-marked-unused]
Change-Id: I9a1950e3719927178221999c33f41920e1e4065a
Reviewed-on: https://code.wireshark.org/review/15103
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-25 11:00:09 +00:00
Alexis La Goutte 47769fb1df gmhdr: fix 'pinfo' was marked unused but was used [-Werror,-Wused-but-marked-unused]
Change-Id: Ib86b2665ad8000b6c4a4ce69b3284a7f0e235115
Reviewed-on: https://code.wireshark.org/review/15102
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-25 10:59:58 +00:00
Alexis La Goutte a22db0f7a5 glusterfs (hndsk): fix 'pinfo/data' was marked unused but was used [-Werror,-Wused-but-marked-unused]
Change-Id: I5177c0bfdfb010a76ee2763030a32eafb9a6d1f2
Reviewed-on: https://code.wireshark.org/review/15101
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-25 10:59:33 +00:00
Alexis La Goutte d9b40c701b glusterfs: fix 'pinfo/data' was marked unused but was used [-Werror,-Wused-but-marked-unused]
Change-Id: I5694867029d5d40de6dbe5c617aee70ac62d7139
Reviewed-on: https://code.wireshark.org/review/15100
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-25 10:59:11 +00:00
Alexis La Goutte 0d608caa9e glusterd: fix 'data' was marked unused but was used [-Werror,-Wused-but-marked-unused]
Change-Id: Id3aa0972503ffcd238148ab0283ec4ea1a0a478c
Reviewed-on: https://code.wireshark.org/review/15099
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-25 10:58:48 +00:00
Alexis La Goutte 2155758cae gluster_pmap: fix 'data' was marked unused but was used [-Werror,-Wused-but-marked-unused]
Change-Id: Idaa9515c8b9a74de3fdeba5cb2dbda195adbe3bf
Reviewed-on: https://code.wireshark.org/review/15098
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-25 10:58:25 +00:00
Alexis La Goutte 267cf1367a gluster_cli: fix 'data' was marked unused but was used [-Werror,-Wused-but-marked-unused]
Change-Id: I969403ac48dbec1ad765e799fcf0cb5b76cd83c7
Reviewed-on: https://code.wireshark.org/review/15097
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-25 10:53:48 +00:00
Alexis La Goutte c86a0888fe gdsdb: fix 'tvb/pinfo' was marked unused but was used [-Werror,-Wused-but-marked-unused]
Change-Id: I53e99b2fc2a0549984d39a9f1fb1de610d4e645c
Reviewed-on: https://code.wireshark.org/review/15096
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-25 10:53:22 +00:00
Alexis La Goutte 2bfcf34d60 gdb: fix 'pinfo' was marked unused but was used [-Werror,-Wused-but-marked-unused]
Change-Id: I8d990808fcfa29494e392721185e987709340c30
Reviewed-on: https://code.wireshark.org/review/15095
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-25 10:51:14 +00:00
Alexis La Goutte da9a11de31 gadu-gadu: fix 'tvb/tree' was marked unused but was used [-Werror,-Wused-but-marked-unused]
Change-Id: I0f7a4f06b5274f00d0f2ff4a0002fb694a6e3e9b
Reviewed-on: https://code.wireshark.org/review/15094
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-25 10:50:44 +00:00
Alexis La Goutte 79c6a4325f fr: fix 'pseudo_header' was marked unused but was used [-Werror,-Wused-but-marked-unused]
Change-Id: I06ceb2d54d1c3dfeaf3f5e80980687e5f68bc4bc
Reviewed-on: https://code.wireshark.org/review/15093
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-25 10:50:15 +00:00
Alexis La Goutte 5cde178725 fp (hint): fix 'pinfo' was marked unused but was used [-Werror,-Wused-but-marked-unused]
Change-Id: I68a8a79ab27a6469512d4a3f26695a37ad307b11
Reviewed-on: https://code.wireshark.org/review/15092
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-25 10:49:44 +00:00
Alexis La Goutte b8bf923d8d fmp (notify): fix 'pinfo' was marked unused but was used [-Werror,-Wused-but-marked-unused]
Change-Id: Ib993d34e0def7c4f0c604357910635dfc4b41795
Reviewed-on: https://code.wireshark.org/review/15091
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-25 10:49:26 +00:00
Alexis La Goutte ce18ccd8a2 fmp: fix 'pinfo' was marked unused but was used [-Werror,-Wused-but-marked-unused]
Change-Id: I0231224daf4754a7b7869e6f25fc3840772a6a3e
Reviewed-on: https://code.wireshark.org/review/15090
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-25 10:48:55 +00:00
Alexis La Goutte 32b2b95f84 fddi: fix 'pseudo_header' was marked unused but was used [-Werror,-Wused-but-marked-unused]
Change-Id: I678ff2c87895bd46ba0df21464b730f54d77af6b
Reviewed-on: https://code.wireshark.org/review/15089
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-25 10:48:25 +00:00
Alexis La Goutte 1289522940 fcswils: fix 'pinfo' was marked unused but was used [-Werror,-Wused-but-marked-unused]
Change-Id: I74cd8bace880abb944a81adc6342b6f9608c789d
Reviewed-on: https://code.wireshark.org/review/15088
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-25 10:48:03 +00:00
Alexis La Goutte bd156912fa fcp: fix 'conversation' was marked unused but was used [-Werror,-Wused-but-marked-unused]
Change-Id: I7ae05ed186cfd1df639c9c453e4b5fa5c02972d7
Reviewed-on: https://code.wireshark.org/review/15087
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-25 10:47:42 +00:00
Alexis La Goutte c730f886cf fcels: fix 'pinfo' was marked unused but was used [-Werror,-Wused-but-marked-unused]
Change-Id: I172b089c65db5cc5289cb1a09edbaaaa760dbf31
Reviewed-on: https://code.wireshark.org/review/15086
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-25 10:47:18 +00:00
Alexis La Goutte 2b723d3fa5 extreme: fix 'length' was marked unused but was used [-Werror,-Wused-but-marked-unused]
Change-Id: Ibcf68c1172cc8080ec59da51b2c6765a6efcd4fa
Reviewed-on: https://code.wireshark.org/review/15085
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-25 10:46:54 +00:00
Alexis La Goutte 3304e78511 eth: fix 'pseudo_header' was marked unused but was used [-Werror,-Wused-but-marked-unused]
Change-Id: I81910fc457afcc1b07a27aea986e1a0c2257b45b
Reviewed-on: https://code.wireshark.org/review/15084
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-25 10:46:33 +00:00
Alexis La Goutte a3e49b7bff enc: fix 'pseudo_header' was marked unused but was used [-Werror,-Wused-but-marked-unused]
Change-Id: I6c2c07ba23be60c3f335cd08c282784b8e5822c4
Reviewed-on: https://code.wireshark.org/review/15081
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-25 10:45:42 +00:00
Alexis La Goutte 42ff679167 ENRP: fix 'flags_tree' was marked unused but was used [-Werror,-Wused-but-marked-unused]
Change-Id: I28020e50212f32703b8c0126a5e880769f950cea
Reviewed-on: https://code.wireshark.org/review/15082
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-25 10:44:42 +00:00
Alexis La Goutte 643235d181 EPL: fix 'segmented' was marked unused but was used [-Werror,-Wused-but-marked-unused]
Change-Id: I90109f724c47684a2413fe3eca9fa73d2f637cbe
Reviewed-on: https://code.wireshark.org/review/15083
Reviewed-by: Roland Knall <rknall@gmail.com>
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
2016-04-25 09:31:52 +00:00
Jeff Morriss 43df65a29c Delay registration of Diameter fields until they're needed.
... Like the RADIUS and wimaxasncp dissectors do.

Change-Id: Ifab019a0040d3938e52918a282a3beba9dfcfc70
Reviewed-on: https://code.wireshark.org/review/14900
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-24 06:47:07 +00:00
Michael Mann e19babfc55 Bounds check the use of ett_zbee_zcl_pwr_prof_enphases array.
Bug: 12358
Change-Id: Iec5dcba388f06e1fd1ef26f0679b06c3dda6a7bf
Reviewed-on: https://code.wireshark.org/review/15072
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>
2016-04-23 21:55:12 +00:00