Commit Graph

30442 Commits

Author SHA1 Message Date
Guy Harris d7006cebbb Revert "Build Flex-generated files with "warnings are errors"."
This reverts commit b56f53884b.

Sadly, we *do* get warnings at this point with older versions of Flex,
such as the one on the 32-bit OS X buildbot.

Change-Id: I9aec1a16e9f2e1bbcfaac3dffdabdd89af5815e3
Reviewed-on: https://code.wireshark.org/review/12443
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-05 17:13:28 +00:00
Andreas Urke b7d1eedeb3 Fix for bug 11856:
Correct parameter-name "opt-offset" to "offset" in macro
"tvb_eui64_to_str" in epan/to_str.h such that offset is taken into account
when converting eui64 to str.

Bug: 11856
Change-Id: Id0b17c4b9186b4c41d6fe338ba7c017e88f63acf
Reviewed-on: https://code.wireshark.org/review/12441
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-12-05 16:26:18 +00:00
Michael Tüxen 4b12491e66 Add missing table entry.
Add a missing table entry for Stream Reset Response parameters.

Change-Id: I45172cace57cd3f628a94fd61c4cb37a6c2e17ed
Reviewed-on: https://code.wireshark.org/review/12439
Reviewed-by: Michael Tüxen
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-05 12:21:02 +00:00
Juanjo Martin 70cf540ac6 RTPS: Minor improvements
1) Fixed the guidPrefix deserialization (before it was showing
counter and it should be instanceId).
2) The PID_PARTICIPANT_GUID was a total mess. Now it looks perfect.
3) Fixed some bounds in the proto_tree creations so instead of
selecting the rest of the tvb, now they select what they have to.

Did all of this keeping the dissection for version 1 untouched.

Change-Id: I93df2a29e292655ceb3f8c1395f31d8e38106dee
Reviewed-on: https://code.wireshark.org/review/12406
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-05 12:17:07 +00:00
Guy Harris b56f53884b Build Flex-generated files with "warnings are errors".
We shouldn't be getting warnings at this point.

Change-Id: I363a48546cb8d916425f42962ae1697d52ed9a29
Reviewed-on: https://code.wireshark.org/review/12436
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-05 12:08:52 +00:00
Lotte Steenbrink 4d337f4213 packetbb: fix the display of IPv4 addresses
IPv4 Addresses are currently displayed incorrectly in RFC5444 Addressblocks.
For example, what should be `Address: 10.1.3.0` is incorrectly rendered as

        Address: 0.0.0.10

This commit fixes that.

Bug: 11852
Change-Id: Id6dc954e9a06e79375058f6070fe8e0f64167d64
Reviewed-on: https://code.wireshark.org/review/12429
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-12-05 12:06:47 +00:00
Matt Texier d0cde7b8e2 BGP: fix some issue
Fixing ESI Label extended community
Fixing PMSI label field decoding on 20 bits
Fixing inclusive multicast Ethernet tag route
Fixing Ethernet segment route

Bug: 11650
Change-Id: Ifadcc3099f681a5c9480d1ccdd50b29ef4c0069f
Reviewed-on: https://code.wireshark.org/review/12430
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-12-05 12:04:24 +00:00
Alexis La Goutte d1dea929bc ECMP: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Change-Id: Idd57cba39e82a2538bd8a8ceb2263ec23202c25a
Reviewed-on: https://code.wireshark.org/review/12424
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-12-05 12:02:53 +00:00
D. Ulis 411104bd89 Enhancements for EtherNet/IP and CIP
EtherNet/IP
1. EtherNet Link object parsed Physical Address attribute response incorrectly.
2. Display Unknown Commands as ENIP instead of just TCP data.

CIP
1. For connected data, don't interpret it as a Message Router Request/Response format when the Forward Open connection was not directed to the Message Router. Previously, this data would be incorrectly shown as explicit CIP data. In many cases, this would show as malformed. This traffic will now just display as Data in the Wireshark tree, and "Implicit Data - Class (0x123)" in the Info column. Make this data filterable by "cip.conn_path_class == 0x123".
2. Fix parsing of Unconnected Send responses. Previously, for most cases, the response was not fully parsed, and would just show "Data", or it would parse the response as if the request class was the Connection Manager, which is incorrect. Now, also show the request path of the original embedded message in the tree.
3. Add some detailed error data for malformed Forward Close response.

Change-Id: I1c98ce516373d8c0ed6e049e25342f726bc370ea
Reviewed-on: https://code.wireshark.org/review/12339
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: D. Ulis <daulis0@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-05 11:51:50 +00:00
Alexis La Goutte c88f24f4f8 ECMP: fix indent
Change-Id: I80e664185a34feaebc05fc089c405e658e3b1e60
Reviewed-on: https://code.wireshark.org/review/12423
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-12-05 09:53:51 +00:00
Guy Harris 4c5f5820b4 Remove a remnant of the old removed support for Python dissectors.
Change-Id: Ib5dcfc3b6ed08310b5aa8ddc3e08a0951f24bbb4
Reviewed-on: https://code.wireshark.org/review/12434
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-05 08:27:38 +00:00
Guy Harris f51bad11d7 Use noyywrap rather than defining our own yywrap functions.
Tweak lemonflex-tail.inc to fix an issue this reveals.

