Commit Graph

73103 Commits

Author SHA1 Message Date
Gerald Combs 5dbc202063 Add support for aliases to dissector tables.
Add register_dissector_table_alias, similar proto_register_alias. Add
aliases for ssl.port, and ssl.handshake.extensions_alpn_str, and
dtls.handshake.extensions_alpn_str.

Change-Id: I87c3215e2872883ed0f581557e08c84f2dba12a0
Reviewed-on: https://code.wireshark.org/review/29652
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-09-15 08:54:14 +00:00
chaoyongzhou 0dafb2bf88 Aeron: Update disector on the latest aeron protocol specification
1, update frame fields and offset
2, shift heartbeat frame from data frame which is a special data frame
3, support rtt frame supported by aeron in java
4, revise data/pad frame length alignment to 32 bytes but not 8 bytes
5, remove frame length alignment from setup,nak,err,and rtt frame
6, fix rtt frame length
Bug: 15111
Change-Id: Ic627a9773850fa6bceacd313ddeba521487815e2
Reviewed-on: https://code.wireshark.org/review/29407
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-09-15 07:18:53 +00:00
Gerald Combs 191abbf18a Debian: Add missing symbols.
Change-Id: I8c1b91d56466c15e797c5404b49dc7de57b8a2f5
Reviewed-on: https://code.wireshark.org/review/29664
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-09-14 21:41:01 +00:00
Peter Wu 8669705f7e QUIC: recognize CRYPTO frame (draft -13)
Avoids malformed packet warnings. Actual TLS handshake/alert protocol
support will be done later.

Change-Id: I87e783ab12a10afad7c0372a0b3a900a5e37f6e1
Ping-Bug: 13881
Reviewed-on: https://code.wireshark.org/review/29642
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-14 19:22:07 +00:00
Gerald Combs 56a30766ef make-manuf.py: Improve truncation.
If the PyICU module is available, use it to truncate manufacturer
names by grapheme clusters.

Change-Id: Ib7dcbb126809df496a534f44a47871a1b28dc539
Reviewed-on: https://code.wireshark.org/review/29660
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-09-14 18:01:49 +00:00
Gerald Combs 17c8101107 Test: Fix a copy+paste error.
Change-Id: Id040b05af022752672f2d56d4796f0c71352e7b1
Reviewed-on: https://code.wireshark.org/review/29658
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-09-14 16:17:54 +00:00
AndersBroman a5cd630033 evs: Start dissecting a bit of speech data.
Change-Id: I30ad1c083c2e3ed920245f0421b280b5b9b16336
Reviewed-on: https://code.wireshark.org/review/29656
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-14 13:38:57 +00:00
Peter Wu 011224bff5 QUIC: split per-packet state to fix packet coalescing
Packet coalescing requires separate state for every QUIC packet. Split
the state as each UDP datagram can contain multiple QUIC packets.

Most datagrams will have only one packet, so to avoid multiple
allocations, just embed the first packet into the datagram info and use
a linked list for simplicity.

Change-Id: Ib921e68a7312c6eccb5601b8951ff64cc9ea49cd
Ping-Bug: 13881
Reviewed-on: https://code.wireshark.org/review/29647
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-09-14 10:28:37 +00:00
Hannes Mezger 28a7a79cac opcua: prevent opcua dissector crash by limiting nesting depth
The OPC UA types DiagnosticInfo, Variant and ExtensionObject can be
nested, which can lead to stack overflows when parsing specially
crafted packets. This is fixed by storing the current nesting depth
as expert info.
The corresponding CVE is https://cve.mitre.org/cgi-bin/cvename.cgi?name=2018-12086
The corresponding security bulletin of the OPC Foundation is https://opcfoundation-onlineapplications.org/faq/SecurityBulletins/OPC_Foundation_Security_Bulletin_CVE-2018-12086.pdf

Change-Id: I5f6da3a3e269f6db1b690b77470ddf60045bcedd
Reviewed-on: https://code.wireshark.org/review/29645
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-14 04:11:20 +00:00
Gerald Combs cd95e197ca Start renaming SSL to TLS.
Rename the "ssl" protocol to "tls" and add an "ssl" alias. Prefer "TLS"
over "SSL" in user interface text and in the documentation.

