Commit Graph

28880 Commits

Author SHA1 Message Date
Evan Huus 82bd00a5e5 ceph: remove an unnecessary DISSECTOR_ASSERT
coverity picked up on this being effectively dead code, and it's trivial to
prove it will never trigger

Change-Id: I5a2893671a764914f483d4ff6bcc835c9b0d3b28
Reviewed-on: https://code.wireshark.org/review/8615
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-05-25 03:49:09 +00:00
Michael Mann 80346da06c Remove proto_tree_add_text from packet-ehs.c
Change-Id: Ia56d41d3591f759619f13d6df679579f9d9888f7
Reviewed-on: https://code.wireshark.org/review/8621
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-05-25 03:17:14 +00:00
Michael Mann 9d67d9fb93 Make protocol name/key combo string filterable.
Change-Id: I1ff863d0a4e114223b8fe283b1dc894e39fcefd7
Reviewed-on: https://code.wireshark.org/review/8618
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-05-25 03:16:35 +00:00
Luke Mewburn 0c8390b8e1 proto.h: fix clang++ 3.6 warning
Add spaces around literals to avoid warnings when compiling ui/qt
with clang++ 3.6 -Wreserved-user-defined-literal (on Mac OS X).

Change-Id: Ia2703dd8c914e8ffb299c4a6c44bba3aa674acb8
Reviewed-on: https://code.wireshark.org/review/8607
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-05-24 18:31:16 +00:00
Michael Mann 776ba4c7a6 Create a PTP/IP preference for "vendors" to break up the duplicate values in the ptp_opcode_names and ptp_respcode_names value_strings.
Bug: 8573
Change-Id: I65a71a2c12cda61ed4c4b52a8ea0441261782942
Reviewed-on: https://code.wireshark.org/review/8597
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-05-23 07:42:02 +00:00
Stig Bjørlykke a34d696377 p1: Fixed do_address for extension attributes
This is not an optimal solution, but fixes the reported problem.
The do_address functionality should probably be rewritten to
only use pinfo for storing data.

Bug: 11210
Ping-Bug: 8515
Change-Id: I2625cc4044ab93b6e943a3c2d2ffd1b26149da29
Reviewed-on: https://code.wireshark.org/review/8585
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-22 16:11:45 +00:00
anilkumar911 3bc42dbf8e Netscaler: Add support to read MTCP record.
Change-Id: I73aadb10e44aa64c6f4c9cc2145a63f5bd9c74e5
Reviewed-on: https://code.wireshark.org/review/8580
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-22 16:10:30 +00:00
Anders 1942039466 [Diameter] Show Visited-PLMN-Id
Change-Id: If528f459535fde03bd936445113a3b12f34d42e5
Reviewed-on: https://code.wireshark.org/review/8590
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-22 16:08:51 +00:00
Martin Mathieson 1f994e89c2 ISAKMP: Add recent notify message types to range_string, and show names in notification root node
Change-Id: I3849868f6fbc8c5243757f6a39806365ca7a3609
Reviewed-on: https://code.wireshark.org/review/8587
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-05-22 14:34:41 +00:00
Joerg Mayer 8d36cda3ea Fix packet-ieee80211-radiotap-iter.c:159:36: runtime error:
left shift of 1 by 31 places cannot be represented in type 'int'

Change-Id: I0135b73c14bab05153a9ba2f5477f8651388037d
Reviewed-on: https://code.wireshark.org/review/8588
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-05-22 14:29:42 +00:00
Andreas Gruenbacher 78593c2e91 NFS: Fix NFSv4 attribute offsets and lengths
NFSv4 attributes are transferred as a bitmask, followed by each of the
attributes in the bitmask.  The offset and length of the dissected attribute
values should point at where the attribute values are; instead, they were
pointing at the bitmap. Fix that.

Change-Id: I4f93b7fffd7497306ae828a2fbd3c0e9b0accd1c
Reviewed-on: https://code.wireshark.org/review/8536
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-05-22 14:06:13 +00:00
Andreas Gruenbacher 03577f6ba4 NFS: Dissect NFSv4.1 dacl and sacl attributes
The NFSv4.1 dacl and sacl attributes consist of a 32-bit acl flags field,
followed by an access control list in the same format as the acl attribute.

