aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-12-10Win32: Add checks for _WIN32_WINNT and NTDDI_VERSION.Gerald Combs2-2/+13
Check to see if we're the source of truth for _WIN32_WINNT and NTDDI_VERSION in config.h and emit a compiler error if we aren't. Rearrange the #includes in ui/qt/data_printer.cpp so that config.h is included first. This fixes the following: 136>C:\buildbot\wireshark\wireshark-master-64\windows-2016-x64\build\cmbuild\config.h(411): warning C4005: 'NTDDI_VERSION': macro redefinition (compiling source file C:\buildbot\wireshark\wireshark-master-64\windows-2016-x64\build\ui\qt\utils\data_printer.cpp) [C:\buildbot\wireshark\wireshark-master-64\windows-2016-x64\build\cmbuild\ui\qt\qtui.vcxproj] C:\Program Files (x86)\Windows Kits\10\Include\10.0.15063.0\shared\sdkddkver.h(223): note: see previous definition of 'NTDDI_VERSION' (compiling source file C:\buildbot\wireshark\wireshark-master-64\windows-2016-x64\build\ui\qt\utils\data_printer.cpp) 136>C:\buildbot\wireshark\wireshark-master-64\windows-2016-x64\build\cmbuild\config.h(412): warning C4005: '_WIN32_WINNT': macro redefinition (compiling source file C:\buildbot\wireshark\wireshark-master-64\windows-2016-x64\build\ui\qt\utils\data_printer.cpp) [C:\buildbot\wireshark\wireshark-master-64\windows-2016-x64\build\cmbuild\ui\qt\qtui.vcxproj] C:\Program Files (x86)\Windows Kits\10\Include\10.0.15063.0\shared\sdkddkver.h(213): note: see previous definition of '_WIN32_WINNT' (compiling source file C:\buildbot\wireshark\wireshark-master-64\windows-2016-x64\build\ui\qt\utils\data_printer.cpp) Change-Id: I90886cb9450463d768d6529ccd678ca11508cde2 Reviewed-on: https://code.wireshark.org/review/24744 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-12-10Convert to using use SPDX identifier on wsutil directoryMichael Mann104-1366/+107
Change-Id: Id73e641499e75bc1afc1dea29682418156f461fe Reviewed-on: https://code.wireshark.org/review/24751 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-10Add support for MongoDB OP_COMPRESSED packetsDerick Rethans1-48/+216
Bug: 14259 Change-Id: Iab6b494bebaa913267f94d41b7950b67dd406cb6 Reviewed-on: https://code.wireshark.org/review/24705 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-10SOCKS: Display right version in pseudo headerUli Heilmeier1-14/+17
Use the previous recorded version as version and set field as generated. Bug: 14262 Change-Id: I0872ed826ccd8a5a1b75b071d810404d08ddc7b3 Reviewed-on: https://code.wireshark.org/review/24741 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-10asterix: wrong presentation of fields I009/080 in CAT009.Marko Hrastovec1-3/+3
Fields I009/080 were wrongly represented for CAT009. 8 and 16 bit long fields were represented as 24 bit. Change-Id: I5bd1c1f006292f58d0290ced80dde22324cb4002 Reviewed-on: https://code.wireshark.org/review/24746 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-10LLDP: Add 802.3 TLV Additional Ethernet Capabilities (Subtype 7)Anton Glukhov1-0/+59
Bug: 14267 Change-Id: I23eb82a2f9bb2d57952f71870cc0fc8f12f036df Signed-off-by: Anton Glukhov <anton.a.glukhov@gmail.com> Reviewed-on: https://code.wireshark.org/review/24735 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-09make-dissectors: Indent and cleanup #includeJoão Valverde1-26/+32
Change-Id: I395d0c168a6ba2fc8fad85598e6355493b897a7a Reviewed-on: https://code.wireshark.org/review/24748 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-09[MIPv6] Fixed IPv4 Home Address OptionMatej Tkac1-1/+0
Change-Id: I1c09ac390d5a40c92fc30cf114a3a13359b46eee Reviewed-on: https://code.wireshark.org/review/24738 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-09Allow switching direction in LTE RLC graphMartin Mathieson6-25/+74
Change-Id: I1681089aebe7f00b2b84ece00c53a3bf8769d50b Reviewed-on: https://code.wireshark.org/review/24682 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2017-12-08Typing error correction for CAT002 settings selection.Marko Hrastovec1-1/+1
Two settings had the same string "Select the CAT001 version". One should be CAT002. Change-Id: Iee6204a1064af786338d1b53c7b983763b985a0c Reviewed-on: https://code.wireshark.org/review/24745 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-08oss-fuzzshark: fix compilation.Jakub Zawadzki1-1/+1
/src/wireshark/tools/oss-fuzzshark/fuzzshark.c:268:58: error: too few arguments to function call, expected 2, have 1 fuzz_handle = get_dissector_handle(FUZZ_DISSECTOR_TARGET); ~~~~~~~~~~~~~~~~~~~~ ^ /src/wireshark/tools/oss-fuzzshark/fuzzshark.c:133:1: note: 'get_dissector_handle' declared here Change-Id: I6c6e25017f0045b833d9249c9648145893fe0439 Reviewed-on: https://code.wireshark.org/review/24742 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2017-12-08Try to fix win32 build, add ui/packet_range.h include.Jakub Zawadzki1-0/+1
add ui/packet_range.h include to try to fix win32 build, compilation log: export_sslkeys.c 99>C:\buildbot\builders\windows-x86-64-petri-dish\windows-x86-64-petri-dish\build\ui/win32/file_dlg_win32.h(73): error C2143: syntax error: missing ')' before '*' (compiling source file C:\buildbot\builders\windows-x86-64-petri-dish\windows-x86-64-petri-dish\build\ui\gtk\export_sslkeys.c) [C:\buildbot\builders\windows-x86-64-petri-dish\windows-x86-64-petri-dish\build\cmbuild\ui\gtk\gtkui.vcxproj] 99>C:\buildbot\builders\windows-x86-64-petri-dish\windows-x86-64-petri-dish\build\ui/win32/file_dlg_win32.h(73): error C2081: 'packet_range_t': name in formal parameter list illegal (compiling source file C:\buildbot\builders\windows-x86-64-petri-dish\windows-x86-64-petri-dish\build\ui\gtk\export_sslkeys.c) [C:\buildbot\builders\windows-x86-64-petri-dish\windows-x86-64-petri-dish\build\cmbuild\ui\gtk\gtkui.vcxproj] 99>C:\buildbot\builders\windows-x86-64-petri-dish\windows-x86-64-petri-dish\build\ui/win32/file_dlg_win32.h(73): error C2143: syntax error: missing '{' before '*' (compiling source file C:\buildbot\builders\windows-x86-64-petri-dish\windows-x86-64-petri-dish\build\ui\gtk\export_sslkeys.c) [C:\buildbot\builders\windows-x86-64-petri-dish\windows-x86-64-petri-dish\build\cmbuild\ui\gtk\gtkui.vcxproj] 99>C:\buildbot\builders\windows-x86-64-petri-dish\windows-x86-64-petri-dish\build\ui/win32/file_dlg_win32.h(73): error C2059: syntax error: ')' (compiling source file C:\buildbot\builders\windows-x86-64-petri-dish\windows-x86-64-petri-dish\build\ui\gtk\export_sslkeys.c) [C:\buildbot\builders\windows-x86-64-petri-dish\windows-x86-64-petri-dish\build\cmbuild\ui\gtk\gtkui.vcxproj] Change-Id: I58c77fdcbe3fe2e738601c4ef97596c7774704ec Reviewed-on: https://code.wireshark.org/review/24743 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2017-12-08[SCTP] Export of reassembled PDU uses wrong tvb.AndersBroman1-1/+1
Change-Id: I87ff6ef54dff5900a4a92406c87693fec6d9f692 Reviewed-on: https://code.wireshark.org/review/24737 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-12-08Have the frame_tvbuff.c routines not use the global cfile.Guy Harris91-104/+259
Have the routines that create them take a pointer to a struct packet_provider_data, store that in the tvbuff data, and use it to get the wtap from which packets are being read. While we're at it, don't include globals.h in any header files, and include it in source files iff the source file actually uses cfile. Add whatever includes that requires. Change-Id: I9f1ee391f951dc427ff62c80f67aa4877a37c229 Reviewed-on: https://code.wireshark.org/review/24733 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-08PROFINET: AdjustMAUType-Extension and CheckMAUTypeExtensionGizem Yurdagül1-2/+75
disections are added. According to specification, AdjustMAUTypeExtension is a subblock for adjusting MAUTypeExtension. CheckMAUTypeExtension is a subblock for checking MAUTypeExtension. Change-Id: Ia90f204887a2e9871bc71e24978ab0095cc0fe1f Reviewed-on: https://code.wireshark.org/review/24718 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Birol Capa <birol.capa@siemens.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-08Hand the packet provider functions to epan_new().Guy Harris12-119/+98
Have separate packet_provider_data structures and packet_provider_funcs structures; the latter holds a table of functions that libwireshark can call for information about packets, the latter holds the data that those functions use. This means we no longer need to expose the structure of an epan_t outside epan/epan.c; get rid of epan/epan-int.h. Change-Id: I381b88993aa19e55720ce02c42ad33738e3f51f4 Reviewed-on: https://code.wireshark.org/review/24732 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-08Move the frame_set stuff back into the capture_file structure.Guy Harris31-406/+391
libwireshark now expects an epan_t to be created with a pointer to a "packet provider" structure; that structure is opaque within libwireshark, and a pointer to it is passed to the callbacks that provide interface names, interface, descriptions, user comments, and packet time stamps, and that set user comments. The code that calls epan_new() is expected to provide those callbacks, and to define the structure, which can be used by the providers. If none of the callbacks need that extra information, the "packet provider" structure can be null. Have a "file" packet provider for all the programs that provide packets from a file. Change-Id: I4b5709a3dd7b098ebd7d2a7d95bcdd7b5903c1a0 Reviewed-on: https://code.wireshark.org/review/24731 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-08sharkd: add sharkd_get_frame() to get frame_data, optimize.Jakub Zawadzki3-20/+23
Add sharkd_get_frame() wrapper to limit number of cfile usage. Don't get frame_data when not needed. Change-Id: I24b96b5b184196e9dbf632c0891b2954c8281eed Reviewed-on: https://code.wireshark.org/review/24728 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-08More QVector fixes.Gerald Combs1-2/+2
Change-Id: I710f9c9d5391a8f1252cc02fdd263a8dfedb31f6 Reviewed-on: https://code.wireshark.org/review/24730 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-12-07Qt: Fix ByteViewText compilation for Qt < 5.5.Gerald Combs1-4/+4
Older versions of Qt don't let you pass a QVector to QVector::append. Change-Id: I58d62c44aa915d4ffb8319e08db85eee069ecbb2 Reviewed-on: https://code.wireshark.org/review/24729 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-12-07Add fuzzshark to cmake/autotools.Jakub Zawadzki7-21/+228
Add fuzzshark target to make sure that oss-fuzzshark always build. Change-Id: I802b679c18023daa1475a54bae722b5e90c72a59 Reviewed-on: https://code.wireshark.org/review/24716 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-12-07sharkd: fix coding style.Jakub Zawadzki1-11/+14
Change-Id: I62ff3f358d1efa3065077b0a913ba614f67f3fd7 Reviewed-on: https://code.wireshark.org/review/24727 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2017-12-07wsjsmn: use SPDX identifier.Dario Lombardo2-26/+2
Change-Id: Iefdfd06b3b063a0d497587142996f2cd986d413f Reviewed-on: https://code.wireshark.org/review/24724 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-07Qt: Use QTextLayout in ByteViewText.Gerald Combs8-350/+261
Use QTextLayout to draw each line in ByteViewText instead of drawing fragments ourselves. Build our pixel-to-byte-offset map when we draw our first line, which should hopefully make it more accurate. This should fix layout and hover issues on some systems. Start moving common code to DataPrinter. Mark prefs.gui_hex_dump_highlight_style GTK+ only. Bug: 11844 Change-Id: Ifda16ae7dc1a5ea22570c0bfd0eb20cee621bfc9 Reviewed-on: https://code.wireshark.org/review/24717 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2017-12-07transum(plugins): no previous prototype for function 'is_dcerpc_stream' ↵Alexis La Goutte1-1/+1
[-Wmissing-prototypes] Change-Id: I3f60eae17b305e2d8982bba5f56d41121676555c Reviewed-on: https://code.wireshark.org/review/24723 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-07mongo: Fix Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-1/+1
Change-Id: I60ee2a37ff166b80ce11cf1c12e9c575bba85529 Reviewed-on: https://code.wireshark.org/review/24722 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Derick Rethans <github@derickrethans.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-06profinet: removed unused var.Dario Lombardo1-10/+0
Some compilers complain about it: - clang (all) - gcc 6 - gcc 7 ../plugins/profinet/packet-dcerpc-pn-io.c:2608:27: error: unused variable 'pn_io_mau_type_extension' [-Werror,-Wunused-const-variable] static const range_string pn_io_mau_type_extension[] = { Change-Id: Iaffdad31c4ecd7459d07a74e3e2665058c9ff9ba Reviewed-on: https://code.wireshark.org/review/24715 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-06frame user comments: move to epan, add support for user comments in sharkd.Jakub Zawadzki6-43/+98
Change-Id: Id15edc60177b160fd09cae99de1c9e01e17d9421 Reviewed-on: https://code.wireshark.org/review/24714 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-06oss-fuzzshark: fix handler of epan->get_frame_ts to fix build.Jakub Zawadzki1-1/+1
Fix oss-fuzzshark build after [1834dca3654ccec238bae130715871be3d8fa344]: Move the parts of a capture_file used by libwireshark to a new structure. I really need to integrate oss-fuzzshark with build system... Change-Id: I75595db392acfbdb7885975e458d8b434830cfec Reviewed-on: https://code.wireshark.org/review/24713 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2017-12-06netlink-netfilter: Add NFQA_CT and NFEXP conntrack dissectorsKevin Cernekee1-4/+813
Add support for the netlink messages used by userspace conntrack helpers. Change-Id: I37d3829399834f578a0ab0f08eab99f119445ff5 Reviewed-on: https://code.wireshark.org/review/24695 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-06PROFINET: AdjustPeerToPeerBoundary disection is added.gizem.yurdagul1-1/+109
According to specification, AdjustPeerToPeerBoundary is a subblock for adjusting the peer to peer boundary. Change-Id: I4036aa08509300e0b8533c94b991c9a21077f634 Reviewed-on: https://code.wireshark.org/review/24710 Reviewed-by: Birol Capa <birol.capa@siemens.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-06Qt: Speed up the splash overlay.Gerald Combs5-79/+95
Instead of blurring the main welcome screen during startup, draw a dark band under the progress bar. This reduces the startup time a bit here. Port over a date check from the GTK+ UI. Change-Id: I997d0fd2e4320702fe85ee2aea02ce835a423df9 Reviewed-on: https://code.wireshark.org/review/24711 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-05Convert the file set dialog treewidget to a treeview+model.Gerald Combs10-165/+357
Add a FilesetEntryModel and use it in FileSetDialog. This should be faster than using a QTreeWidget. Move dialog updates and date calculations out of the "add file" loop. Bug: 11280 Bug: 14242 Change-Id: I702cef4fe91e739695fe805dc5e496bf3db411f1 Reviewed-on: https://code.wireshark.org/review/24708 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-12-05[profile.c] glist_fre_full() is 2.28, include glib-compat.hAndersBroman1-0/+1
Change-Id: I4b4e39de55a30352aa965653bcdf2429efb9e146 Reviewed-on: https://code.wireshark.org/review/24709 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-05dumpcap.c: cap_pipe_read() returns a ssize_t whatever the platform (CID 1424899)Pascal Quantin1-4/+6
Change-Id: I9c157e1ed7264d787c26ca60bbbe32edfc99bff8 Reviewed-on: https://code.wireshark.org/review/24706 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-04Fix loop bounds check.Guy Harris1-2/+2
Fix indentation while we're at it. Change-Id: If8acaa944fd4c1aae848faa3a99f7566e003e801 Reviewed-on: https://code.wireshark.org/review/24707 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-04Use g_list_prepend() it's faster.AndersBroman3-4/+7
Change-Id: I950901c56df230826a6011a6dcf34195b11fa61a Reviewed-on: https://code.wireshark.org/review/24702 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-04DOCSIS: Fixing typosBruno Verstuyft1-3/+3
Change-Id: I25684534dee48158ea0cc1e960808e30cc1376d5 Reviewed-on: https://code.wireshark.org/review/24701 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-04[decode_as.c] Use g_list_prepend() insted of g_list_append, it's faster.AndersBroman1-1/+1
Change-Id: I56c4a7948da48d02c81c5cf30187a6eeb973db77 Reviewed-on: https://code.wireshark.org/review/24700 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-04[tap-rtp-common.c] Change g_list_append() to g_list_prepend().AndersBroman1-1/+1
Change-Id: I6ecc6658f75056db55dc68497956019a52fad0e6 Reviewed-on: https://code.wireshark.org/review/24699 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-04make-dissectors: Fix null pointer dereference for error conditionJoão Valverde1-1/+1
Found by scan-build. Change-Id: I89b56bac951ccb7054d494592928306a860f9e5e Reviewed-on: https://code.wireshark.org/review/24697 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-04tshark: fix pdml export for LUA casesPavel Strnad1-0/+2
- bug fix for wrong level introduced in SHA-1:b8ead953 - fix indent for Close off fake wrapper protocol Change-Id: Iccb10af8f3ac1604fc5582d730f2fd39ffaeb1c0 Reviewed-on: https://code.wireshark.org/review/24681 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-12-04Let a "past the on-the-network length" exception terminate dissection.Guy Harris1-5/+5
Don't make sure we have the full server entry before trying to dissect it; that way, a malformed frame that was really too short on the network (as opposed to being cut short by a snapshot length) will get reported as such. Change-Id: Ib7f0d909645a698162ebcd9b3fe8dd2d520983b7 Reviewed-on: https://code.wireshark.org/review/24696 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-04RTPS: Added new PIDs to SecurityJuanjo Martin2-4/+220
Change-Id: I91ffb48ac5435d4eb45b60f8083762b2151de2c3 Reviewed-on: https://code.wireshark.org/review/24671 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-04Show retx prev and next framenum types as chevronsMartin Mathieson3-3/+37
Change-Id: I1641c70130a7562db9ea099770d8b5a7fe6e5532 Reviewed-on: https://code.wireshark.org/review/24676 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-04RLC LTE graph: add comments clarifying tracer limitationMartin Mathieson1-0/+5
Change-Id: Ib6a79689ced9377b1ac00513810db2e86d26d83f Reviewed-on: https://code.wireshark.org/review/24690 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-04Get rid of cfile-int.h.Guy Harris1-35/+0
Change-Id: I6e2349a082e542e4020afafe4cf65b596259e868 Reviewed-on: https://code.wireshark.org/review/24694 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-04Put the structure of a capture_file back in cfile.h.Guy Harris59-152/+68
The split isn't necessary now that epan no longer uses the capture_file structure. Change-Id: Ia232712a2fb5db511865805518e8d03509b2167f Reviewed-on: https://code.wireshark.org/review/24693 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-04Move the parts of a capture_file used by libwireshark to a new structure.Guy Harris29-417/+450
Embed one of those structures in a capture_file, and have a struct epan_session point to that structure rather than to a capture_file. Pass that structure to the routines that fetch data that libwireshark uses when dissecting. That separates the stuff that libwireshark expects from the stuff that it doesn't look at. Change-Id: Ia3cd28efb9622476437a2ce32204597fae720877 Reviewed-on: https://code.wireshark.org/review/24692 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-04Use cfile fields for some frame_data pointers.Guy Harris4-99/+88
Those fields weren't being used in TShark/TFShark/rawshark/sharkd, so we can use them, instead of defining our own static variables. This makes the non-Wireshark code paths a bit more like the Wireshark code paths. Change-Id: I55da4cf525e37598f314efca22f20d3e80cb547c Reviewed-on: https://code.wireshark.org/review/24691 Reviewed-by: Guy Harris <guy@alum.mit.edu>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-22 16:15:56 +0000