Fix the test_tls_master_secret test while we're here.

Bug: 14922
Change-Id: Iab6ba2c7c4c0f8f6dd0f6d5d90fac5e9486612f8
Reviewed-on: https://code.wireshark.org/review/29649
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-09-13 22:37:52 +00:00
Peter Wu 63743a3733 QUIC: fix Initial dissection (draft -13)
Recognize the Token field in the Initial Packet. Accept Initial Packet
from server and adjust connection tracking logic to take this into
account.

Tested with ngtcp2-13.pcap, now the Initial packets can be decrypted
(even if the containing frames are not correctly handled).

Change-Id: I5937fb85172a2f93d1b4a4ed7667474ec04f95fc
Ping-Bug: 13881
Reviewed-on: https://code.wireshark.org/review/29641
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-13 21:27:00 +00:00
Peter Wu aedf4a7dd7 QUIC: use HKDF-Expand-Label (draft -13)
Prepare for draft -13 support. A comment references draft -14 since the
draft -13 text is wrong (it lacks the context argument).

Change-Id: I3f2c59d2640693959372ebe0de3b58f67b5588b9
Ping-Bug: 13881
Reviewed-on: https://code.wireshark.org/review/29640
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-13 21:26:24 +00:00
Peter Wu 81710c7d3c QUIC: implement draft -12 decryption (PNE and PP)
Packet number encryption (draft -12 + PR 1389) is implemented. The
payload protection has been updated to use the decrypted PKN as well.

Caveats: since the packet number is initially unavailable, the previous
approach on detecting legitimate key updates no longer works. This
change breaks Key Update support which needs to be revisited later. Due
to how PKN lengths and decrypted results are stored (one per datagram),
packet coalesing is also not fully supported.

Bug: 13881
Change-Id: I13c63578cec7f7f74a404b1a7a8fc85026a14252
Reviewed-on: https://code.wireshark.org/review/29637
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-13 21:24:57 +00:00
Gerald Combs aeadce8478 Prefs: Add a check for aliased protocol preferences.
Add a check to set_pref for aliased protocols alongside the checks for
protocols we've renamed in the past.

Change-Id: I62ad2ddb17d66bd7385635bfa6ca1dd58fad6ad5
Reviewed-on: https://code.wireshark.org/review/29651
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-09-13 20:48:56 +00:00
Gerald Combs f55c33d4b8 DHCP: Fixup whitespace.
Change-Id: Iaf56751dff81ff9f5c59e1e99ca93aafb38a934d
Reviewed-on: https://code.wireshark.org/review/29650
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-09-13 17:09:33 +00:00
Emmanuel Grumbach e6d9b78402 ieee80211: parse the 9th byte of the Extended Capability as a byte
Some of the bits were parsed as a bit of a WORD, and others as
a bit of BYTE leading to a bug in the display.

Bug: 15133
Change-Id: Ie6877c4a4a79fcc802afec49436370cf22a6bfae
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Reviewed-on: https://code.wireshark.org/review/29633
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-13 13:58:56 +00:00
AndersBroman 35e4bbe691 evs: Put CMR "rate" in Info column.
Change-Id: I99447ac80751dea53849bd0575804dc7e74a27c5
Reviewed-on: https://code.wireshark.org/review/29638
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-13 08:36:00 +00:00
Joakim Karlsson 26d4ad2fa8 gtp: move column append outside IF brackets
Column appended never happen on IPv4/IPv6 since latest refactor

Change-Id: Icc85cfa8136386a440b226959f9df4a980a2658e
Reviewed-on: https://code.wireshark.org/review/29644
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-13 05:06:58 +00:00
Lajos Olah c3cf33d1ef MTP2 bitstream dissector - dissect MTP2 packets from RTP stream
Change-Id: I704c68caa8cd8aa60c6417e6ee038db5f6507686
Reviewed-on: https://code.wireshark.org/review/29506
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-13 03:56:42 +00:00
Gerald Combs 57a397bded tvbtest: Remove an unused function.
It looks like "skip" hasn't been required since 2011.