Bug: 11208
Change-Id: I5fb08f9764c21cd6abb4ee02265e4e6b4ed54f01
Reviewed-on: https://code.wireshark.org/review/8526
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-05-22 14:05:37 +00:00
Alexis La Goutte e6b5ae74c9 Diameter: fix indent (Use 4 spaces)
Change-Id: Ie82f243af15f6851021d297018005c672a3fb28b
Reviewed-on: https://code.wireshark.org/review/8584
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-05-22 12:38:22 +00:00
Anders a0fcd0b726 [Diameter] Added feature list dissection for 3GPP Sh interface
Bug: 11218
Change-Id: I83838cc4af1d3eeaed04032c3127f2d4707d0fd3
Reviewed-on: https://code.wireshark.org/review/8583
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-22 11:09:06 +00:00
Anders 99e43f93f6 [Diamater] Sub dissect Suported-Vendor-Id
Change-Id: I5c0014449ef9886ba74abdf8f609860ef37a7831
Reviewed-on: https://code.wireshark.org/review/8582
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-22 11:08:34 +00:00
Anders 6b72a528e6 [SIP] Add hf for header Session-Id
Change-Id: I9b1dc7822fd1753d9b5af9c00a7eda928f423a67
Reviewed-on: https://code.wireshark.org/review/8581
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-22 10:19:50 +00:00
Peter Lemenkov 4fc571cde9 Cosmetic - adjust comments according to the proto
Change-Id: I75b422d3181e93e12d6758d891538fa9fea7d1f7
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
Reviewed-on: https://code.wireshark.org/review/8574
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-05-22 09:14:20 +00:00
Peter Lemenkov b738857041 Typo
Change-Id: Ib50768ccca6e0354d287793ce639e28bee2c9865
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
Reviewed-on: https://code.wireshark.org/review/8573
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-22 09:13:28 +00:00
Peter Lemenkov 3ddbda55e8 Don't treat packets w/o line feed differently
Change-Id: I7ddd0ecf5e4f02f66b9fea528725a5e29c1062ea
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
Reviewed-on: https://code.wireshark.org/review/8572
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-22 09:10:55 +00:00
Peter Lemenkov 5addf12c5f Change unofficial extension parameter
A character "v" was mapped to a different command parameter. So we
should replace it.

Change-Id: Ia668b0b0bead7bb4c4ba0a60f51f53daf2095a36
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
Reviewed-on: https://code.wireshark.org/review/8571
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-22 09:08:48 +00:00
Jeff Morriss 4dfc5a7204 MSRP has a registered port now, register the dissector for it.
Presumably it got the port when it became an RFC.

Change-Id: I0afb815bcfe4b36b896fa6f7e62f93047a36b05b
Reviewed-on: https://code.wireshark.org/review/8576
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-05-22 08:07:36 +00:00
Guy Harris 2aea664d60 Expand a comment.
As either Grace Hopper or Andrew Tanenbaum, depending on which claim you
read, said, "The {wonderful,good} thing about standards is that there
are so many to choose from." Which standard for Lawful Intercept headers
do you want?

Change-Id: I8633e3d3e3d9a205f643d63980a80986e59d43f4
Reviewed-on: https://code.wireshark.org/review/8579
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-22 03:14:59 +00:00
Anders 0289d5c2b5 [NSIP GPRS-NS] Fix a crash due to not NULL terminated hf arrays for
proto_tree_add_bitmask().

Change-Id: I65adad6a33b3d6b199d54160bce85759a35607d6
Reviewed-on: https://code.wireshark.org/review/8575
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-21 15:33:23 +00:00
Anders 8999634b17 [GTP] Add a couple of new IEs as "Not dissected yet"
Change-Id: If7a083ab3a56801168853a43dff85e1066d6bec5
Reviewed-on: https://code.wireshark.org/review/8570
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-21 13:43:17 +00:00
Tatsuhiro Tsujikawa 3e8c9a4c1a Include stdint.h instead of inttypes.h when compiled with MSVC < 2013
Backport by Alexis La Goutte from upstream

