Commit Graph

67295 Commits

Author SHA1 Message Date
Pascal Quantin 8112b8d7a8 Kafka: add LZ4 decompression
Change-Id: Idf2f63782c8751778ad88f46a7f65fe7d5d49f3b
Reviewed-on: https://code.wireshark.org/review/21577
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>
2017-05-13 11:54:31 +00:00
Martin Mathieson 2c9b07a8b6 AIM: allow multiple TCP ports to be configured
Change-Id: I4a74120ad1424f2b5aab0a4ef734ff52e5ac1a14
Reviewed-on: https://code.wireshark.org/review/21586
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: Martin Mathieson <martin.r.mathieson@googlemail.com>
2017-05-12 20:21:07 +00:00
Pascal Quantin 008e6eff4e Thread CoAP: fix 2 potential infinite loops
Bug: 13693
Change-Id: Ie47ca69a9941dbc273bb8f18e300773092a2fc96
Reviewed-on: https://code.wireshark.org/review/21620
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-05-12 19:46:05 +00:00
Nick b6c2592ffa packet-acn.c: Various cleanup
1. Fix some typos (in hf_ field names and value_string values)
2. Fix an off-by-on error in blob calculation
3. Bugfix a few field lengths
4. Bugfix offset handling when adding ACN address

Change-Id: Id9e3d205b848ce3767b27ef1fcf02f7faae0be15
Reviewed-on: https://code.wireshark.org/review/20953
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>
2017-05-12 19:45:34 +00:00
Pascal Quantin d566531ae5 BT L2CAP: avoid a division by 0
Bug: 13701
Change-Id: Ie433ecd932dcfc40fa6d3fdc3fa00139c64584a2
Reviewed-on: https://code.wireshark.org/review/21618
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: Anders Broman <a.broman58@gmail.com>
2017-05-12 19:43:09 +00:00
S. Shapira 900695547b UMTS Iub: Resolve U-RNTI for C-RNTI
This commit includes logic used to store pairs of C-RNTIs and U-RNTIs based on allocations in RRC and logic to retrive those when encountering C-RNTIs in the MAC header for DCCH over FACH/RACH.

Change-Id: I629ab061b7a73416e5730a980480b81a1aaade11
Reviewed-on: https://code.wireshark.org/review/21607
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>
2017-05-12 19:42:20 +00:00
Guy Harris a8228fa80b Fix Windows build without pcap.
Change-Id: Ib79da01124a7f1b44f168ce19691d3ceaa7d5a68
Reviewed-on: https://code.wireshark.org/review/21619
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-05-12 18:44:10 +00:00
Michael Mann 572a2e93f4 DOCSIS: Simplify all MAC Management into a single file.
Removes a bunch of duplication set up because commands were all in
different files.

Change-Id: I950bc70da0edcdef7aaf21a43328cf69267f79af
Reviewed-on: https://code.wireshark.org/review/21613
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-05-12 18:39:46 +00:00
Camille Guérin 95ec5329a3 OPC UA: Added details for BrowseDescription NodeClassMask and ResultMask
Display the details for the NodeClassMask and ResultMask values in a
BrowseRequest's BrowseDescription.
As described in OPC UA 1.03 Specification, the value 0 for the
NodeClassMask and the value 63 (0x003F) for ResultMask should results in
returning all the fields in the BrowseResponse.
Display 'All' when those fields have those values
Display a detailled bit tree mask when values are different

Code Change:
Added parseNodeClass and parseResultMask
Use them in parseBrowseDescription instead of parseUInt32
Removed not needed anymore hf_opcua_NodeClassMask, hf_opcua_ResultMask
and their related entries in registerFieldTypes

Change-Id: Ic3ed8630825b5456f91156f06b2203ebfa422155
Reviewed-on: https://code.wireshark.org/review/21446
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-05-12 16:48:18 +00:00
Alexis La Goutte 4b9e481665 .mailmap: update (of April)
Change-Id: I74bf31ad4772966a292dde7a73a97d172c5121aa
Reviewed-on: https://code.wireshark.org/review/20909
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-05-12 14:14:12 +00:00
Martin Kaiser 0eaeb99f06 gif: make data block an FT_UINT_BYTES entry
The length byte is now highlighted along with the actual data.