It appears that, at least on the buildbots, the Visual Studio compiler
no longer issues warnings for the code generated with %option noyywrap.

Change-Id: Id64d56f1ae8a79d0336488a4a50518da1f511497
Reviewed-on: https://code.wireshark.org/review/12433
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-05 08:06:50 +00:00
Pascal Quantin 4b206d1b06 Export prefs_register_module() and prefs_register_subtree() functions
Change-Id: I09796eadb5fb8b564adfab5060715571983b1bb3
Reviewed-on: https://code.wireshark.org/review/12428
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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-12-04 14:52:23 +00:00
AndersBroman 85e94d5e9a [packet-h] Add defines to make it possible to convert functions prefixed
with new_ to plain function names without changing all at the same time.

Change-Id: I52682996704ff2472c9830bb62fda2a3cbef6589
Reviewed-on: https://code.wireshark.org/review/12401
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-04 11:35:52 +00:00
Matthieu Coudron 0d3f77fff1 Adds wmem_list_find function
Change-Id: I72162210b830a57978e108032d75d8c54f17d16b
Reviewed-on: https://code.wireshark.org/review/12387
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-04 04:00:48 +00:00
Guy Harris f670b99aea Make the gauntlet a bit clearer.
if(is a fixed-length TDS type)
	{
		XXX
	}
	else if(is a variable-length TDS type)
	{
		XXX
	}

Change-Id: Icaa8047ad76abe8b955fb5a025a057ddf8757b1f
Reviewed-on: https://code.wireshark.org/review/12415
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-03 21:22:42 +00:00
Michael Mann e78093f69f TDS: Sanity check number of columns to prevent crash.
Bug: 11846
Change-Id: I6eac46dc397263fe005e803730c5d3084bfb7f74
Reviewed-on: https://code.wireshark.org/review/12391
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-12-03 05:14:14 +00:00
Evan Huus cda450ed59 Fix address hashing broken in g4f39c60
We actually have to *use* the return value of the method, which the macro did
for us.

Change-Id: I240ca7e526a18054fe39c6c4ded902998dc2fef0
Reviewed-on: https://code.wireshark.org/review/12389
Petri-Dish: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Jim Young <jim.young.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
2015-12-03 02:00:18 +00:00
Nicolas S. Dade c66d67e6f8 L2TP: define the Cisco ACK control message
This is a common packet when sniffing Cisco routers performing L2TP
with their proprietary AVPs.

Change-Id: I8093f7e3ceb39c9af5b6292289c55f705b53dffb
Reviewed-on: https://code.wireshark.org/review/12368
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>
2015-12-02 14:53:45 +00:00
Alexis La Goutte 1f363e5c4b OSTIP: fix typo found by PVS Studio (V519)
The 'pinfo->clnp_dstref' variable is assigned values twice successively

Change-Id: I02b8ae54728f88c2173b4522d436bd2f7b1b7bc0
Reviewed-on: https://code.wireshark.org/review/12365
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-12-02 12:41:09 +00:00
Nicolas S. Dade 739cfa0d7a L2TP: fix typo: s/zero length bit/zero length body/
A "ZLB" message is a Zero Length Body message. See RFC 3931

Change-Id: I89d8f2328754e236f0704f851831fd8274f3b99e
Reviewed-on: https://code.wireshark.org/review/12366
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-12-02 12:40:20 +00:00
Nicolas S. Dade ea852b2bd0 L2TP: show unsigned value of control connection id
Everywhere else in the l2tp packet tree we show the control connection ID as
an unsigned decimal.

Change-Id: I189b9ce8c56b024a249d18fc62641c2f5283b0c1
Reviewed-on: https://code.wireshark.org/review/12367
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-02 11:39:22 +00:00
AndersBroman 3f3de12a88 [SUA] Change the dissector table sua.prop.tags to use DISSECTOR_TABLE_ALLOW_DUPLICATE
Change-Id: Iaabd69e5779534c1cf73b2c1ab1b957bb30c44d3
Reviewed-on: https://code.wireshark.org/review/12373
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-02 09:39:02 +00:00
Ryan Doyle 6b216c4fc5 PCP: Use GLib 2.32 < supported hash functions
GLib 2.32 is required for use of g_hash_table_contains function

Change-Id: Ia2af2868ab1029d392d921d915b8898fb5ec81a4
Reviewed-on: https://code.wireshark.org/review/12361
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-02 07:52:45 +00:00
Ryan Doyle 6198a437ed PCP: Implement PMID to name mapping
Tracks the interation between PMNS_NAMES and PMNS_IDS packets to build
up a mapping from PMID to a text name and displays the name whenever the
PMID is displayed.

