diff options
| -rw-r--r-- | packages/miniupnpd/miniupnpd.inc | 30 | ||||
| -rw-r--r-- | packages/miniupnpd/miniupnpd.xml | 2 | ||||
| -rwxr-xr-x | packages/miniupnpd/sbin/miniupnpd | bin | 51285 -> 44737 bytes | |||
| -rw-r--r-- | pkg_config.xml | 2 |
4 files changed, 19 insertions, 15 deletions
diff --git a/packages/miniupnpd/miniupnpd.inc b/packages/miniupnpd/miniupnpd.inc index e69dcb26..fa5160c6 100644 --- a/packages/miniupnpd/miniupnpd.inc +++ b/packages/miniupnpd/miniupnpd.inc @@ -102,19 +102,23 @@ } /* valid paramters lets create rc file and start miniupnpd */ - - $stop = "if [ `pgrep miniupnpd | wc -l` != 0 ]; then\n"; - $stop .= "\t\t/usr/bin/killall miniupnpd\n"; - $stop .= "\t\twhile [ `pgrep miniupnpd | wc -l` != 0 ]; do sleep 1; done\n"; - $stop .= "\tfi\n"; - $stop .= "\t# Clear existing rules and rdr entries\n"; - $stop .= "\tif [ `pfctl -aminiupnpd -sr | wc -l` != 0 ]; then\n"; - $stop .= "\t\t/sbin/pfctl -aminiupnpd -Fr 2>&1 >/dev/null\n"; - $stop .= "\tfi\n"; - $stop .= "\tif [ `pfctl -aminiupnpd -sn | wc -l` != 0 ]; then\n"; - $stop .= "\t\t/sbin/pfctl -aminiupnpd -Fn 2>&1 >/dev/null\n"; - $stop .= "\tfi"; - + + $stop = <<<EOD +if [ `pgrep miniupnpd | wc -l` != 0 ]; then + /usr/bin/killall miniupnpd + while [ `pgrep miniupnpd | wc -l` != 0 ]; do + sleep 1 + done + fi + # Clear existing rules and rdr entries + if [ `pfctl -aminiupnpd -sr | wc -l` != 0 ]; then + /sbin/pfctl -aminiupnpd -Fr 2>&1 >/dev/null + fi + if [ `pfctl -aminiupnpd -sn | wc -l` != 0 ]; then + /sbin/pfctl -aminiupnpd -Fn 2>&1 >/dev/null + fi +EOD; + $start = $stop."\n\t/usr/local/sbin/miniupnpd -p 2869 -i {$wanif}{$ifaces_final}"; /* define maximum downstream and upstream bitrates */ diff --git a/packages/miniupnpd/miniupnpd.xml b/packages/miniupnpd/miniupnpd.xml index 4b166bad..15c99139 100644 --- a/packages/miniupnpd/miniupnpd.xml +++ b/packages/miniupnpd/miniupnpd.xml @@ -2,7 +2,7 @@ <packagegui> <title>Services: Miniupnpd</title> <name>miniupnpd</name> - <version>20061110</version> + <version>20061123</version> <savetext>Change</savetext> <include_file>/usr/local/pkg/miniupnpd.inc</include_file> <aftersaveredirect>status_upnp.php</aftersaveredirect> diff --git a/packages/miniupnpd/sbin/miniupnpd b/packages/miniupnpd/sbin/miniupnpd Binary files differindex 800a0472..447b925d 100755 --- a/packages/miniupnpd/sbin/miniupnpd +++ b/packages/miniupnpd/sbin/miniupnpd diff --git a/pkg_config.xml b/pkg_config.xml index ba16b6de..f4b2c7a1 100644 --- a/pkg_config.xml +++ b/pkg_config.xml @@ -121,7 +121,7 @@ <website>http://miniupnp.free.fr/</website> <category>Network Management</category> <maintainer>seth.mos@xs4all.nl ryan@wgnrs.dynu.com</maintainer> - <version>20061110</version> + <version>20061123</version> <required_version>1.0</required_version> <status>BETA</status> <config_file>http://www.pfsense.com/packages/config/miniupnpd/miniupnpd.xml</config_file> |