Change-Id: I93ce25ad2cd7c790cc23668d354e32c4f5e195c6
Reviewed-on: https://code.wireshark.org/review/21610
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>
2017-05-12 12:08:15 +00:00
Alexis La Goutte f022976359 smb: fix some indent typo (use tabs)
Change-Id: I54b301cb224a2ff15d5a7a453ecf6f29b798f366
Reviewed-on: https://code.wireshark.org/review/21615
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-05-12 09:33:01 +00:00
Guy Harris f9f539ce81 Include caputils/capture-wpcap.h whether HAVE_LIBPCAP is defined or not.
It declares what's defined here, so always include it.

Change-Id: I1d7d5ed071e6f2d53af9ff147ede18b05b98ecd1
Reviewed-on: https://code.wireshark.org/review/21616
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-05-12 08:48:48 +00:00
Simon Barber 65227b3e82 Adds aggregate detection, calculation of frame start and end time, and IFS
Change-Id: I3a9cddd9c6e47a5c5c48e2e02a32a71413bcf799
Reviewed-on: https://code.wireshark.org/review/13590
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-05-12 03:34:18 +00:00
Guy Harris f3098fb282 Don't include headers that depend on pcap if you don't have it.
Change-Id: I17234ef60411f922678b900a6ac4fb264b9ce431
Reviewed-on: https://code.wireshark.org/review/21614
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-05-12 03:20:02 +00:00
Martin Kaiser 4e28cf02c5 Fix header field info checks for FT_UINT_BYTES.
It should be allowed to have an FT_UINT_BYTES hf entry with
BASE_NONE|BASE_ALLOW_ZERO. At the moment, this triggers an assert:

Err  Field 'Data block' (image-gif.data_block) is an FT_UINT_BYTES
but is being displayed as (Bit count: 2048) instead of BASE_NONE

For FT_UINT_BYTES entries, we should make the same checks as for
FT_BYTES. Don't fall through to the default case.

Change-Id: I986a9b779d130919d17595f08b3b63306b3956f2
Reviewed-on: https://code.wireshark.org/review/21606
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>
2017-05-12 03:16:21 +00:00
Pau Espin 6effc33f56 gsm_osmux: Add RTP Marker field
GSM Osmux recently got support to bring RTP Marker (M) bit. It should be
mostly backwards compatible as the first bit was reserved and not used
before for the FieldType.

Support was added in libosmo-netif commit e98afe5808176efb60298a2f764e8e11efaf580b
This bit is documented in the protocol documentation recently available: http://ftp.osmocom.org/docs/latest/osmux-reference.pdf

Change-Id: Ia0508971519b3df9499d963404bb8a0e3c4b9c33
Reviewed-on: https://code.wireshark.org/review/21599
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-05-12 03:10:01 +00:00
Pascal Quantin 46ef2dabfd Windows: update LZ4 to 1.7.5 and USBPcap to 1.2.0.1
Change-Id: I02eb4c255a0794b650f566abdadcac16e97196af
Reviewed-on: https://code.wireshark.org/review/21609
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>
2017-05-12 03:07:31 +00:00
Michael Mann d2e7e0b519 Allow proto_register_protocol_in_name_only values to be used as valid hf_ field prefixes.
Change-Id: Ic9998d1f8c6719c7cba78966691295ff9ffbc12a
Reviewed-on: https://code.wireshark.org/review/21612
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-05-12 03:05:59 +00:00
Guy Harris 635ae3d147 Don't include pcap headers if you don't have pcap.
Don't try to compile code that uses pcap if you don't have it.

Change-Id: Ifa98b4ff47783f5347cb6e1129bbf4e5cac35aab
Reviewed-on: https://code.wireshark.org/review/21611
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-05-12 02:24:45 +00:00
Guy Harris 7321183716 Put the HAVE_REMOTE hack into wsutil/wspcap.h, and include that file.
Have a header file that defines HAVE_REMOTE if HAVE_PCAP_REMOTE is
defined, and then includes pcap.h.  Replace all other includes of
pcap.h, and the definition of HAVE_REMOTE, with includes of that file.
Check for anything other than wspcap.h including pcap.h in checkAPIs.pl.

Change-Id: I3cbee8208944ad6f006f568b3fe3134e10b2a883
Reviewed-on: https://code.wireshark.org/review/21605
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-05-11 19:58:15 +00:00
Guy Harris 6f1e6d24c6 Revert "Revert "Get rid of HAVE_REMOTE.""
This reverts commit 8cd1fd0c99.

