Bug: 14115
Change-Id: I836ee337f4727b0592cda074975c20a68fe7a27d
Reviewed-on: https://code.wireshark.org/review/24124
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
It's typically masked with 0x60 without any bit shifting,
so make the value reflect it
Bug: 14116
Change-Id: I677c609a8e19a66ee557ac24c721ecb2312131a5
Reviewed-on: https://code.wireshark.org/review/24123
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
Change-Id: I5d99692d897f17e6e14952db8e4736ca65aa1373
Reviewed-on: https://code.wireshark.org/review/24106
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
Previous logic required multiple values from the decode as structure in
order to provide an initial value. This was incorrect and led to
values from protocol not selected showing in the selector column.
Change-Id: If1ad5085f4a6eb8d79fc5dd72be968188051ec4e
Reviewed-on: https://code.wireshark.org/review/24122
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
Add Syntax-id decoding for accessing frequency inverter parameters.
Moved the decoding of all other syntax-ids to separate functions.
Change-Id: Iba41f0631c4aeaf31a4ec6f73ffc42ca0b76f00d
Reviewed-on: https://code.wireshark.org/review/24102
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
The spatial streams amount support is still to be added.
Bug: 14136
Change-Id: I58b4ff4febcbd871c063a7add6a1e6b79ef23683
Reviewed-on: https://code.wireshark.org/review/24079
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Convenience function to add the same parameters to find_conversation as
find_or_create_conversation.
Change-Id: I3a92541cb9c1e827a9de8248825636debbd989cd
Reviewed-on: https://code.wireshark.org/review/24118
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
Change-Id: Iaaa76ac8a5aad457258de3c23828cf3738f612c2
Reviewed-on: https://code.wireshark.org/review/24110
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
When an capture file containing AMQP 0-9 traffic is missing the
protocol header, and the first packet contains more than one AMQP
frame, we'd fail to detect the protocol version properly, since we'd
check for the frame size being equal to the PDU size. Fix this case
by checking if the frame fits within the PDU instead.
While it's possible that 0-10 and 1.0 captures could be misdetected as
0-9, this seems highly unlikely. See details in comment in
packet-amqp.c.
Bug: 14113
Change-Id: I98978ed3919be3daf7fe9a972b87e09f27ba20e3
Reviewed-on: https://code.wireshark.org/review/24108
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
Apparently this macro is (was?) used for CPP and some esoteric old non-ISO C headers,
which we don't use.
(Introduced with the very first Wireshark git commit.)
Change-Id: I22c32161aaa8df450d36d145b03cfcd62aa6268a
Reviewed-on: https://code.wireshark.org/review/24119
Reviewed-by: João Valverde <j@v6e.pt>
ranges for AMR and AMR-WB.
Change-Id: If5dca10b226a09168f1b1f834d97b826f8b777d6
Reviewed-on: https://code.wireshark.org/review/24105
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
- RFC7684
- draft-ietf-ospf-segment-routing-extensions-20
Bug: 12297
Change-Id: I3acafe95ae2ef44a433c38c2495169d77e3c955d
Reviewed-on: https://code.wireshark.org/review/24070
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
Octet 5 (Spare Node/ID Type) is included in the IE length
and FQDN uses just remainding length
Change-Id: I9c6e1de850bda0af315cbf801e757af6b25ed33e
Reviewed-on: https://code.wireshark.org/review/24101
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
commands not being searchable.
Change-Id: I28cf212b3eacb16572ce9d1ff2dbf45040046b00
Reviewed-on: https://code.wireshark.org/review/24069
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
If we're using Clang, use either _Pragma("clang diagnostic XXX") or
nothing; don't use _Pragma("GCC diagnostic XXX"). If we're using
something other than Clang that is, or claims to be, GCC, use
_Pragma("GCC diagnostic XXX") or nothing.
Explain why we're only using _Pragma("GCC diagnostic XXX") with GCC 4.8
or later, even though it's supported in GCC 4.2 and later, and even
though 4.6 an later support _Pragma("GCC diagnostic {push,pop}").
Change-Id: I7a5f46ec419b945663d473cb4ae435ab7fdcf0ef
Reviewed-on: https://code.wireshark.org/review/24096
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This change improves performance through better handling of SYN -
SYN/ACK pairs.
Bug: 14094
Change-Id: Ie479f1b69fa48f85a2ed9f8f173533db25582bbd
Reviewed-on: https://code.wireshark.org/review/24090
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
While we're at it, sort some header file lists, and clean up white
space.
Change-Id: If737dda45334fedf1df7295d8719ad9381daf7a1
Reviewed-on: https://code.wireshark.org/review/24089
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Add global preference to allow for "stricter" conversation tracking
Bug: 13518
Change-Id: I166a084c402374fa76dac7bb54f941e2e9c9325a
Reviewed-on: https://code.wireshark.org/review/22842
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
Change-Id: I94da228cba6baf20a2cd02bafc9704492f2cfc9f
Reviewed-on: https://code.wireshark.org/review/23956
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
/src/wireshark/tools/oss-fuzzshark/fuzzshark.c:218:7: warning: implicit declaration of function 'color_filters_init' is invalid in C99 [-Wimplicit-function-declaration]
if (!color_filters_init(&err_msg, NULL))
^
1 warning generated.
Change-Id: I37dbc4521b6a3cda271e6e33a290ed35911e7dda
Reviewed-on: https://code.wireshark.org/review/24086
Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Winsock2.h will do that for us via packet32.h.
Change-Id: Ie834d49b052c3db6784481bb85d94d4eecff8287
Reviewed-on: https://code.wireshark.org/review/24082
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Not all versions of GCC or Clang have the returns_nonnull function
attribute, so use the same technique used in current master branch
libpcap - use __has_attribute() if it's available, otherwise use
compiler version tests.
This also lets us use WS_NORETURN on some non-GCC compilers.
Change-Id: I6ca4a81797ebfca9f743e16f83839c49d303da81
Reviewed-on: https://code.wireshark.org/review/24083
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Set NTDDI_VERSION and _WIN32_WINNT to their Vista values so that
ws2tcpip.h will define inet_pton and inet_ntop. Remove the associated
compiler version checks so that everyone is on the same page.
Add breadcrumbs to the various parts of the code where we set a minimum
Windows version.
Change-Id: I83bba5fa1024bfbc02e07b120412807ad259e291
Reviewed-on: https://code.wireshark.org/review/24080
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Also fix buffer length define, as it is not guaranteed to be 46 on
Windows (it never was guaranteed anyway for the libc implementation,
but the likelyhood of being greater was small).
Change-Id: I2db705d86f825765ed32ec70b8d22058b5d629e8
Reviewed-on: https://code.wireshark.org/review/24074
Reviewed-by: João Valverde <j@v6e.pt>
Developers should know how to instrument the code for profiling with a given
toolchain. This particular case is trivially replaced with:
./configure CFLAGS="-pg" LDFLAGS="-pg"
Change-Id: Icc4bca9a8dc5d3ae59a3ff5a8d155f8dc868fcdd
Reviewed-on: https://code.wireshark.org/review/24054
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
Change-Id: Ieef2cbf34e32f0730af03acc65ebe3499e1fe1f3
Reviewed-on: https://code.wireshark.org/review/24076
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
At least not exported from libwireshark - it's now a static inline
function defined in a header.
Change-Id: Ic3eb397226459c7c8fb296f23777cbd0678a0a2f
Reviewed-on: https://code.wireshark.org/review/24077
Reviewed-by: Guy Harris <guy@alum.mit.edu>
They test where the address is XXX, for various values of XXX, so name
them accordingly.
Change-Id: I437175f02b3f97fecee77e8bb9416bb5b71cd0d0
Reviewed-on: https://code.wireshark.org/review/24075
Reviewed-by: Guy Harris <guy@alum.mit.edu>
That allows a parallel typedef of ws_in4_addr for guint32.
Change-Id: I03b230247065e0e3840eb87635315a8e523ef562
Reviewed-on: https://code.wireshark.org/review/24073
Reviewed-by: Guy Harris <guy@alum.mit.edu>
If we're building on Windows we're going to have windows.h and
winsock2.h. Don't bother checking for them.
Change-Id: I0004c44d7364ab3f41682f34b8c84cd8617c9603
Reviewed-on: https://code.wireshark.org/review/24068
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Most of it doesn't need to be public; pull it into epan/ipv4.c. Pull
the two routines that *are* used outside epan/ftypes/ftype-ipv4.c into
epan/ipv4.h as static inline functions.
This allows some optimization, and makes epan/ipv4.h more like epan/ipv6.h.
Change-Id: I80229acde559d810aecec2acd5c995076440c181
Reviewed-on: https://code.wireshark.org/review/24071
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Michael Mann