diff options
| author | Gerald Combs <gerald@wireshark.org> | 2017-12-11 14:41:58 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2017-12-11 23:29:00 +0000 |
| commit | 34b62c60bfad56275dca48242c7e477f33b691ef (patch) | |
| tree | 3370b3a9df2ce98d09a75419da725f3e97fb8b11 /ui/capture_globals.h | |
| parent | 10e98462520b5dcfa1e5d7b80e53a95725d91d94 (diff) | |
Revert "Move fill_in_local_interfaces to a thread."
Calling scan_local_interfaces ends up calling fork via extcap. Doing so
from a thread is ill-adivsed:
https://rachelbythebay.com/w/2014/08/16/forkenv/
http://www.linuxprogrammingblog.com/threads-and-fork-think-twice-before-using-them
This reverts commit 5b4894b7959f44e077f36194c490cbf402e1e659.
Revert "fix compilation without pcap." as well.
This reverts commit 51300b3c834a3877d567fb57ae78ec74ec8ba80d.
Change-Id: Ic80582b52398c44af73c6d74dbb3216c4d1b37fc
Reviewed-on: https://code.wireshark.org/review/24772
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/capture_globals.h')
| -rw-r--r-- | ui/capture_globals.h | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/ui/capture_globals.h b/ui/capture_globals.h index e71f29ade4..916bd37516 100644 --- a/ui/capture_globals.h +++ b/ui/capture_globals.h @@ -5,7 +5,19 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #ifndef __CAPTURE_GLOBALS_H__ @@ -17,10 +29,7 @@ extern "C" { #endif /* __cplusplus */ -// This should probably be behind an API. extern capture_options global_capture_opts; -// Should this be an element of capture_options? -extern GMutex global_capture_opts_mtx; #ifdef __cplusplus } |