Making HAVE_REMOTE a config.h #define is a really horrible idea.  It's *NOT* a configuration option.

Instead, HAVE_REMOTE should be defined by other mechanisms, as was done in 79eab8ca07.

Change-Id: I4632b63bd73a25a27c5f4686d2baf3e0beddecb3
Reviewed-on: https://code.wireshark.org/review/21604
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-05-11 18:19:12 +00:00
Jörg Mayer 8cd1fd0c99 Revert "Get rid of HAVE_REMOTE."
This reverts commit d13b8ea13c.

This will only work with git HEAD of libpcap, but not with any release versions of libpcap or winpcap (the *pcap includes require the define, not Wireshark).

Change-Id: I08e5ec66e3642dc02f793c83ffc4363bb348202c
Reviewed-on: https://code.wireshark.org/review/21603
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2017-05-11 18:09:04 +00:00
Peter Wu 129bdb5a16 dns: improve loop detection in label decompression
Previously the number of allowed pointers within a message is equal to
the data in a tvb (16575 in one example). This is still expensive, so
implement an alternative detection mechanism that looks for a direct
self-loop and limits the total pointers to about 256.

Bug: 13633
Change-Id: I803873e24ab170c7ef0b881d3bdc9dfd4014de97
Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1206
Reviewed-on: https://code.wireshark.org/review/21507
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-05-11 14:52:44 +00:00
Guy Harris 79eab8ca07 Force HAVE_REMOTE to be defined when including pcap.h with remote support.
WinPcap made the mistake of having stuff in its public header fines
depend on a configuration #define, HAVE_REMOTE; this means that we need
to forcibly define it when building with remote capture support.

The tip of the libpcap master branch does not have that botch; hopefully
future versions of libpcap-for-Windows will be based on that libpcap and
thus lack that botch as well.

Defining HAVE_REMOTE in config.h is not the right fix, as it makes it
look like a *Wireshark* configuration option that code in Wireshark
should test, rather than a *WinPcap* configuration option that the
pcap.h that ships with the WinPcap SDK should have been changed, as part
of the build process, to correctly define or not, so that users of
WinPcap don't have to define it themselves.

Change-Id: I62d1eca6d3c900d0dcc9fbc011db77f595a86313
Reviewed-on: https://code.wireshark.org/review/21593
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-05-11 10:57:22 +00:00
Guy Harris 871a8a2ccc Another shadowing fix for abort().
Change-Id: I991bd24ab8b64bdfeae275941d79b716da3309f9
Reviewed-on: https://code.wireshark.org/review/21592
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-05-11 10:50:45 +00:00
Guy Harris 804d0cdfa3 Squelch warning from some compilers.
Change-Id: Iacd5832e3b63fa24907423d2b7df40e81fafb0de
Reviewed-on: https://code.wireshark.org/review/21591
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-05-11 10:08:07 +00:00
Guy Harris 1ecf3b6645 Note whether we found remote pcap support in libpcap.
Change-Id: Ida20f7164d3132a72fdd6547905cd0af4e451917
Reviewed-on: https://code.wireshark.org/review/21590
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-05-11 09:49:31 +00:00
Christoph Schlosser 1be20bc4c2 EPL: Dissect read/write multiple parameter SDOs
The dissector only dissected Write Multiple Parameter by Index requests
 correctly.
 Now it is possible to dissect the response to the request and
 Read Multiple Parameter by Index request and responses.

Bug: 13677

Change-Id: I13aae241690cd3ac9dfbe8129ef56d0fc9016301
Reviewed-on: https://code.wireshark.org/review/21034
Reviewed-by: Christoph Schlosser <christoph@schlosser.xyz>
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-05-11 04:56:36 +00:00
Pascal Quantin f751918476 GSM RLC/MAC: fix global-buffer-overflow error reported by ASAN
After a M_NEXT_EXIST(), you should always have another variable (like
M_UINT, M_TYPE, ...) and not immediately end the structure with
CSN_DESCR_END.
Note that this is a workaround as the current description does not allow
a proper parsing anyway (as the structure is reentrant). But at least it
solves the buffer overflow.

Bug: 13692
Change-Id: I8e607aadcced2d8cc636dc10f9690c5c679ad581
Reviewed-on: https://code.wireshark.org/review/21585
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>
2017-05-11 04:55:21 +00:00
Guy Harris d13b8ea13c Get rid of HAVE_REMOTE.
We never test for it - we test for HAVE_PCAP_REMOTE - so there's no need
to set it in config.h.

