From f90e96f2438fb587ff10188899aa60bc2fda57a2 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Sun, 21 Feb 2016 12:36:56 +0100
Subject: [PATCH] universal plug and play: move functions to their file

services.inc already includes unbound.inc and miniupnpd.inc so
it's safe to do this...
---
 src/etc/inc/miniupnpd.inc | 33 ++++++++++++++++++++++++++++++---
 src/etc/inc/services.inc  | 29 -----------------------------
 2 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/src/etc/inc/miniupnpd.inc b/src/etc/inc/miniupnpd.inc
index cbc151a2f..50b410925 100644
--- a/src/etc/inc/miniupnpd.inc
+++ b/src/etc/inc/miniupnpd.inc
@@ -1,8 +1,5 @@
 <?php
 
-
-/* MiniUPnPd */
-
 function upnp_notice ($msg) { log_error("miniupnpd: {$msg}"); }
 function upnp_warn ($msg) { log_error("miniupnpd: {$msg}"); }
 
@@ -12,6 +9,36 @@ function upnp_running () {
 	return false;
 }
 
+function upnp_start()
+{
+    if (file_exists('/var/etc/miniupnpd.conf')) {
+        @unlink('/var/run/miniupnpd.pid');
+        mwexec_bg('/usr/local/sbin/miniupnpd -f /var/etc/miniupnpd.conf -P /var/run/miniupnpd.pid');
+    }
+}
+
+function upnp_stop()
+{
+    killbypid('/var/run/miniupnpd.pid');
+    while((int)exec("/bin/pgrep -a miniupnpd | wc -l") > 0) {
+        mwexec('killall miniupnpd 2>/dev/null', true);
+    }
+    mwexec('/sbin/pfctl -aminiupnpd -Fr 2>&1 >/dev/null');
+    mwexec('/sbin/pfctl -aminiupnpd -Fn 2>&1 >/dev/null');
+}
+
+function upnp_configure()
+{
+       global $config;
+
+       if (!empty($config['installedpackages']['miniupnpd']['config'][0]['enable'])) {
+           echo gettext("Starting UPnP service... ");
+           sync_package_miniupnpd();
+           echo "done.\n";
+       }
+}
+
+
 function upnp_write_config($file, $text) {
 	$handle = fopen($file, 'w');
 	if(!$handle) {
diff --git a/src/etc/inc/services.inc b/src/etc/inc/services.inc
index f48cbaa02..952cb8ff4 100644
--- a/src/etc/inc/services.inc
+++ b/src/etc/inc/services.inc
@@ -2431,35 +2431,6 @@ function configure_cron()
     killbypid('/var/run/cron.pid', 'HUP');
 }
 
-function upnp_start()
-{
-    if (file_exists('/var/etc/miniupnpd.conf')) {
-        @unlink('/var/run/miniupnpd.pid');
-        mwexec_bg('/usr/local/sbin/miniupnpd -f /var/etc/miniupnpd.conf -P /var/run/miniupnpd.pid');
-    }
-}
-
-function upnp_stop()
-{
-    killbypid('/var/run/miniupnpd.pid');
-    while((int)exec("/bin/pgrep -a miniupnpd | wc -l") > 0) {
-        mwexec('killall miniupnpd 2>/dev/null', true);
-    }
-    mwexec('/sbin/pfctl -aminiupnpd -Fr 2>&1 >/dev/null');
-    mwexec('/sbin/pfctl -aminiupnpd -Fn 2>&1 >/dev/null');
-}
-
-function upnp_configure()
-{
-       global $config;
-
-       if (!empty($config['installedpackages']['miniupnpd']['config'][0]['enable'])) {
-           echo gettext("Starting UPnP service... ");
-           sync_package_miniupnpd();
-           echo "done.\n";
-       }
-}
-
 function install_cron_job($command, $active=false, $minute="0", $hour="*", $monthday="*", $month="*", $weekday="*", $who="root") {
     global $config;