summaryrefslogtreecommitdiff
path: root/debian
AgeCommit message (Collapse)AuthorFilesLines
2015-11-26Remove create_dissector_handleMichael Mann1-1/+0
Change-Id: I1ad7c112eda45a41c3f94b04348e328d44d8f585 Reviewed-on: https://code.wireshark.org/review/12152 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-25Require BER dissector (OID) registration to be "new style".Michael Mann1-2/+0
Both old and new style API existed, just remove the "old" one. Change-Id: If725e778a0ecad5a431d634ed5c4856b4a281013 Reviewed-on: https://code.wireshark.org/review/12107 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-24Remove support for "old style" dissectors in PER API.Michael Mann1-3/+0
Most of it wasn't used in current Wireshark source anyway. Change-Id: If395e4e940adc76a2701d226ba4f7c9b17cb795d Reviewed-on: https://code.wireshark.org/review/12108 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-24Remove register_dissector.Michael Mann1-1/+0
new_register_dissector will eventually take its place, but that search/replace should be done when all "old style" APIs have been removed. Change-Id: Ic3fdec67d5761fd72beeca7355f9de617562bb77 Reviewed-on: https://code.wireshark.org/review/12095 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-23Qt: Set tooltip for packet list headerStig Bjørlykke1-0/+1
Added get_column_tooltip() to use common code in GTK and Qt. Change-Id: I2f6ce95e2e129752bbb958a28aec6f42aa81be3d Reviewed-on: https://code.wireshark.org/review/12047 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-21Lua: Validate Proto() argumentsStig Bjørlykke1-0/+1
Check if description (protocol name) and short_name are used before registering the protocol. This because proto_register_protocol() makes sure there's not already a protocol with any of the names registered and duplicates will be reported with a g_error() which terminates the Wireshark unexpectedly. Also check if short_name contains valid characters. Give appropriate error messages. Bug: 11739 Change-Id: Ib9776a2a3406ae5278ce744defd61864ebed0282 Reviewed-on: https://code.wireshark.org/review/11995 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-11-20Bluetooth: Add ability to add custom UUID descriptionMichal Labedzki1-1/+2
Some vendors use UUID128 as own services/attributes. Sometimes they use UUID16 for it too. Support both cases. Change-Id: I001692b94fcc2f86eafa81012790e9134b0f2a36 Reviewed-on: https://code.wireshark.org/review/11976 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-11-19extcap: add sshdump.Dario Lombardo1-0/+1
sshdump is an extcap module that allows dumping from a remote host using an ssh connection. It goes with the existing extcap plugin interface. Change-Id: I8987614fdd817b8173a50130812bc643a4833bca Reviewed-on: https://code.wireshark.org/review/11402 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-17debian: Don't ship unused duplicated images for guidesBalint Reczey1-2/+0
Change-Id: I815e4600de2e0c075eabec79e27a4a36e8e4e09e Reviewed-on: https://code.wireshark.org/review/11861 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2015-11-11Make routines used only within wiretap/merge.c static.Guy Harris1-6/+0
We just export some UI helpers and the Big Merge Engine. Change-Id: I60bc8ab167e7100189a9ce60d84c0e4db27b6bda Reviewed-on: https://code.wireshark.org/review/11689 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-11debian: Move icon and mime info file to wireshark-commonBalint Reczey3-5/+3
Change-Id: I4d8660b36810baa95f8b300af9790778dcba83a8 Reviewed-on: https://code.wireshark.org/review/11697 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2015-11-11GTK: Add separate working desktop file for GTK+ Wireshark GUIBalint Reczey1-1/+1
Change-Id: I52a749b7e2b9a4a5cb2968409e140b9d5f2002f6 Reviewed-on: https://code.wireshark.org/review/11696 Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2015-11-11debian: Ship wireshark.desktop file in wireshark-qtBalint Reczey1-1/+4
Change-Id: Idbf77e6a613c79e267f41d3e9d3c05617e9c6d99 Reviewed-on: https://code.wireshark.org/review/11695 Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2015-11-11debian: Ship wireshark.1 in the package we ship /usr/bin/wiresharkBalint Reczey1-0/+0
Change-Id: I7935f412092d6dbb0f545803d82d9b42dfe5a638 Reviewed-on: https://code.wireshark.org/review/11694 Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2015-11-11debian: Finish postinst of wireshark-common even when wireshark group is a ↵Balint Reczey1-5/+8
user group Failing postinst has been reported several times under LP#1447893 Change-Id: I196f246b34aa3be9d53f02b4e0092c802effc42a Reviewed-on: https://code.wireshark.org/review/11693 Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2015-11-11debian: Add note to README.Debian to log in again to be able to capture packetsBalint Reczey1-1/+3
Change-Id: Ifae1223d34f7ae071484fe47d1c88de166ed84ca Reviewed-on: https://code.wireshark.org/review/11692 Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2015-11-11debian: Drop menu supportBalint Reczey3-8/+0
Debian is migrating away from the Debian Menu system to adopt Freedesktop Desktop Entry Specification instead. (.desktop files) Packages providing .desktop files should not provide menu files. https://lists.debian.org/debian-devel-announce/2015/09/msg00000.html Change-Id: I862deee870e9697c590a8323ba8ae2da892b7bb1 Reviewed-on: https://code.wireshark.org/review/11691 Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2015-11-11Additional 2.1 symbols.Guy Harris1-0/+8
Change-Id: Icf5d218e3e0a3336c80e04ed51a1ef5262cc9f28 Reviewed-on: https://code.wireshark.org/review/11711 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-10New 2.0 symbols.Guy Harris3-0/+6
Change-Id: Ie85ac43891c5587b0998e26da683ef275b631657 Reviewed-on: https://code.wireshark.org/review/11706 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-07column-utils: Refactor col_append_port() to col_append_ports()João Valverde1-1/+1
Having a single function call to format source-destination port column info serves the current (and presently only) use case better by having a single place to manage the display format. This commit does not introduce any actual formatting changes. Change-Id: I1d479d0fd5690d12afb47e538057fdc2dd369ca2 Reviewed-on: https://code.wireshark.org/review/11539 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-07Create real dissector tables for SSL and DTLS to use.Michael Mann1-2/+2
Since ssl_dissector_[add|delete] only take TCP dissectors, remove the parameter and just use it within the "internal" ssl_association_add call. Change-Id: I0fdf941389934c20cbacf910250e17520614e706 Reviewed-on: https://code.wireshark.org/review/11591 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-04Refactor DCE/RPC dissection to include a real dissector table.Michael Mann1-1/+0
This is hopefully just the first step in getting DCE/RPC dissection to use "standard" APIs instead of homegrown ones. For starters, it allows Decode As functionality to be less hacky (although incomplete in Qt) Change-Id: Ia0923a3d8d514ab7acce32e26ee7e08f6e24feca Reviewed-on: https://code.wireshark.org/review/11468 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-29Use "2.0.0" for symbols that are in 2.0.Guy Harris1-18/+18
Change-Id: Ie8c6206f0761310a6bb101d10b981b9f917116b2 Reviewed-on: https://code.wireshark.org/review/11389 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-29Update symbol list.Guy Harris1-4/+26
Change-Id: Id3c275c2c3e15bb54f8b30423c990ca78fc94d32 Reviewed-on: https://code.wireshark.org/review/11387 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-27Replace all "dissector filter" registrations with "dissector color filter" ↵Michael Mann1-2/+0
registration. In the GTK, there was "colorize" (via context menu using color_dissector_filter.{c,h}) or "not colorize" (via main menu using dissector_filters.{c,h}). In Qt, you have the option to colorize (via context menu using color_dissector_filter.{c,h}) or not colorize (via main menu using color_dissector_filter.{c,h}). Combine all into "colorize" and convert GTK to use color_dissector_filter.{c,h} in the "not colorize" main menu like Qt. Change-Id: Ib3ca1c822f5f66ab5b812632d808f7905b328483 Reviewed-on: https://code.wireshark.org/review/11263 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-25[Automatic update for 2015-10-25]Gerald Combs19-19/+19
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I84cf4d6acbcadc10c3d0f404cdcc7024ddee6ec5 Reviewed-on: https://code.wireshark.org/review/11264 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-15Remove ability to make dissectors "private"Michael Mann1-2/+0
Change-Id: If5897e8137f729503edf2cafb49b2ebeab4716ad Reviewed-on: https://code.wireshark.org/review/10997 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-10-09airpdcap: add free_key_string function, fix memleaksPeter Wu1-0/+1
Do not leak the key and SSID. Note that there are still some leaks in the GTK UI related to get_wireshark_keys(), but I did not track them down. Caught by LeakSanitizer. Change-Id: I639166e6ea457605d6ae0ebd58e56d7594a7b7db Reviewed-on: https://code.wireshark.org/review/10860 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-10-05debian: Build .debs with Qt 5Balint Reczey2-3/+3
Change-Id: I085d5332a0a1c8151b5781c0a94cffe2fe32aeb7 Reviewed-on: https://code.wireshark.org/review/10800 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Balint Reczey <balint@balintreczey.hu> Tested-by: Balint Reczey <balint@balintreczey.hu> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
2015-10-05Initialize 2.1.Gerald Combs1-1/+1
Change-Id: I515c53bb56cf82d1911b58f2cb2103afd0e597a5 Reviewed-on: https://code.wireshark.org/review/10810 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-09-28debian: Enable parallel package buildBalint Reczey1-1/+1
Debian packages used to build with parallel build enabled when debian/rules used autotools but with switching to CMake the parallel build failed sometimes. Now the CMake based build system seems to be working for parallel builds, too, thus it seems to be safe to enable parallel building of .debs again. Change-Id: I79003bf6c4b74640f24d907b763a5cc3da595e68 Reviewed-on: https://code.wireshark.org/review/10657 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-09-27debian: Show hardening results after buildBalint Reczey2-1/+4
Change-Id: I121d264b86ecf9e0607e6fe00c2791a91d8fe974 Reviewed-on: https://code.wireshark.org/review/10656 Reviewed-by: Balint Reczey <balint@balintreczey.hu> Petri-Dish: Balint Reczey <balint@balintreczey.hu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-09-25Export all hardening options in .deb packagesBalint Reczey1-0/+2
Change-Id: I0448e564305ce78dee4ec364007e0162c6f74c09 Reviewed-on: https://code.wireshark.org/review/10644 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2015-09-21Remove proto_tree_add_text API.Michael Mann1-1/+0
Its time has finally come. Technically I just renamed it to proto_tree_add_text_internal and removed the WS_DLL_PUBLIC (so it shouldn't link outside of epan). It's still (legitimately) used by expert.c otherwise I would have made it static within proto.c (and the rename wouldn't have been necessary). Change-Id: I9bdf888d5e92bc7b70a3f5461b9297a66d994b80 Reviewed-on: https://code.wireshark.org/review/10594 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2015-09-13Make other_decode_bitfield_value private to proto.c.Michael Mann1-1/+0
This is further encouragement to not try to manually create a bitstring while formatting a field. Change-Id: I4efbeb39a210cf1fd26203cd8560859276b333b0 Reviewed-on: https://code.wireshark.org/review/10494 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-09-08Add API to expose "expert info" summary.Michael Mann1-0/+1
This is intended for use in expert_add_info_format or proto_tree_add_expert_format to get the "base" string to then append additional information, but I'm sure other uses can be found. Similar to some of the proto_get_xxx APIs, but still only "create as needed". Change-Id: Ib76e6ed557c2ae41e0a40957a9efa4bf485909da Reviewed-on: https://code.wireshark.org/review/10420 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-09-021.99.9 → 1.99.10.Gerald Combs1-1/+1
Change-Id: I924be5b0e3c73a0bb8ae1361fa518ec10139e13d Reviewed-on: https://code.wireshark.org/review/10363 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-08-22Add the display filter macros dialog.Gerald Combs1-1/+0
Add some missing functionality to UatDialog. Remove what appears to be unused dfilter macro code. Change-Id: I8a8d6358523f24d5ddfe953d7741fe9af25d98eb Reviewed-on: https://code.wireshark.org/review/10187 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-08-21Fix memory leaks of dumper SHB and IDB infosHadriel Kaplan1-2/+3
Change-Id: I6b81d3e853d503c6a81f9793957b48ab34c6808c Reviewed-on: https://code.wireshark.org/review/10156 Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-19Use system's GeoIP database by default on DebianBalint Reczey3-0/+3
Change-Id: I58c1cbb242c20737dd16a0477858b0225c0b5d14 Reviewed-on: https://code.wireshark.org/review/10051 Petri-Dish: Balint Reczey <balint@balintreczey.hu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2015-08-19Use system's OpenLayers.js on DebianBalint Reczey3-7/+19
Change-Id: Id790ee61d3443e2f96a83260514fa3a6d31d09da Reviewed-on: https://code.wireshark.org/review/10050 Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2015-08-19capinfos: add more info about file and interfacesHadriel Kaplan1-0/+1
Add more information about the capture file, and about the interface descriptions in it. Also remove long-unused g_options code. Change-Id: I93cbd70fc7b09ec1b8b2fd6c85bb885c7f749543 Reviewed-on: https://code.wireshark.org/review/10073 Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-18Improve file merging for mergecap and wiresharkHadriel Kaplan1-0/+4
Refactor the file merging code by removing the duplicate logic from mergecap.c and file.c's cf_merge_files(), into a new merge_files() function in merge.c. Also the following user-visible changes: * Removed the '-T' encap type option from mergecap, as it's illogical for mergecap and would complicate common merge code. * Input files with IDBs of different name, speed, tsprecision, etc., will produce an output PCAPNG file with separate IDBs, even if their encap types are the same. * Added a '-I' IDB merge mode option for mergecap, to control how IDBs are merged. * Changed Wireshark's drag-and-drop merging to use PCAPNG instead of PCAP. Bug: 8795 Bug: 7381 Change-Id: Icc30d217e093d6f40114422204afd2e332834f71 Reviewed-on: https://code.wireshark.org/review/10058 Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-18Add udp_dissect_pdus.Michael Mann1-0/+1
It works similar to tcp_dissect_pdus, but only works on a single packet. Intended for protocols that go over TCP and UDP so that they can have a common dissection function. Will of course, also work on UDP-only protocols with a fixed length header and size. Used DNP3 as a guinea pig since "multiple PDU support" over UDP was just added. Change-Id: Ib7af8eaf7102c96b4f8b5c1b891ae2d8f0886f9d Reviewed-on: https://code.wireshark.org/review/10083 Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Reviewed-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-18Pcapng: clean up Section Header Block handlingHadriel Kaplan1-1/+4
Change-Id: I8516d0c561ed0b63e49a3594027c9c15bb789258 Reviewed-on: https://code.wireshark.org/review/9726 Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-15Fix for the current wireshark.desktop.Guy Harris1-2/+2
The default version doesn't use GTK+ any more, so the version we distribute doesn't have "Categories=System;Monitor;GTK;", and the Debian version presumably shouldn't put it into category "GNOME". Change-Id: I4e59026b5c4f26d02e4a96686e339f8d54bdcd1e Reviewed-on: https://code.wireshark.org/review/10035 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-08-11Added Reload Lua plugins.Stig Bjørlykke1-3/+14
This is initial support for reloading Lua plugins without restarting the application. Still todo: - Deregister FileHandlers - Support deregister ProtoField with existing abbrev (same_name_hfinfo) - Add a progress dialog when reloading many plugins - Search for memory leakages in wslua functions Change-Id: I48870d8741251705ca15ffe1068613fcb0cb18c1 Reviewed-on: https://code.wireshark.org/review/5028 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-08-09[Automatic update for 2015-08-09]Gerald Combs19-19/+19
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I14806e32e93b7f189ccc68834afa4645bda3e1aa Reviewed-on: https://code.wireshark.org/review/9942 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-08-06Fixup stat_tap table freeing.Gerald Combs1-1/+1
As it turns out we *do* need to free table elements. We also need to free the tables themselves and clear the table array. Do so. Change-Id: Ic1c81388eac8f47f74caea0169c79685a83aaff9 Reviewed-on: https://code.wireshark.org/review/9901 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-08-06Pcapng: support Name Resolution Block optionsHadriel Kaplan1-0/+4
Make pcapng decode options in an NRB during read, and store the comment option, and write it back out as well. Also make it handle plugin handlers for unknown options in received NRB(s). Change-Id: I81863ef8d85cb1c8b5ba6673ba0e562efe77714f Reviewed-on: https://code.wireshark.org/review/9723 Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-02 15:02:32 +0000