While we're at it, note that "PCAP" in "HAVE_PCAP_REMOTE" can refer to
libpcap as well as WinPcap, given that, at least in the tip of the
master branch, you can configure remote support in libpcap, although
it's not enabled by default (it needs to be vetted for security, as it
increases the attack surface of a machine running the server *and* of an
application using libpcap with remote support).

Change-Id: I3c96cf16bbda19ec7c085f74cffc6f125198d45b
Reviewed-on: https://code.wireshark.org/review/21589
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-05-10 21:16:29 +00:00
Guy Harris 537eddbc40 Define YYMALLOCARGTYPE appropriately.
Define it, so the generated parser knows what argument type the function
passed to MateParserAlloc() takes.  Use it when declaring
MateParserAlloc().

Change-Id: Ice18fd6b5fdbdb31f527e5d6eb06e78594d4565b
Reviewed-on: https://code.wireshark.org/review/21588
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-05-10 20:47:35 +00:00
Guy Harris 559952b903 Clean up MateParser routine declarations.
Remove the declarations from mate_parser.l, and have mate_parser.h
include mate.h at the beginning of the file, instead.

Move the #if'ed version of the declaration of MateParserAlloc() to
mate.h.

Change-Id: I03ffdd5f093b179ffc0cb0e43eac093f7e4af65c
Reviewed-on: https://code.wireshark.org/review/21587
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-05-10 20:42:06 +00:00
Guy Harris 12057373d7 This is specified in section 8 of the DIX v2.0 Ethernet spec.
Note that, and give a URL for the spec.

Change-Id: I60953ddf2e7934ac273ba808ae4aa662f562917e
Reviewed-on: https://code.wireshark.org/review/21583
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-05-10 01:42:55 +00:00
Alexis La Goutte fc1f62a88c RADIUS: sync with FreeRADIUS
commit d4e9cc75313f05678d0f2ac41962f46c99751e1f
Author: Alan T. DeKok <aland@freeradius.org>
Date:   Sun May 7 12:56:57 2017 -0400

    added one more attribute

Change-Id: I5821076c2d4f02d82c393a768edd0c77da582a2d
Reviewed-on: https://code.wireshark.org/review/21576
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-05-09 23:11:13 +00:00
Alexis La Goutte a78ff1093c nge: add modelines info
Change-Id: Ib75f637c36be575a85e75fee6282d1a16455bfd6
Reviewed-on: https://code.wireshark.org/review/21572
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Charlie Lenahan <clenahan@sonicbison.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-05-09 23:10:04 +00:00
Alexis La Goutte 5d45e77eef nge: fix no previous prototype for ‘proto_register_nge/handoff_nge’ [-Wmissing-prototypes]
Change-Id: I2e7cecad96390f709c6a135b6059c01712971dfe
Reviewed-on: https://code.wireshark.org/review/21571
Reviewed-by: Charlie Lenahan <clenahan@sonicbison.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-05-09 23:09:47 +00:00
Alexis La Goutte 5e944ee2a8 mate (grammar): fix no previous prototype for function 'MateParser/Alloc/Free' [-Wmissing-prototypes]
Change-Id: I87ff11b7c04cb3b6963d4c8c16df2c3d60a0aec8
Reviewed-on: https://code.wireshark.org/review/21574
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>
2017-05-09 23:09:26 +00:00
Guy Harris 8bab958e19 You can't have a field be both integer and string.
For an inter-frame gap that couldn't be determined, just add it with
proto_tree_add_uint_format_value() and "Cannot be determined" as the way
the value is displayed.

(But why add it *at all* if it couldn't be determined?)

Change-Id: I491f9a6fe430141a15568e9a7dec3253a1c78cf5
Reviewed-on: https://code.wireshark.org/review/21582
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-05-09 22:08:02 +00:00
Guy Harris 9d6083efd1 Give fields better names than ".bitN".
".bitN" names 1) don't indicate what the bit actually *means* and 2) run
the risk of collisions if the bit in question has a different meaning in
different bitsets.

Combine the "receive case" and "transmit case" bitsets in some cases
where the only difference between the two sets is that some bits are
present only in one set, but if a bit is present in both sets, it has
the same meaning.