Change-Id: I665b293c32fee95b649fe6a6e26989db1eff38e0
Reviewed-on: https://code.wireshark.org/review/12303
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-12-02 03:38:43 +00:00
Michael Mann 83bad0215d btatt - make size 32-bit in get_value()
Bug: 11817
Change-Id: I118ff55f9a709167976a2522114d65ec03fc68c5
Reviewed-on: https://code.wireshark.org/review/12353
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-02 02:56:49 +00:00
Guy Harris 6655dd93e5 Only check for the last nibble being 0x0f.
That's what my_dgt_tbcd_unpack() did; do the same thing here.

Change-Id: Ia68c6ba652c748bd2661fd6eda736e880f414dc5
Reviewed-on: https://code.wireshark.org/review/12359
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-02 01:47:55 +00:00
Guy Harris 1d1a893b61 Add a separate expert info for "not a valid digit".
That should be used in for errors in the BCD strings where only 0
through 9 ar valid.

Fix comments to reflect that the two checks for '?' in the output of
tvb_bcd_dig_to_wmem_packet_str() are doing different checks - one is
checking for end-of-string padding, the other is checking for anything
that's not a digit.

Change-Id: I615587b34883ed5bfdc57827451c6e00e213fa5f
Reviewed-on: https://code.wireshark.org/review/12358
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-02 01:43:17 +00:00
Guy Harris f27ac817fb "#if 0" out unused variables.
Change-Id: If6663c18a809b13faa14744c3b0ee625ef03ea03
Reviewed-on: https://code.wireshark.org/review/12357
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-02 01:35:58 +00:00
Guy Harris dd74e49166 Fix field long name.
(Copy-and-pasteo.)

Add some comments while we're at it.

Change-Id: If03a43203a2ee7fad54b76cbdaf9318768edc1b0
Reviewed-on: https://code.wireshark.org/review/12354
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-02 01:31:52 +00:00
James Lynch 77f2ae0ce7 eCMP Dissector - Extensible Control & Management Protocol
Developed by Emerson Industrial Automation (Control Techniques Division)
eCMP is a protocol for setting up and controlling the devices in a factory
automation system. eCMP has about 30 commands; most are embedded into TCP/IP
messages, but cyclic data messages use the UDP protocol.

Bug: 10562
Change-Id: I9a421f39dfbdbc9e28d8f7cba72c22e270064641
Reviewed-on: https://code.wireshark.org/review/3157
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-12-02 01:25:52 +00:00
Michael Mann d2644aef36 [NBAP] Fix SIGSEGV in dissect_nbap_MACdPDU_Size
Bug: 11815
Change-Id: I107cf90df87bdafa23bd4b81acbc25d98773b223
Reviewed-on: https://code.wireshark.org/review/12347
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-02 00:08:42 +00:00
Michael Mann 96bf82ced0 [IPMI] packet-scope isn't valid for use in BASE_CUSTOM functions.
Bug: 11831
Change-Id: Ic4b963bf5a790c2f57b26a15f6226924f742fa55
Reviewed-on: https://code.wireshark.org/review/12340
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-01 22:11:13 +00:00
João Valverde b41319bde3 autotools: Fix g212f2f1
Change-Id: If7185885faea2319fdce4d89a7a9bf40312bcfa6
Reviewed-on: https://code.wireshark.org/review/12346
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-01 21:37:43 +00:00
D. Ulis 7a3dadf042 Bugfixes for EtherNet/IP and CIP
EtherNet/IP
1. Only decode 32-bit header if there is enough data. Previously, this would show malformed data, even for I/O packets that have no data, eg: heartbeat data.
2. Typos

CIP
1. Many Time Sync attribute responses were flagged incorrectly as malformed.
2. Create service response highlighted the instance number incorrectly, and showed warnings.
3. Set Attribute List Request should exit early if it doesn't know about a particular attribute.
4. Incorrect format for Safety Network Segment: Router Format.
5. Typos

Change-Id: I506dbb053c247bc8efcbde2cce6ab24d9550c897
Reviewed-on: https://code.wireshark.org/review/12321
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-12-01 21:14:46 +00:00
Alexis La Goutte 21ac94a323 stats_tree: re-indent else for avoid warning found by PVS Studio (V705)
It is possible that 'else' block was forgotten or commented out, thus altering the program's operation logics

Change-Id: Ie246592282bd0791021159f90b4b8aeb92cff86f
Reviewed-on: https://code.wireshark.org/review/12333
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-01 21:08:04 +00:00
Stig Bjørlykke 9779ae3817 Removed some remaining svn Id tags
Change-Id: I7ffbf59099132cde55995bde991d1c6a5dd224b0
Reviewed-on: https://code.wireshark.org/review/12330
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-12-01 14:41:25 +00:00
Ryan Mullen 7332001c0a Art-Net: Fix ArtAddress dissection
Parse and display NetSwitch and SubSwitch fields, treating 0x00 and 0x7f
as "special" values with meaning beyond what is usually offered by these
fields.

