summaryrefslogtreecommitdiff
path: root/extcap.c
AgeCommit message (Collapse)AuthorFilesLines
2017-06-30extcap: another round of memory leak fixesPeter Wu1-4/+14
Fix assorted memory leaks. Note that _tool_for_ifname is cleaned up at exit by extcap_cleanup, but lacked key/value destructors, so add them. After this, ASAN reports no more extcap memleaks. Change-Id: Ie5f4b1e2453a0beb52d617670202973839ca1416 Reviewed-on: https://code.wireshark.org/review/22466 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>
2017-05-30Qt: Add support to verify extcap capture filterMichael Mann1-0/+49
Bug: 11668 Change-Id: Ib218d87c1905e53ffdab4e3dd6f93ba2c3d07c8b Reviewed-on: https://code.wireshark.org/review/21770 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-05-03Extcap: use glib-compat for g_list_free_full()Martin Mathieson1-0/+1
Change-Id: I13e6a465b0e169f2f4ce134df3c873c416737b33 Reviewed-on: https://code.wireshark.org/review/21476 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-04-29extcap_free_interface_info: data param is usedMartin Kaiser1-1/+1
The data parameter is used, remove the _U_ qualifier. Change-Id: I3a3935bae958103da1a7a1abe0636e4781424aa7 Reviewed-on: https://code.wireshark.org/review/21408 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2017-04-25Qt: Add interface toolbar supportStig Bjørlykke1-2/+169
An extcap utility can provide configuration for controls to use in a GUI interface toolbar. This controls are bidirectional and can be used to control the extcap utility while capturing. This is useful in scenarios where configuration can be done based on findings in the capture process, setting temporary values or give other inputs without restarting current capture. Todo: - Add support for Windows Change-Id: Ie15fa67f92eb27d8b73df6bb36f66b9a7d81932d Reviewed-on: https://code.wireshark.org/review/19982 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-04-19extcap: fix memory leakMax Dmitrichenko1-1/+1
found by valgrind Change-Id: I8c5226a08be797ce72ec937138a6681d946fb13c Reviewed-on: https://code.wireshark.org/review/20720 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-03-27Don't waste time trying to run non-plain file and non-executable files.Guy Harris1-11/+17
Directories, and non-executable files, aren't going to be extcap executables. This may not make much of a difference for an installed version of Wireshark, but it makes a difference if you're running from the build directory. Change-Id: Ib9953fa04392dc7a8420ddf28bab9726e6050c12 Reviewed-on: https://code.wireshark.org/review/20752 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-03-04extcap: Minor improvementsRoland Knall1-14/+46
Add method for searching for tools by ifname and minor improvements in the interface callback to save time and space Change-Id: I0073c96fbee846cc5ff6304823fa14564ff36c22 Reviewed-on: https://code.wireshark.org/review/20376 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-03-01extcap: Create callback structureRoland Knall1-32/+56
To ease development of callbacks and new parameters, move all parameters for the callback methods to a struct Change-Id: I160277acf4d0473897172124f7c7aa744718da9c Reviewed-on: https://code.wireshark.org/review/20316 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-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-22extcap: Reduce number of scans and storageRoland Knall1-212/+266
Reduce the number of storage arrays and the number of necessary loads. Also include cleaner methods for reloading the interfaces and cleanly reload if asked by the overall system Change-Id: I529465ec2593d40c955c6cdeaf3a85e3021c0596 Reviewed-on: https://code.wireshark.org/review/20230 Petri-Dish: Roland Knall <rknall@gmail.com> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-02-03extcap: destroy hash tables on exit.Dario Lombardo1-0/+10
Change-Id: Ia6a1d8a45c36aff7f2bea8bde2ed5f308bddd2e1 Reviewed-on: https://code.wireshark.org/review/19919 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-01-22Internalize struct preferenceMichael Mann1-1/+0
Move "struct preference" into prefs.c, essentially creating a "private" structure to handle preferences. The 2 motivating factors were: 1. Better memory management so that clients/users of API don't have to worry about it. 2. Hide the ugliness of the union stuff and make it transparent to the API. A few bugs related to preference <-> Decode As integration were fixed while in the neighborhood. Change-Id: I509b9a236235d066b139c98222b701475e0ed365 Reviewed-on: https://code.wireshark.org/review/19578 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-01-12Extcap: Restore previously created preference from hash table, not ↵Michael Mann1-2/+2
preference pointer Change-Id: Ie68a5c6c193f362e78d4f4b1f20edf7747e2313f Reviewed-on: https://code.wireshark.org/review/19614 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-01-04Include extcap binaries in the count of things to point out during startup.Guy Harris1-2/+33
The GTK+ version, at least, crashes if there are more "doing XXX..." items put up than the calculated count, so, now that we're putting up items for extcap binaries, we need to count the extcap binaries. Clean up some stuff we found doing this (indentation, a _U_ on something that's used). Change-Id: I1f88042b64ce4b9ae352de37689677c694e3770b Reviewed-on: https://code.wireshark.org/review/19549 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-12-14extcap: Avoid double free of help.Stig Bjørlykke1-2/+2
Avoid double free of help when having multiple extcap interfaces. Ping-Bug: 13218 Change-Id: I6a0d6afd645787f9814c02e84079b4e8763d05f1 Reviewed-on: https://code.wireshark.org/review/19261 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-12-14extcap: set help for interfaces.Dario Lombardo1-0/+3
The help statement is in the first sentence, while interfaces are in others. We need to keep state of it. Ping-Bug: 13218 Change-Id: Iad1d403d5e8bc34e2489daaa3b14d469d5ee5b5b Reviewed-on: https://code.wireshark.org/review/19148 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-12-08extcap: Whitespace cleanup.Stig Bjørlykke1-192/+367
Cleanup code to use uniform whitespace to make it more readable. Also added brackets to unbracketed one line conditional statements. This was done using "astyle -A1cHjk3pU". Change-Id: Iebe96c488c843ce1d790ede0016eb9df025e98a5 Reviewed-on: https://code.wireshark.org/review/19133 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-07extcap: Separate dirname and file with G_DIR_SEPARATOR_S.Stig Bjørlykke1-5/+1
Change-Id: I9e1e9b1a10a15ca95519392a7a19ba77f460141e Reviewed-on: https://code.wireshark.org/review/19131 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-22More checks for localtime() and gmtime() returning NULL.Guy Harris1-0/+4
And some comments in the case where we're converting the result of time() - if your machine's idea of time predates January 1, 1970, 00:00:00 UTC, it'll crash on Windows, but that's not a case where a *file* can cause the problem due either to a bad file time stamp or bad time stamps in the file. Change-Id: I837a438e4b875dd8c4f3ec2137df7a16ee4e9498 Reviewed-on: https://code.wireshark.org/review/18369 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-18extcap: fix management of multicheck and saved non boolean argumentsPascal Quantin1-4/+3
Launching USBPcap without going in the interface options menu exhibits 2 bugs: - we should restore a value only if it is not an empty string (otherwise USBPcap with an ampty --devices multicheck argument) - when building the argument list for a non boolean argument not using the default value, do not call g_strconcat. It will build a string concatenating the option and value (for example "--devices 1" that will be treated as a single argument). Instead option and value must be given separately to argument list. Bug: 12846 Change-Id: I5628cb264a7632089e6579e9ae7400e2c0e500e2 Reviewed-on: https://code.wireshark.org/review/17773 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: Roland Knall <rknall@gmail.com>
2016-09-17extcap: fix heap-use-after free after saving prefsPeter Wu1-1/+2
All strings passed to prefs must be valid for the lifetime of the program (before prefs_cleanup is called). Use wmem for this purpose. Fixes v2.3.0rc0-660-g26bf66f Change-Id: I94f3bbb8ac6e18ae59d6462525f6bbc46fdb0f1f Reviewed-on: https://code.wireshark.org/review/17737 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-09-12Fix file name in comment.Guy Harris1-1/+1
Change-Id: I2a5b6e5c0ba8e729fbfa7e9e218aca1c747d6e45 Reviewed-on: https://code.wireshark.org/review/17667 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-12extcap: plug more memory leaksPeter Wu1-15/+23
Fix leak of the preference key name which happen for every new extcap argument. Fix leak of extcap arguments and the interface names in extcap_register_preferences. Change-Id: Idd68f924baa000303043cb98b32b23ce34fddb64 Reviewed-on: https://code.wireshark.org/review/17637 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-09-12extcap: Fix misc memory leaks triggered by network interface changesMikael Kanstrup1-17/+43
Valgrind reports plenty of misc memory leaks in extcap after the network interface list has changed or is refreshed. Errors can be seen by starting Wireshark with Valgrind's memcheck tool and bringing a network interface up and down a few times with: ifconfig eth0 up ifconfig eth0 down Change-Id: I90f53847071854b7d02facb39b7a380732de79b4 Reviewed-on: https://code.wireshark.org/review/17606 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-09-11extcap: fix use-after-free for preferencesPeter Wu1-29/+44
In commit v2.3.0rc0-117-g485bc45 (backported to v2.2.0rc0-44-g66721ca), extcap_prefs_dynamic_vals and extcap_cleanup were added in an attempt to address dangling pointers. Unfortunately it is not sufficient: - A pointer to the preference value is stored in extcap_arg and passed to the prefs API, but this extcap_arg structure can become invalid which result in use-after-free whenever the preference is accessed. - On exit, a use-after-free occurs in prefs_cleanup when the preference value is being checked. As the preference subsystem actually manages the memory for the string value and consumers should only provide a pointer where the value can be stored, convert the char* field in extcap to char**. This has as additional benefit that values are not limited to 256 bytes anymore. extcap_cleanup is moved after epan_cleanup to ensure that prefs_cleanup does not operate on dangling pointers. Crash is reproducible under ASAN with: tshark -i randpkt Ping-Bug: 12183 Change-Id: Ibf1ba1102a5633aa085dc278a12ffc05a4f4a34b Reviewed-on: https://code.wireshark.org/review/17631 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-09-08extcap_child_watch_cb() always uses the status argument.Guy Harris1-2/+2
Change-Id: I2537f2e3babe2158796acda6855f5aebeb0b7d4d Reviewed-on: https://code.wireshark.org/review/17595 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-07extcap: Add tool-specified helppageRoland Knall1-11/+19
Allow the tool to provide a link to a helppage, displayed by clicking on help in the configuration dialog. The URL will be opened using an URL based service, therefore local as well as remote URLs are possible. Change-Id: I58b30244e97919d5cf6892faf96536ddc30fb5a7 Reviewed-on: https://code.wireshark.org/review/17549 Reviewed-by: Roland Knall <rknall@gmail.com>
2016-09-06extcap:Replace self-organized lists with glib onesRoland Knall1-133/+53
Replace the error-prone next/prev handling with GList and GHashTable Cleanup extcap_parser to only expose necessary functions Remove token know-how from extcap Change-Id: I7cc5ea06f58ad6c7a85ac292f5d2cb3d33e59833 Reviewed-on: https://code.wireshark.org/review/17496 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-15extcap: Fix Dereference of null pointerAlexis La Goutte1-11/+8
Change-Id: I03098de9bd8684953a4fe024a3e6b604eeecf03f Reviewed-on: https://code.wireshark.org/review/17066 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-08-04extcap: preference name must only contain lower case ASCII, numbers, dots or ↵Pascal Quantin1-10/+30
underscores This chage set restores the normalization that was done before g485bc45. Without it, USBPcap extacp utility triggers a crash. Change-Id: Id960db186888452ec3d04df1ee48dcc3899e8951 Reviewed-on: https://code.wireshark.org/review/16871 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-08-02Fix compilation on FreeBSD.Michael Tuexen1-0/+7
Includes are needed for using macros like WIFEXITED. Change-Id: Ia09ca58eeab2d151a756d285b0aeb55141c4d24a Reviewed-on: https://code.wireshark.org/review/16841 Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
2016-08-02extcap: Remove g_spawn_check_exit_statusRoland Knall1-3/+12
This function is not supported in the min GLIB version, therefore the code is to be removed Change-Id: Ie39170bfc0662e5a477cbc45d7eadebcf2c70d4e Reviewed-on: https://code.wireshark.org/review/16827 Petri-Dish: Roland Knall <rknall@gmail.com> Reviewed-by: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-08-02extcap: add null check (CID 1364683).Dario Lombardo1-15/+18
Change-Id: I1d81d6f043fa695ed507cf733fffa832922a708c Reviewed-on: https://code.wireshark.org/review/16832 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-02extcap: extend buffer (CID 1364684).Dario Lombardo1-1/+1
Change-Id: I4ed6965fa1173b69d9e325bc814e382b5368d40c Reviewed-on: https://code.wireshark.org/review/16831 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-30extcap: Use stderr to print error messageRoland Knall1-8/+131
This patch reads out the stderr messages from an extcap utility and displays it to an user. It was tested on Qt but not on GTK, but should work their as well. On Mac OS/X and Windows the child_watch does not behave as it was intended. Therefore in extcap_cleanup, the callbacks are called manually, if and only if, they have not been called already. The reason why it displays two error messages is, that by the time the first one is being displayed, glib has not returned from the spawned process on Linux yet. So there is no way to add the stderr correctly, and putting a handler to stderr into interface_opts will lead to memory errors, cause then the code tries to access memory outside of its protection. Bug: 11892 Change-Id: I2db60dd480fed3e01428b91a705057e4f088bd15 Reviewed-on: https://code.wireshark.org/review/12954 Reviewed-by: Roland Knall <rknall@gmail.com> Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-29extcap: Restore functionality for optionsRoland Knall1-47/+98
Allow stored options to be restored to their default values. This adds a global cleanup method for extcap and globally defined preference values, which fixes the parameter problem with windows Change-Id: I48e0cf846ef81f4732d652c6a2ad0020db5df08e Reviewed-on: https://code.wireshark.org/review/13741 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-07-05extcap: Remove g_spawn_helper supportRoland Knall1-131/+58
Move g_spawn to separate file and implement functions to use Windows based method of spawning, instead of the glib based version Change-Id: Ibae03d834ec86531eba37dc8768fbf17ddadf57f Reviewed-on: https://code.wireshark.org/review/16049 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-06-01Allow create_tempfile to support a suffix.Michael Mann1-1/+1
Ping-Bug: 10203 Change-Id: Ifa24870d711449b87e9839dd46af614e4aa28fde Reviewed-on: https://code.wireshark.org/review/15608 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2016-04-25Compile sshdump and ciscodump for WindowsPascal Quantin1-1/+1
Use libSSH 0.7.2 compiled with MinGW(32|64) and linked with zlib and gcrypt support Change-Id: I7c17d1ba3dd1890e2f83c119f5ea851834807e43 Reviewed-on: https://code.wireshark.org/review/12117 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-19extcap: fix const compiler warnings.Dario Lombardo1-3/+3
Change-Id: I849b16597829212b195bd75a2aab8e1db49f1ccf Reviewed-on: https://code.wireshark.org/review/14827 Reviewed-by: Roland Knall <rknall@gmail.com> Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-21Fix building without extcap enabledJoão Valverde1-3/+0
Using cmake -DENABLE_EXTCAP=no or ./configure --without-extcap. Some documentation fixes too. Change-Id: Iebf9c843d67e10a32de1a62904de8f88b872ec99 Reviewed-on: https://code.wireshark.org/review/14522 Petri-Dish: 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-02-27Replace extcap_interface_list() with append_extcap_interface_list().Guy Harris1-35/+40
Pull the "rebuild the list of extcap interfaces and, optionally, return a list of if_infos for them" into a separate extcap_reload_interface_list() routine, call it in the cases where we don't want the if_infos list, and have append_extcap_interface_list() call it, asking it for the if_infos list, and then append the interfaces to that list. Change-Id: I07478ab133859484b3e0916144971639f961224b Reviewed-on: https://code.wireshark.org/review/14189 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-27Put the extcap interfaces at the *end* of the interface list.Guy Harris1-12/+27
The list should start with the native local interfaces, as returned by pcap, so that we default to the interface pcap gives first, rather than to whatever extcap interface happens to be at the beginning. This also means that, if we're only calling extcap_interface_list() to regenerate our internal data structures, we don't bother allocating - and leaking! - a list of if_info structures. Change-Id: Ida651b5b081883f118a300b9f57403f2dc5c4363 Ping-Bug: 12183 Reviewed-on: https://code.wireshark.org/review/14187 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-26Clean up setting *err_str to NULL.Guy Harris1-5/+1
Just do it upfront. Change-Id: I5305882b8efd080fcb3e8ea626e09f4682729702 Reviewed-on: https://code.wireshark.org/review/14185 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-26Fix indentation.Guy Harris1-1/+1
Change-Id: I201c35e1f6dfdb67a68dbc0ee684e0231842f00b Reviewed-on: https://code.wireshark.org/review/14182 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-11extcap: Fix call to child watchRoland Knall1-6/+2
Child watch seems to keep executables in limbo, if extcap_cleanup removed the watch before it could be fired at least once Bug: 12080 Change-Id: I74afafe8545d464ec08b1043a6377a6450e4c772 Reviewed-on: https://code.wireshark.org/review/13900 Petri-Dish: Roland Knall <rknall@gmail.com> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-02-11extcap: Convert settings to preference friendly key namesMikael Kanstrup1-26/+46
Preferences are only allowed to contain lowercase ASCII letters, numbers, underscores or dot characters. Create a utility function to convert an extcap setting to its equivalent preference key and use it wherever conversion from setting to preference key is needed. Bug: 12064 Change-Id: I39bbac7de5f0f905bd41c54257fa997a3b32442d Reviewed-on: https://code.wireshark.org/review/13687 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-02-01Fix leaks when spawning extcap processesMikael Kanstrup1-2/+1
Valgrind reports leaks like these when spawning extcap processes (for example when displaying or refreshing interface list with extcap interfaces present): 3,917 (464 direct, 3,453 indirect) bytes in 29 blocks are definitely lost in loss record 58,301 of 58,638 at 0x4C2AB80: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) by 0xA6D2610: g_malloc (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0) by 0xA6E822D: g_slice_alloc (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0) by 0xA6B913B: g_error_new_valist (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0) by 0xA6B94ED: g_set_error (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0) by 0xA710B03: ??? (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0) by 0xA710E17: g_spawn_sync (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0) by 0x44C677: extcap_foreach (extcap.c:199) by 0x44CCAD: extcap_interface_list (extcap.c:413) by 0x72B548: capture_interface_list (capture_ifinfo.c:126) by 0x7336FA: scan_local_interfaces (iface_lists.c:141) by 0x55F01F: WiresharkApplication::refreshLocalInterfaces() (wireshark_application.cpp:898) ... Change-Id: If8f750f5f8fa42a6f0884bb0e6bbbd71bd8f68aa Reviewed-on: https://code.wireshark.org/review/13631 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-02-01extcap: Correct save for file argumentsRoland Knall1-0/+5
Also add check to has_configuration Change-Id: Ia0ffbd3bf68ad51c26bc75b5ee179db179e22bd4 Reviewed-on: https://code.wireshark.org/review/13635 Reviewed-by: Roland Knall <rknall@gmail.com>
generated by cgit v1.2.1 (git 2.18.0) at 2024-05-04 09:39:56 +0000