Change-Id: Ie1cb9d076e431b30b64ef05acab39efe38193d33
Reviewed-on: https://code.wireshark.org/review/21581
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-05-09 21:47:30 +00:00
Guy Harris 3d9cadd392 De-capitalize "error" - it's not capitalized in other field names.
Change-Id: I6f5aaaba47ab8d36124aa10c63ceec7cf1f70867
Reviewed-on: https://code.wireshark.org/review/21580
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-05-09 21:40:23 +00:00
Guy Harris b8040a44ce Fix various field names and types.
Make some names used for multiple fields more stylistically consistent.

If a bitfield has more than one bit, it's not Boolean - the extra bits
mean it has more values than "true" or "false".

If a bitfield has only one bit, and indicates that something is
true/false, or enabled/disabled, or present/absent, or on/off, or
something else obviously Boolean, it's Boolean.

Change-Id: I89d5e214eb5c4e7f72eb59a78757f0f49fec3dbf
Reviewed-on: https://code.wireshark.org/review/21579
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-05-09 21:29:29 +00:00
Björn Ruytenberg c25b4f2f3f debian-setup: Always install Libgcrypt
Libgcrypt is mandatory to build. Do not mark as optional.

Change-Id: Iafbe1cd93f4185e2a9492bb0a21c30a26d8883ce
Reviewed-on: https://code.wireshark.org/review/21575
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-05-09 18:22:21 +00:00
Guy Harris 09209056ce Set nss and rate_mcs_index in more arms of the Series II PLCP switch.
For HT mixed, set it the same way it's set for HT greenfield.

For pre-HT, set it to 0.

Also, for the "unknown" case, set rate_mcs_index to 0.
This should obviate the need to initialize either of those variables,
don't initialize them, so that failing to set them in an arm of the
switch statement shows up as an error if the compiler's dataflow
analysis actually bothers to check this.

Change-Id: I92703770dd5000a579b53609fb93a2085fd9fca3
Reviewed-on: https://code.wireshark.org/review/21573
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-05-09 17:51:59 +00:00
Alexis La Goutte 2d44f7f303 ua3g: fix conflicting entry in its value_string
Field 'Audio Env.' (ua3g.ip.set_param_req.parameter.audio_env) has a conflicting entry in its value_string: 2 is at indices 2 (Open Space) and 3 (Meeting Room))

Field 'Audio Env.' (ua3g.ip.set_param_req.parameter.audio_env) has a conflicting entry in its value_string: 2 is at indices 2 (Open Space) and 4 (Noisy))

Field 'Audio Env.' (ua3g.ip.set_param_req.parameter.audio_env) has a conflicting entry in its value_string: 2 is at indices 3 (Meeting Room) and 4 (Noisy))

Change-Id: I495f183dd52e59ec64e6eea0df15a5b243d8b87c
Reviewed-on: https://code.wireshark.org/review/21568
Reviewed-by: Nicolas BERTIN <nicolas.bertin@al-enterprise.com>
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>
2017-05-09 16:37:00 +00:00
Adrian Simionov 0972db2f9d docsis: DCC-REQ TLV 2.7 support
Change-Id: I40724306d5facd0f4a5a9ca2354330577857d27f
Reviewed-on: https://code.wireshark.org/review/21563
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-05-09 16:36:21 +00:00
Michael Mann 5cd7ea6af2 Don't have epan_dissect_init() return anything.
It manipulates the epan_dissect_t structure passed into it and then
returns that.
Callers can (and have been) just using the passed in epan_dissect_t
structure anyway.

Change-Id: Ia19d360a7347ff473654eeb553756f59a38f95bd
Reviewed-on: https://code.wireshark.org/review/21570
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-05-09 16:36:06 +00:00
Graham Bloice 8c576051fd More fields, more pre-allocated memory for fields.
Change-Id: I36469fad59d28a1fbf15d3fd99544a3a6b0ef015
Reviewed-on: https://code.wireshark.org/review/21569
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2017-05-09 14:55:27 +00:00
Alexis La Goutte 33f3866fb4 tshark: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Change-Id: I4425be3bbee0e781dff59a07d7de65f5eba81bdd
Reviewed-on: https://code.wireshark.org/review/21564
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-05-09 13:42:24 +00:00
Alexis La Goutte ea3b356eb2 nm: Uninitialized argument value Warning found by Clang Analyzer
false positive

Change-Id: I8aa2537328a04a64b06142a04ee76705d0df5443
Reviewed-on: https://code.wireshark.org/review/21566
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-05-09 13:38:01 +00:00