Bug:11216
Change-Id: Ia269adce607ebc5a31ac9ef119dc2d4248173d62
Reviewed-on: https://code.wireshark.org/review/8568
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-05-21 11:23:34 +00:00
Alexis La Goutte 90a1303846 802.11: Remove duplicate RIC Descriptor display
Change-Id: I0fa523dd0e62f94e478ad35b216fc3dc5651718c
Reviewed-on: https://code.wireshark.org/review/8547
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-21 06:11:13 +00:00
Pascal Quantin 22aa241eff MBIM: fix GSM SMS transmitted PDU length
Change-Id: I5568d6048f620f5332577e2cf0d36ffa20200ebf
Reviewed-on: https://code.wireshark.org/review/8556
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-05-20 20:41:36 +00:00
Pascal Quantin af3cb5e06b PCEP: reorder pcep_class_vals extended value string
Change-Id: Iaa270bc085cbee41be9881eab2749c0ed26ef359
Reviewed-on: https://code.wireshark.org/review/8554
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-05-20 20:20:57 +00:00
Oscar Gonzalez de Dios 734032a38f Added support to RFC 6006, in particular, SERO and SSRO Objects and P2MP Endpoints Object.
Trailing whitespaces, indent and typo fixed, used value_string.
Fixed EOF Problem (Ubuntu Petri Dish failed)

Bug:11213

Change-Id: I4ecc11b17c34dd993a72903ad4314c51ada64e02
Reviewed-on: https://code.wireshark.org/review/8532
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-05-20 17:33:02 +00:00
Pascal Quantin 2acb57d703 GSM SMS: update some (value|range)_string tables for MTC Device Trigger feature
Change-Id: Iffc62744310688d2f5f4d6689ff2f9d96fd4f6f1
Reviewed-on: https://code.wireshark.org/review/8552
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-05-20 17:21:31 +00:00
Michael Mann 344c990159 Improve VN-Tag dissector.
Bug: 7496
Change-Id: Ic1648f1c111913b7370b2eaf5557c4d8ea078033
Reviewed-on: https://code.wireshark.org/review/8546
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
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-05-20 14:57:51 +00:00
Alexis La Goutte 390299c953 Aruba ERM: fix typo
Double space between Signal Strength and [percent]

Change-Id: Ibf645a9e44d2e642df8fd53afd0a6ccbbb2adde0
Reviewed-on: https://code.wireshark.org/review/8549
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-20 14:53:33 +00:00
cbontje 713ed3f817 Fixed Modbus RTU Serial message direction detection.
("And that, children, is why we always test different message types before submitting").

Change-Id: I29c730c01db4596a2326dcadfcffa3a20758569a
Reviewed-on: https://code.wireshark.org/review/8539
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-05-20 09:07:42 +00:00
Benjamin Roch efe3486f83 Enhanced info output of packet-tte dissector.
Change-Id: I2df393e9913d3a52db632778410d7b8932f78f8b
Reviewed-on: https://code.wireshark.org/review/7637
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-05-20 09:06:00 +00:00
Martin Kaiser b687f719a3 DVB-CI: change two proto_tree_add_text() calls into expert info
Change-Id: Ic5f87480273e0a097900ace6a7538c34b2a89444
Reviewed-on: https://code.wireshark.org/review/8545
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-05-20 07:54:44 +00:00
Martin Kaiser 2b68570100 DVB-CI: remove some more proto_tree_add_text() calls
Change-Id: I02349c2e7aa00c1b105ab069a9fe9b66d130bc7d
Reviewed-on: https://code.wireshark.org/review/8543
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-05-19 21:16:08 +00:00
Anders 1f34e047e4 [GTP]Target identification can have a length of 0.
Change-Id: Ica74dc4ce891f226c05d031c29465d386957edf4
Reviewed-on: https://code.wireshark.org/review/8541
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-19 19:53:18 +00:00
Guy Harris c19b8eb7db Apparently "H" stands for "HOSC", not "HSC", at least these days.
Change-Id: I90807b5b40afa53fbfd31b48a322918ef4a7cc27
Reviewed-on: https://code.wireshark.org/review/8540
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-19 19:06:27 +00:00
Alexis La Goutte adc05f4f74 HTTP2: Update to libnghttp2 1.0.0
Change-Id: I77ae40b4c5643e3cb71242e27a00de151db0d83c
Reviewed-on: https://code.wireshark.org/review/8477
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: Anders Broman <a.broman58@gmail.com>
2015-05-19 14:16:36 +00:00
Stig Bjørlykke f1ea2fae57 p1: Handle OrganizationalUnitName
Added back code removed in commit for bug 8515.

Bug: 11210
Change-Id: I23bf56f88d8a1320da8404a82a8d9d3aacc3dace
Reviewed-on: https://code.wireshark.org/review/8537
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-05-19 12:13:48 +00:00
Alexis La Goutte cff7bcd90b BGP: Remove proto_tree_add_text call
Part 2
Update VPLS-BGP and BGP-AD

