aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2019-01-02cli_main: remove real_main from stack traces for non-WindowsPeter Wu18-28/+29
Restore the "main" name since that is used everywhere else except for Windows. On Windows, "main" is renamed via a macro to avoid a conflict with "wmain" and to allow it to be called in cli_main.c. For those wondering, GUI applications (such as Qt) have a different entry point, namely WinMain. In Qt5, src/winmain/qtmain_win.cpp defines WinMain, but seems to convert its arguments from Unicode to CP_ACP (ASCII). It might not support UTF-8, but I did not verify this. Change-Id: I93fa59324eb2ef95a305b08fc5ba34d49cc73bf0 Reviewed-on: https://code.wireshark.org/review/31208 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-02nas5gs: Add dissection of QoS flow descriptions.Anders Broman1-404/+503
While there renumber according to latest spec. and fix some indentation. Change-Id: Ib9b4590d72c3124ffcb96fd719a9a19cadb4c494 Reviewed-on: https://code.wireshark.org/review/31300 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-02Diameter: Add 3GPP avp name="eDRX-Related-RAT" code="1705"Anders Broman1-1/+5
Change-Id: Ib95113f12831eed298c28998e4e6106bb4df8019 Reviewed-on: https://code.wireshark.org/review/31299 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-02Updates and bugfixes of ASTERIX I062Atli Guðmundsson1-168/+323
I062 v1.18 updates (now the default) - Updated I062/380#10.STAT, new enum values (6 & 7) - Added asterix.062/080.SFC - Added asterix.062/080.IDD - Added asterix.062/080.IEC I062 v1.17 updates - Added asterix.062/060.V - Added asterix.062/060.G I062 bugfixes: - Fixed I062 Capitalisation inconsistencies - Fixed I062/080.FPLT, incorrect value mask - Fixed I062/080.SDS, incorrect value mask - Fixed I062/110#1.M5, incorrect name (was I062/110#1.MD5) - Fixed I062/110#4, incorrect abbreviation (was asterix.062_11_04) - Fixed I062/110#4, missing spare bit - Fixed I062/110#4.RES, incorrect value mask - Fixed I062/110#6, incorrect abbreviation (was asterix.062_11_06) - Fixed I062/136.MFL, incorrect abbreviation (was asterix.062_136_ALT) - Fixed I062/245.STI, was missing - Fixed I062/245, did not display anything - Fixed I062/290, incorrect abbreviation, (was asterix.062_) - Fixed I062/295#7.MHG, incorrect name (was I062/295#07.MHD) - Fixed I062/340#4/5, incorrect abbreviations (was asterix.062_340_) - Fixed I062/380#4, incorrect abbreviation (was asterix.062_380_4) - Fixed I062/380#4.IAS, incorrect scaling (depends on IM bit) - Fixed I062/380#6.ALT, incorrect type (was unsigned) - Fixed I062/380#7.ALT, incorrect type (was unsigned) - Fixed I062/380#9.NC, incorrect value mask - Fixed I062/380#9.TD, incorrect field size - Fixed I062/380#9.TTR, incorrect type (was signed) - Fixed I062/380#17.TA, incorrect type (was signed) - Fixed I062/380#19.VUC, incorrect field size - Fixed I062/390#3, incorrect type (was 32-bit), incorrect value mask - Fixed I062/390#n, incorrect abbreviations (was asterix.062_nn) - Fixed I062/500#3.APWLAT, incorrect type (was signed) - Fixed I062/500#3.APWLON, incorrect type (was signed) - Fixed I062/500#n, incorrect abbreviations (was asterix.062_nn) - Fixed I062/510, missing support for slaved trackers - Fixed I062/510.SUD, incorrect name (was I062/510.SID) - Fixed I062/510.SUD, incorrect type (was 24-bit), incorrect value mask - Fixed I062/510.STN, incorrect value mask - Updated I062/RE.CST.SAC/SIC, now reports as asterix.SAC/SIC - Updated I062/RE.CSNT.SAC/SIC, now reports as asterix.SAC/SIC Note: incorrect value masks and field sizes would in most cases cause an exception when trying to decode those fields. Change-Id: If6b9662d20619dd30b4fe28907ab0630c6d55e44 Reviewed-on: https://code.wireshark.org/review/31214 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-02Make dissect_icmp_extension_structure into a dissector function.Michael Mann3-22/+13
That way there isn't a need for packet-icmp-int.h. Change-Id: Ib523c36ab2fdf6a43ee6ff32dadfcd53e9d9bf14 Reviewed-on: https://code.wireshark.org/review/31290 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-02dpaux: Minor improvementsMichael Mann3-66/+41
1. Pass dissector data to dpaux dissector directly instead of using p_get_proto_data. 2. Don't assume dissector data will always be present and default to "sink" if that is the case. 3. tvb_memdup isn't needed for proto_tree_add_bytes 4. Use value_string to save switch cases. 5. Bugfix major/minor version dissection. Change-Id: I018d923537ce276fda8be1884f5bb3a8b2eef862 Reviewed-on: https://code.wireshark.org/review/31297 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-02wsutil: fix crash due to corruption of the "small_buffers" arrayPeter Wu1-0/+3
Gracefully handle repeated calls of ws_buffer_free on the same buffer to avoid strange crashes in other new users that allocate a "small" buffer. The first call to ws_buffer_free would store data pointer in the 'small_buffers' array for reuse and set the pointer to NULL. Result: (gdb) p cfile.rec.options_buf $2 = { data = 0x0, allocated = 2048, // Oops, not modified! start = 0, first_free = 0 } All users of Buffer (including ws_buffer_free) however asssume that 'allocated' reflects the actual size of 'data'. If this is not the case (if ws_buffer_free is called again), then a data pointer (NULL!) will be stored and the next ws_buffer_init request for a "small buffer" will result in unexpected behavior (including crashes). Fix the issue by clearing the 'allocated' field as well. Add assertions to catch such issues earlier rather than crashing at random users of these buffers (such as frame_tvbuff). Bug: 15263 Change-Id: I0b491c3fccac8c6fddd43779629343d721638ca9 Reviewed-on: https://code.wireshark.org/review/31278 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-01No need to report "some files could not be saved".Guy Harris6-34/+12
We've already reported the files that couldn't be saved; no need to tell the user something they already know by that point. Change-Id: I8251a46134342df6b40a6324aa76a5237fde7c93 Reviewed-on: https://code.wireshark.org/review/31298 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-01lorawan: fix this condition has identical branches [-Wduplicated-branches]Alexis La Goutte1-2/+0
Change-Id: I9bf885dcd9b8c15212062f8e6205816521e707c3 Reviewed-on: https://code.wireshark.org/review/31292 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Erik de Jong <erikdejong@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2019-01-01Always report errors in eo_save_entry().Guy Harris4-11/+8
If a particular save failed, always let the user know. Change-Id: I618e0ff82813cd4249ab7b1714f9a50e095a1ea8 Reviewed-on: https://code.wireshark.org/review/31296 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-01-01Limit the maximum *file* name length for exported objects.Guy Harris4-35/+33
Limiting the maximum *path* name length is bogus; if the user wants to store the file in some directory deep under the root (UN*X) or the root of the drive (Windows), that's their choice - don't prevent them from saving in a directory with a path longer than some maximum or limit the file name based on the length of the path leading up to it. Limiting the maximum *file* name is presumably to cope with, for example, HTTP objects with a URL that had a very long query component, so it makes sense. Change-Id: Idfc7de8124ee80bdd4950341ff2239834eb9f6f6 Reviewed-on: https://code.wireshark.org/review/31295 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-01-01Get rid of local_eo_save_entry().Guy Harris2-58/+5
Have eo_save_entry() use the report_ routines to report errors, so they pop up a dialog in Wireshark and print an error message in command-line programs such as TShark. Use it instead of local_eo_save_entry(). Change-Id: I689fd880ff2a31486372374560129ee9d9692b1e Reviewed-on: https://code.wireshark.org/review/31294 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-01-01Fixes GeoNetworking secured packets dissectionChristophe GUERBER3-59/+73
Secured packets contain Common and Extended header. Change-Id: I60b5ed35811c19c9596bd142c1315b341d760968 Reviewed-on: https://code.wireshark.org/review/31238 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-01Use dissector table to dissect content of ieee1609Christophe GUERBER6-21/+113
For unsecured and signed data, the dissector uses a dissector table to determine the next dissector. It uses the psId field to index the table. In the case no psId is provided inside, the caller can set a default psid if it is provided beforehand. If none is provided, data are not dissected. Change-Id: I6f9d6989cd87dd373a155a5b893c460344a0c857 Reviewed-on: https://code.wireshark.org/review/31237 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-01Qt: Pluralize "Copy Row(s)"Stig Bjørlykke2-3/+7
Properly pluralize "Copy Row(s)" entry in the popup menu. Change-Id: Ifc4f9c69ab63d2d2594648db3115087ba51a941f Reviewed-on: https://code.wireshark.org/review/31269 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2019-01-01Z39.50: Eliminate unnecessary header.Craig Jackson2-25/+0
I decided that packet-z3950.h was unnecessary at this time, but I didn't eliminate all trace of it. Change-Id: Iaff41e143bac6bf42779de49f7390ac129cef3e1 Reviewed-on: https://code.wireshark.org/review/31288 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2019-01-01Fix asn2wrs.py: always add BASE_VAL64_STRINGChristophe GUERBER1-6/+2
In some cases (e.g. when a field has a user defined dissection function) the type reported for this field is a 'virtual' one and the latter is not contained in selt.type. Consequently, BASE_VAL64_STRING is not set. Function eth_get_type_attr should return all the attributes of a type and it seems resonable to expect it to return the BASE_VAL64_STRING. This will solve the above mentioned error and may solve any possible issue in other parts that call this function. Change-Id: Iaee9ce5bd30f2a768cfcecf628df23bf1ed54e55 Reviewed-on: https://code.wireshark.org/review/31287 Reviewed-by: Michael Mann <mmann78@netscape.net>
2019-01-01Happy New Year 2019!Stig Bjørlykke2-3/+3
Change-Id: Ic140aafdb32e649e88bf3f00bda3cec9404e555a Reviewed-on: https://code.wireshark.org/review/31284 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2019-01-01krb5: fix parsing of PA-S4U-X509-USER in AS-REQIsaac Boukris3-55/+83
Per [MS-SFU] 2.2.2 PA_S4U_X509_USER in AS-REQ consists of the certificate data instead of the corresponding struct. Also, the subject-certificate field in the struct consists of the certificate data as well, so let's decode it as such. Change-Id: I6f03a66eac74b7d42c0893f63cab772d8ddcb803 Signed-off-by: Isaac Boukris <iboukris@gmail.com> Reviewed-on: https://code.wireshark.org/review/31279 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-01Add a "failed" return for tap packet routines.Guy Harris147-715/+788
This allows taps that can fail to report an error and fail; a failed tap's packet routine won't be called again, so they don't have to keep track of whether they've failed themselves. We make the return value from the packet routine an enum. Don't have a separate type for the per-packet routine for "follow" taps; they're expected to act like tap packet routines, so just use the type for tap packet routines. One tap packet routine returned -1; that's not a valid return value, and wasn't one before this change (the return value was a boolean), so presume the intent was "don't redraw". Another tap routine's early return, without doing any work, returned TRUE; this is presumably an error (no work done, no need to redraw), so presumably it should be "don't redraw". Clean up some white space while we're at it. Change-Id: Ia7d2b717b2cace4b13c2b886e699aa4d79cc82c8 Reviewed-on: https://code.wireshark.org/review/31283 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-01-01Move some command-line-oriented routines from wsutil to ui.Guy Harris48-86/+72
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-31WSDG: Update the find and goto images and descriptions.Gerald Combs4-70/+64
Change-Id: I3e8fcc3b2c940e241d4c38c2b03d4ec44bcd319e Reviewed-on: https://code.wireshark.org/review/31280 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-31Export ITS-AppId/psId names from IEEE1609Christophe GUERBER10-96/+414
PsId and ITS-AID are defined in several documents and listed in ieee1609.12. Put these definitions in ieee1609.2 ASN1 definition and export it so that GeoNetworking and wsmp dissectors may use it. Change-Id: Ia3ac181a4c9092b555decb3ee7c5e78adcece5c0 Reviewed-on: https://code.wireshark.org/review/31236 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-31CESoETH: Add dissection of MEF 8 CES over EthernetJaap Keuter5-0/+520
Add dissection of Metro Ethernet Forum specification of Implementation Agreement for the Emulation of PDH Circuits over Metro Ethernet Networks [MEF 8]. This includes the introduction of a RTP shim header dissection function, as is not uncommon in PW and CES services. Signed-off-by: Jaap Keuter <jaap.keuter@aimvalley.nl> Change-Id: I6de81007ce11793cd5352fadadd80d3f6f45ae0d Reviewed-on: https://code.wireshark.org/review/31239 Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2018-12-31Accept v1 of GeoNetworking and improve item treeChristophe GUERBER1-16/+77
Accept version value 1 for geonetworking, dissect last 4 bytes of SHB and traffic class as per EN 302 636-4. Change-Id: I254e48f888aae063d2f4b5178c2e0eadc839f8ea Reviewed-on: https://code.wireshark.org/review/31245 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-31Improve capture-on-pipe error messages.Guy Harris1-7/+26
Add "Please report this to us" and "Please report this to whoever wrote the program that's writing to the pipe" secondary error messages. Use the latter for most of the errors, as the most likely cause is that the program writing to the pipe is messing up somehow. If we don't recoginze the first 4 bytes of the file, say "Data written to the pipe is neither in a supported pcap format nor in pcapng format." - it's not necessarily a pcap file. Speak of "pcap" rather than "libpcap" format - it's not completely tied to libpcap (although two of the libraries not called "libpcap" that read it are basically libpcap+a Windows driver+a library for the Windows driver, at this point), and the suffix generally used it ".pcap". Change-Id: Ifb5518af5cade788294c93a7ac416893f57f6bc8 Reviewed-on: https://code.wireshark.org/review/31273 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-31WSDG: Update packet list and popup images and descriptions.Gerald Combs8-104/+331
Update the images and descriptions for the packet list, column header popup, packet list popup, and packet detail popups. Add images and descriptions for the byte view popup. Use title case in more places. Change-Id: Icf3af426c97c6e7cf97dee377c20039b7b8791ce Reviewed-on: https://code.wireshark.org/review/31271 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-31asn2wrs.py: use BASE_VAL64_STRING and val64_stringChristophe GUERBER1-5/+24
When UINT64 contains value strings, in addition to using VALS64 to give the list of names, the type of the structure has to be val64_string and the display parameter has to be ORed with BASE_VAL64_STRING. Change-Id: I0a619c91027df1eaae8209ada816f45b85d6431d Reviewed-on: https://code.wireshark.org/review/31268 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-31CMake: clean up FindGNUTLS.cmakePeter Wu1-39/+27
Use consistent capitalization and whitespace. Remove library names from find_library that are unsuitable. No functional change intended. Change-Id: Ic40516542777d768b6eef656fe5c0a0af143fb7e Reviewed-on: https://code.wireshark.org/review/31264 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-31Windows: Upgrade GnuTLS to 1.6.3Peter Wu3-7/+9
Upgrade to GnuTLS 3.6.3-1, using MinGW binaries from Fedora 29 packages: mingw64-gnutls-3.6.3-1.fc29.noarch.rpm mingw64-gcc-8.2.0-3.fc29.x86_64.rpm mingw64-gmp-6.1.2-4.fc29.noarch.rpm mingw64-nettle-3.4-2.fc29.noarch.rpm mingw64-p11-kit-0.23.7-5.fc29.noarch.rpm mingw64-libffi-3.1-4.fc29.noarch.rpm mingw64-libtasn1-4.13-3.fc29.noarch.rpm mingw64-winpthreads-5.0.4-2.fc29.noarch.rpm This includes libgcc_s_seh-1.dll (64-bit, new) and libgcc_s_sjlj-1.dll (32-bit, previously included with glib2). Built with https://git.lekensteyn.nl/peter/wireshark-notes/tree/windows-libs/make-gnutls-libs-zip.sh?id=b86878e458d5d7deb21218ce6598b98af4ed7ec2 The main motivation is improved PKCS #11 support: - 3.6.0: fix potential compatibility issue with SafeNet HSMs https://gitlab.com/gnutls/gnutls/merge_requests/398/ - 3.6.2: gnutls_pkcs11_token_get_flags now forwards token info. - 3.6.3: new APIs for low-level PKCS #11 token or object operations. Change-Id: I235774e3b27f3426cb74d3d9c0ab593d06870e89 Reviewed-on: https://code.wireshark.org/review/31128 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-31SMPP: General improvementsMichael Mann1-913/+841
1. Use proto_tree_add_item (and friends) instead of a protocol specific wrapper for integer types 2. Create #defines for command IDs and properly sort them in the their value_string 3. Improve heuristics for command specific parameters to reduce false positives 4. Use length value in TLV for strings 5. Remove "sub tvb" creation. The tvb passed into the pdu should be used. 6. Use proto_tree_add_bitmask_list and proto_tree_add_bitmask_list_value where applicable 7. Allow empty fields for vendor-specific TLVs. 8. Treat version fields as FT_UINT8 and use format with BASE_CUSTOM 9. Condense all command response codes to a single range_string. Bug: 5206 Bug: 15267 Change-Id: I49751d287af1ebb9e27ae7463c08f4724ee60c07 Reviewed-on: https://code.wireshark.org/review/31267 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-31KNET: Validate the length field before claiming packetMichael Mann1-0/+8
Heuristic is weak, but length of packet should be non-zero. Change-Id: I68d6d85092c84d5d421731be3ada008fe7a5b06f Reviewed-on: https://code.wireshark.org/review/31266 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-31GSM over IP: Require a valid message type for dissection.Michael Mann1-10/+24
Protects against some false positives because by default GSM over IP claims some "frequently used" ports. Change-Id: I94736ecef8ac1422bb330a364a3f77edd9a52a2b Reviewed-on: https://code.wireshark.org/review/31265 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-31Update the comment again.Guy Harris1-6/+12
The third URL works, but let's go https: for it. The other two don't. Line-wrap another part of the comment while we're at it. Change-Id: I744770c859b317ace2a71e82f86e2419b6d7ef2b Reviewed-on: https://code.wireshark.org/review/31276 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-12-31Update a comment.Guy Harris1-3/+5
(Thanks for killing off a bunch of comment mechanisms, not saving the old comments and placing them somewhere useful, and not even allowing the Wayback Machine to archive at least some of those sites, Microsoft.) Change-Id: Ie4258250a0176a56ee33be77604acf43c6886e0f Reviewed-on: https://code.wireshark.org/review/31274 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-12-31Use size_t, not int, for sizes.Guy Harris1-60/+89
Change-Id: I421acce006692d6415a3d647b262843d38858cf7 Reviewed-on: https://code.wireshark.org/review/31272 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-12-30Qt: traffic table: remove a tap listener only onceMartin Kaiser2-6/+0
Class TrafficTableTreeWidget is used by the conversation and enpoint dialogs, both of which are subclasses of WiresharkDialog. Those dialogs use WiresharkDialog::registerTapListener() to register tap listeners. When the dialog is closed, those listeners are removed by WiresharkDialog::removeTapListeners(). TrafficTableTreeWidget's destructor tries to remove its tap listener a 2nd time after WiresharkDialog did its cleanup. This causes warnings Warn remove_tap_listener(): no listener found with that tap data Don't call remove_tap_listener() from TrafficTableTreeWidget's destructor. The destructor is now empty and can be removed completely. Change-Id: I3143fa1c5116203f4a0be791bd4c5f08135aefb0 Reviewed-on: https://code.wireshark.org/review/31259 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-12-30CMake: clean up FindGCRYPT.cmakePeter Wu1-31/+32
Use consistent lowercase capitalization and whitespace. Windows: clarify libgpg-error names and remove libgcc_s (1.7.6/1.8.3 do not need it). Change-Id: I5d1b1a67f7a992ccfca4c28d0e19bbbfc41b7a4d Reviewed-on: https://code.wireshark.org/review/31244 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-12-30srt: fix not a Doxygen trailing comment [-Wdocumentation]Alexis La Goutte1-10/+10
Change-Id: I78de1d2fc55ac64542d7d031c33c3b4bc58b10ff Reviewed-on: https://code.wireshark.org/review/31199 Reviewed-by: Maxim Sharabayko <maxim.sharabayko@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-30asn2wrs.py: fix regression introduced by gf4b0b2109Pascal Quantin1-1/+2
FT_(U)INT64 are restricted to integer types only currently. Do not use VALS64() for other types. Change-Id: Id2299a9291c53ef246b90d732eb84811510ccb85 Reviewed-on: https://code.wireshark.org/review/31257 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-12-30[Automatic update for 2018-12-30]Gerald Combs8-232/+288
Update manuf, services enterprise numbers, translations, and other items. Change-Id: Ic8eac1cb4b08b5d567ef5bd3a52062eca095458c Reviewed-on: https://code.wireshark.org/review/31254 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-12-30Revert "Add routines to load Lua programs that assume the path is UTF-8 on ↵Peter Wu2-171/+2
Windows." This reverts commit 5953756305388724545f0df46d286be2f02c048a. The public API should not be polluted with Windows-specific hacks. As we already override dofile/loadfile, those should be fixed instead. Ping-Bug: 15118 Change-Id: Ia9d5e64e8ef14032f982f695ffd4cac59067bb17 Reviewed-on: https://code.wireshark.org/review/31134 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-30Fixes ASN.1 generation for VALS using 64 bitsChristophe GUERBER1-1/+4
VALS generation did not take into account the constraints on integers. We now generate VALS if no constraints are present and VALS64 if the interger needs 64 bits. Change-Id: Ia044ee1ba1bd5b45554c19a458876e20110b1b7f Reviewed-on: https://code.wireshark.org/review/31252 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-30Use cmdarg_err() to report errors in CLI taps.Guy Harris21-37/+68
Change-Id: Ic6b35220e394f8c67848ed067e4bbddb980d5bc0 Reviewed-on: https://code.wireshark.org/review/31253 Reviewed-by: Guy Harris <guy@alum.mit.edu> Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot
2018-12-29CMake output: Show Windows paths for the VC redist filesGraham Bloice2-3/+4
Purely cosmetic, show the various VC redist paths using the native format. Change-Id: I96d0b088f703e3e8dea6623ec258139eff066d90 Reviewed-on: https://code.wireshark.org/review/31251 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-12-29Fix indentation.Guy Harris1-11/+10
Change-Id: I6cc3373d043e6a8203a5f70eb03f03bb6cd8a6d9 Reviewed-on: https://code.wireshark.org/review/31246 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-12-29Add support for RSA decryption using PKCS #11 tokensPeter Wu11-15/+431
Add support for loading RSA private key files from PKCS #11 tokens, identified by PKCS #11 URIs. Add a new 'pkcs11_libs' UAT which can dynamically load PKCS #11 provider libraries that are not found by p11-kit. The configuration GUI will need additional code to discover available PKCS #11 tokens and will be added later. This feature requires GnuTLS 3.4 with PKCS #11 support, so Windows, macOS via Homebrew, Ubuntu 16.04, Debian Stretch. Not supported: RHEL7. Currently macOS via official packages disables PKCS #11 support, so that will also not work. Change-Id: I20646bfd69c6bd13c8c2d27cb65c164a4b0b7a66 Reviewed-on: https://code.wireshark.org/review/30855 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-12-29Lua: fix crash in reloading Lua plugins that use FileHandlerPeter Wu2-19/+52
Reloading Lua plugins did not actually remove registered FileHandler instances which resulted in a use-after-free of lua_State. Fix this by tracking instances and release them in wslua_deregister_filehandlers. Other required fixes to allow reregistration after reloading: - Fix END_FILEHANDLER_ROUTINE not to block all new registrations. - wtap file subtypes are apparently persistent, even after "unregistering". Fix this by looking up the previous subtype that matches the FileHandler short name. Add a small sanity check to wtap_register_file_type_subtypes to prevent internal handlers from being overwritten. This patch creates a potential memleak of registered_file_handlers as wslua_deregister_filehandlers is not called on program exit (yet?). Bug: 13264 Change-Id: I4f5935cde6ff8dc4de333359bad3efca96d4fb9b Reviewed-on: https://code.wireshark.org/review/31068 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-12-29Add jsonraw to tshark's -T man page synopsisJim Young1-1/+1
Change-Id: Icf3dacb143b19a55788a30dac297787ab3d2c3f0 Reviewed-on: https://code.wireshark.org/review/31242 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 20:00:25 +0000