aboutsummaryrefslogtreecommitdiffstats
path: root/debian
AgeCommit message (Collapse)AuthorFilesLines
2019-06-11debian: update libwsutil0 symbolsPascal Quantin1-0/+11
Change-Id: I319d619b34ab754a65f003623f957e421675499b Reviewed-on: https://code.wireshark.org/review/33561 Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-06-11Kill libwscodecs plugin library, just use pluginsJoão Valverde4-29/+1
Change-Id: I085d04840acb53b0b7681787429a2b4e10547cd5 Reviewed-on: https://code.wireshark.org/review/33068 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-06-09tools: Switch some scripts exclusively to Python 3.Gerald Combs1-1/+1
Convert asn2wrs.py to Python 3 via `2to3 --print-function --write` along with additional tweaks. Convert asn2deb and idl2deb using `2to3 --write`. Work around what appears to be a Debian packaging bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=818609 Change-Id: I5cc246f7162c2d713673955c10c092e1b91adf82 Reviewed-on: https://code.wireshark.org/review/33504 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>
2019-06-08Have routines to add a protocol tree item and return a display string.Guy Harris1-2/+2
That way, even if we're not building a protocol tree, so that you don't get protocol tree items, you can get the display string, e.g. to use in a column. Replace the use of the "get display string" routines with calls to those routines. Change-Id: I23e3e88838bdf837d8660c271f78c79b7d1c5620 Reviewed-on: https://code.wireshark.org/review/33519 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-06-07Improve handling of binary data that *might* be text.Guy Harris1-0/+2
Add a BASE_SHOW_ASCII_PRINTABLE flag for the "display" field, to use with FT_BYTES and FT_UINT_BYTES fields; it specifies that, if the field consists solely of printable ASCII characters, its value be displayed as a string, in quotes. Have a routine hfinfo_format_bytes() to do that formatting, depending on the display field value. Add routines to fetch the display value of string and FT_BYTES/FT_UINT_BYTES fields; for strings, it's the result of hfinfo_format_text(), and for byte arrays, it's the result of hfinfo_format_bytes(). Use BASE_SHOW_ASCII_PRINTABLE for extended attribute data in SMB and SMB2. Use the routines in question for extended attribute names (string) and data (bytes). That keeps us from displaying non-text extended attribute data as if it were text. Document BASE_SHOW_ASCII_PRINTABLE. Change-Id: I24dcf459c14f00985e4daaf9b58f5933964eabd8 Reviewed-on: https://code.wireshark.org/review/33517 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-05-29Use the HTTPS URL for our main site in a few places.Gerald Combs2-2/+2
Fixup the encoding of plugins/plugin.rc.in while we're here. Change-Id: I21b56ce68bc3d84298a846a991c72bf710b9ae8a Reviewed-on: https://code.wireshark.org/review/33414 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2019-05-28Dissect LDAP strings as UTF-8.Guy Harris1-0/+1
This requires some special hackery, including a new packet-ber.c routine, as those strings are just OCTET STRINGs, not UTF8Strings. Change-Id: I776ed47f7400eba366a630b60b94be3397f7b45f Reviewed-on: https://code.wireshark.org/review/33403 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-05-20debian: add libspeexdsp-dev to debian/control.Dario Lombardo1-1/+2
Change-Id: Ie4fda4b81be6746eba9880edd6ed69693889ca4d Reviewed-on: https://code.wireshark.org/review/33255 Reviewed-by: Dario Lombardo <lomato@gmail.com> Tested-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-05-09Debian: Be more strict about symbol changes.Gerald Combs1-0/+3
Add export DPKG_GENSYMBOLS_CHECK_LEVEL=4 to debian/rules in order to ensure that we update the Debian config when we change the API. Change-Id: Ieeaf08342790c075de62a52079d874fe9d36bed8 Reviewed-on: https://code.wireshark.org/review/33119 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>
2019-05-08Debian: Add missing symbols.Gerald Combs1-0/+2
Change-Id: Ia35aedfe0c934ea2a9020ad8e157c09f68743d06 Reviewed-on: https://code.wireshark.org/review/33118 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-05-02CMake: Check for and use system SpeexDSP libraryJoão Valverde1-22/+0
Change-Id: I8443379d23a2946dd21c12e5e0bd5464ab73ca25 Reviewed-on: https://code.wireshark.org/review/31857 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2019-05-02Move the Winsock initialization and cleanup to wsutil routines.Guy Harris1-0/+2
Those routines exist on both Windows and UN*X, but they don't do anything on UN*X (they could if it were ever necessary). That eliminates some #ifdefs, and also means that the gory details of initializing Winsock, including the Winsock version being requested, are buried in one routine. The initialization routine returns NULL on success and a pointer to a g_malloc()ated error message on failure; report the error to the user, along with a "report this to the Wireshark developers" suggestion. That means including wsutil/socket.h, which obviates the need to include some headers for socket APIs, as it includes them for you. Change-Id: I9327bbf25effbb441e4217edc5354a4d5ab07186 Reviewed-on: https://code.wireshark.org/review/33045 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-04-24Qt: Support setting custom preferencesTomasz Moń1-0/+1
This makes it possible to set the console.log.level from the Advanced preferences window. Change-Id: I5c5551f089a935eef77f54fdcad0ba060f14edfd Reviewed-on: https://code.wireshark.org/review/32930 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-04-22Add brotli decompression support for HTTP and HTTP2 dissectors.Dániel Bakai2-1/+3
Change-Id: I9c09f55673187f6fee723fcd72798fb6b9958b03 Reviewed-on: https://code.wireshark.org/review/32745 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-04-05Have wtap_read() fill in a wtap_rec and Buffer.Guy Harris1-2/+0
That makes it - and the routines that implement it - work more like the seek-read routine. Change-Id: I0cace2d0e4c9ebfc21ac98fd1af1ec70f60a240d Reviewed-on: https://code.wireshark.org/review/32727 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-04-04epan: Convert our PROTO_ITEM_ macros to inline functions.Gerald Combs1-0/+7
Convert our various PROTO_ITEM_ macros to inline functions and document them. Change-Id: I070b15d4f70d2189217a177ee8ba2740be36327c Reviewed-on: https://code.wireshark.org/review/32706 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-04-01Add some new symbols for Debian.Guy Harris2-0/+3
Change-Id: I11fdfba21c4c2a68726d8aaf7f98c9b80e6b4ec8 Reviewed-on: https://code.wireshark.org/review/32654 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-03-21ieee80211: Support decrypting WPA3-Personal / SAE capturesMikael Kanstrup1-0/+1
Add support for decrypting IEEE 802.11 WPA3-Personal / SAE traffic. SAE uses AES encryption but a different key derivation function (KDF) making Wireshark fail to decrypt such captures. Also both KDF and decryption method is determined based only on EAPOL key description version. This is not enough to figure out that SAE is being used. Implement the alternative KDF needed to derive valid PTK. Also implement a function to parse pairwise + group cipher suites and auth key management type from RSNE tag. Using this new function together with a number of new cipher and AKM lookup functions correct KDF for SAE can be selected. Bug: 15621 Change-Id: I8f6c917af1c9642c276a244943dd35f850ee3757 Reviewed-on: https://code.wireshark.org/review/32485 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-03-19Debian: Add a missing symbol.Gerald Combs1-0/+1
Change-Id: Ic6596fbac05204c41b8790aa24b895413554ddce Reviewed-on: https://code.wireshark.org/review/32478 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-02-19Add new Debian symbols.Guy Harris1-0/+2
Change-Id: I7c270ca5b079fa5993c2391e68f98fe3a0d4c356 Reviewed-on: https://code.wireshark.org/review/32108 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-02-11json_dumper: add json_dumper_value_doublePeter Wu1-0/+1
Add locale-independent version that replaces json_dumper_value_anyf for floating-point numbers. NaN and -/+Infinity are mapped to null. Change-Id: I8e7856de480b7bcafe77ddd015239e1257768ced Reviewed-on: https://code.wireshark.org/review/31948 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Jakub Zawadzki <jbwzawadzki@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-02-06debian: fix indentation in postinst script.Dario Lombardo1-12/+12
Change-Id: I753dd887990660f5218a91767c4e124a8ae1971d Reviewed-on: https://code.wireshark.org/review/31909 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-02-06debian: fix wrong version in symbols.Dario Lombardo1-3/+3
Change-Id: Ia9ad470f8b9137526ceea0358d1ddeaa87aa56c6 Reviewed-on: https://code.wireshark.org/review/31910 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>
2019-02-05debian: update libwireshark symbols.Dario Lombardo1-0/+3
Change-Id: I69d32009fbd27b05f6eb1da6ee6daa47cca2e1fd Reviewed-on: https://code.wireshark.org/review/31900 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-02-052.9 → 3.1.Gerald Combs1-1/+1
Change-Id: Iea6b55037bfb62d2e9b333148cbdc55fcd53dfa2 Reviewed-on: https://code.wireshark.org/review/31888 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-01-29secrets: add functions to query and validate pkcs11 tokens/key filesPeter Wu1-0/+2
Provide a way to retrieve key URIs ("pkcs11:" and in the future maybe "system:") and validate the PIN/password for such keys. Additionally permit validation of a RSA key file. This will be used for the RSA Keys GUI dialog. Change-Id: I4177a11cb9f4758d7564daae509e20a4a42623fa Reviewed-on: https://code.wireshark.org/review/31794 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-28funnel: Fix memleaks in funnel_remove_menuStig Bjørlykke1-0/+1
The loop to remove all matching callbacks was skipping every second entry which would give some leaks when reloading Lua plugins. Add funnel_cleanup() to be called in epan_cleanup() at shutdown to remove all allocated menu entries. Change-Id: I3a50ba2070c8675fee1385f25e9e109db57c2dc5 Reviewed-on: https://code.wireshark.org/review/31769 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2019-01-11Fix up the lists of binaries and man pages in dpkgs.Guy Harris2-13/+18
Sort both lists; for the man pages, sort the extcap man pages after the regular command-line tool man pages. Add the captype and randpkt programs and man pages, and the udpdump man page. Change-Id: I0244013f8d08685d61ba70274185cb5539ff0545 Reviewed-on: https://code.wireshark.org/review/31503 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-01-10debian: Fixup symbols.Gerald Combs1-4/+4
Change-Id: I544220cdcc43b20b4f6b663e28039804cd6d3619 Reviewed-on: https://code.wireshark.org/review/31475 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-01-04debian: add dh-python to debian deps.Dario Lombardo1-1/+1
Basic Ubuntu installation lacks it. Change-Id: I208952d15bd32a7813c20625fe94656fb71ae824 Reviewed-on: https://code.wireshark.org/review/31322 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Balint Reczey <balint@balintreczey.hu>
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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 13:41:56 +0000