aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-10-28QUIC: Display Connection ID (CID) on hexaAlexis La Goutte1-2/+2
Ping-Bug: 13881 Change-Id: I7b97e27b6d2091a18e5fc3fd27251523a446cfde Reviewed-on: https://code.wireshark.org/review/24020 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-28IEEE 1905.1a: fix an infinite loop (CID 1420355)Alexis La Goutte1-0/+2
Change-Id: Iaa8e82cb5dc9f32e5c9dbf1db1068868d6fd3f18 Reviewed-on: https://code.wireshark.org/review/24144 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-28MOAR PRE-ALLOCATED FIELDS.Guy Harris1-1/+1
Do what the errors in the master buildbots say to do. Change-Id: I2b926bd9a75a1490390c42b8080f29e48096a3b4 Reviewed-on: https://code.wireshark.org/review/24143 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-10-28Also display the protocol with -G dissector-tables.Guy Harris1-0/+5
Change-Id: If5c61195ad6bfb86c8e047428abaa6b0d48e7d74 Reviewed-on: https://code.wireshark.org/review/24142 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-10-28Indicate Decode As support in the -G dissector-tables output.Guy Harris1-0/+2
Change-Id: I95535ba11fdcac37057d1441e850ddf5455d32cf Reviewed-on: https://code.wireshark.org/review/24141 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-10-28Put all the 11n vs. 11ac stuff together.Guy Harris1-13/+7
Also, there's no need to zero out the NSS values for 11ac - we zero out the entire pseudo-header at the beginning. We only need to set them if we *have* them. Change-Id: I9ebda7e246c24941ca77314bba6f86dea41e5992 Reviewed-on: https://code.wireshark.org/review/24135 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-10-28tshark: Use -G help instead of -G ?Michael Mann1-2/+8
Not all platforms handle ? or -? *predictably* at the command line. As long as "?" isn't replaced with a file name, it works, but if it gets replaced by a file name... Bug: 13984 Change-Id: I4496bb27fdef121967e7baf7b7f4a1bb0a44b00a Reviewed-on: https://code.wireshark.org/review/24125 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-28Don't add for "Decode As" if the dissector table doesn't support it.Guy Harris1-16/+23
While we're at it, consistently use "name" as the name of the argument giving the dissector table name. Change-Id: Ied54c88d0d3dd467fe9067b008b49ead754c31a2 Reviewed-on: https://code.wireshark.org/review/24131 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-10-28packet-knxnetip.c: Fix bitmaskMichael Mann1-1/+1
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>
2017-10-28Q931: Fix Q931_ISO_IEC_STANDARDIZED_CODING valueMichael Mann1-1/+1
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>
2017-10-28DOCSIS: DPD: adding modulation list to info columnBruno Verstuyft1-1/+10
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>
2017-10-28Always provide value for Decode As selector columnMichael Mann1-13/+9
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>
2017-10-27s7comm: Syntax-id decoding of frequency inverter parametersThomas Wiens1-192/+275
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>
2017-10-27peekremote: Support properly 11ac MCS rates.Nicolas Darchis1-6/+24
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>
2017-10-27Add find_conversation_pinfoMichael Mann4-6/+53
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>
2017-10-27OSPF: dissect_ospf_bitfield -> proto_tree_add_bitmaskMichael Mann1-216/+84
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>
2017-10-27Autodetect more AMQP 0-9 capturesMagnus Henoch1-6/+18
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>
2017-10-27Remove AC_PROG_GCC_TRADITIONAL from configure.acJoão Valverde1-4/+0
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>
2017-10-27Change NewCo to new Company name, AlivJeff Dyer1-1/+1
Change-Id: I84c06a7f168da0f65b7c76360f38f39ecf1024d0 Reviewed-on: https://code.wireshark.org/review/24112 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-27YACC is set to the missing script if not foundJoão Valverde1-4/+0
Change-Id: I38ce7542e96c7571fa179e550cfba39d16dc417f Reviewed-on: https://code.wireshark.org/review/24117 Reviewed-by: João Valverde <j@v6e.pt>
2017-10-27autotools: Fix LN_S usageJoão Valverde2-2/+2
"cp" always takes two arguments. Change-Id: I6183988a24a38b1091d31a4e533b329f89f35dac Reviewed-on: https://code.wireshark.org/review/24113 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-10-27IEEE 1905.1a: fix an infinite loop (CID 1420356)Pascal Quantin1-0/+1
Change-Id: I39b75acbf3598ad4e32e268f4b4378f16ca273c6 Reviewed-on: https://code.wireshark.org/review/24107 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-27[AMR] Change the Payload type preference to a range and have separateAndersBroman1-16/+27
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>
2017-10-27[BSSGP] Fix decoding of PERFORM-LOCATION-REQUEST.AndersBroman1-1/+1
Change-Id: I5039c93bd4f572599386a314a16230d7c1aaaf23 Reviewed-on: https://code.wireshark.org/review/24104 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-27[BSSMAP-LE] Add dissection of 10.18 Location Type.AndersBroman1-1/+51
Change-Id: I54900e13eca61cd1f190934a77cb0e704c877dfe Reviewed-on: https://code.wireshark.org/review/24103 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-27OSPFv2 Segment Routing extention support with RFC7684.Taisuke Sasaki1-30/+723
- 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>
2017-10-27PFCP: Dissect Node ID: Fix length of FQDN Node Id TypeMarius Paliga1-6/+6
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>
2017-10-27IEEE 1905.1a: remove an unused hf variablePascal Quantin1-5/+0
Change-Id: I03d37495937020407783d366d01e3ad353889e80 Reviewed-on: https://code.wireshark.org/review/24098 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-10-27IEEE 1905.1a: add what seems to be missing breaksPascal Quantin1-0/+2
Change-Id: I60b41e503bc8933fb2efb2016b565caa0ec3bb97 Reviewed-on: https://code.wireshark.org/review/24097 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-10-27debian: add ws_compiler_tests.h to libwsutils-dev.installPascal Quantin1-2/+3
Change-Id: Ia2db7069a22c4786b0628fd554038b3091388963 Reviewed-on: https://code.wireshark.org/review/24099 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-10-27Device provisioning protocol: Fix a last issue with DPP and ConfigurationRichard Sharpe3-5/+27
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>
2017-10-27Clean up a bit.Guy Harris1-24/+31
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>
2017-10-27TRANSUM: File loading slow with transum enabledPaul Offord2-10/+19
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>
2017-10-27Fix typo.Guy Harris1-1/+1
Change-Id: I27373dd3823d3527ad3ebf272169feb7323b1a83 Reviewed-on: https://code.wireshark.org/review/24094 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-10-26proto.c: do not set an item length longer that the remaining tvb lengthPascal Quantin1-3/+9
Ping-Bug: 14128 Change-Id: Iae5cb2f85d5d2fa3f2b6051aa57390a3f73d724a Reviewed-on: https://code.wireshark.org/review/24087 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-26proto.c: protect against buffer overflow in proto_find_undecoded_data()Pascal Quantin1-6/+12
Bug: 14128 Change-Id: I01aadf2dc9a3f714caaef273a7e012c6f1840726 Reviewed-on: https://code.wireshark.org/review/24088 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-26Move the compiler version tests to ws_compiler_tests.h and use them elsewhere.Guy Harris6-179/+242
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>
2017-10-26Include VLAN ID in key for ICMP request/response trackingChristopher Maynard4-21/+57
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>
2017-10-26Initial coding of the ieee1905 dissector with Multi-AP support.Richard Sharpe6-0/+5694
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>
2017-10-26oss-fuzzshark: add missing include to fix implicit declaration of ↵Jakub Zawadzki1-0/+1
color_filters_init() /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>
2017-10-26Whitespace cleanups.Guy Harris1-5/+5
Change-Id: Ic19c143fc9143da230f286f1fe4aecc0fe8b08be Reviewed-on: https://code.wireshark.org/review/24085 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-10-26Move a comment to where it belongs, expand another comment.Guy Harris1-10/+12
Change-Id: I04eff374132cbe4b93271c7a43303db406998bcb Reviewed-on: https://code.wireshark.org/review/24084 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-10-26We don't need to define sockaddr_storage.Gerald Combs1-48/+0
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>
2017-10-26Use more than just "does it claim to be GCC?" to test for attributes.Guy Harris1-5/+135
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>
2017-10-26CMake: Set the Windows build target to Vista.Gerald Combs4-13/+30
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>
2017-10-26Fix indentationJoão Valverde1-2/+2
Change-Id: I81892f2624920ccf3e2f18734665b9b2e99de5cf Reviewed-on: https://code.wireshark.org/review/24081 Reviewed-by: João Valverde <j@v6e.pt>
2017-10-26Improve our inet_ntop() wrapperJoão Valverde6-29/+43
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>
2017-10-26configure: Remove profile-build optionJoão Valverde1-20/+0
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>
2017-10-26DOCSIS: added Energy Management and CM Status Ack modem capabilitiesBruno Verstuyft2-1/+69
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>
2017-10-26PFCP: Fix offset after decoding Message LengthMarius Paliga1-0/+1
Change-Id: I163b4b1dfcad68e392fbddc3327ad081ca304a85 Reviewed-on: https://code.wireshark.org/review/24078 Reviewed-by: Michael Mann <mmann78@netscape.net>