aboutsummaryrefslogtreecommitdiffstats
path: root/debian
AgeCommit message (Collapse)AuthorFilesLines
2015-12-18prefs_register_modules() is used only in epan/prefs.c; make it static.Guy Harris1-1/+0
Change-Id: If2a5ad5c836c5dfddb4f6c4ffa41c52e52f2b671 Reviewed-on: https://code.wireshark.org/review/12717 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-18debian: Fix .deb package generation on wheezyBalint Reczey2-1/+9
Bug: 11901 Change-Id: Id2bfd33d05e74d197832af21a4ac701e0d84ab50 Reviewed-on: https://code.wireshark.org/review/12709 Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2015-12-16debian: Sync patches with DebianBalint Reczey7-14/+42
Change-Id: Iec369a7c5ecd559310198efca2cadb56a449de49 Reviewed-on: https://code.wireshark.org/review/12662 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-13Create a way to register "capture" dissectors.Michael Mann1-26/+0
Capture dissectors could be architected like dissection dissectors, with tables and subtables and possibly using tvbs to pass there data instead of raw byte arrays. This is a first step towards that by refactoring capture_info_packet() to work off of a "capture dissector table" Registering the capture dissection functions instead of calling them directly also clears up a bunch of dissector header files who sole purpose was providing the capture dissection function definition. Change-Id: I10e9b79e061f32d2572f009823601d4f048d37aa Reviewed-on: https://code.wireshark.org/review/12581 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-12-11epan: Don't export deregister functionsStig Bjørlykke1-8/+0
Most of the deregister functions are used internally from Lua while reloading plugins. Don't export them for others to use. Change-Id: I919dbfa807f696c38d409ca7206104a0fba1ae65 Reviewed-on: https://code.wireshark.org/review/12508 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-12-10Convert ASN.1 dissectors to remove "new" from "new-style" dissector function ↵Michael Mann1-2/+2
names that were generated from asn2wrs.py This includes: 1. new_create_dissector_handle -> create_dissector_handle 2. new_register_dissector -> register_dissector 3. new_register_ber_oid_dissector -> register_ber_oid_dissector 4. new_register_ber_syntax_dissector -> register_ber_syntax_dissector Also remove PDU_NEW, SYNTAX_NEW and REGISTER_NEW as there is no need for the distinction anymore. Change-Id: I82c7de7c8ffeeab3259d1b55bb4afc5f6a1e0329 Reviewed-on: https://code.wireshark.org/review/12491 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-10debian: Build-depend on qtmultimedia5-dev and libqt5svg5-dev to enable more ↵Balint Reczey1-0/+1
Qt features Change-Id: I14ff81898cd9154805d35ab67976b354e50fbe16 Reviewed-on: https://code.wireshark.org/review/12471 Reviewed-by: Balint Reczey <balint@balintreczey.hu> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
2015-12-09debian: Make wireshark meta-package depend on Qt _or_ GTK+ UIBalint Reczey1-1/+1
Change-Id: I0a6df7bd3b738125dd83be15d7a0e36e2396cc3d Reviewed-on: https://code.wireshark.org/review/12472 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2015-12-06debian: Merge multiple small packaging fixes from DebianBalint Reczey2-12/+16
* Ask user during installation if she/he wants to allow regular users to capture packets * Fix minor typos in d/control * Handle upgrades from older versions properly * Make wireshark depend on misc:Depends * Sync order of some fields Change-Id: I608b43cfaa81799f165f4c39734182d41cb1d524 Reviewed-on: https://code.wireshark.org/review/12448 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-12-04[packet-h] Add defines to make it possible to convert functions prefixedAndersBroman1-3/+3
with new_ to plain function names without changing all at the same time. Change-Id: I52682996704ff2472c9830bb62fda2a3cbef6589 Reviewed-on: https://code.wireshark.org/review/12401 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-03Change codecs from static to dynamic libraryPascal Quantin3-1/+45
This allows to properly register codecs plugins. See https://www.wireshark.org/lists/wireshark-dev/201511/msg00202.html for details. Change-Id: Ibc13a19936abb7a2e81b86582a75fa424351565b Reviewed-on: https://code.wireshark.org/review/12385 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 15:57:21 +0000