aboutsummaryrefslogtreecommitdiffstats
path: root/debian
AgeCommit message (Collapse)AuthorFilesLines
2019-01-04CRC6: Fixed CRC lookup table and functionsRoss1-2/+1
* Generated code and 256-element lookup table with pycrc * Combined 2 crc6 functions which both have same poly 0x6f and lookup table * Using the example file from the bug report, $ tshark -r ~/Downloads/M1_header_crc.pcapng -V | grep "Calculated CRC" 1101 00.. = Header CRC: 0x34 [Calculated CRC 0x34] Header and Calculated CRC are now both 0x34 (correct value) * pycrc settings for generation: $ python pycrc.py --reflect-in False \ --reflect-out False \ --xor-in 0 \ --xor-out 0 \ --algorithm table-driven --width 6 \ --poly 0x2f * To manually check 3GPP protocol header CRCs, use above command with flag --check-hexstring=<HEADER HEX> Bug: 14875 Change-Id: I283f52fcae10b2f92f107df6988629d49d692428 Reviewed-on: https://code.wireshark.org/review/31356 Reviewed-by: Ross Jacobs <rossbjacobs@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-03debian: update symbols.Dario Lombardo1-0/+1
Change-Id: I550dd3b6bdf29cb8c5a80ba8d08b29ffbe3246cd Reviewed-on: https://code.wireshark.org/review/31321 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-01Move some command-line-oriented routines from wsutil to ui.Guy Harris1-8/+0
cmdarg_err() is for reporting errors for command-line programs and command-line errors in GUI programs; it's not something for any of the Wireshark libraries to use. The various routines for parsing numerical command-line arguments are not for general use, they're just for use when parsing arguments. Change-Id: I100bd4a55ab8ee4497f41d9651b0c5670e6c1e7f Reviewed-on: https://code.wireshark.org/review/31281 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-01-01Add some new symbols.Guy Harris1-0/+4
Change-Id: I1652b4357ca93913696a89a9254e4bfe9c2484b7 Reviewed-on: https://code.wireshark.org/review/31282 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-12-28Allow floating point values for stats_treeMichael Mann1-1/+2
Bug: 4234 Change-Id: Ibd59809b2dd9890a7851eb57ef7af384e280a74b Reviewed-on: https://code.wireshark.org/review/31222 Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-12-27json_dumper: add json_dumper_value_va_list().Dario Lombardo1-0/+1
Change-Id: I8effb701b505e5ce0c06be42ab524c458e1839ce Reviewed-on: https://code.wireshark.org/review/31207 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Dario Lombardo <lomato@gmail.com>
2018-12-23json_dumper: add base64 routines.Dario Lombardo1-0/+3
Change-Id: Iab9a201fe951e5557501f4e675ab74ecd9dbb930 Reviewed-on: https://code.wireshark.org/review/31034 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-12-13Add new "rsa_keys" UAT for storage of RSA private keysPeter Wu1-0/+1
This should eventually replace the "ssl_keys" UAT which additionally contains a useless address, port and protocol field. This prepares for HSM support through PKCS #11. Change-Id: I59409c98aeedf260d19266d18e14ef7d9b40b582 Reviewed-on: https://code.wireshark.org/review/30977 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-132.9.0 → 2.9.1.Gerald Combs1-1/+1
Change-Id: I5c1a26f234289edeb9e29f5b8a8bdd220bd49ecf Reviewed-on: https://code.wireshark.org/review/31028 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-12-09Add tvb_get_token_lenMichael Mann1-0/+1
This is intended to be a replacement for get_token_len (from strutil.h) when its used on a tvb. It should be a little safer and remove the need for a dissector to use tvb_get_ptr. Change-Id: Ib2d4a79718b6fba4eb9acc0129b13be6c8199a43 Reviewed-on: https://code.wireshark.org/review/30892 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-05Debian: Add a Lintian override for l16_mono.Gerald Combs1-0/+2
Add an override for: library-not-linked-against-libc usr/lib/x86_64-linux-gnu/wireshark/plugins/2.9/codecs/l16mono.so Change-Id: Id053892125301fcd66349c1a571ff6e3d64463c9 Reviewed-on: https://code.wireshark.org/review/30925 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>
2018-12-05Debian: Add missing symbols.Gerald Combs1-0/+3
Change-Id: Id05eb1e6060d60892ffdd65aa5a2e0aad42215f0 Reviewed-on: https://code.wireshark.org/review/30917 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>
2018-11-29Drop support for GnuTLS 2.12.x, require GnuTLS 3.2 or newerPeter Wu1-3/+2
Upcoming changes need GnuTLS >= 3.0.2. Require GnuTLS 3.2 (or newer) for licensing reasons. The Debian control file still mentions 3.2.14 because older packages linked with a GMP library that was not GPLv2+ compatible. RHEL6 only has 2.12.23, but is already unsupported anyway. Change-Id: I024b2a734ebb16b73a624bb2435c254e963d8b7d Reviewed-on: https://code.wireshark.org/review/30832 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-20Add new Secrets API and allow TLS to use pcapng decryption secretsPeter Wu2-0/+2
Add a new secrets API to the core, one that can outlive the lifetime of a single capture file. Expose decryption secrets from wiretap through a callback and let the secrets API route it to a dissector. Bug: 15252 Change-Id: Ie2f1867bdfd265bad11fc58f1e8d8e7295c0d1e7 Reviewed-on: https://code.wireshark.org/review/30705 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-20Replace JSON-GLib by custom JSON dumper libraryPeter Wu1-0/+8
The (optional) JSON-GLib library adds dependencies on GObject, GIO. For statically linked oss-fuzz builds it also adds libffi and more. To avoid these dependencies, replace JSON-GLib by some custom code. This allows `tshark -G elastic-mapping` to be enabled by default without extra deps. API design goals of the new JSON dumper library: - Small interface without a lot of abstraction. - Avoid memory allocations if possible (currently none, but maybe json_puts_string will be replaced to improve UTF-8 support). - Do not implement parsing, this is currently handled by jsmn. Methods to open/close array/objects and to set members are inspired by the JsonGlib interface. The interfaces to write values is inspired by the sharkd code (json_puts_string is also borrowed from that). The only observed differences in the tshark output: - JSON-GLib ignores duplicates, json_dumper does not and may produce duplicates and currently print two "ip.opt.sec_prot_auth_unassigned". - JSON-GLib adds a space before a colon (unimportant formatting detail). - (Not observed, but UTF-8 strings will be wrong like bug 14948.) A test was added to catch changes in the tshark output. I also fuzzed json_dumper with libFuzzer + UBSAN/ASAN and fixed an off-by-one error. Change-Id: I0c85b18777b04d1e0f613a3d59935ec59be87ff4 Link: https://www.wireshark.org/lists/wireshark-dev/201811/msg00052.html Reviewed-on: https://code.wireshark.org/review/30732 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-20wsutil: rename some wsjson functionsPeter Wu1-3/+3
Rename wsjson_unescape_json_string to json_decode_string_inplace (inspired by the g_base64_decode_inplace name). Rename wsjson_is_valid_json to json_validate (inspired by g_unichar_validate). Ideally json_parse is inlined with its user (sharkd_session.c), but that requires exporting the jsmn_init and jsmn_parse functions... Hence the dependency on jsmn.h remains in wsjson.h. Change-Id: I7ecfe3565f15516e9115cbd7e025362df2da5416 Reviewed-on: https://code.wireshark.org/review/30731 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-16Use an enum for compression types in various interfaces.Guy Harris1-1/+1
This: 1) means that we don't have to flag the compression argument with a comment to indicate what it means (FALSE doesn't obviously say "not compressed", WTAP_UNCOMPRESSED does); 2) leaves space in the interfaces in question for additional compression types. (No, this is not part 1 of an implementation of additional compression types, it's just an API cleanup. Implementing additional compression types involves significant work in libwiretap, as well as UI changes to replace "compress the file" checkboxes with something to indicate *how* to compress the file, or to always use some other form of compression). Change-Id: I1d23dc720be10158e6b34f97baa247ba8a537abf Reviewed-on: https://code.wireshark.org/review/30660 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-11-15Debian: Add missing symbols.Gerald Combs2-0/+30
Change-Id: Ia8a385faad06a1221a9ab6f31e27e4be09a5590d Reviewed-on: https://code.wireshark.org/review/30646 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-13Don't have _ng versions of the dumper open routines.Guy Harris1-4/+0
Have the routines always take a parameters pointer; pass either null or a pointer to an initialized-to-nothing structure in cases where we were calling the non-_ng versions. Change-Id: I23b779d87f3fbd29306ebe1df568852be113d3b2 Reviewed-on: https://code.wireshark.org/review/30590 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-11-12wiretap: refactor common parameters for pcapng dump routinesPeter Wu1-0/+2
Four variants of wtap_dump_open_ng exists, each of them take the same three parameters for the SHB, IDB and NRB blocks that has to be written before packets are even written. Similarly, a lot of tools always create these arguments based on an existing capture file session (wth). Address the former duplication by creating a new data structure to hold the arguments. Address the second issue by creating new helper functions to initialize the parameters based on a wth. This refactoring should make it easier to add the new Decryption Secrets Block (DSB). No functional change intended. Change-Id: I42c019dc1d48a476773459212ca213de91a55684 Reviewed-on: https://code.wireshark.org/review/30578 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-11-07Require Python 3, drop Python 2 supportPeter Wu2-3/+3
Python 3 is widely available. All major Linux distributions support it. RHEL is covered via EPEL (which is already required for cmake3). Drop support for Python 2 in order to reduce maintenance costs. The main motivation is being able to simplify the tests. CMake is updated to search for Python >= 3.4 and will fail if unavailable (generating dissectors.c requires Python, so it is quite an important piece to have). The documentation is updated to reflect the Python 3.7 paths used by Chocolatey. Tested the git-review installation instructions in Windows 7 x64 without a previous Chocolatey installation. macOS brew now installs Python 3 (its dependencies are already installed by python@2 for libxml2). The macOS (non-brew variant) is updated to use the official 64-bit installer to install Python 3. Change-Id: I80b1e36957f338e0dad1bfcc173b6418682cddba Reviewed-on: https://code.wireshark.org/review/30192 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-01ws_pipe_close() is now available starting from 2.6.5Pascal Quantin1-1/+1
Change-Id: I182e6227fda8402519a6bc7268f78aae7485c49a Reviewed-on: https://code.wireshark.org/review/30454 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-11-01wsutil: introduce ws_pipe_close() helper and use it to terminate mmdbresolvePascal Quantin1-0/+1
We were not calling TerminateProcess() to stop mmdbresolve.Exe process on Windows. Bug: 15248 Change-Id: Ic90cf438a8003a6fefb023b7056984681ce09b46 Reviewed-on: https://code.wireshark.org/review/30449 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-10-31debian: install required GeoIP resolver executable and manual pagePeter Wu2-0/+2
Bug: 15230 Change-Id: I22ee65fb4de7a482544ebc9f8574d88b7b686ab4 Fixes: v2.5.1rc0-466-ga1da75c554 ("Transition from GeoIP Legacy to MaxMindDB.") Reviewed-on: https://code.wireshark.org/review/30439 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Balint Reczey <balint@balintreczey.hu> Tested-by: Petri Dish Buildbot
2018-10-25dissectors: Fix visibility and header installationJoão Valverde1-4/+0
Registration definitions for built-in dissectors are internal to libwireshark. Change-Id: Icd7065731459848bd6aabe721ae1da6d2e7ced34 Reviewed-on: https://code.wireshark.org/review/30371 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-10-21Add tvb_ascii_isprint APIMichael Mann1-0/+1
This allows dissectors to check if a portion of the tvb is an ascii string while hiding the use of tvb_get_ptr. Change-Id: Iaec7559dcfdefb8a5ae23e099ced45e90e611f8f Reviewed-on: https://code.wireshark.org/review/30291 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-10-11wsutil: Add config_file_exists_with_entries()Stig Bjørlykke1-0/+1
The purpose of this function is to check if a configuration file exists and has at least one entry which is not a comment. Use this when building the list of profiles where the user can copy configuration from, to avoid listing profiles with empty files or files with only comments. Change-Id: If45f52025959818fb1213ffac488cd59441e9fce Reviewed-on: https://code.wireshark.org/review/30113 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-10-05wsutil: Add get_profile_dir()Stig Bjørlykke1-0/+1
Use this in profile_exists() and copy_persconffile_profile(). Change-Id: I48728038b086a38822ef71766b23db8050deb464 Reviewed-on: https://code.wireshark.org/review/30027 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-10-03debian: add libsystemd-journal-dev as alternative.Dario Lombardo1-1/+1
Required for building on ubuntu 14.04. Change-Id: I2ebdceb1c73d093458adc05cf38629ac0b50c9e4 Reviewed-on: https://code.wireshark.org/review/29990 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-10-03Debian: Add a missing symbol.Gerald Combs1-0/+1
Change-Id: Id6135a51a25e22a03de6fd396786658cac9a25a0 Reviewed-on: https://code.wireshark.org/review/29999 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-10-01Add a systemd Journal Export extcap.Gerald Combs1-1/+1
Add an sdjournal extcap, which reads journal entries using the sd-journal API and dumps them as journal Export Format records. Change-Id: I17ccfa88ab5d053c16c869cd26e580d84022502e Reviewed-on: https://code.wireshark.org/review/29479 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-15Add support for aliases to dissector tables.Gerald Combs1-0/+1
Add register_dissector_table_alias, similar proto_register_alias. Add aliases for ssl.port, and ssl.handshake.extensions_alpn_str, and dtls.handshake.extensions_alpn_str. Change-Id: I87c3215e2872883ed0f581557e08c84f2dba12a0 Reviewed-on: https://code.wireshark.org/review/29652 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-09-14Debian: Add missing symbols.Gerald Combs1-0/+2
Change-Id: I8c1b91d56466c15e797c5404b49dc7de57b8a2f5 Reviewed-on: https://code.wireshark.org/review/29664 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-09-09epan: Add argument to epan_init() to disable pluginsJoão Valverde1-1/+1
Change-Id: I8dc76e6bf8c4d5a3081cbdc1d47b88e857415d29 Reviewed-on: https://code.wireshark.org/review/29498 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-09-03epan: Use g_base64_decode_inplace()Stig Bjørlykke1-1/+0
Replace ws_base64_decode_inplace() with g_base64_decode_inplace() or g_base64_decode(), which was introduced in glib 2.12. The only observed difference is a need for zero-terminate the buffer after decoding. Change-Id: Ia102d0d8e9bec575ffeddf448191a3f6de9fb1ed Reviewed-on: https://code.wireshark.org/review/29382 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-08-29epan: Remove unnecessary all protocols registration callbackJoão Valverde1-3/+0
We are exporting a registration function from libwireshark just to have it passed back as a callback. Seems unnecessary. Change-Id: I7621005c9be11691d319102326824c5e3520a6f3 Reviewed-on: https://code.wireshark.org/review/29328 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-08-29debian: Fix library installation path.João Valverde1-2/+1
Blind fix for bug 15084 (needs testing). CMake GNUInstallDirs module supports Debian multiarch (all supported CMake versions?). Bug: 15084 Change-Id: I477bf252a3faf3dd0fd2ad648a0059bf88d2211a Reviewed-on: https://code.wireshark.org/review/29330 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-08-24CMake: Change installation path for modulesJoão Valverde1-1/+1
This is one of the CMake standard paths on Unix and avoids polluting the $libdir/wireshark folder. Change-Id: I6e5fd81e95b52e585e92306aca18dfb2426668ca Reviewed-on: https://code.wireshark.org/review/29255 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-08-08wsutil: Add Curve25519 ECDH (X25519) using GcryptPeter Wu1-0/+2
The WireGuard dissector will need X25519 to enable decryption, add a Gcrypt implementation that implements the NaCl/Sodium interface. While inspired by the MPI example in t-cv25519.c, note subtle but important correctness/interoperability fixes: add a check for infinity (gcry_mpi_ec_get_affine) and handle short values from gcry_mpi_print. The last issue is ugly, perhaps the high level API (gcry_pk_decrypt) should be used instead (which < 2% slower than this MPI implementation). (Both issues were found through fuzzing.) As for alternative options, Sodium is superior but would be a new dependency. For some older performance and usability notes (comparing crypto_scalarmult_curve25519_base (note "_base") against others), see https://lists.gnupg.org/pipermail/gcrypt-devel/2018-July/004532.html Performance comparison on Ubuntu 18.04 (i7-3770) between Sodium 1.0.16 against Gcrypt 1.8.3 and Gcrypt 86e5e06a (git master, future 1.9.x) by computing 65536 times X25519(1, 8) via crypto_scalarmult_curve25519: Sodium (sandy2x): 1.4x faster than ref10 Sodium (ref10): 1 (baseline) Gcrypt (git): 5x slower than ref10, 7x slower than sandy2x Gcrypt (1.8.3): 17x ref10, 24x sandy2x (took 65 seconds) Change-Id: Ia54e73cc3cc469a6697554729aff4edd19f55630 Ping-Bug: 15011 Reviewed-on: https://code.wireshark.org/review/28987 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-08-01Revert "Have find_or_create_conversation() use pinfo->conv_endpoint if present."Guy Harris1-1/+1
This reverts commit ba202ef36225b59eb797c5a48b8d4a4665b479c7. Creating endpoints, and corresponding conversations, for protocols atop which TCP or UDP runs can potentially cause attempts to look up the conversation to find the conversation for that protocol rather than for TCP/UDP, which can confuse protocols running atop TCP or UDP. Change-Id: I3ca522e54e67cc4f996d0ee841c6bb40ee6a9976 Reviewed-on: https://code.wireshark.org/review/28912 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-07-31Have find_or_create_conversation() use pinfo->conv_endpoint if present.Guy Harris1-1/+1
Add conversation_new_pinfo(), which uses the endpoint if present, and have find_or_create_conversation() use it rather than conversation_new(). Remove find_or_create_conversation_by_id() - it's no longer needed. Bug: 15018 Change-Id: Ib13e539751af0f071aede4ee0ed751d0cb72ba3f Reviewed-on: https://code.wireshark.org/review/28908 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-07-31Export some more conversation functions.Guy Harris1-0/+4
They're used by built-in dissectors; I see no reason whatsoever to forbid plugins from using them. See https://ask.wireshark.org/question/4366/compile-plugin-with-call-to-conversation_set_port2/ Change-Id: I6a04df961c164a09b88abd8f46a1fe3420a21661 Reviewed-on: https://code.wireshark.org/review/28906 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-07-31For ISDN, don't create an endpoint by ID and then use it.Guy Harris1-0/+1
That isn't working, because it depends on the notion that for every "endpoint type" there's a "port type" for the packet_info structure; that's not true for ISDN channels. The whole point of "use the packet_info structure when trying to find a conversation and create it if it doesn't exist" is to use address information *already filled in by somebody for use by other dissectors*; we don't do that with the ISDN channel number, because there's no *need* to do so. So just add a new find_or_create_conversation_by_id() routine, which passes the packet_info structure to get the frame number, and explicitly passes the endpoint type and ID. Use that in the ISDN dissector. Bug: 15018 Change-Id: Id0e997254b0eaf7cbc9261a2adff639ecbf083c0 Reviewed-on: https://code.wireshark.org/review/28904 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-07-27debian: add lintian-overrides for libwireshark0 (spelling-error-in-binary)Alexis La Goutte1-0/+6
Change-Id: Ic5e2745c0245c343fd6aae13638768fd215d6d60 Reviewed-on: https://code.wireshark.org/review/28860 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-07-06Fix the calculation of a file's "basename".Guy Harris1-0/+1
Strip off only extensions that correspond to file types we know about; QFileInfo::baseName() strips off *all* extensions, where "extension" is "anything preceded by a .", so it turns foo.bar.pcap.gz into foo, not foo.bar. We don't want that; instead, we strip off only those extensions that correspond to file types we know how to read, so we'd strip off .pcap.gz in foo.bar.pcap.gz, and strip off .pcap in foo.bar.pcap, leaving foo.bar in both cases. Change-Id: I5385921ad2f0fef815d52e9902fef15735fd9dae Reviewed-on: https://code.wireshark.org/review/28636 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-07-01Fix handling of DEB_BUILD_OPTIONS=nocheckLars Christensen1-1/+1
When DEB_BUILD_OPTIONS is set to nocheck when running dpkg-buildpackage, tests would not be built but still run. Changed to nether build or run tests when set to nocheck. Change-Id: I2a27025273aab536f0fc0a98cb8efd2d825c5013 Reviewed-on: https://code.wireshark.org/review/28529 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-11Give more detailed information about capture permissions on Debian.Guy Harris1-12/+29
Indicate what you're supposed to do when running dpkg-reconfigure wireshark-common, and indicate that you have to run it as root using sudo. Emphasize in README.Debian, and indicate in the permission failure secondary message, that you have to add users to the "wireshark" group after doing that, and that a user may have to log out and log in again to make this change take effect. Bug: 14847 Change-Id: Ia83ff8e92bd2f00b6c3779272322a40201416da0 Reviewed-on: https://code.wireshark.org/review/28206 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-06-05Debian: Add missing symbols.Gerald Combs1-0/+2
Change-Id: Ie7cc03154c6afcb6ab18b87d73c35be9f79a5f41 Reviewed-on: https://code.wireshark.org/review/28044 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-06-05Debian: More GNUTLS updates.Gerald Combs1-4/+3
Try to make our libgnutls28-dev / libgnutls-dev dependency work across different OS versions. Change-Id: I673619ae81b15df5bdbe386b4354e5c01f7bba29 Reviewed-on: https://code.wireshark.org/review/28042 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-06-05Debian: Use libgnutls28-dev.Gerald Combs1-2/+2
Switch Build-Depends from libgnutls-dev to libgnutls28-dev. I'm upgrading the Ubuntu builder to 18.04 and this appears to be required in order to fix the Debian package step. Change-Id: Ib3ab2a1a5dcfbd9ad0c088b22fcac63d81a2a765 Reviewed-on: https://code.wireshark.org/review/28022 Reviewed-by: Gerald Combs <gerald@wireshark.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-02 13:30:51 +0000