From 4adaa5b8b01b449ea79add9ed1f535e5a8127f13 Mon Sep 17 00:00:00 2001
From: Terry Stockert <stockert@inkblotadmirer.me>
Date: Mon, 23 Oct 2017 19:10:37 -0500
Subject: [PATCH] fwknop: ensure default ifname matches default network

Signed-off-by: Terry Stockert <stockert@inkblotadmirer.me>
---
 net/fwknop/Makefile           | 2 +-
 net/fwknop/files/fwknopd.init | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/net/fwknop/Makefile b/net/fwknop/Makefile
index 4350c35cc..f48893c28 100644
--- a/net/fwknop/Makefile
+++ b/net/fwknop/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fwknop
 PKG_VERSION:=2.6.10
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://www.cipherdyne.org/fwknop/download
diff --git a/net/fwknop/files/fwknopd.init b/net/fwknop/files/fwknopd.init
index b77b1439d..761016dd9 100644
--- a/net/fwknop/files/fwknopd.init
+++ b/net/fwknop/files/fwknopd.init
@@ -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"