Change-Id: Idf94361793441f5f4b32c23e7f7f9250ed952a37
Reviewed-on: https://code.wireshark.org/review/12279
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>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-01 09:44:07 +00:00
Michael Mann 5b4ada1772 [NBAP] Prevent crash.
If no previous conversation exists, a memcpy will try to copy from NULL destination.

Bug: 11835
Change-Id: I445480bb425834c5a918f1ffa148cb83d6c9750c
Reviewed-on: https://code.wireshark.org/review/12326
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-12-01 05:55:57 +00:00
Michael Mann 858c3f0079 [S7COMM] Prevent divide by zero.
Bug: 11823
Change-Id: I4437efb3dc9532e3d29aacd36736d6f7b3ed38a2
Reviewed-on: https://code.wireshark.org/review/12322
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-01 04:15:21 +00:00
João Valverde 212f2f1761 autotools: Clean abi-check with maintainer-clean
Change-Id: Ia2ce54592485d2995bcfd56bd127a2fedb1a7d07
Reviewed-on: https://code.wireshark.org/review/12293
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-12-01 02:16:51 +00:00
Alexis La Goutte 01603971a5 mausb: The '&' operator is applied to bool type value found by PVS Studio (V564)
You've probably forgotten to include parentheses or intended to use the '&&' operator

Change-Id: Ie9c79729f2ec67aa9579dca40b2e904a9047218f
Reviewed-on: https://code.wireshark.org/review/12313
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-30 21:06:05 +00:00
Alexis La Goutte a1d1bd2272 mausb: Fix A part of conditional expression is always true found by PVS Studio (V560)
!del is always true (else if before)

Change-Id: I21e335eb3035ec17e990076a4895006d3138f16b
Reviewed-on: https://code.wireshark.org/review/12312
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-30 21:04:55 +00:00
Alexis La Goutte 9bd05a274f IMAP: fix Recurring check found by PVS Studio (V571)
The 'session_state->ssl_requested' condition was already verified in line 259

Change-Id: I6813176b2c235780785ff258377a7fd77a2cf24a
Reviewed-on: https://code.wireshark.org/review/12311
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-30 21:03:37 +00:00
Alexis La Goutte d59335b906 adb service/logcat : fix Consider inspecting this expression. The expression is excessive or contains a misprint found by PVS Studio (V590)
Change-Id: I59cf9c8b2aab347023dea323602dd6ff85ac7ab6
Reviewed-on: https://code.wireshark.org/review/12309
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-30 20:59:22 +00:00
DiablosOffens 83516dce1a SMB2: fix problems with dissection of error response
Sometimes it isn't actually an error response but a normal packet with a non-zero status code to indicate a warning or information. This should be handled as a normal case and not break the dissection

Change-Id: I7104608d67cbc7528994bd86812ea5241f1e4460
Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-on: https://code.wireshark.org/review/12282
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-11-30 20:54:29 +00:00
Michael Mann dc9f782017 Add BASE_ALLOW_ZERO for byte arrays that are validly zero sized.
<MISSING> implies that the field should be there and isn't.  Allow dissectors to specify when a zero-sized array for a field is perfectly valid.

Ping-Bug: 11803
Change-Id: I3fd60e3c6f832c6b4a3a8837ebc52c3e74e795ae
Reviewed-on: https://code.wireshark.org/review/12271
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>
Reviewed-by: João Valverde <j@v6e.pt>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-30 18:28:10 +00:00
Michael Mann 370d32dd3c Remove some THROWs and just return when lengths are bad.
Change-Id: I4e01117e0cf0600be75f75336f22d011c4964113
Reviewed-on: https://code.wireshark.org/review/12298
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-11-30 09:14:03 +00:00
Ryan Mullen 22d9cea841 Art-Net: Add missing DHCP-Enabled flags where needed
Added flag to Command field in ArtIpProg and introduced new Status field
in ArtIpProgReply.

Change-Id: I88363eb83646953ae5a01faebe88b4016db09ba0
Reviewed-on: https://code.wireshark.org/review/12287
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-11-29 22:30:50 +00:00
João Valverde 2932596b65 IPv6: Add ipv6extprotostr() to ipproto.h
Move ipv6_exthdr_check() to ipproto.c.

Seems a better fit, prevents future code duplication.

Change-Id: I84f247febd1499e334289e3057ec1d8ba32d5bcc
Reviewed-on: https://code.wireshark.org/review/12283
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-11-29 21:38:30 +00:00
Pascal Quantin 257938f66c GSM SMS: fix reassembly of UCS2 encoded SMS
Bug: 11809
Change-Id: I5cbf43cbc9d0f33fa527aef1be4d5105f1d795a7
Reviewed-on: https://code.wireshark.org/review/12288
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-11-29 18:56:38 +00:00
Thies Moeller 6952c1c54f USB: allow usb string descriptor short read
Some drivers do a probing access to the descriptor to fetch just the length field

