#!/bin/sh /etc/rc.common
START=95
-include /lib/miniupnpd
+upnpd_get_port_range() {
+ local _var="$1"; shift
+ local _val
-boot() {
- # On boot, there's a race condition with hotplug,
- # therfore do nothing here
- return
+ config_get _val "$@"
+
+ case "$_val" in
+ [0-9]*[:-][0-9]*)
+ export -n -- "${_var}_start=${_val%%[:-]*}"
+ export -n -- "${_var}_end=${_val##*[:-]}"
+ ;;
+ [0-9]*)
+ export -n -- "${_var}_start=$_val"
+ export -n -- "${_var}_end="
+ ;;
+ esac
+}
+
+conf_rule_add() {
+ local cfg="$1"
+ local tmpconf="$2"
+ local action external_port_start external_port_end int_addr
+ local internal_port_start internal_port_end
+
+ config_get action "$cfg" action "deny" # allow or deny
+ upnpd_get_port_range "ext" "$cfg" ext_ports "0-65535" # external ports: x, x-y, x:y
+ config_get int_addr "$cfg" int_addr "0.0.0.0/0" # ip or network and subnet mask (internal)
+ upnpd_get_port_range "int" "$cfg" int_ports "0-65535" # internal ports: x, x-y, x:y or range
+
+ # Make a single IP IP/32 so that miniupnpd.conf can use it.
+ case "$int_addr" in
+ */*) ;;
+ *) int_addr="$int_addr/32" ;;
+ esac
+
+ echo "${action} ${ext_start}${ext_end:+-}${ext_end} ${int_addr} ${int_start}${int_end:+-}${int_end}" >>$tmpconf
+}
+
+upnpd_write_bool() {
+ local opt="$1"
+ local def="${2:-0}"
+ local alt="$3"
+ local val
+
+ config_get_bool val config "$opt" "$def"
+ if [ "$val" -eq 0 ]; then
+ echo "${alt:-$opt}=no" >> $tmpconf
+ else
+ echo "${alt:-$opt}=yes" >> $tmpconf
+ fi
}
start() {
- local extif
- local intif
- local extiface
- local upload
- local download
- local logging
- local secure
+ type miniupnpd_add_rules >/dev/null 2>/dev/null || \
+ ACTION=- . /etc/hotplug.d/firewall/50-miniupnpd
config_load "upnpd"
- config_get extif config external_iface
- config_get intif config internal_iface
+ local extiface intiface upload download logging secure enabled natpmp
+ local extip port usesysuptime conffile serial_number model_number
+ local uuid notify_interval presentation_url enable_upnp
+ local upnp_lease_file clean_ruleset_threshold clean_ruleset_interval
+
+ config_get extiface config external_iface
+ config_get intiface config internal_iface
+ config_get extip config external_ip
+ config_get port config port 5000
config_get upload config upload
config_get download config download
config_get_bool logging config log_output 0
- config_get_bool secure config secure_mode 0
+ config_get conffile config config_file
+ config_get serial_number config serial_number
+ config_get model_number config model_number
+ config_get uuid config uuid
+ config_get notify_interval config notify_interval
+ config_get presentation_url config presentation_url
+ config_get upnp_lease_file config upnp_lease_file
+ config_get clean_ruleset_threshold config clean_ruleset_threshold
+ config_get clean_ruleset_interval config clean_ruleset_interval
+
+ local args
+
+ include /lib/network
+ scan_interfaces
+
+ local ifname
+ config_get ifname ${extiface:-wan} ifname
+
+ if [ -n "$conffile" ]; then
+ args="-f $conffile"
+ else
+ local tmpconf="/var/etc/miniupnpd.conf"
+ args="-f $tmpconf"
+ mkdir -p /var/etc
- config_load "network"
- config_get extiface ${extif:-wan} ifname
-
- if [ -n "$extiface" ]; then
- upnp_firewall_start
+ echo "ext_ifname=$ifname" >$tmpconf
- local args="-i $extiface"
+ [ -n "$extip" ] && \
+ echo "ext_ip=$extip" >>$tmpconf
- for iface in ${intif:-lan}; do
+ local iface
+ for iface in ${intiface:-lan}; do
local ipaddr
config_get ipaddr "$iface" ipaddr
- [ -n "$ipaddr" ] && append args "-a $ipaddr"
+ [ -n "$ipaddr" ] && \
+ echo "listening_ip=$ipaddr" >>$tmpconf
done
- append args "-p 5000 -U"
+ [ "$port" != "auto" ] && \
+ echo "port=$port" >>$tmpconf
- [ -n "$upload" -a -n "$download" ] && \
- append args "-B $(($download * 1024 * 8)) $(($upload * 1024 * 8))"
+ config_load "upnpd"
+ upnpd_write_bool enable_natpmp 1
+ upnpd_write_bool enable_upnp 1
+ upnpd_write_bool secure_mode 1
+ upnpd_write_bool system_uptime 1
- [ "$secure" -gt 0 ] && \
- append args "-S"
+ [ -n "$upnp_lease_file" ] && \
+ echo "lease_file=$upnp_lease_file" >>$tmpconf
+
+ [ -n "$upload" -a -n "$download" ] && {
+ echo "bitrate_down=$(($download * 1024 * 8))" >>$tmpconf
+ echo "bitrate_up=$(($upload * 1024 * 8))" >>$tmpconf
+ }
+
+ [ -n "${presentation_url}" ] && \
+ echo "presentation_url=${presentation_url}" >>$tmpconf
+
+ [ -n "${notify_interval}" ] && \
+ echo "notify_interval=${notify_interval}" >>$tmpconf
+
+ [ -n "${clean_ruleset_threshold}" ] && \
+ echo "clean_ruleset_threshold=${clean_ruleset_threshold}" >>$tmpconf
+
+ [ -n "${clean_ruleset_interval}" ] && \
+ echo "clean_ruleset_interval=${clean_ruleset_interval}" >>$tmpconf
+
+ [ -z "$uuid" ] && {
+ uuid="$(cat /proc/sys/kernel/random/uuid)"
+ uci set upnpd.config.uuid=$uuid
+ uci commit upnpd
+ }
+
+ [ "$uuid" = "nocli" ] || \
+ echo "uuid=$uuid" >>$tmpconf
+
+ [ -n "${serial_number}" ] && \
+ echo "serial=${serial_number}" >>$tmpconf
+
+ [ -n "${model_number}" ] && \
+ echo "model_number=${model_number}" >>$tmpconf
+
+ config_foreach conf_rule_add perm_rule "$tmpconf"
+ fi
+
+
+ if [ -n "$ifname" ]; then
+ # start firewall
+ local zone
+ config_load firewall
+ config_get zone core "${extiface:-wan}_zone"
+
+ [ -n "$zone" ] && \
+ miniupnpd_add_rules "$zone" "${extiface:-wan}" "$ifname"
if [ "$logging" = "1" ]; then
- eval start-stop-daemon -S -x miniupnpd -- $args -d | logger -t miniupnpd &
+ start-stop-daemon -b -S -x miniupnpd -- $args -d
else
- eval start-stop-daemon -S -x miniupnpd -- $args 2>/dev/null
+ start-stop-daemon -S -x miniupnpd -- $args
fi
else
logger -t "upnp daemon" "external interface not found, not starting"
stop() {
start-stop-daemon -K -q -x miniupnpd -p /var/run/miniupnpd.pid
- upnp_firewall_stop
+ rm -f /var/run/miniupnpd.pid
+
+ type miniupnpd_remove_rules >/dev/null 2>/dev/null || \
+ ACTION=- . /etc/hotplug.d/firewall/50-miniupnpd
+
+ miniupnpd_remove_rules
+
+ iptables -t nat -F MINIUPNPD 2>/dev/null
+ iptables -t nat -X MINIUPNPD 2>/dev/null
+ iptables -t filter -F MINIUPNPD 2>/dev/null
+ iptables -t filter -X MINIUPNPD 2>/dev/null
}
projects / openwrt / svn-archive / archive.git / blobdiff