#!/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 && {
- procd_append_param command -I "$1"
- append ifaces "$1"
+ append resolved_ifnames "$1"
}
}
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
- procd_open_instance
- procd_set_param command "$PROG"
+ 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
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"
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
local fwd_dhcp # = 1
config_get_bool fwd_dhcp "$cfg" forward_dhcp 1
- [ $fwd_dhcp -eq 1 ] && procd_append_param command"-D"
+ [ $fwd_dhcp -eq 1 ] && procd_append_param command "-D"
procd_close_instance
}
service_triggers()
{
procd_add_reload_trigger "network"
+ procd_add_raw_trigger "interface.*" 2000 /etc/init.d/relayd reload
}
start_service() {