aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-06-26conversation: rename shadow variableDario Lombardo33-56/+56
Change-Id: I8f738b2e01d7f448b21cdc1b488b16b7dd581911 Reviewed-on: https://code.wireshark.org/review/16104 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-26ex-opt: rename shadow variableDario Lombardo2-4/+4
Change-Id: Iba19920e58ffb7f1a88c2a75964c518f0479c66f Reviewed-on: https://code.wireshark.org/review/16103 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-26filter: rename shadow varDario Lombardo4-7/+7
Change-Id: Idc18f2988754fc21b1f8f2dcadfe5e3dd31d5545 Reviewed-on: https://code.wireshark.org/review/16102 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-26srt: rename shadow variableDario Lombardo3-11/+11
Change-Id: I69bda25f79b6b46bdb288e32133847a853b614e0 Reviewed-on: https://code.wireshark.org/review/16101 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-26stats_tree: rename shadow variableDario Lombardo1-2/+2
Change-Id: I5b3272cc4df728c70d6b0370b0d8a6d3482a0c6c Reviewed-on: https://code.wireshark.org/review/16100 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-26h248: rename shadow variable.Dario Lombardo5-5/+5
Change-Id: I98545776127a0cc3b5d9c44bb625a217672b4443 Reviewed-on: https://code.wireshark.org/review/16099 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-25Minor UI locale updates.Gerald Combs4-15/+12
Qt: Call setlocale before commandline_early_options so that we get proper "-v" output, similar to the GTK+ UI. GTK+: Call setlocale once at startup. Bug: 11960 Change-Id: I3c3a196b9d94fc768e1085200891bc8d67e21a08 Reviewed-on: https://code.wireshark.org/review/16132 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-06-25wsutil: Move Win32 helper routines from capchildRoland Knall5-143/+258
Move error handling and argument quoting routines from capchild to wsutil, as those methods will be used by extcap_spawn as well. Change-Id: I2c4515fefd5aecad317fcdaefa721734288f792c Reviewed-on: https://code.wireshark.org/review/16123 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-06-24Qt: Fix "-l" behavior.Gerald Combs3-10/+3
gbcae998 didn't completely fix the missing "-l" behavior. Bug: 12311 Change-Id: Iee3c844013ac137e94848aaafca7aeb3de43e080 Reviewed-on: https://code.wireshark.org/review/16128 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-06-24Qt: Keep the syntax line edit cursor active.Gerald Combs2-0/+12
Ignore focusOutEvents when the syntax line edit completer is active. This keeps it from hiding its cursor. Bug: 12520 Change-Id: I8e25b92c097e039e26e2381c5209be1e27a6a7cd Reviewed-on: https://code.wireshark.org/review/16126 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Tested-by: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Jim Young <jim.young.ws@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-06-24print(.c): fix indentAlexis La Goutte1-86/+83
Change-Id: Ie7c55fb432b29abe689eed1968cfa30bd8e88e33 Reviewed-on: https://code.wireshark.org/review/16124 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-24tfshark: remove unused variableDario Lombardo1-2/+0
Change-Id: I30ab3e4e044de12b18b7b7213a605df7096d1c54 Reviewed-on: https://code.wireshark.org/review/16108 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-24Indicate how this should be done.Guy Harris1-0/+7
Assuming that it could, if registered as an "eth.trailer" heuristic dissector, get the length of the entire frame, that is. Change-Id: I1ac26feeb10bb8ba357089a80f4b768f580bb51d Reviewed-on: https://code.wireshark.org/review/16121 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-23Fix "disable this protocol by default".Guy Harris3-9/+28
Allow a dissector to mark its protocol as "disabled by default", which means that the "enable all protocols" routine won't enable it. This is necessary in order to allow the disabling of protocols not to be unintentionally changed due to profile changes; see bug 9826. Change-Id: I3947f794c21350b70a8de06899cfc7715b77f90f Ping-Bug: 9826 Reviewed-on: https://code.wireshark.org/review/16109 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-23LTE RRC: fix display of info column when receiving a BR SIBPascal Quantin3-10/+54
Change-Id: Ic288cb10fad3bd34fe088479e7a79f77985808e0 Reviewed-on: https://code.wireshark.org/review/16098 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-06-23packet-nfs: add extent decoding for SCSI layoutsBenjamin Coddington1-0/+58
Decode extents sent within the response to a LAYOUTGET operation on SCSI layout types. Change-Id: I1fc0a5e3d4782f078f96866dc63f2ec43b6d62b1 Signed-off-by: Benjamin Coddington <bcodding@redhat.com> Reviewed-on: https://code.wireshark.org/review/16097 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-23NASA provided LTP and DTN updates dz-msfc3-264/+671
Change-Id: I49769271a41b6a7b23c6bc1d4beaadbe8819198d Reviewed-on: https://code.wireshark.org/review/14310 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-23Increase MAX_DISSECTOR_ADDR_TYPE.Jens Kilian1-1/+1
With the recent changes causing some address types to be registered by their proper dissectors, I ran into the MAX_DISSECTOR_ADDR_TYPE limit in a new dissector I'm currently writing. Change-Id: I72f521266af9190e8ad198ace4d6608b6b4d2dee Reviewed-on: https://code.wireshark.org/review/16091 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-23bthci: add missing break (CID 1362832)Dario Lombardo1-0/+1
Change-Id: I705cb17d7c6d615361d29f00ba840a94dc835ff0 Reviewed-on: https://code.wireshark.org/review/16090 Petri-Dish: Dario Lombardo <lomato@gmail.com> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-06-23Fix some of the brokenness in the PRP redundancy control trailer dissector.Guy Harris1-0/+14
IF YOU ARE DOING A HEURISTIC CHECK TO DETERMINE WHETHER THE PACKET YOU'RE LOOKING AT IS ONE YOU SHOULD DISSECT, EVEN IN A DISSECTOR THAT'S NOT REGISTERED AS A HEURISTIC DISSECTOR, DO NOT LOOK AT PACKET BYTES UNLESS YOU HAVE ALREADY DETERMINED THAT THEY ARE AVAILABLE IN THE CAPTURE. THERE ARE NO EXCEPTIONS TO THIS RULE. Bug: 9826 Change-Id: I2327a92ee760003bc10489263c0c53acdf2094e9 Reviewed-on: https://code.wireshark.org/review/16092 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-23No pcap, no live capture, so no auto_scroll_live.Guy Harris1-0/+2
Change-Id: Ic1993916cdb78c946bb291fa59f7cdc25e9cef2d Reviewed-on: https://code.wireshark.org/review/16088 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-23Qt: quit the UI if WIRESHARK_QUIT_AFTER_CAPTURE is set (offline mode too).Dario Lombardo2-4/+16
This change is useful to use the offline mode in tests (like fuzzing) that require the software to quit after the processing of a sample. Change-Id: I311c642edecf4012dc518c2bf8bca66c97aa1b02 Reviewed-on: https://code.wireshark.org/review/16038 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>
2016-06-23Add LACP "flag strings"Michael Mann1-25/+64
Merged the functionality of a Lua script from Sharkfest '16 presentation into the dissector. Also cleaned up some of the tfs values used by the dissector. Bug: 12550 Change-Id: I6b4c2f4d8a07cfb836265518d713a499df3e971c Reviewed-on: https://code.wireshark.org/review/16086 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>
2016-06-23ZigBee updated ZDO support to comply with R22Chris Brandson3-16/+207
Update ZDO support for R22 (and IEEE 802.15.4-2015) - Add support for the new IEEE Joining List request / response - Changed Network Update to support channel pages - Added Network Update Enhanced request - Added decoding of EU Sub-GHz Frequency Band Change-Id: I3a513a486f6d3784897fc8b783411c678e3f905e Reviewed-on: https://code.wireshark.org/review/16040 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-23IPv6: Don't check payload length for ICMPv6 encapsulationJoão Valverde1-1/+1
Change-Id: I783df2ddc98da1c78020837a32005ea143321990 Reviewed-on: https://code.wireshark.org/review/16081 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-06-23Squelch some 64-bit-to-32-bit-shortening warnings.Guy Harris1-4/+8
Change-Id: I64f833abd11d3b2511c235bb353cb5fb7b813b7f Reviewed-on: https://code.wireshark.org/review/16085 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-23Qt: Use queued signals+slots for filter actionsGerald Combs10-35/+43
Many of our dialogs can send an "apply this display filter" signal to the main window. Applying a display filter in turn creates a nested event loop via cf_read+update_progress_dlg. If the "apply" signal+slot is directly connected (which is the default, and which means we're calling into a function table) we can close the dialog while the signal is firing, which means we return into a deleted object. Make all of the filterAction signals+slots queued instead of direct. Bug: 12523 Change-Id: Ica331054c0aa52a7f33bd8df1fa65ecd09fdc292 Reviewed-on: https://code.wireshark.org/review/16080 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-23HTTP: Split URI into path and query. Tokenize parameters.Uli Heilmeier1-3/+40
Split a HTTP URI into path and query. Tokenize the parameters of a query. Bug: 12514 Change-Id: I9892914eba9737c9751936ce62e63497aba61c61 Reviewed-on: https://code.wireshark.org/review/15971 Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-23RTP player: increase the maximum number of silence frames to 30 minutes worth.Jeff Morriss3-2/+3
The BadAlloc X11 crash I reported in bug 4119 (which is why the limit was as low as it was) has long since been fixed thanks to bug 2630/I71e1bd2f9a62792db06ce887e2bbe7a96d110e0a so we can now deal with more silence frames. Change-Id: I0127381e71e497560e0f23af04f9d96af1ed6335 Ping-Bug: 5902 Ping-Bug: 4119 Ping-Bug: 2270 Reviewed-on: https://code.wireshark.org/review/16003 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-23Qt: Support the -j, -J, and -l command line flagsGerald Combs6-8/+27
Add support for -j, -J, and -l. Mark the -m flag deprecated. Bug: 12546 Change-Id: Ic44b3997840018e5d571aa1813a1646bce11d4a6 Reviewed-on: https://code.wireshark.org/review/16083 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-23Editcap: Fix setting of max_packet_numberJohn A. Thacker1-3/+3
editcap -r only sets max_packet_number to the earliest, instead of latest, packet or end of range selection. This changes it to the proper test. Bug: 12547 Change-Id: I81772962b00fc6566ccead4fb44c6626a47fff31 Reviewed-on: https://code.wireshark.org/review/16045 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-22Windows: rename wiretap-${PROJECT_VERSION}.dll to libwiretap.dllPascal Quantin7-12/+4
This aligns the name with what is done for other Wireshark shared libraries. Moreover it allows to compile a wiretap plugin once per major release, without the need to recompile it each time ${PROJECT_VERSION} changes (each nightly build / official release). Change-Id: I53c82277223a4f323079cf695168ac85c2fba523 Reviewed-on: https://code.wireshark.org/review/16058 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-22Don't close Wireshark (GTK) if user cancels Save on Close.Michael Mann1-13/+18
Bug: 9635 Change-Id: I4a6e3ca676f1c1096521c0a8147a1459777c92fa Reviewed-on: https://code.wireshark.org/review/16075 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-22Don't close Wireshark (Qt) if user cancels Save on Close.Michael Mann2-16/+18
Bug: 9635 Change-Id: I8c73c839419cd4bcb850824ffb42bf72eed50b19 Reviewed-on: https://code.wireshark.org/review/16076 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-22Handle ENAMETOOLONG.Gerald Combs1-0/+8
g_strerror doesn't appear to handle ENAMETOOLONG. Check for it ourselves. Change-Id: Icd113a81e8d95bb3c84c91bb420a1a6a19bf5d40 Reviewed-on: https://code.wireshark.org/review/16041 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-22No GeoIP, no need for geoip_none_.Guy Harris1-0/+2
Change-Id: I6fb328d07718d2ff7a7d6008c936b7478ea6db3f Reviewed-on: https://code.wireshark.org/review/16084 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-22Qt: Fix crash in Conversations and Endpoints dialogsGerald Combs2-53/+58
Don't assume that conv_item_t or hostlist_talker_t pointers never change. GArrays can reallocate their data, and in our case this can happen when we have more than 10,000 items (which is the size that the conversation table code passes to_array_sized_new). Bug: 12288 Change-Id: I88e58be830e35dde272f81fe9250b054fb87facf Reviewed-on: https://code.wireshark.org/review/16078 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-22SSH: Fix Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-2/+1
Change-Id: If084278acfeb82ae7c91aefff9035f156e8f4f15 Reviewed-on: https://code.wireshark.org/review/16079 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Kenny Root <kenny@the-b.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-22Qt: Make the syntax line edit less greedy.Gerald Combs1-8/+27
In SyntaxLineEdit::event, only grab ShortcutOverride events that have Ctrl+Alt modifiers. When the main window display filter edit has focus this should let us use text editing shortcuts and most main window shorcuts as appropriate. "Most" means everything except for time display formats. We might want to use something other than Ctrl+Alt for their modifiers. Bug: 12533 Ping-Bug: 12270 Change-Id: I61eb86b80b4237e6907d5e50262b8f5c291b27a7 Reviewed-on: https://code.wireshark.org/review/16065 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Jeff Morriss <jeff.morriss.ws@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-22GTK: Keep display filter applied when switching profilesBalint Reczey1-2/+8
Bug: 6130 Change-Id: I3bcd6aaad33482474e3429e0dcc074973a338fca Reviewed-on: https://code.wireshark.org/review/15992 Petri-Dish: Balint Reczey <balint@balintreczey.hu> Tested-by: Balint Reczey <balint@balintreczey.hu> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-22Add address_to_bytes API.Michael Mann20-20/+64
This will copy an address's "byte format" into a buffer. The original intended design is for export_pdu functionality, which tries to do this "manually" for many address types (and creates undesired dependencies) The default functionality if a "byte format function" isn't provided (currently the case for all address types) is a memcpy of the address data. Providing "address to byte" functions to aid export PDU functionality will be provided later. Change-Id: I3703f9e617a8cef09165ad53a0f98c6372676b9b Reviewed-on: https://code.wireshark.org/review/16070 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>
2016-06-22Qt: Clear the packet list selection before freezing it.Gerald Combs1-0/+2
Call selectionModel()->clear() before removing our model. This will hopefully make sure we don't end up with an invalid selection in selectionChanged(). Clear the selection model before clearing the model while we're here. Change-Id: I1007eeaa480afa0fb31dafc15a49ca6c247b30c8 Reviewed-on: https://code.wireshark.org/review/16062 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Kenny Root <kenny@the-b.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-22Move AT_VINES address type to VINES dissector.Michael Mann4-47/+40
proto.c still has to deal with FT_VINES, but maybe that can be refactored to the dissector too. Change-Id: Iee04eed3b75f91cb62bb7b625dd44baeeb9aebb3 Reviewed-on: https://code.wireshark.org/review/16069 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-22Move AT_USB to inside USB dissector.Michael Mann4-53/+50
This required some hacking in the conversation table handling, but still seemed worth it as USB address is not widely used. Maybe a "is_stringlike" property for address types... Change-Id: I628a15c17cb1f595bb292130867adbc5bea0f41a Reviewed-on: https://code.wireshark.org/review/16068 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>
2016-06-21The C standard requires <stdlib.h> for getenv() and abort().Guy Harris1-0/+1
You might be able to get away with not including it on some or all UN*Xes, but you can't do so on Windows with MSVC. Change-Id: Id2de70745e2a6e8dedc005a55030f3d3fcb54a69 Reviewed-on: https://code.wireshark.org/review/16064 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-21More helpful failure when registration fails.Joerg Mayer1-0/+7
Change-Id: I3c574c504cc9166d04b5b725a6a393767a58a280 Reviewed-on: https://code.wireshark.org/review/16063 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-06-21As with dissector_add_uint(), so with dissector_add_{string,guid}.Guy Harris1-7/+17
Improve the error message for a null disssector handle. Fix indentation while we're at it. Change-Id: I1cb2f8ac52e56fc98f6b3ad981018f571e5a7bf0 Reviewed-on: https://code.wireshark.org/review/16060 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-21Slightly improve error message in case of initialization errors.Joerg Mayer1-3/+8
Change-Id: Icb5d4f0f3bc60970737abbf62044f4550e8d3ca3 Reviewed-on: https://code.wireshark.org/review/16059 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-06-21tshark JSON and Elasticsearch output fixMartin Kacer6-50/+140
Fixed json and ek escape function Fixed -j protocol filter to do exact match Fixed -T json to correctly close json Added -j protocol filter also to pdml output Bug: 11754 Change-Id: I02f274e4a5a02346922b37bbe946c10340c242ea Reviewed-on: https://code.wireshark.org/review/16034 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-21libcodecs and libwsutil are DLLs, not static librariesPascal Quantin2-2/+2
Change-Id: I4486f35e07c72d4ca35d5649de25d0c9abd2a964 Reviewed-on: https://code.wireshark.org/review/16057 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>