Defer procd_open_instance only after validity check passed.
Fixes FS#541
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
include $(TOPDIR)/rules.mk
PKG_NAME:=relayd
include $(TOPDIR)/rules.mk
PKG_NAME:=relayd
PKG_SOURCE_URL=$(LEDE_GIT)/project/relayd.git
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=$(LEDE_GIT)/project/relayd.git
PKG_SOURCE_PROTO:=git
resolve_ifname() {
grep -qs "^ *$1:" /proc/net/dev && {
resolve_ifname() {
grep -qs "^ *$1:" /proc/net/dev && {
- procd_append_param command -I "$1"
- procd_append_param netdev "$1"
+ append resolved_ifnames "$1"
start_relay() {
local cfg="$1"
start_relay() {
local cfg="$1"
config_get proto "$cfg" proto
[ "$proto" = "relay" ] || return 0
config_get proto "$cfg" proto
[ "$proto" = "relay" ] || return 0
config_get_bool disabled "$cfg" disabled 0
[ "$disabled" -gt 0 ] && return 0
config_get_bool disabled "$cfg" disabled 0
[ "$disabled" -gt 0 ] && return 0
- procd_open_instance
- procd_set_param command "$PROG"
-
local net networks
config_get networks "$cfg" network
for net in $networks; do
local net networks
config_get networks "$cfg" network
for net in $networks; do
local ifn ifnames
config_get ifnames "$cfg" ifname
for ifn in $ifnames; do
local ifn ifnames
config_get ifnames "$cfg" ifname
for ifn in $ifnames; do
+ resolve_ifname "$ifn" || {
+ return 1
+ }
+ procd_open_instance
+ procd_set_param command "$PROG"
+
+ for ifn in $resolved_ifnames; do
+ procd_append_param command -I "$ifn"
+ procd_append_param netdev "$ifn"
+ done
local ipaddr
config_get ipaddr "$cfg" ipaddr
[ -n "$ipaddr" ] && procd_append_param command -L "$ipaddr"
local ipaddr
config_get ipaddr "$cfg" ipaddr
[ -n "$ipaddr" ] && procd_append_param command -L "$ipaddr"