Change-Id: Idd07a1e66800afcc838beb795594a4505ce13e82
Reviewed-on: https://code.wireshark.org/review/12250
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-11-29 17:40:03 +00:00
Gerald Combs 1acb2816bd [Automatic update for 2015-11-29]
Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: Id342a0bfe0bea352813c19adae67fb41806eb7d3
Reviewed-on: https://code.wireshark.org/review/12284
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-11-29 16:13:52 +00:00
Peter Wu 5f713f27ed http: detect multiple names in Transfer-Encoding header
Treat Transfer-Encoding: chunked specially, it is applied as final
encoding and must be stripped first.

Rename the expert info field http.chunkd_and_length (sic) to something
more generic and add a new field for unknown Transfer-Encodings
(implementations should normally send an error response, but we are not
a server so try to be permissive).

Also removed an unnecessary content_length check, it was covered by
have_content_length.

Tested with the weird crafted capture from bug 11801 and a crafted
capture (netcat) which returns Content-Length: 1 and Transfer-Encoding:
bla,chunked.

Bug: 11801
Change-Id: I978bf74e52e70782ebc5153d1017de67f323e514
Reviewed-on: https://code.wireshark.org/review/12256
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-11-29 14:06:05 +00:00
Pascal Quantin 15edc8d714 Fix bugs introduced in gcfc47c1
Bug: 11797
Change-Id: I2574e19aa2b86f7c72370d98dd6a2b72b471da25
Reviewed-on: https://code.wireshark.org/review/12280
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: Michael Mann <mmann78@netscape.net>
2015-11-29 13:38:09 +00:00
Jeff Morriss 3749e981aa Support building the X11 dissector outside the source tree.
Use relative path names for the script names and mesa/xcbproto directories so
different paths (from different users) don't cause deltas.

Also, with help from Peter Wu and Graham, get generation of the X11 dissector
working from cmake.

Change-Id: I95cd2a0f973dcbc67f457ff94c28e46a666afb74
Reviewed-on: https://code.wireshark.org/review/12213
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-11-29 11:20:39 +00:00
João Valverde 9b128181b9 IPv6: Fix RPL routing header computed address count if ip6r_len == 0
Bug: 11803
Change-Id: I6de6a240dee1cfb310c41976853c0c3683b0b80a
Reviewed-on: https://code.wireshark.org/review/12269
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>
2015-11-29 10:56:45 +00:00
Michael Mann f777d68bd6 Fix Ubuntu compile error.
Should be using the dgt_set_t variables provided in packet-ansi_a.c and packet-gsm_a_dtap.c

Change-Id: I5bd95a2d31d4419faae0943ae0ab524e796d7d92
Reviewed-on: https://code.wireshark.org/review/12274
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-29 03:30:11 +00:00
João Valverde 5e6d45ca98 Make address_to_display() use proper (non-)constness
Don't return allocated memory as a const pointer.

Fixes multiple [-Wcast-qual] warnings.

Change-Id: Ie9ceac27fa2a5eba41a5392ac983ff28c3939239
Reviewed-on: https://code.wireshark.org/review/12267
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-29 00:25:11 +00:00
Michael Mann cfc47c15c2 Replace my_dgt_tbcd_unpack with the safer tvb_bcd_dig_to_wmem_packet_str.
Bug: 11797
Change-Id: I07fdf3f7564424eac053f4c17de17f0d96597cca
Reviewed-on: https://code.wireshark.org/review/12239
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-29 00:02:49 +00:00
Alexis La Goutte efe1b7aa14 LDAP: fix indent (use 2 spaces)
Change-Id: I6da4bd1a6c82b9d46566bb52d5c01f250db88b1f
Reviewed-on: https://code.wireshark.org/review/12234
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-28 21:34:13 +00:00
Alexis La Goutte 2f5849cc8c IS-IS: Add Instance ID TLV (RFC 6822)
Bug:11649
Change-Id: I852b0f93797ba9e67c2772f482182b1f0d753a43
Reviewed-on: https://code.wireshark.org/review/12254
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-11-28 19:07:04 +00:00
Alexis La Goutte d3e40e499a ISIS: Add Expert Info when undecoded/unknown CLV
Change-Id: I8048954cce6a370cc37faad62b657704f6ccef6a
Reviewed-on: https://code.wireshark.org/review/12255
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-11-28 19:04:48 +00:00
Pascal Quantin 56baca6027 RSVP: copy all rsvp_request_key info in file scope
This is needed as it is later used for comparisons in the request hash table

Bug: 11793
Change-Id: I5fce82f77c27cf728c61676ef937fbbcd0833fd9
Reviewed-on: https://code.wireshark.org/review/12253
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: Michael Mann <mmann78@netscape.net>
2015-11-28 16:13:29 +00:00
Pascal Quantin aaa28a9d39 Diameter: check IPv6 prefix length before copying it in e_in6_addr structure
Bug: 11792
Change-Id: I37a07044d40f10e9a1a90025d90753fdb3db2278
Reviewed-on: https://code.wireshark.org/review/12248
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-11-28 12:12:16 +00:00
Peter Wu 40b283181c Add boundary check for 802.11 decryption
Fixed stack-based buffer overflow when the frame length exceeds 8KB.

