relayd: fix making incomplete instance json data

[openwrt/staging/lynxis/omap.git] / package / network / services / relayd / files / relay.init

diff --git a/package/network/services/relayd/files/relay.init b/package/network/services/relayd/files/relay.init
index c6288637d19ab8b8c67ad985c5fdf51d790b78f5..5c7a0f9efe608766e577a667262c155395408fe9 100644 (file)
--- a/package/network/services/relayd/files/relay.init
+++ b/package/network/services/relayd/files/relay.init
@@ -19,8 +19,7 @@ validate_proto_relayd()
 
 resolve_ifname() {
        grep -qs "^ *$1:" /proc/net/dev && {
-               procd_append_param command -I "$1"
-               append ifaces "$1"
+               append resolved_ifnames "$1"
        }
 }
 
@@ -34,9 +33,7 @@ resolve_network() {
 
 start_relay() {
        local cfg="$1"
-
-       local args=""
-       local ifaces=""
+       local proto disabled
 
        config_get proto "$cfg" proto
        [ "$proto" = "relay" ] || return 0
@@ -44,20 +41,7 @@ start_relay() {
        config_get_bool disabled "$cfg" disabled 0
        [ "$disabled" -gt 0 ] && return 0
 
-       SERVICE_DAEMONIZE=1
-       SERVICE_WRITE_PID=1
-       SERVICE_PID_FILE="/var/run/relay-$cfg.pid"
-       [ -f "$SERVICE_PID_FILE" ] && {
-               if grep -q relayd "/proc/$(cat $SERVICE_PID_FILE)/cmdline"; then
-                       return 0
-               else
-                       rm -f "$SERVICE_PID_FILE"
-               fi
-       }
-
-       procd_open_instance
-       procd_set_param command "$PROG"
-
+       local resolved_ifnames
        local net networks
        config_get networks "$cfg" network
        for net in $networks; do
@@ -69,9 +53,18 @@ start_relay() {
        local ifn ifnames
        config_get ifnames "$cfg" ifname
        for ifn in $ifnames; do
-               resolve_ifname "$ifn"
+               resolve_ifname "$ifn" || {
+                       return 1
+               }
        done
 
+       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"
@@ -82,7 +75,7 @@ start_relay() {
 
        local expiry # = 30
        config_get expiry "$cfg" expiry
-       [ -n "$expiry" ] && procd_append_param command "$expiry"
+       [ -n "$expiry" ] && procd_append_param command -t "$expiry"
 
        local retry # = 5
        config_get retry "$cfg" retry
@@ -106,6 +99,7 @@ start_relay() {
 service_triggers()
 {
        procd_add_reload_trigger "network"
+       procd_add_raw_trigger "interface.*" 2000 /etc/init.d/relayd reload
 }
 
 start_service() {