From 86a7761331b83158631508b16e19b21f054715bc Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Thu, 9 Jun 2011 17:04:06 +0000 Subject: [PATCH] miniupnpd: properly handle multiple internal interfaces in hotplug helper (#9538) SVN-Revision: 27151 --- net/miniupnpd/Makefile | 4 +- net/miniupnpd/files/miniupnpd.iface.hotplug | 9 +- net/miniupnpd/files/miniupnpd.init | 237 ++++++++++---------- 3 files changed, 127 insertions(+), 123 deletions(-) diff --git a/net/miniupnpd/Makefile b/net/miniupnpd/Makefile index 318c764eb..0a2d443e9 100644 --- a/net/miniupnpd/Makefile +++ b/net/miniupnpd/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2009 OpenWrt.org +# Copyright (C) 2006-2011 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=miniupnpd PKG_VERSION:=1.5.20110309 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MD5SUM:=350d20bf25922e12f8d69e06fa33fd83 PKG_SOURCE_URL:=http://miniupnp.free.fr/files diff --git a/net/miniupnpd/files/miniupnpd.iface.hotplug b/net/miniupnpd/files/miniupnpd.iface.hotplug index 4772df912..32d527257 100644 --- a/net/miniupnpd/files/miniupnpd.iface.hotplug +++ b/net/miniupnpd/files/miniupnpd.iface.hotplug @@ -1,7 +1,8 @@ #!/bin/sh -/etc/init.d/miniupnpd enabled && [ -n "`pidof miniupnpd`" ] && { - local intif="$(uci_get upnpd config internal_iface)" - [ "$ACTION" = "ifup" ] && [ "$INTERFACE" = "$intif" ] && \ - /etc/init.d/miniupnpd restart +/etc/init.d/miniupnpd enabled && [ -n "`pidof miniupnpd`" ] && [ "$ACTION" = "ifup" ] && { + local intif + for intif in $(uci_get upnpd config internal_iface); do + [ "$INTERFACE" = "$intif" ] && /etc/init.d/miniupnpd restart + done } diff --git a/net/miniupnpd/files/miniupnpd.init b/net/miniupnpd/files/miniupnpd.init index 3d41ba8ab..4eebe4170 100644 --- a/net/miniupnpd/files/miniupnpd.init +++ b/net/miniupnpd/files/miniupnpd.init @@ -2,52 +2,55 @@ START=95 upnpd_get_port_range() { - local _var="$1"; shift - local _val - - 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 + local _var="$1"; shift + local _val + + 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 + 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 + 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() { @@ -84,89 +87,89 @@ start() { local ifname config_get ifname ${extiface:-wan} ifname - + if [ -n "$conffile" ]; then - args="-f $conffile" + args="-f $conffile" else - local tmpconf="/var/etc/miniupnpd.conf" - args="-f $tmpconf" - mkdir -p /var/etc - - echo "ext_ifname=$ifname" >$tmpconf - - local iface - - [ -n "$extip" ] && \ - echo "ext_ip=$extip" >>$tmpconf - - for iface in ${intiface:-lan}; do - local ipaddr - config_get ipaddr "$iface" ipaddr - [ -n "$ipaddr" ] && \ - echo "listening_ip=$ipaddr" >>$tmpconf - done - - [ "$port" != "auto" ] && \ - echo "port=$port" >>$tmpconf - - 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 - - [ -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 - + local tmpconf="/var/etc/miniupnpd.conf" + args="-f $tmpconf" + mkdir -p /var/etc + + echo "ext_ifname=$ifname" >$tmpconf + + [ -n "$extip" ] && \ + echo "ext_ip=$extip" >>$tmpconf + + local iface + for iface in ${intiface:-lan}; do + local ipaddr + config_get ipaddr "$iface" ipaddr + [ -n "$ipaddr" ] && \ + echo "listening_ip=$ipaddr" >>$tmpconf + done + + [ "$port" != "auto" ] && \ + echo "port=$port" >>$tmpconf + + 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 + + [ -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 - - + fi + + if [ -n "$ifname" ]; then - # start firewall - local zone - config_load firewall - config_get zone core "${extiface:-wan}_zone" + # start firewall + local zone + config_load firewall + config_get zone core "${extiface:-wan}_zone" + [ -n "$zone" ] && \ - miniupnpd_add_rules "$zone" "${extiface:-wan}" "$ifname" + miniupnpd_add_rules "$zone" "${extiface:-wan}" "$ifname" - if [ "$logging" = "1" ]; then - start-stop-daemon -b -S -x miniupnpd -- $args -d - else - start-stop-daemon -S -x miniupnpd -- $args - fi + if [ "$logging" = "1" ]; then + start-stop-daemon -b -S -x miniupnpd -- $args -d + else + start-stop-daemon -S -x miniupnpd -- $args + fi else logger -t "upnp daemon" "external interface not found, not starting" fi -- 2.30.2