Bug: 11790
Change-Id: I20db8901765a7660e587057e955d4fb5a8645574
Reviewed-on: https://code.wireshark.org/review/12237
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-11-28 09:47:28 +00:00
Michael Mann 44d98dafd4 Remove the GSSAPI specific members out of packet_info structure.
The last piece was the NTLMSSP dissector and that is now handled by passing a pointer to a tvbuff* as dissector data for the NTLMSSP dissector to (possibly) "return" a tvbuff* with decrypted data.

Change-Id: I2606172e4d0ebb5fc6353921d5b5f41a4792f9e5
Reviewed-on: https://code.wireshark.org/review/12232
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-11-28 09:20:27 +00:00
Pascal Quantin 62b03da49a Fix display of bytes as EBCDIC
MSVC compiler does not support properly setting an enum being part of a bit field.
For example the following code:
pinfo->fd->flags.encoding = PACKET_CHAR_ENC_CHAR_EBCDIC;
changes pinfo->fd->flags.encoding from 0x0 to 0xfffffffe instead of 0x1
Let's put back an unsigned int definition (like it is in master-1.12 branch) and add explicit casts where required

Bug: 11787
Change-Id: Idae0140fb6c172f1b3dbf10baefc8cfb00128f4c
Reviewed-on: https://code.wireshark.org/review/12220
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-11-27 18:39:09 +00:00
Michael Mann 1949a971c8 [COAP] Add "2.31 Continue" code
Bug: 11682
Change-Id: I77c7b9cdb39f18dabe0de0f11d9132ae074e3686
Reviewed-on: https://code.wireshark.org/review/12222
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 13:42:14 +00:00
Peter Wu 58dc5b05b9 SMB sidsnooping: use sid as key and name as value
Fixes "cast from 'const char *' to 'char *' drops const qualifier
[-Wcast-qual]", but changes the internal representation of
sid_name_table.

Change-Id: Ia853c3cf3010ea0cd1e2c975a23dd97e15be0fd6
Reviewed-on: https://code.wireshark.org/review/12157
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-27 05:34:36 +00:00
Alexis La Goutte 20a41fae76 NGHTTP2: Update to 1.5.0
Change-Id: I18ec89d1d053014a023217f6a07d72c7791fd436
Reviewed-on: https://code.wireshark.org/review/12199
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-11-27 05:32:19 +00:00
Michael Mann c51f207308 [LDAP] Bugfix counting of search results.
Bug: 11761
Change-Id: Icd955b848edc9f802331f25ab1b8684aa2631553
Reviewed-on: https://code.wireshark.org/review/12184
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-11-27 05:22:31 +00:00
Alexis La Goutte 4f8865994d MP4ves: fix no previous prototype for ... [-Wmissing-prototypes]
Change-Id: I89579ad371decb46a312ee4c3e967bd80709ef1d
Reviewed-on: https://code.wireshark.org/review/12198
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-11-27 05:11:34 +00:00
Michael Mann 3606f80d9e Officially remove tvb_get_string and tvb_get_stringz.
Almost all replacements were done awhile ago, just put the final nail in the coffin.

Change-Id: I0a708d886da5a500c2a1e2c9ee2736794bdb9411
Reviewed-on: https://code.wireshark.org/review/12206
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-27 05:11:25 +00:00
Michael Mann 10261d1202 Remove manual setting of pinfo->current_proto.
Calling a protocol dissection function will properly set/restore pinfo->current_proto, so there's no need to duplicate it.

Change-Id: Ic2ec0b35fa4d46a98f3410bf238056425076e4a9
Reviewed-on: https://code.wireshark.org/review/12205
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-27 05:00:37 +00:00
Guy Harris 677faf2bd4 Don't allow the "Ethertype" pseudo-protocol's dissection to be disabled.
It's not a real protocol, it's a helper dissector for various protocols,
and it makes no sense to disable it; doing so means that the Ethertype
field itself isn't disabled, and allowing it to be disabled means that
you can't do "Disable All", and manually enable Ethernet, IPv4, IPv6,
and TCP to disable dissection of protocols running atop TCP on Ethernet.

(See

    https://ask.wireshark.org/questions/48011/enabled-protocols-negation-of-disabled-proto

for an example of somebody who wants to do exactly that.)

Change-Id: Ibdd6ef53503de548e14cecc3766040c3a0b101d4
Reviewed-on: https://code.wireshark.org/review/12207
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-26 20:26:19 +00:00
Francesco Fondelli 42e3d9a96b PCEP: support of "PCEP Extensions for Establishing
Relationships Between Sets of LSPs", draft-ietf-pce-association-group-00

Bug: 11782
Change-Id: I1f0886bc30a71af54b51dea771a927d1f5742ca9
Signed-off-by: Francesco Fondelli <francesco.fondelli@gmail.com>
Reviewed-on: https://code.wireshark.org/review/12179
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>
2015-11-26 20:14:36 +00:00
Guy Harris e988e1c764 Wrong field name for signal strength as a percentage.
Copy-and-pasteo.

