mv packages to config dir to match web layout

1 files changed, 290 insertions, 0 deletions

diff --git a/config/miniupnpd/miniupnpd.inc b/config/miniupnpd/miniupnpd.inc
new file mode 100644
index 00000000..98e44951
--- /dev/null
+++ b/config/miniupnpd/miniupnpd.inc
@@ -0,0 +1,290 @@
+<?php
+
+/*   package is now in base, check to see 
+ *   if we are already being included 
+ */
+if(!function_exists("upnp_action")) {
+		
+	require_once("config.inc");
+	require_once("functions.inc");
+
+	/* MiniUPnPd */
+
+	define('UPNP_RCFILE', '/usr/local/etc/rc.d/miniupnpd.sh');
+	define('UPNP_CONFIG','/usr/local/etc/miniupnpd.conf');
+
+	function upnp_notice ($msg) { syslog(LOG_NOTICE, "miniupnpd: {$msg}"); }
+	function upnp_warn ($msg) { syslog(LOG_WARNING, "miniupnpd: {$msg}"); }
+
+	function upnp_action ($action) {
+		if (file_exists(UPNP_RCFILE))
+			mwexec(UPNP_RCFILE.' '.$action);
+	}
+
+	function upnp_running () {
+		if((int)exec('pgrep miniupnpd | wc -l') > 0)
+			return true;
+		return false;
+	}	
+
+	function upnp_write_config($file, $text) {
+		$handle = fopen($file, 'w');
+		if(!$handle) {
+			upnp_warn("Could not open {$file} for writing.");
+			exit;
+		}
+		fwrite($handle, $text);
+		fclose($handle);	
+	}
+
+	function upnp_uuid() {
+		/* md5 hash of wan mac */
+		$uuid = md5(exec('arp -an -i '.get_real_wan_interface().' | /usr/bin/cut -d " " -f4'));
+		/* put uuid in correct format 8-4-4-4-12 */
+		return substr($uuid,0,8).'-'.substr($uuid,9,4).'-'.substr($uuid,13,4).'-'.substr($uuid,17,4).'-'.substr($uuid,21,12);
+	}
+
+	function upnp_validate_ip($ip,$check_cdir) {
+		/* validate cdir */	
+		if($check_cdir)	{
+			$ip_array = explode('/',$ip);
+			if(count($ip_array) == 2) {
+				if($ip_array[1] < 1 || $ip_array[1] > 32)
+					return false;
+			} else
+				if(count($ip_array) != 1)
+					return false;
+		} else
+			$ip_array[] = $ip;
+
+		/* validate ip */
+		if(!eregi('^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$', $ip_array[0]))
+			return false;
+		foreach(explode('.', $ip_array[0]) as $sub)
+			if($sub < 0 || $sub > 256)
+				return false;
+		return true;
+	}
+
+	function upnp_validate_port($port) {
+		foreach(explode('-', $port) as $sub)
+			if($sub < 0 || $sub > 65535)
+				return false;
+		return true;	
+	}
+
+	function before_form_miniupnpd($pkg) {
+		global $config;
+
+		config_lock();		
+		
+		/* if shaper connection speed defined hide fields */
+		if($config['ezshaper']['step2']['download'] && $config['ezshaper']['step2']['upload']) {
+			$i=0;
+			foreach ($pkg['fields']['field'] as $field) {
+				if ($field['fieldname'] == 'download' || $field['fieldname'] == 'upload')
+					unset($pkg['fields']['field'][$i]);
+				$i++;
+			}
+		}
+
+		config_unlock();
+	}
+
+	function validate_form_miniupnpd($post, $input_errors) {
+		if($post['iface_array'])
+			foreach($post['iface_array'] as $iface)
+				if($iface == 'wan')
+					$input_errors[] = 'It is a security risk to specify WAN in the \'Interface\' field';
+		if($post['overridewanip'] && !upnp_validate_ip($post['overridewanip'],false))
+			$input_errors[] = 'You must specify a valid ip address in the \'Override WAN address\' field';
+		if(($post['download'] && !$post['upload']) || ($post['upload'] && !$post['download']))
+			$input_errors[] = 'You must fill in both \'Maximum Download Speed\' and \'Maximum Upload Speed\' fields';
+		if($post['download'] && $post['download'] <= 0)
+			$input_errors[] = 'You must specify a value greater than 0 in the \'Maximum Download Speed\' field';
+		if($post['upload'] && $post['upload'] <= 0)
+			$input_errors[] = 'You must specify a value greater than 0 in the \'Maximum Upload Speed\' field';
+
+		/* user permissions validation */
+		for($i=1; $i<=4; $i++) {
+			if($post["permuser{$i}"]) {
+				$perm = explode(' ',$post["permuser{$i}"]);
+				/* should explode to 4 args */
+				if(count($perm) != 4) {
+					$input_errors[] = "You must follow the specified format in the 'User specified permissions {$i}' field";
+				} else {
+					/* must with allow or deny */
+					if(!($perm[0] == 'allow' || $perm[0] == 'deny'))
+						$input_errors[] = "You must begin with allow or deny in the 'User specified permissions {$i}' field";
+					/* verify port or port range */
+					if(!upnp_validate_port($perm[1]) || !upnp_validate_port($perm[3]))
+						$input_errors[] = "You must specify a port or port range between 0 and 65535 in the 'User specified
+							permissions {$i}' field";
+					/* verify ip address */
+					if(!upnp_validate_ip($perm[2],true))
+						$input_errors[] = "You must specify a valid ip address in the 'User specified permissions {$i}' field";
+				}
+			}
+		}		
+	}
+
+	function sync_package_miniupnpd() {
+		global $config;
+		global $input_errors;
+
+		config_lock();
+
+		$upnp_config = $config['installedpackages']['miniupnpd']['config'][0];
+
+		$config_text = "ext_ifname=".get_real_wan_interface()."\n";
+		$config_text .= "port=2189\n";
+
+		$ifaces_active = '';
+
+		/* since config is written before this file invoked we don't need to read post data */
+		if($upnp_config['enable'] && $upnp_config['iface_array'])
+			$iface_array = explode(',', $upnp_config['iface_array']);
+
+		if($iface_array) {
+			foreach($iface_array as $iface) {
+				$if = convert_friendly_interface_to_real_interface_name($iface);
+				/* above function returns iface if fail */
+				if($if!=$iface) {
+					$addr = find_interface_ip($if);
+					/* non enabled interfaces are displayed in list on miniupnpd settings page */
+					/* check that the interface has an ip address before adding parameters */
+					if($addr) {
+						$config_text .= "listening_ip={$addr}\n";
+						if(!$ifaces_active) {
+							$webgui_ip = $addr;
+							$ifaces_active = $iface;
+						} else {
+							$ifaces_active .= ", {$iface}";
+						}
+					} else {
+						upnp_warn("Interface {$iface} has no ip address, ignoring");
+					}
+				} else {
+					upnp_warn("Could not resolve real interface for {$iface}");
+				}
+			}
+
+			if($ifaces_active) {
+				/* override wan ip address, common for carp, etc */
+				if($upnp_config['overridewanip'])
+					$config_text .= "ext_ip={$upnp_config['overridewanip']}\n";
+
+				/* if shaper connection speed defined use those values */
+				if($config['ezshaper']['step2']['download'] && $config['ezshaper']['step2']['upload']) {
+					$download = $config['ezshaper']['step2']['download']*1000;
+					$upload = $config['ezshaper']['step2']['upload']*1000;
+				} else {
+					$download = $upnp_config['download']*1000;
+					$upload = $upnp_config['upload']*1000;
+				}
+
+				/* set upload and download bitrates */
+				if($download && $upload) {
+					$config_text .= "bitrate_down={$download}\n";
+					$config_text .= "bitrate_up={$upload}\n";
+				}
+				
+				/* enable logging of packets handled by miniupnpd rules */
+				if($upnp_config['logpackets'])
+					$config_text .= "packet_log=yes\n";
+				
+				/* enable system uptime instead of miniupnpd uptime */
+				if($upnp_config['sysuptime'])
+					$config_text .= "system_uptime=yes\n";
+
+				/* set webgui url */
+				if($config['system']['webgui']['protocol']) {
+					$config_text .= "presentation_url={$config['system']['webgui']['protocol']}://{$webgui_ip}";
+					if($config['system']['webgui']['port'])
+						$config_text .= ":{$config['system']['webgui']['port']}";
+					$config_text .= "/\n";
+				}
+
+				/* set uuid and serial */
+				$config_text .= "uuid=".upnp_uuid()."\n";
+				$config_text .= "serial=".strtoupper(substr(upnp_uuid(),0,8))."\n";
+
+				/* set model number */
+				$config_text .= "model_number=".exec("/bin/cat /etc/version")."\n";
+	
+				/* upnp access restrictions */
+				for($i=1; $i<=4; $i++) {
+					if($upnp_config["permuser{$i}"])
+						$config_text .= "{$upnp_config["permuser{$i}"]}\n";
+				}
+
+				if($upnp_config['permdefault'])
+					$config_text .= "deny 0-65535 0.0.0.0/0 0-65535\n";
+
+				/* generate rc file start and stop */
+				$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 -f ".UPNP_CONFIG;
+
+				/* write out the configuration */
+				conf_mount_rw();
+				upnp_write_config(UPNP_CONFIG, $config_text);
+				write_rcfile(array(
+					    'file' => 'miniupnpd.sh',
+					    'start' => $start,
+					    'stop' => $stop
+				    )
+				);
+				conf_mount_ro();
+
+				/* if miniupnpd not running start it */
+				if(!upnp_running()) {
+					upnp_notice("Starting service on interface: {$ifaces_active}");
+					upnp_action('start');	
+				}
+				/* or restart miniupnpd if settings were changed */
+				elseif($_POST['iface_array']) {
+					upnp_notice("Restarting service on interface: {$ifaces_active}");
+					upnp_action('restart');
+				}
+			}
+		}
+
+		if(!$iface_array || !$ifaces_active) {
+			/* no parameters user does not want miniupnpd running */
+			/* lets stop the service and remove the rc file */
+
+			if(file_exists(UPNP_RCFILE)) {
+				if(!$upnp_config['enable'])
+					upnp_notice('Stopping service: miniupnpd disabled');
+				else
+					upnp_notice('Stopping service: no interfaces selected');
+					
+				upnp_action('stop');
+
+				conf_mount_rw();
+				unlink(UPNP_RCFILE);
+				unlink(UPNP_CONFIG);
+				conf_mount_ro();
+			}
+		}
+
+		config_unlock();
+	}
+
+}
+
+?>
\ No newline at end of file