relayd: fix making incomplete instance json data

[openwrt/staging/yousong.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 43ba6e10f40f78d289f38b14c85324e640ab4407..5c7a0f9efe608766e577a667262c155395408fe9 100644 (file)
--- a/package/network/services/relayd/files/relay.init
+++ b/package/network/services/relayd/files/relay.init
@@ -1,11 +1,25 @@
 #!/bin/sh /etc/rc.common
 # Copyright (c) 2011-2012 OpenWrt.org
+
 START=80
 
+USE_PROCD=1
+PROG=/usr/sbin/relayd
+
+validate_proto_relayd()
+{
+       uci_validate_section network "interface" "${1}" \
+               'network:list(string)' \
+               'expiry:uinteger:30' \
+               'retry:uinteger:5' \
+               'table:range(0, 65535):16800' \
+               'forward_bcast:bool:1' \
+               'forward_dhcp:bool:1'
+}
+
 resolve_ifname() {
        grep -qs "^ *$1:" /proc/net/dev && {
-               append args "-I $1"
-               append ifaces "$1"
+               append resolved_ifnames "$1"
        }
 }
 
@@ -19,24 +33,15 @@ resolve_network() {
 
 start_relay() {
        local cfg="$1"
-
-       local args=""
-       local ifaces=""
+       local proto disabled
 
        config_get proto "$cfg" proto
-       [[ "$proto" == relay ]] || 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
-       }
+       [ "$proto" = "relay" ] || return 0
+
+       config_get_bool disabled "$cfg" disabled 0
+       [ "$disabled" -gt 0 ] && return 0
 
+       local resolved_ifnames
        local net networks
        config_get networks "$cfg" network
        for net in $networks; do
@@ -48,49 +53,56 @@ 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" ] && append args "-L $ipaddr"
+       [ -n "$ipaddr" ] && procd_append_param command -L "$ipaddr"
 
        local gateway
        config_get gateway "$cfg" gateway
-       [ -n "$gateway" ] && append args "-G $gateway"
+       [ -n "$gateway" ] && procd_append_param command -G "$gateway"
 
        local expiry # = 30
        config_get expiry "$cfg" expiry
-       [ -n "$expiry" ] && append args "-t $expiry"
+       [ -n "$expiry" ] && procd_append_param command -t "$expiry"
 
        local retry # = 5
        config_get retry "$cfg" retry
-       [ -n "$retry" ] && append args "-p $retry"
+       [ -n "$retry" ] && procd_append_param command -p "$retry"
 
        local table # = 16800
        config_get table "$cfg" table
-       [ -n "$table" ] && append args "-T $table"
+       [ -n "$table" ] && procd_append_param command -T "$table"
 
        local fwd_bcast # = 1
        config_get_bool fwd_bcast "$cfg" forward_bcast 1
-       [ $fwd_bcast -eq 1 ] && append args "-B"
+       [ $fwd_bcast -eq 1 ] && procd_append_param command "-B"
 
        local fwd_dhcp # = 1
        config_get_bool fwd_dhcp "$cfg" forward_dhcp 1
-       [ $fwd_dhcp -eq 1 ] && append args "-D"
+       [ $fwd_dhcp -eq 1 ] && procd_append_param command "-D"
 
-       service_start /usr/sbin/relayd $args
+       procd_close_instance
 }
 
-stop() {
-       for pid in /var/run/relay-*.pid; do
-               SERVICE_PID_FILE="$pid"
-               service_stop /usr/sbin/relayd
-               rm -f "$SERVICE_PID_FILE"
-       done
+service_triggers()
+{
+       procd_add_reload_trigger "network"
+       procd_add_raw_trigger "interface.*" 2000 /etc/init.d/relayd reload
 }
 
-start() {
+start_service() {
        include /lib/network
        config_load network
        config_foreach start_relay interface