Change-Id: I42ba4f172f9b837f01d3b30f2d14e7ee066f3e83
Reviewed-on: https://code.wireshark.org/review/12203
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-26 20:01:22 +00:00
Guy Harris 9418701909 Process the radio information internally for AiroPeek classic files.
Process it in libwiretap; no need to hand it to libwireshark for
dissection, it can just dissect the radio information pseudo-header with
the processed information.

Change-Id: I482697947eecbd3967cf1910ba2fa2bff805cd66
Reviewed-on: https://code.wireshark.org/review/12202
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-26 19:44:39 +00:00
Uli Heilmeier ff5719c6e8 Lua: Switch URL to documentation to HTTPS
URL to documentation with https as suggested by Alexis.
(s. commit ecc9c74326)

Change-Id: I64d82b0c07cce5658eb8f4ae758f1a42946b837a
Reviewed-on: https://code.wireshark.org/review/12181
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-26 15:45:07 +00:00
Michael Mann 986a870145 Change TCP transmission window full message
Bug: 11741
Change-Id: I2b3adc82bc44fd4e83e6f04b7e9bdcfaadf1b445
Reviewed-on: https://code.wireshark.org/review/12180
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-11-26 15:29:48 +00:00
João Valverde edb3388303 Fix ISO C restricts enumerator values to range of 'int' [-Wpedantic]
Change-Id: I0609d1920038feb47eae9cef9bce2ee80f9720b7
Reviewed-on: https://code.wireshark.org/review/12160
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>
2015-11-26 12:35:30 +00:00
Michael Mann 3cb5d94018 Completely remove "old style" dissector support.
The typedef for the "old style" has been removed as well as any old vs new style checks.

The release notes have been updated to reflect the API change, even though the search/replace of the "new style" function names hasn't happen yet.  But it will be coming shortly...

Change-Id: I6d1eeb51d30e3b2b27f0eafd85fe0ddc0ca25b14
Reviewed-on: https://code.wireshark.org/review/12153
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>
2015-11-26 12:34:50 +00:00
Michael Mann 921a844200 Remove use of APPEND_BOOLEAN_FLAG in favor of proto_tree_add_bitmask_with_flags.
The "flags" used in proto_tree_add_bitmask-like functions can provide the same functionality of APPEND_BOOLEAN_FLAG, so it simplifies the dissector.

Change-Id: I7c87cbcc9b33588bc0eea6630e03b591f9f27fc8
Reviewed-on: https://code.wireshark.org/review/12145
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
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-11-26 11:27:31 +00:00
Nicolas S. Dade 97e627e56d L2TP: Correct L2TP over IP SHA1 message digest
It should match the MD5 code, and skip over the 0x00000000 session id
at the start of tvb.

Change-Id: Ia3bee2bd07015523acc49bd7cb0247c3f1ac986e
Reviewed-on: https://code.wireshark.org/review/12168
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-11-26 11:05:01 +00:00
Michael Mann be7bd77d99 Add BMT_NO_FLAGS for proto_tree_add_bitmask_XXX_with_flags.
This prevents some false positives for fix-encoding_args.pl which doesn't like constant values (like 0) passed as the last argument to any proto_tree_add_xxx call.

Change-Id: Iab7b09b425bf0d48126533daa0e65490bd7b8890
Reviewed-on: https://code.wireshark.org/review/12167
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-11-26 08:38:30 +00:00
Pascal Quantin 1b32d505a5 SCTP: add another NULL dereference check
This is a follow-up of g2259bf8

Change-Id: I4dfb839fcd016a8d7a7210e6358d230025eb96a3
Reviewed-on: https://code.wireshark.org/review/12171
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-11-26 08:35:44 +00:00
Michael Mann 013bf21eb3 [RUDP] Use proto_tree_add_bitmask instead of something homegrown.
Also don't put calls to dissectors under an if (tree), even for the data dissector.

Change-Id: Ia897d7ae7aa61c89e92949225a54f40d56c1df74
Reviewed-on: https://code.wireshark.org/review/12155
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-11-26 05:45:48 +00:00
Michael Mann 805136d4ad Replace tvb_get_enctohl and tvb_get_enctohs with the functions already created in tvbuff.h
Change-Id: Id44d4b11e0ba140f6ec4a8e87eaaa8eacbc2d8b6
Reviewed-on: https://code.wireshark.org/review/12151
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-11-26 05:11:37 +00:00
Michael Mann 486dd13af3 Remove create_dissector_handle
Change-Id: I1ad7c112eda45a41c3f94b04348e328d44d8f585
Reviewed-on: https://code.wireshark.org/review/12152
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-26 03:18:30 +00:00
Pascal Quantin b1044d6553 ISUP: fix a wrong removal of proto_tree_add_text()
Bug: 11768
Change-Id: I42199f391f6559de88ce37104bd74a9f4be77e09
Reviewed-on: https://code.wireshark.org/review/12149
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: Michael Mann <mmann78@netscape.net>
2015-11-26 02:15:06 +00:00
Pascal Quantin 2259bf8a82 SCTP: verify frame pointer before dereferencing it
Bug: 11767
Change-Id: Icd01550e0aaa4cd0cc33ae3acc0ef702c38f4db4
Reviewed-on: https://code.wireshark.org/review/12146
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: Michael Mann <mmann78@netscape.net>
2015-11-25 23:59:58 +00:00
John A. Thacker 723756bfd7 PPP: RTP IPHC Compressed Non TCP packets and D bit zero packets (RFC 2507)
Add support for RFC 2507 style IP Header Compression Compressed Non TCP packets
(PPP protocol 0x0065). Also support RTP IPHC Full Header packets (protocol
0x0061) where the D bit is unset. Add expert info for when the D bit is unset
but the sequence number is nonzero.

