aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
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>
2017-12-03This also looks inside a capture_file structure.Guy Harris1-0/+1
Change-Id: I6c4de5212028643fa34c5d939608b592f554f2bd Reviewed-on: https://code.wireshark.org/review/24689 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-03Clean up dissection of server entries in SAP responses.Guy Harris1-19/+52
Have the top-level protocol tree item for a server entry cover the entire entry, rather than just the server name. Have the server name be just another entry under that top-level item. Change-Id: I8089f3e132a0f388c87ba04caa3d15f5146c2303 Reviewed-on: https://code.wireshark.org/review/24688 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-03Add cfile-int.h.Guy Harris2-0/+110
Change-Id: I6132dc0322d3ac85e89ac853ab6139244d610dd5 Reviewed-on: https://code.wireshark.org/review/24687 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-03Use cfile.h to define the capture_file type.Guy Harris72-120/+141
Have cfile-int.h declare the structure, and use it in files that directly access the structure. Have cfile.h just incompletely declare the structure and include it rather than explicitly declaring it in source files or other header files. Never directly refer to struct _capture_file except when typedeffing capture_file. Add #includes as necessary, now that cfile.h doesn't drag in a ton of Change-Id: I7931c8039d75ff7c980b0f2a6e221f20e602a556 Reviewed-on: https://code.wireshark.org/review/24686 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-03[Automatic update for 2017-12-03]Gerald Combs13-78/+348
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I4a3a5f62e5024a4df19c12296ddd67012c9ff5c7 Reviewed-on: https://code.wireshark.org/review/24683 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-12-03Fix the configuration check for remote-capture support in libpcap.Guy Harris2-2/+48
In autotools, if we find pcap_open(), define HAVE_PCAP_REMOTE, so we build the remote capture support. In both autotools and CMake, only check for pcap_setsampling() if we have pcap_open(), as the compile fails if we have pcap_setsampling() but don't have remote capture. Change-Id: I0e7b78a2d372ea658a19ed2f6493532928c36872 Reviewed-on: https://code.wireshark.org/review/24680 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-03LDP: Add support for MP2MP FECUli Heilmeier1-0/+2
As stated in https://tools.ietf.org/html/rfc6388#section-3.2 MP2MP uses the same structure as the P2MP FEC element. Bug: 13171 Change-Id: Ia619deac6075f5eb27dff2144edbbb60b440cc46 Reviewed-on: https://code.wireshark.org/review/24677 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-01MPLS: Add Media Access Control (MAC) Address Withdrawal over Static ↵Alexis La Goutte5-0/+264
Pseudowire (RFC 7769 Bug: 14208 Change-Id: I80beda971b3727566c107dba0efdee0291529c42 Reviewed-on: https://code.wireshark.org/review/24560 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Francesco Fondelli <francesco.fondelli@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-01PROFINET: AdjustDCPBoundary disection is added.gizem.yurdagul1-1/+79
According to specification, AdjustDCPBoundary is a sub block for adjusting the DCP boundary. Change-Id: I2515e2b3592ff0e5e67487b1785db41015964b21 Reviewed-on: https://code.wireshark.org/review/24673 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>
2017-12-01Get rid of some void pointers.Gerald Combs10-39/+29
Explictly struct _capture_file * in epan_session and its callbacks. Change-Id: I63703015c661a08f3350a7448a7bcdaf98f119dc Reviewed-on: https://code.wireshark.org/review/24675 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>
2017-12-01TDS: Improve TDS7 Prelogin request/response handlingCraig Jackson1-77/+112
- Fix detection of TDS7 Prelogin responses to have fewer false positives. This was causing regular responses to be recognized as Prelogin responses if they happened to begin with a DONEINPROC token. - Define symbolic constents for the Prelogin options. - Apply the version_convert processing to the relevant prelogin options as well as to the loginack_progversion. - Correct the display of the program version in version_convert. - Factor out the setting of tds7_version so it can be called from the dissect_tds7_login as well as dissect_tds_login_ack_token. This is needed to correctly handle tokens which come before the loginack token in the login response. - Fix the wording of a comment in my last commit. Change-Id: I57615bbb1e780db37cda25d8d5d7f964f68b337e Reviewed-on: https://code.wireshark.org/review/24664 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-12-01ZigBee: Correct Smart Energy Publish Block Thresholds and endianessKenneth Soerensen1-8/+13
Change-Id: I1007fdff01b370c06a8ccfb1145fd162ffde9a94 Reviewed-on: https://code.wireshark.org/review/24674 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-12-01RTPS: Fixed a quick typo in a hf itemJuanjo Martin1-1/+1
Change-Id: I71315900a4fd5130ab051854bc70dbc4ba9afc2b Reviewed-on: https://code.wireshark.org/review/24672 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-01[glib-compat] #include "ws_attributes.h" needed to handle _U_AndersBroman1-0/+2
Change-Id: Ie7aa8ef0a2ec8e65947e214488809d0df0ee015b Reviewed-on: https://code.wireshark.org/review/24670 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-01dumpcap: enable capture of pcapng from pipeJames Ko4-116/+792
Reads pcapng blocks from a pipe. Section header blocks are parsed for endianess. All other blocks only have the general block header parsed for type and length, and then endianess converted if necessary. Outputs all blocks using the original endianess format so none of the other block types or options require parsing. Change-Id: I2f4f0175013d8fc2cda42a63e7deacad537951e3 Bug: 11370 Reviewed-on: https://code.wireshark.org/review/24536 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-30RRC: Improve C-RNTI resolvingDarien Spencer7-42/+54
Now also trying to resolve C-RNTIs in FACH from the global RNTIs map Change-Id: If9ce5b73d6855271c15001fd73d8acaaaf9d1864 Reviewed-on: https://code.wireshark.org/review/24665 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-11-30packet-rsl.c: Use value-string in RXLEV and RXQUAL fieldsPau Espin Pedrol4-16/+17
RXLEV and RXQUAL fields in RSL "Uplink Measurements" use same scale format (0-63, 0-7) as RXLEV and RXQUAL in RR. RXQUAL value-string is moved to packet-gsm_a_common.c in order to use it in both protocols. Change-Id: Idadd9505225353fec76b9605e2045a5222669475 Reviewed-on: https://code.wireshark.org/review/24663 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-11-30rrc: Remove unused GTreeDarien Spencer4-25/+7
Change-Id: I137ac55cd99e659db9d9a496cc82f4427300765d Reviewed-on: https://code.wireshark.org/review/24662 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 13:29:31 +0000