summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2017-02-28IEEE 802.11: Handle Atheros paddingJaap Keuter1-3/+7
For some unknown reason between 802.11 protocol fields end and LLC protocol field start two octets of padding may appear. These octets (value 0x00) were observed on the OLPC laptop, heuristically detected and marked as OLPC mysterious stuff. It seems that Atheros chipset drivers also show this behaviour, although the padding is not 0x0000, but seem to be a duplicate of the sequence control field. This is now also heuristically detected and marked more generically as payload padding. Bug: 13411 Change-Id: I1e817e07dc19be8b3917ff302ede3328ca6a4938 Reviewed-on: https://code.wireshark.org/review/20284 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2017-02-28sharkd: support for rtp tap.Jakub Zawadzki1-0/+96
Change-Id: I84b542f8ace1e53f41be0b73a24aeb720c3c904a Reviewed-on: https://code.wireshark.org/review/20271 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2017-02-28androiddump: Use only non-blocking connect() instead of the socketMichal Labedzki1-0/+2
Architecture of androiddump based on "blocking" sockets, however for start-up it is better to use non-bloking connect() to avoid long waiting time then fail. Change-Id: I2bb8ea51e24db4dd1f5a6b97e1d2bc0156342d97 Reviewed-on: https://code.wireshark.org/review/20293 Petri-Dish: Michal Labedzki <michal.tomasz.labedzki@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>
2017-02-28RSVDv2 support - 2nd stageVolodymyr Khomenko1-34/+288
Improved META_OPERATION_START (CreateSnapshot, ApplySnapshot) Added VHDSET_QUERY_INFORMATION (SnapshotEntry) Added DELETE_SNAPSHOT Minor fixes: RSVD Status field of RSVD header shown as NT_STATUS Using more structural names for RSVDv2 hf_ Change-Id: I0199527a2de819796c7b34b663df73547f32d2fd Ping-Bug: 11232 Reviewed-on: https://code.wireshark.org/review/20300 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-02-28Some ERF pseudo-headers have color instead of lctr valuesfd1-3/+26
Don't report expert-info warnings for lctr when it is actually color. Change-Id: I689ec84dd8f1cafa1ec7e8740f9bc4091339929a Reviewed-on: https://code.wireshark.org/review/20306 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-02-28wiretap (nettl/pppdump): fix this statement may fall through ↵Alexis La Goutte2-0/+2
[-Werror=implicit-fallthrough=] found by gcc7 Change-Id: I8c339e7484d410460d499dd2923641630b482ebe Reviewed-on: https://code.wireshark.org/review/20303 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-27Return correct filter for get_hostlist_filter()Jakub Zawadzki3-4/+46
It was returning (ip.src == ... && <protocol>.port == ...). Now, I think correctly returns (ip.addr == ... && <protocol>.port == ...) Change-Id: I242e13c0c79c2222e2b27fc2f9ee348b89d21ec1 Reviewed-on: https://code.wireshark.org/review/20281 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-27Qt: Avoid null pointer dereference (CID 1401573)Stig Bjørlykke1-2/+3
Change-Id: I638174a05c6275baf54e000d941f47f8ba572169 Reviewed-on: https://code.wireshark.org/review/20302 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-02-27extcap: remove leak in interface lists.Dario Lombardo1-2/+14
Change-Id: Ib57292afc88cd32736b78a901385cfdde84c46c9 Reviewed-on: https://code.wireshark.org/review/20297 Reviewed-by: Roland Knall <rknall@gmail.com> Petri-Dish: Roland Knall <rknall@gmail.com> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-02-27print_stream: free memory on exit.Dario Lombardo4-2/+5
Change-Id: I6c4acaa9026cfdf1d4230c28c30bccfb6c025cef Reviewed-on: https://code.wireshark.org/review/19920 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-02-27Free radius dissector memory on shutdownMichael Mann3-8/+48
Change-Id: I19eef65e8144d7cb6d5c9eea454581a532420c75 Reviewed-on: https://code.wireshark.org/review/20292 Reviewed-by: Dario Lombardo <lomato@gmail.com> Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-27text2pcap: fix -Wmacro-redefined warningPeter Wu3-4/+10
With flex 2.6.3, this warning is observed (which causes a build failure when -Werror is not disabled: text2pcap-scanner.c:398:9: warning: 'yywrap' macro redefined [-Wmacro-redefined] #define yywrap() (/*CONSTCOND*/1) ^ text2pcap-scanner.c:76:13: note: previous definition is here #define yywrap yywrap Issue is specific to flex 2.6.3 and resolved upstream at https://github.com/westes/flex/issues/162 Change-Id: I861565f5080f87a9457427e7a63b5d9256c49e85 Reviewed-on: https://code.wireshark.org/review/20294 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-27wslua: fix documentation of Struct.fromhexPeter Wu1-1/+1
The default separator is really an empty string, not a single space. This has been wrongly documented since the beginning. Change-Id: I5598daec1486ce17cfeeaf5697f9759172db9cf5 Fixes: v1.11.3-rc1-1760-g860747e1e7 ("Adds some Lua helper functions: some commonly used functions, and to help troubleshooting Lua scripts") Reviewed-on: https://code.wireshark.org/review/20296 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-27pluginifdemo: Adjust title textsStig Bjørlykke1-6/+6
Small improvement in the title texts. Change-Id: Ia413577386dab11f78fd141d6333944beefb5b33 Reviewed-on: https://code.wireshark.org/review/20295 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-02-27text2pcap: check return values of functions and use a single exit point.Dario Lombardo3-80/+109
This is going to check every function for success and following patches will free allocated memory in clean_exit. Change-Id: I7ba7a53eae8a37a4c25e56369af20e575c3489fb Reviewed-on: https://code.wireshark.org/review/20225 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-26HTTP: do not call g_path_get_basename with a NULL pointerPascal Quantin1-1/+1
If the HTTP request was not found / captured, the request_uri pointer in conversation data is set to NULL. Do not call g_path_get_basename in that case. Bug: 13441 Change-Id: I86eef2072ad4932e8e415580e3144d1d95796c4f Reviewed-on: https://code.wireshark.org/review/20289 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>
2017-02-26ppp: fix conflict for hf fieldAlexis La Goutte1-4/+2
ccp.opt.oui' exists multiple times with NOT compatible types: FT_BYTES and FT_UINT24 Change-Id: If6a3bbaf0012ab41722648a950f7b7007cf9a3b3 Reviewed-on: https://code.wireshark.org/review/20291 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-26Fix error: extra ';' after member function definition [-Werror,-Wextra-semi]Joerg Mayer1-2/+2
Change-Id: I53aee8f259c3e855bf71160bbfd1d79254a5cdf4 Reviewed-on: https://code.wireshark.org/review/20290 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2017-02-26capinfos: use single exit point.Dario Lombardo1-5/+10
Change-Id: Ib1b556c07ec3e1f788c48038ed6bb0ae6af5cb7d Reviewed-on: https://code.wireshark.org/review/20196 Petri-Dish: Dario Lombardo <lomato@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-26wsutil: fix bugs in plugins_cleanup().Dario Lombardo2-12/+12
If plugin_list was NULL, plugin_types didn't get cleaned. Add test and set of open_info_arr. Change-Id: I7669e3ba86039fb2b26ff2da64f51896053c5e68 Reviewed-on: https://code.wireshark.org/review/20195 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-26Qt: Enable/disable Capture Interfaces buttons consistently.Gerald Combs1-6/+3
The "Compile BPFs" and "Start" buttons need to be enabled and disabled at the same time and according to the same criteria. Make sure we do so. Change-Id: I708886564dcf569cd71f936119195209ef6dcbd5 Reviewed-on: https://code.wireshark.org/review/20265 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-02-26Remove executable bit, from not executable files.Jakub Zawadzki8-0/+0
Change-Id: I8afa246172cd8d5a86513ade2f482566e3f9957a Reviewed-on: https://code.wireshark.org/review/20272 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2017-02-26[Automatic update for 2017-02-26]Gerald Combs12-4438/+4782
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I3094033ff26c1d8da5abcc22a25e4075f6bc087f Reviewed-on: https://code.wireshark.org/review/20285 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-02-26apply_line_edit(.h): fix extra ';' inside a class [-Wextra-semi] (clang) / ↵Alexis La Goutte1-2/+2
extra ‘;’ [-Wpedantic] (gcc) Change-Id: Ie75da8de308a5fe3a063cf929d0bb2ab739ad96f Reviewed-on: https://code.wireshark.org/review/20276 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-26 plugin_if: fix no previous prototype for ‘ext_toolbar_find_item’ ↵Alexis La Goutte1-1/+1
[-Wmissing-prototypes] Change-Id: Ie11bc347b609bce754b85516601b57f6b0174f7b Reviewed-on: https://code.wireshark.org/review/20279 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-26preferences_dialog (Qt): fix commas at the end of enumerator lists are a ↵Alexis La Goutte1-1/+1
C++11 extension [-Wc++11-extensions] Change-Id: I9781fea02e7578f7d940c050a6f405bfe4b347dd Reviewed-on: https://code.wireshark.org/review/20278 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-26pluginif: Adapt code for Qt4.8Roland Knall1-0/+15
Change-Id: I663bb39cc6b186228bee01946c705eb6e12a8a0a Reviewed-on: https://code.wireshark.org/review/20280 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-02-26Bugfix for extcap fileselect functionality, start button in extcap options ↵Kim Bäckström3-5/+16
dialog wouldn't get enabled if the user had selected a file (and mustexist=true wasn't specified). This commit also contains minor fixes to doc/README.extcap, it's now more aligned to the actual implementation. Added example usage of fileselect, radio and multiselect to doc/extcap_example.py. Change-Id: Ibfe40a35a26f49322fbe64c0594506a2163f7e20 Reviewed-on: https://code.wireshark.org/review/20274 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-02-26plugin_if(.h): fix commas at the end of enumerator lists are a C++11 ↵Alexis La Goutte1-1/+1
extension [-Wc++11-extensions] Change-Id: I09fa357dbf9fee44a83ae9e9d78d8512b1aa9ee8 Reviewed-on: https://code.wireshark.org/review/20277 Reviewed-by: Roland Knall <rknall@gmail.com>
2017-02-26androiddump: Set connect socket to non-blocking on WindowsMichael Mann1-0/+4
Bug: 13104 Change-Id: I05248dad8e72272cf0933c766ec0bf5160075e1e Reviewed-on: https://code.wireshark.org/review/20275 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-26smb2: Fix Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-1/+1
Change-Id: Ib1a74394195a945c8c723299f08dc9709233a5af Reviewed-on: https://code.wireshark.org/review/20245 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-26RADIUS: add cnergee dictionary (from FreeRADIUS)Alexis La Goutte4-0/+47
commit e37987492b0d575a8ef41900ef916244112b2468 Author: Alan T. DeKok <aland@freeradius.org> Date: Sat Feb 18 12:11:05 2017 -0500 Dictionary from cnergee. Which modifications so that the names don't conflict with existing ones. Change-Id: I4fed7f38300dd8bcf526e5a07eec6c7812991d95 Reviewed-on: https://code.wireshark.org/review/20258 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-25Revert "Qt: call cleanup from destructor in WiresharkApplication."Peter Wu1-2/+1
Calling cleanup() twice (via exit signal and via destructor) results in a use-after-free on exit via write_profile_recent. This reverts commit e47f9fbeb090a68f9229b0f03c3f76a6285d2dff. Change-Id: Ic3ca0742c03a345fd8cb7f3f782942872a3057f5 Reviewed-on: https://code.wireshark.org/review/20273 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-02-25json2pcap support addedMartin Kacer5-64/+595
Modified tshark -T json -x output Added tshark -T jsonraw output json2pcap.py (can be used for basic packet editing by modifying json) The modification in tshark -T json -x and new tshark -T jsonraw output add into hex-data output in JSON also information on which position each field is dissected in the original frame, what is the field length, bitmask (for not byte aligned fields) and type. This information can be used for latter processing. One use-case is json2pcap script which assembles the protocol layers back together from upper to lowers layers, which allows the basic packet modification/editing/rewriting. Change-Id: Ibf948eb8fc7e3b0b51c12df6c3855f705a9c7925 Reviewed-on: https://code.wireshark.org/review/19990 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Dario Lombardo <lomato@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-02-25RADIUS: update nomadix dictionary (from FreeRADIUS)Alexis La Goutte1-0/+6
commit ade4a571ad959d54faa4844df2305e5d5ccbb86 Author: Mark Johnson <mark@sunray.net> Date: Thu Feb 9 12:15:37 2017 -0800 Updating Nomadix dictionary with missing attributes. commit 4400bf37add2e1fb29a9dcf18ad76d2b8001db7b Author: Ethan Hayon <ehayon@gmail.com> Date: Tue Jun 4 13:27:58 2013 -0400 Updated VSAs for Nomadix Access Gateway Change-Id: I015418dc1ac808a128f12146ff8468a5eb8b6c5f Reviewed-on: https://code.wireshark.org/review/20259 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-25Fix compilation without plugins:Jakub Zawadzki1-0/+2
filesystem.c: In function ‘free_progdirs’: filesystem.c:2209:12: error: ‘plugin_dir’ undeclared (first use in this function) g_free(plugin_dir); Change-Id: Ib52b86d41be79b8ed7e42f5fdfaddcae6b0ca5c8 Reviewed-on: https://code.wireshark.org/review/20270 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-25Convert a few more dissectors to use wmem_hash instead of GHashtable.Michael Mann3-93/+55
Change-Id: I86c9e485b447b380f00195bf407ce28c05bb1822 Reviewed-on: https://code.wireshark.org/review/20268 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-25packet-fw1.c: header should be packet scoped, not epan scopedMichael Mann1-4/+1
Subtle memory leak Change-Id: I39e3f2d35de5a8c48469f3e0992cdfec09ff0755 Reviewed-on: https://code.wireshark.org/review/20269 Petri-Dish: Michael Mann <mmann78@netscape.net> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-25Configuration dump for webshark.Jakub Zawadzki1-1/+66
Change-Id: Ideaedaaa7bf5f1244d7f6845a08e4dc36a2c798f Reviewed-on: https://code.wireshark.org/review/20083 Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2017-02-25Replace "n/a" with an em dash.Gerald Combs3-6/+8
Replace occurrences of "n/a" with an em dash. It matches what we do elsewhere and reduces the need for translation. Change-Id: Ib5b63be765b7da9ae3e66ab19bd25cb497fd722d Reviewed-on: https://code.wireshark.org/review/20267 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-02-24dtd: fix build due to -Wtypedef-redefinitionPeter Wu1-2/+2
dtd.h defines the type, so avoid redefining to avoid this warning: epan/dtd_preparse.l:113:3: warning: redefinition of typedef 'Dtd_PreParse_scanner_state_t' is a C11 feature [-Wtypedef-redefinition] Change-Id: Id6dddb8fe082717b483a6eeae08dfde468c19c89 Fixes: v2.3.0rc0-2505-ge1282f2875 ("dtd: free memory on shutdown.") Reviewed-on: https://code.wireshark.org/review/20266 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-02-24dtd: free memory on shutdown.Dario Lombardo3-7/+13
Change-Id: I502e505730b9310066563bfd9c8df9fceddd0301 Reviewed-on: https://code.wireshark.org/review/20229 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-02-24udpdump: fix help.Dario Lombardo1-1/+1
Change-Id: Iad0e802f8c5d3920104751fab5135d71f02b29b8 Reviewed-on: https://code.wireshark.org/review/20264 Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-02-24androiddump: Use nonblocking connectMichal Labedzki1-7/+61
Release as version 1.0.5: All connects to ADB are now non-blocking. Try to connect up to 10 times with 1ms delays, so in worst-case it takes ~10ms (for example 14ms) Bug: 13104 Change-Id: I791909c9c951b62195b48acd82490e1b9ebf2be0 Reviewed-on: https://code.wireshark.org/review/19968 Petri-Dish: Michal Labedzki <michal.tomasz.labedzki@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.tomasz.labedzki@gmail.com> Tested-by: Michal Labedzki <michal.tomasz.labedzki@gmail.com>
2017-02-24tools: add options validation.Dario Lombardo1-2/+9
This prevents to call the apps with incongruent options. Change-Id: I76919a2da141bd277c06e708548c971c19dd7af7 Reviewed-on: https://code.wireshark.org/review/20211 Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-02-24Developers Guide typoGraham Bloice1-1/+1
Change-Id: I125f8d9171ebdfaf7528d784e69d9768e6b1b8b7 Reviewed-on: https://code.wireshark.org/review/20262 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2017-02-24Qt: Code cleanupStig Bjørlykke2-62/+48
Remove whitespace to match coding style used in file. Change-Id: I4c1649aa02087cd39b2f516db6e40749899c5125 Reviewed-on: https://code.wireshark.org/review/20260 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-02-24pluginif: Add documentation for toolbar interfaceRoland Knall1-0/+108
Add the documentation for the new toolbar interface to the README file Change-Id: I9dd37dc4f31760ccd1c9a3e6ae379cd6f9ca1db9 Reviewed-on: https://code.wireshark.org/review/20261 Reviewed-by: Roland Knall <rknall@gmail.com>
2017-02-24PluginIF: AdditionalToolbarRoland Knall35-31/+3743
Creates an interface for plugins and other parts of the code, to add a new toolbar to the system and have various widget types interact with this toolbar. All toolbars added via this interface, will be added to an additional submenu called "Additional Toolbars" within Wireshark. Also a demo plugin is being provided, demonstrating various features of the toolbar, including updating the gui elements. It also demonstrates how to update toolbar items. Change-Id: I8d0351224b3d7f4b90220d58970b51695551d7e3 Reviewed-on: https://code.wireshark.org/review/19803 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-02-24Reduce number of fwrite when writing pcap-ng EPB.AndersBroman1-2/+25
According to callgrind with the patch dumping 3000 pakets the number of calls to write_to_file is reduced from 11541 to 9000 reducing the number of lr from 4 681 518 to 4 314 101. If the buffer holding the packet was guaranteed to be padded to 32 bit boundary the code could be simplified and if there was space "in front" for the packet header it would be even better. Change-Id: Ie991c05fa9d831ee4d703bd47b8123f2b1f83277 Reviewed-on: https://code.wireshark.org/review/20256 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>