Change-Id: I6a311bfc69d9666be6f83e38042745162701aaac
Reviewed-on: https://code.wireshark.org/review/8485
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-05-19 11:50:00 +00:00
Andreas Gruenbacher 75be35d8e3 NFS: Move attribute definitions higher up in the nfs dissector
The next commit will use some of these definitions before their (previous)
point of definition.

Change-Id: Ic7c96bc48d338bb7b44bf295af3fadc3e7bec370
Reviewed-on: https://code.wireshark.org/review/8525
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-05-19 11:34:02 +00:00
Michael Mann a80c88a10f Improve Firebird/Interbase dissector.
Inspired by the patch in bug 3749, added better dissection of opcodes and better (but not complete) support of multiple messages in a frame.

Provided links to firebird source.

Bug: 3749
Change-Id: I403728d32d634c23e1af7ce842f9aaca4014ed78
Reviewed-on: https://code.wireshark.org/review/8494
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-05-19 02:35:08 +00:00
Martin Kaiser 376ba916d4 DVB-CI: remove proto_tree_add_text() calls from the appmmi resource
Change-Id: I422e8644445d7bb8a8ae43f426183db6b8974839
Reviewed-on: https://code.wireshark.org/review/8530
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-05-18 21:10:33 +00:00
Martin Kaiser b4f895ced7 DVB-CI: remove proto_tree_add_text() calls from the operator profile resource
rename some variables and remove obsolete comments while we're at it

Change-Id: Ib400c371ea52c3681fbc1d25ef42791e4aeff9e4
Reviewed-on: https://code.wireshark.org/review/8529
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-05-18 21:10:00 +00:00
Martin Kaiser fcb284db97 DVB-CI: remove proto_tree_add_text() calls from the transport layer
Change-Id: I593527fafa38312d5d4e8f778e9af0d6294bb3f8
Reviewed-on: https://code.wireshark.org/review/8528
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-05-18 21:09:30 +00:00
Martin Kaiser f33aa0c6d4 DVB-CI: fix a TPDU parsing error
if the response TPDU starts with 0x80 (T_SB), this is not an unknown
tag, it simply indicates that the optional header and body are absent

this bug was introduced in e597acdc48

Change-Id: I076a0c9f0ea124e11edbb7a0bc0e41d1ab6f374a
Reviewed-on: https://code.wireshark.org/review/8527
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-05-18 21:08:57 +00:00
Guy Harris 9d5a9fb1ff Don't put the NTLMv2 ChallengeFromClient into the protocol tree twice.
It's already put there by dissect_ntlmv2_response(); no need to do it
again.

Also, rename "NTLM Client Challenge" to "LMv2 Client Challenge", as
that's what it is (ChallengeFromClient from 2.2.2.4 LMv2_RESPONSE), and
rename "Client Challenge" to "NTLMv2 Client Challenge", as that's what
*it* is (ChallengeFromClient from 2.2.2.7 NTLM v2:
NTLMv2_CLIENT_CHALLENGE).

Change-Id: If95e2c77323cb597df7e400bf9ffc045d94c60e2
Reviewed-on: https://code.wireshark.org/review/8524
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-18 17:18:26 +00:00
Guy Harris 65b17d4323 Reorganize the NTLMSSP blob and AUTHENTICATE message parsing.
The "result" argument to dissect_ntlmssp_blob() is never null, so don't
check for it being null.

Have separate clauses for LmChallengeResponse and NtChallengeResponse,
and do the checks for NTLMv1 vs. NTLMv2 inside those clauses.

Do the copy to client_challenge within the AUTHENTICATE message parsing
only if we've already determined that it's an NTLMv2 message.

Add some comments to better explain what's being done and to ask some
questions.

Change-Id: I52345eaeac4252d928b2e477751817084bf4e363
Reviewed-on: https://code.wireshark.org/review/8523
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-18 17:01:36 +00:00
Michal Labedzki 930f5b5402 Bluetooth: OBEX: Fix crash when there is no Type/Name header in request
Not all requests have them, so check for them to avoid crash.

Change-Id: I265fb8ad9f63132bee6eeb1aa521cae8b8df82b9
Reviewed-on: https://code.wireshark.org/review/8521
Reviewed-by: Michal Orynicz <michal.orynicz@tieto.com>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-05-18 12:03:10 +00:00