From 98bcf1f8b57478833f65e3309d0cc98ba4933c0a Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Sat, 6 Nov 2010 12:40:54 -0400
Subject: Fix misc input validation errors.  Move routed/* to same dir as pkg
 items

---
 usr/local/pkg/routed.inc        | 114 ++++++++++++++++++++++++++++++++++++++++
 usr/local/pkg/routed.xml        | 114 ++++++++++++++++++++++++++++++++++++++++
 usr/local/pkg/routed/routed.inc | 114 ----------------------------------------
 usr/local/pkg/routed/routed.xml | 114 ----------------------------------------
 4 files changed, 228 insertions(+), 228 deletions(-)
 create mode 100644 usr/local/pkg/routed.inc
 create mode 100644 usr/local/pkg/routed.xml
 delete mode 100644 usr/local/pkg/routed/routed.inc
 delete mode 100644 usr/local/pkg/routed/routed.xml

(limited to 'usr/local/pkg')

diff --git a/usr/local/pkg/routed.inc b/usr/local/pkg/routed.inc
new file mode 100644
index 0000000..2d4f6d1
--- /dev/null
+++ b/usr/local/pkg/routed.inc
@@ -0,0 +1,114 @@
+<?php
+/* $Id$ */
+/*
+	routed.inc
+	Copyright (C) 2006 Bill Marquette
+	All rights reserved.
+
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions are met:
+
+	1. Redistributions of source code must retain the above copyright notice,
+	   this list of conditions and the following disclaimer.
+
+	2. Redistributions in binary form must reproduce the above copyright
+	   notice, this list of conditions and the following disclaimer in the
+	   documentation and/or other materials provided with the distribution.
+
+	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+	POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+function setup_routed() {
+	global $config;
+	$gw = "";
+
+	if (!is_array($config['installedpackages']['routed']))
+		return;
+	if (!is_array($config['installedpackages']['routed']['config']))
+		return;
+	if (isset($config['installedpackages']['routed']['config'][0]['enable']) &&
+		$config['installedpackages']['routed']['config'][0]['enable'] == "on") {
+		/* if user selected individual interfaces */
+		$ifdescrs = get_configured_interface_with_descr();
+		$ifarr = explode(",", $config['installedpackages']['routed']['config'][0]['iface_array']);
+                if (count($ifarr) != 0) {
+			foreach($ifdescrs as $ifdescr => $ifname) {
+				if (in_array($ifname, $ifarr)) {
+					$gw .= setup_etc_gateways($ifdescr, 'enable');
+				} else {
+					$gw .= setup_etc_gateways($ifdescr, 'disable');
+				}
+			}
+		} else {
+			/* setup for all interfaces */
+			$gw = setup_etc_gateways();
+		}
+		conf_mount_rw();
+		$fd = fopen("/etc/gateways", "w");
+		fwrite($fd, $gw);
+		fclose($fd);
+		conf_mount_ro();
+		restart_routed();
+	} else {
+		stop_routed();
+	}
+}
+
+function setup_etc_gateways($iface="", $mode="") {
+	global $config;
+
+	$ret = "";
+	if ($iface != "") {
+		$realif=convert_friendly_interface_to_real_interface_name($iface);
+		if ($realif)
+			$ret = "if={$realif} ";
+	}
+
+	switch($mode) {
+	case "enable":
+		if ($config['installedpackages']['routed']['config'][0]['ripversion'] == "2") {
+			$ret .= "ripv2 ";
+			$passwd = $config['installedpackages']['routed']['config'][0]['passwd'];
+			if ($passwd != "") {
+				$ret .= "passwd={$passwd} ";
+			}
+		}
+		break;
+	case "disable":
+		$ret .= "no_rip ";
+		break;
+
+	default:
+		break;
+
+	}
+	$ret .= "\n";
+
+	return $ret;
+}
+
+function start_routed() {
+	mwexec("/sbin/routed");
+}
+
+function stop_routed() {
+	if(isvalidproc("routed"))
+		mwexec("killall routed");
+}
+
+function restart_routed() {
+	stop_routed();
+	start_routed();
+}
+
+?>
diff --git a/usr/local/pkg/routed.xml b/usr/local/pkg/routed.xml
new file mode 100644
index 0000000..e284010
--- /dev/null
+++ b/usr/local/pkg/routed.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<packagegui>
+	<copyright>
+	/* $Id$ */
+	/*
+		part of pfSense (http://www.pfsense.org/)
+
+		Copyright (C) 2006 Bill Marquette - bill.marquette@gmail.com.
+		All rights reserved.
+
+		Redistribution and use in source and binary forms, with or without
+		modification, are permitted provided that the following conditions are met:
+
+		1. Redistributions of source code must retain the above copyright notice,
+		   this list of conditions and the following disclaimer.
+
+		2. Redistributions in binary form must reproduce the above copyright
+		   notice, this list of conditions and the following disclaimer in the
+		   documentation and/or other materials provided with the distribution.
+
+		THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+		INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+		AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+		AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+		OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+		SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+		INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+		CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+		ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+		POSSIBILITY OF SUCH DAMAGE.
+	*/
+	</copyright>
+	<name>routed</name>
+	<version>1.1</version>
+	<title>Services: RIP</title>
+	<include_file>routed/routed.inc</include_file>
+
+	<additional_files_needed>
+		<item>http://www.pfsense.org/packages/config/routed/routed.inc</item>
+	</additional_files_needed>
+
+	<!-- Menu is where this packages menu will appear -->
+	<menu>
+		<name>RIP</name>
+		<section>Services</section>
+		<configfile>routed/routed.xml</configfile>
+		<url>pkg_edit.php?xml=routed/routed.xml&amp;id=0</url>
+	</menu>
+	<tabs>
+		<tab>
+			<text>ROUTED Settings</text>
+			<url>/pkg_edit.php?xml=routed/routed.xml</url>
+			<active/>			
+		</tab>
+	</tabs>
+	<!-- configpath gets expanded out automatically and config items will be
+		stored in that location -->
+	<configpath>['installedpackages']['routed']['config']</configpath>
+	<!-- fields gets invoked when the user adds or edits a item.   the following items
+		will be parsed and rendered for the user as a gui with input, and selectboxes. -->
+	<fields>
+		<field>
+			<fielddescr>Enable RIP</fielddescr>
+			<fieldname>enable</fieldname>
+			<description>Enables the Routing Information Protocol daemon</description>
+			<type>checkbox</type>
+      <enablefields>iface_array[],ripversion,passwd</enablefields>
+		</field>
+		<field>
+			<fielddescr>Interfaces</fielddescr>
+			<fieldname>iface_array</fieldname>
+			<value>lan</value>
+			<multiple>true</multiple>
+			<size>3</size>
+			<type>interfaces_selection</type>
+			<description>Select the interfaces that RIP will bind to.  You can use the CTRL or COMMAND key to select multiple interfaces.</description>
+      <required />
+		</field>
+		<field>
+			<fielddescr>RIP Version</fielddescr>
+			<fieldname>ripversion</fieldname>
+			<type>select</type>
+			<default_value>2</default_value>
+			<options>
+				<option><name>RIP Version 1</name><value>1</value></option>
+				<option><name>RIP Version 2</name><value>2</value></option>
+			</options>
+			<typehint>Select which RIP version the daemon will listen/advertise using.</typehint>
+      <required />
+		</field>
+		<field>
+			<fielddescr>RIPv2 password</fielddescr>
+			<fieldname>passwd</fieldname>
+			<description>Specify a RIPv2 password.  This password will be sent 
+				in the clear on all RIPv2 responses received and sent.
+			</description>
+			<type>input</type>
+		</field>
+	</fields>
+	<aftersaveredirect>pkg_edit.php?xml=routed/routed.xml&amp;id=0</aftersaveredirect>
+        <custom_php_command_before_form>
+        </custom_php_command_before_form>
+	<custom_delete_php_command>
+	</custom_delete_php_command>
+	<custom_php_resync_config_command>
+		conf_mount_rw();
+		setup_routed();		
+		conf_mount_ro();
+	</custom_php_resync_config_command>
+	<custom_php_install_command>
+	</custom_php_install_command>
+	<custom_php_deinstall_command>
+	</custom_php_deinstall_command>
+</packagegui>
diff --git a/usr/local/pkg/routed/routed.inc b/usr/local/pkg/routed/routed.inc
deleted file mode 100644
index 2d4f6d1..0000000
--- a/usr/local/pkg/routed/routed.inc
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-/* $Id$ */
-/*
-	routed.inc
-	Copyright (C) 2006 Bill Marquette
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without
-	modification, are permitted provided that the following conditions are met:
-
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-
-	2. Redistributions in binary form must reproduce the above copyright
-	   notice, this list of conditions and the following disclaimer in the
-	   documentation and/or other materials provided with the distribution.
-
-	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-	POSSIBILITY OF SUCH DAMAGE.
-
-*/
-
-function setup_routed() {
-	global $config;
-	$gw = "";
-
-	if (!is_array($config['installedpackages']['routed']))
-		return;
-	if (!is_array($config['installedpackages']['routed']['config']))
-		return;
-	if (isset($config['installedpackages']['routed']['config'][0]['enable']) &&
-		$config['installedpackages']['routed']['config'][0]['enable'] == "on") {
-		/* if user selected individual interfaces */
-		$ifdescrs = get_configured_interface_with_descr();
-		$ifarr = explode(",", $config['installedpackages']['routed']['config'][0]['iface_array']);
-                if (count($ifarr) != 0) {
-			foreach($ifdescrs as $ifdescr => $ifname) {
-				if (in_array($ifname, $ifarr)) {
-					$gw .= setup_etc_gateways($ifdescr, 'enable');
-				} else {
-					$gw .= setup_etc_gateways($ifdescr, 'disable');
-				}
-			}
-		} else {
-			/* setup for all interfaces */
-			$gw = setup_etc_gateways();
-		}
-		conf_mount_rw();
-		$fd = fopen("/etc/gateways", "w");
-		fwrite($fd, $gw);
-		fclose($fd);
-		conf_mount_ro();
-		restart_routed();
-	} else {
-		stop_routed();
-	}
-}
-
-function setup_etc_gateways($iface="", $mode="") {
-	global $config;
-
-	$ret = "";
-	if ($iface != "") {
-		$realif=convert_friendly_interface_to_real_interface_name($iface);
-		if ($realif)
-			$ret = "if={$realif} ";
-	}
-
-	switch($mode) {
-	case "enable":
-		if ($config['installedpackages']['routed']['config'][0]['ripversion'] == "2") {
-			$ret .= "ripv2 ";
-			$passwd = $config['installedpackages']['routed']['config'][0]['passwd'];
-			if ($passwd != "") {
-				$ret .= "passwd={$passwd} ";
-			}
-		}
-		break;
-	case "disable":
-		$ret .= "no_rip ";
-		break;
-
-	default:
-		break;
-
-	}
-	$ret .= "\n";
-
-	return $ret;
-}
-
-function start_routed() {
-	mwexec("/sbin/routed");
-}
-
-function stop_routed() {
-	if(isvalidproc("routed"))
-		mwexec("killall routed");
-}
-
-function restart_routed() {
-	stop_routed();
-	start_routed();
-}
-
-?>
diff --git a/usr/local/pkg/routed/routed.xml b/usr/local/pkg/routed/routed.xml
deleted file mode 100644
index e284010..0000000
--- a/usr/local/pkg/routed/routed.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<packagegui>
-	<copyright>
-	/* $Id$ */
-	/*
-		part of pfSense (http://www.pfsense.org/)
-
-		Copyright (C) 2006 Bill Marquette - bill.marquette@gmail.com.
-		All rights reserved.
-
-		Redistribution and use in source and binary forms, with or without
-		modification, are permitted provided that the following conditions are met:
-
-		1. Redistributions of source code must retain the above copyright notice,
-		   this list of conditions and the following disclaimer.
-
-		2. Redistributions in binary form must reproduce the above copyright
-		   notice, this list of conditions and the following disclaimer in the
-		   documentation and/or other materials provided with the distribution.
-
-		THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-		INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-		AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-		AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-		OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-		SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-		INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-		CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-		ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-		POSSIBILITY OF SUCH DAMAGE.
-	*/
-	</copyright>
-	<name>routed</name>
-	<version>1.1</version>
-	<title>Services: RIP</title>
-	<include_file>routed/routed.inc</include_file>
-
-	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/routed/routed.inc</item>
-	</additional_files_needed>
-
-	<!-- Menu is where this packages menu will appear -->
-	<menu>
-		<name>RIP</name>
-		<section>Services</section>
-		<configfile>routed/routed.xml</configfile>
-		<url>pkg_edit.php?xml=routed/routed.xml&amp;id=0</url>
-	</menu>
-	<tabs>
-		<tab>
-			<text>ROUTED Settings</text>
-			<url>/pkg_edit.php?xml=routed/routed.xml</url>
-			<active/>			
-		</tab>
-	</tabs>
-	<!-- configpath gets expanded out automatically and config items will be
-		stored in that location -->
-	<configpath>['installedpackages']['routed']['config']</configpath>
-	<!-- fields gets invoked when the user adds or edits a item.   the following items
-		will be parsed and rendered for the user as a gui with input, and selectboxes. -->
-	<fields>
-		<field>
-			<fielddescr>Enable RIP</fielddescr>
-			<fieldname>enable</fieldname>
-			<description>Enables the Routing Information Protocol daemon</description>
-			<type>checkbox</type>
-      <enablefields>iface_array[],ripversion,passwd</enablefields>
-		</field>
-		<field>
-			<fielddescr>Interfaces</fielddescr>
-			<fieldname>iface_array</fieldname>
-			<value>lan</value>
-			<multiple>true</multiple>
-			<size>3</size>
-			<type>interfaces_selection</type>
-			<description>Select the interfaces that RIP will bind to.  You can use the CTRL or COMMAND key to select multiple interfaces.</description>
-      <required />
-		</field>
-		<field>
-			<fielddescr>RIP Version</fielddescr>
-			<fieldname>ripversion</fieldname>
-			<type>select</type>
-			<default_value>2</default_value>
-			<options>
-				<option><name>RIP Version 1</name><value>1</value></option>
-				<option><name>RIP Version 2</name><value>2</value></option>
-			</options>
-			<typehint>Select which RIP version the daemon will listen/advertise using.</typehint>
-      <required />
-		</field>
-		<field>
-			<fielddescr>RIPv2 password</fielddescr>
-			<fieldname>passwd</fieldname>
-			<description>Specify a RIPv2 password.  This password will be sent 
-				in the clear on all RIPv2 responses received and sent.
-			</description>
-			<type>input</type>
-		</field>
-	</fields>
-	<aftersaveredirect>pkg_edit.php?xml=routed/routed.xml&amp;id=0</aftersaveredirect>
-        <custom_php_command_before_form>
-        </custom_php_command_before_form>
-	<custom_delete_php_command>
-	</custom_delete_php_command>
-	<custom_php_resync_config_command>
-		conf_mount_rw();
-		setup_routed();		
-		conf_mount_ro();
-	</custom_php_resync_config_command>
-	<custom_php_install_command>
-	</custom_php_install_command>
-	<custom_php_deinstall_command>
-	</custom_php_deinstall_command>
-</packagegui>
-- 
cgit v1.1