aboutsummaryrefslogtreecommitdiffstats
path: root/ui/commandline.c
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2017-12-11 14:41:58 -0800
committerGerald Combs <gerald@wireshark.org>2017-12-11 23:29:00 +0000
commit34b62c60bfad56275dca48242c7e477f33b691ef (patch)
tree3370b3a9df2ce98d09a75419da725f3e97fb8b11 /ui/commandline.c
parent10e98462520b5dcfa1e5d7b80e53a95725d91d94 (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/commandline.c')
-rw-r--r--ui/commandline.c16
1 files changed, 13 insertions, 3 deletions
diff --git a/ui/commandline.c b/ui/commandline.c
index f891fef5d0..8d81c8d1a9 100644
--- a/ui/commandline.c
+++ b/ui/commandline.c
@@ -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.
*/
#include "config.h"
@@ -54,8 +66,6 @@ commandline_param_info_t global_commandline_info;
#if defined(HAVE_LIBPCAP) || defined(HAVE_EXTCAP)
capture_options global_capture_opts;
-// Initialized in fill_in_local_interfaces_start.
-GMutex global_capture_opts_mtx;
#endif
void