Also fix an existing typo where the CUDP16 handle was being called for the
CUDP8 "ethertype" for NDISWAN (very rare.)

Bug: 11776
Change-Id: I9a7adcc5fdd4ee49bb75724142684043bd664111
Reviewed-on: https://code.wireshark.org/review/12143
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-25 22:43:49 +00:00
Dario Lombardo 83c8cd2f27 wmem: add initializer (CID 1340194).
Change-Id: I7b3d7a95af213a198b62c1475ba2125f8fe37ee6
Reviewed-on: https://code.wireshark.org/review/12142
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Evan Huus <eapache@gmail.com>
2015-11-25 21:19:18 +00:00
Alexander Wetzel 9cd66b270c WPA (IEEE802.11) decryption function cleanups
- Updated AirPDcapPacketProcess function description
 - Try to return better error codes
 - Remove broken/useless return of keys from AirPDcapRsna4WHandshake

Change-Id: I1e4e0a76f6d1307e11c0466f17935dd7030561e1
Reviewed-on: https://code.wireshark.org/review/12033
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-11-25 21:00:59 +00:00
Juanjo Martin f5404e5f70 RTPS: feature to add a preference that enables the dissection
of the RTPS special announcements that RTI sends. They just start
by RTPX and are sent to the domain 0 always.

Bug: 11765
Change-Id: I00b47f1aa1702bb35aeb8c4686c7012fecc94baa
Reviewed-on: https://code.wireshark.org/review/12105
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-11-25 20:15:09 +00:00
Alexis La Goutte bcb31916f5 TACACS: fix indent (and add modelines)
Change-Id: Ia8d52e9d8f8600c28988dd8d3cc11c7fe08943a3
Reviewed-on: https://code.wireshark.org/review/12131
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-25 19:56:01 +00:00
Michael Mann 73e58f025e create_dissector_handle -> new_create_dissector_handle for ASN.1 dissectors
Change-Id: I3d7a61a5ddd79b7bcbec5b9c515470848f413fd5
Reviewed-on: https://code.wireshark.org/review/12121
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-25 19:21:28 +00:00
Michael Mann 0cd1a85064 Require BER dissector (OID) registration to be "new style".
Both old and new style API existed, just remove the "old" one.

Change-Id: If725e778a0ecad5a431d634ed5c4856b4a281013
Reviewed-on: https://code.wireshark.org/review/12107
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-25 19:21:14 +00:00
Mikael Kanstrup 9a2d16bac7 Fix memory leak in write_prefs
Valgrind reports leaks like these:
384 bytes in 8 blocks are definitely lost in loss record 43,909 of 46,703
  at 0x4C2AB80: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
  by 0xD6A055F: __vasprintf_chk (vasprintf_chk.c:80)
  by 0xA5FD0FB: g_vasprintf (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0)
  by 0xA5D8C7F: g_strdup_vprintf (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0)
  by 0xA5D8D1B: g_strdup_printf (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0)
  by 0x6854FA6: write_prefs (prefs.c:4941)
  by 0x733A9A: prefs_main_write (preference_utils.c:266)
  by 0x5F8A5C: CaptureInterfacesDialog::saveOptionsToPreferences() (capture_interfaces_dialog.cpp:851)
  by 0x5F93CD: CaptureInterfacesDialog::on_manage_clicked() (capture_interfaces_dialog.cpp:858)
  by 0x7182AC: CaptureInterfacesDialog::qt_static_metacall(QObject*, QMetaObject::Call, int, void**) (capture_interfaces_dialog.moc.cpp:316)
  by 0x718822: CaptureInterfacesDialog::qt_metacall(QMetaObject::Call, int, void**) (capture_interfaces_dialog.moc.cpp:413)
  by 0xBEBE36C: QMetaObject::activate(QObject*, int, int, void**) (in /usr/lib/x86_64-linux-gnu/libQt5Core.so.5.2.1)

When storing user preferences the constructed pathname of user's
preferences file is not freed properly.

Change-Id: I5cdc53ca836503af048e1d06e4614d83ef8921ac
Reviewed-on: https://code.wireshark.org/review/12114
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-11-25 14:18:47 +00:00