Change-Id: Idaf53943519fa76e362aaecc6999f9971a359348
Reviewed-on: https://code.wireshark.org/review/29643
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-13 03:56:08 +00:00
Alexis La Goutte dcf01e817e ospf: fix conlict
'ospf.mpls.pri' exists multiple times with NOT compatible types: FT_FLOAT and FT_UINT8

Change-Id: Iea0b662d0a9ff4a7ea7363ef4ef049d11d5a5dca
Reviewed-on: https://code.wireshark.org/review/29608
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-13 03:55:10 +00:00
Darien Spencer 9a40000182 AT: Add CSUPI command
Change-Id: I501bd0e00a20b39e4c53bdd7e5e2b9b3c5234469
Reviewed-on: https://code.wireshark.org/review/29635
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-12 21:57:45 +00:00
Peter Wu 366c52315b QUIC: create QUIC-specific cipher context
This makes it easier to track the packet number cipher.

Change-Id: I220935e91c324e0a641306c590f55af4992ee2e1
Ping-Bug: 13881
Reviewed-on: https://code.wireshark.org/review/29636
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-12 21:56:46 +00:00
Darien Spencer 5c7dae1337 AT: Fix rejection values
Dissect functions for CNUM/VTS were returning TRUE for all wrong role/type combinations instead of FALSE ( = Rejecting the parameter )

Change-Id: I1aae5b76db83cef6b59f5244c05a67b2110f8969
Reviewed-on: https://code.wireshark.org/review/29634
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-12 19:38:57 +00:00
Guy Harris e31ca2e278 Revert "Some older compilers don't allow diagnostic pragmas inside a function."
This reverts commit f94cfa0cdc.

Reason for revert: we don't use those diagnostic pragmas with those
older compilers.

Change-Id: I5154527dcc3813fb893c382059cb33538f2d29f7
Reviewed-on: https://code.wireshark.org/review/29639
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-09-12 16:29:30 +00:00
Rody Liu 0cb87b7389 nas_5gs: can't decode 5GS NAS PDU when there are multiple NSSAIs.
Use dummy length in proto_tree_add_subtree_format(),
proto_item_set_len() will set the correct length later.
Bug: 15120
Change-Id: I7a56f3d1541b75eb53bc03750b6402a8b78a8251
Reviewed-on: https://code.wireshark.org/review/29465
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-12 14:41:02 +00:00
AndersBroman 5c36055d9b nas5gs: Align with version 15.0.0
Change-Id: I068bef5cb9536e2af0c2be473841f4325b461cce
Reviewed-on: https://code.wireshark.org/review/29632
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-12 13:43:04 +00:00
Alexis La Goutte 794d1bb58d tvbtest: fix no previous prototype for ‘test/skip/run_tests’ [-Wmissing-prototypes]
Change-Id: I21a2a0edc4cb96d4d757e4d6e9c38d7fc922afc8
Reviewed-on: https://code.wireshark.org/review/29631
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-12 11:40:40 +00:00
AndersBroman 40789524c5 gsm_a_gm: Fix dissection of 10.5.6.3 Protocol configuration options.
Session-AMBR dissected as QoS rules
PDU session address lifetime dissected as Session-AMBR.

Change-Id: Iee9e630644638718f37ddbc185e23add32ee61ea
Reviewed-on: https://code.wireshark.org/review/29630
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-12 10:54:40 +00:00
Jano Svitok 59ae0a2d83 MBIM: changes after Microsoft fixed documentation
- update doc link to MBIM_CID_PCO
- add numeric values and dissector skeleton for MBIM_CID_BASE_STATIONS_INFO
  and MBIM_CID_LOCATION_INFO_STATUS
- MBIM_CID_MS_NETWORK_BLACKLIST: Set command has the same data as response
- MBIM_CID_MS_NETWORK_BLACKLIST: Query command has no data, but is legal

Change-Id: I8158029ae1e9ae2bc6fb389e889eb0bb71aa3d5d
Reviewed-on: https://code.wireshark.org/review/29624
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-09-12 10:20:41 +00:00
Guy Harris a6dc0c27fc Don't use -Werror with Apple's llvm-gcc.
Its handling of warnings, and of warnings-treated-as-errors, is horribly
broken; once you've asked for a warning, and have specified -Werror,
there appears to be nothing whatsoever that you can do to keep that
warning from being an error *everywhere* in the code.

