fwknop: ensure default ifname matches default network

Signed-off-by: Terry Stockert <stockert@inkblotadmirer.me>
This commit is contained in:
Terry Stockert
2017-10-23 19:10:37 -05:00
committed by Yousong Zhou
parent f1c78bb0ec
commit 4adaa5b8b0
2 changed files with 6 additions and 3 deletions
+5 -2
View File
@@ -8,6 +8,8 @@
USE_PROCD=1
START=95
. /lib/functions/network.sh
FWKNOPD_BIN=/usr/sbin/fwknopd
start_service()
@@ -62,7 +64,9 @@ generate_configuration()
local PCAP_INTF=
local USER_CONFIG_PATH=/etc/fwknop/fwknopd.conf
local DEFAULT_UCI_NETWORK=wan
local DEFAULT_FWKNOPD_IFNAME=eth0
local DEFAULT_FWKNOPD_IFNAME=
network_get_device DEFAULT_FWKNOPD_IFNAME $DEFAULT_UCI_NETWORK
config_cb() {
local type="$1"
@@ -163,7 +167,6 @@ generate_configuration()
# Resolve network if possible
if [ -n "$NETWORK" ]; then
. /lib/functions/network.sh
network_get_device DEPEND_IFNAME "$NETWORK"
if [ -n "$DEPEND_IFNAME" ]; then
logger -p daemon.debug -t "fwknopd[----]" "Resolved network $NETWORK as interface $DEPEND_IFNAME"