Prior to change Ib591a1d6beaa13337d927a446b4d8d5e687ff610, the tests for
warnings were all failing on the macOS buildbot, so *no* warnings were
being requested.

With this change, a warning won't be reported as an error, but at least
it'll be reported.

(We should probably switch to using Clang on the macOS buildbot at some
point; I don't know whether the version of Clang currently on the
buildbot is safe to use, but if we ever run a newer version of Xcode,
which doesn't come with llvm-gcc - which may involve running a newer
version of macOS on the buildbot as well - it's presumably safe, given
that it's the only compiler Apple shipped.)

Change-Id: I677967cb87b91f68f08de546e59abff1dbd6788b
Reviewed-on: https://code.wireshark.org/review/29623
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-09-12 04:22:33 +00:00
Peter Wu 91c5942c93 QUIC: implement packet coalescing (draft >= 11)
Messages with long headers have a payload length while short header
messages extend to the end of a datagram.

Create a new tvb for every message since the decryption routines assume
that the header starts from the beginning of the tvb.

quic_get_message_tvb tries to avoid throwing exceptions in most cases if
the (payload) length is too large such that dissection can proceed until
the payload is encountered. (One edge case is when the varint cannot
even be read, but then indeed the message is severely malformed.)

Change-Id: Id42f55dfd73905b709b218002b9ca660f6f703f1
Ping-Bug: 13881
Reviewed-on: https://code.wireshark.org/review/29607
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-12 03:57:27 +00:00
Guy Harris 4bab4b2e0c OK, try to prevent -Wunused-function warnings with llvm-gcc as well.
Change-Id: I53e48eb14d157eacd24322fb978f039e57377ed8
Reviewed-on: https://code.wireshark.org/review/29622
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-09-12 03:23:12 +00:00
Guy Harris 47b1ec984b Fix WITHOUT_VALS.
It was setting EF_TYPE and then clearing it; it should set EF_TYPE and
clear EF_VALS.

Change-Id: Ie0a85a12646c0395e50abb34caf32367e4191da0
Reviewed-on: https://code.wireshark.org/review/29621
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-09-12 02:07:27 +00:00
Guy Harris 69a01b650a With llvm-gcc, just don't do -Wshorten-64-to-32.
If you specify -Werror and -Wshorten-64-to-32, there does not appear to
be any way to get llvm-gcc *NOT* to treat those warnings as errors - not
with pragmas, and not even with -Wno-error=shorten-64-to-32.

Change-Id: Ia82df3f548085cca8d187c4b43c02060b87f0542
Reviewed-on: https://code.wireshark.org/review/29620
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-09-12 01:28:57 +00:00
Guy Harris 2f65fbae4e -Wcomma isn't supported by llvm-gcc, so don't make it a non-error.
Replace a tab in an arguments string with a space while we're at it.

Change-Id: Iee6ce920fbd7a883fb23bc798abb7f965e3757e6
Reviewed-on: https://code.wireshark.org/review/29619
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-09-12 00:50:55 +00:00
Guy Harris a8024f1dc0 Just spaces between -W arguments.
Ninja, at least, complains about tabs.

Change-Id: I65c3458dadc7096773084864d5e3970d1d9d580d
Reviewed-on: https://code.wireshark.org/review/29618
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-09-11 23:15:56 +00:00
Guy Harris 8e0d8acadc WERROR_COMMON_FLAGS isn't a list, so don't treat it as one.
Change-Id: Iea0b39a61fade5ac87ed31efaf8c1c7a90aa4fb7
Reviewed-on: https://code.wireshark.org/review/29617
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-09-11 22:11:52 +00:00
Guy Harris b09f27ce0f Add the -Wno-error= flags to the correct variable.
Change-Id: I61896b959da1a7cbdb0faab99b60b57d1c00cbb7
Reviewed-on: https://code.wireshark.org/review/29616
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-09-11 21:40:27 +00:00
Peter Wu 46b2701626 QUIC: ensure handshake keys availability before PKN
Prepare for PKN decryption (draft -12) during the initial handshake.

Ping-Bug: 13881
Change-Id: I675086f732e39679bcb94e2e20da3d4bd40d0f2e
Reviewed-on: https://code.wireshark.org/review/29606
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-11 21:14:17 +00:00
Guy Harris 87887802ef Put the -Wno-error= options after -Werror.
It appears that -Werror overrides them, at least with llvm-gcc; I guess
the options are evaluated in order.

Change-Id: I0fd9e544a8e191a8950e17e97513912034763645
Reviewed-on: https://code.wireshark.org/review/29615
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-09-11 21:11:21 +00:00
Guy Harris 7533398f65 OK, try just suppressing the "-Wunused-function" warning with llvm-gcc.
Was Apple trying to release a game for Mac OS X, somewhat resembling
Whack-A-Mole, when they went into the lab and had Igor help them stitch
together the GCC front end and the LLVM back end?

Change-Id: If08392c3d244a83f50f62b4d7c878ae9a274ec4b
Reviewed-on: https://code.wireshark.org/review/29614
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-09-11 20:46:43 +00:00
Guy Harris ff31ed8c4c Go back to using a #pragma directly.
See if *that* prevents us from failing with a warning;
-Wno-error=unused-function doesn't seem to do the trick.

Change-Id: If2dec4ca70451670d0181c6cd0c7bc714e856c95
Reviewed-on: https://code.wireshark.org/review/29613
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-09-11 20:09:05 +00:00
Guy Harris f7346284ac More selectively prevent warnings from becoming errors.
Always use -Werror if it's supported, even with Apple's llvm-gcc, and
only use -Wno-error= with llvm-gcc.  Use -Wno-error= with all the errors
we get in the buildbot.

Change-Id: I6797f064d2d354f979e24fcb04f592e9313af721
Reviewed-on: https://code.wireshark.org/review/29612
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-09-11 19:43:15 +00:00
Guy Harris 4207660996 Revert "Make versions of DIAG_OFF() and DIAG_ON() for GCC 4.2 through 4.5."
This reverts commit f6b8bc39c6.

Reason for revert: prior to 4.6 or so, the pragmas didn't work as well,
e.g. they couldn't be used inside a function; we depend on them being
usable within a function.

Change-Id: I7a7a0c08a2aca553233c237b8b6c43115095804e
Reviewed-on: https://code.wireshark.org/review/29610
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-09-11 18:54:02 +00:00
Guy Harris b7685821c1 Don't use -Werror with llvm-gcc.
Apple's llvm-gcc appears not to support suppressing warnings with
pragmas, so, if we're building on a Mac (we check for APPLE), and we're
not using Clang, we don't turn on -Werror, because we rely on those
pragmas to suppress otherwise-unremovable warnings in order to build
warning-free.

Change-Id: I43bd1ab42918c6ba22643b4a2d4cc3618c25434b
Reviewed-on: https://code.wireshark.org/review/29609
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-09-11 18:36:11 +00:00
Alexis La Goutte 342f7d2987 ieee80211: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Change-Id: I27c82383987aa4da3bf86c5abc0d467252be5c80
Reviewed-on: https://code.wireshark.org/review/29599
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-11 17:38:02 +00:00
Richard Sharpe 71378072e6 ieee80211: Fix some issues with the D3.0 support.
The ieee80211ax D3.0 support got merged accidentally with some issues.

This fixes the remainder of those issues.

Change-Id: I2a3a427e04cb1dca076fd761458de92d4d5e0df2
Reviewed-on: https://code.wireshark.org/review/29602
Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-11 16:16:06 +00:00
Alexis La Goutte c525578aff QUIC: Remove draft-10 support
Bug: 13881
Change-Id: I11270c6be4304a5d37216cb2e09ae0d4149091b0
Reviewed-on: https://code.wireshark.org/review/29603
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-09-11 16:03:32 +00:00
AndersBroman 351ea5940e nas5gs: 9.10.4.7 PDU address. IPv6 type is a 8 byte link local address.
Change-Id: Ic83fd7fe2480946201732b38f42596f346ba48f5
Reviewed-on: https://code.wireshark.org/review/29601
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-11 13:57:37 +00:00