duh, helps if you commit the code you want people to use!

without further ado, heres the new virutal IP code :)

1 files changed, 391 insertions, 0 deletions

diff --git a/usr/local/www/firewall_virtual_ip_edit.php b/usr/local/www/firewall_virtual_ip_edit.php
new file mode 100755
index 0000000..1f6e887
--- /dev/null
+++ b/usr/local/www/firewall_virtual_ip_edit.php
@@ -0,0 +1,391 @@
+#!/usr/local/bin/php
+<?php
+/* $Id$ */
+/*
+
+    firewall_virtual_ip_edit.php
+    part of pfSense (http://www.pfsense.com/)
+
+    Copyright (C) 2005 Bill Marquette <bill.marquette@gmail.com>.
+    All rights reserved.
+
+    Includes code from m0n0wall which is:
+    Copyright (C) 2003-2005 Manuel Kasper <mk@neon1.net>.
+    All rights reserved.
+
+    Includes code from pfSense which is:
+    Copyright (C) 2004-2005 Scott Ullrich <geekgod@pfsense.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.
+*/
+
+require("guiconfig.inc");
+if (!is_array($config['virtualip']['vip'])) {
+        $config['virtualip']['vip'] = array();
+}
+$a_vip = &$config['virtualip']['vip'];
+
+if (isset($_POST['id']))
+	$id = $_POST['id'];
+else
+	$id = $_GET['id'];
+
+if (isset($id) && $a_vip[$id]) {
+	$pconfig['mode'] = $a_vip[$id]['mode'];
+	$pconfig['vhid'] = $a_vip[$id]['vhid'];
+	$pconfig['advskew'] = $a_vip[$id]['advskew'];
+	$pconfig['password'] = $a_vip[$id]['password'];
+	$pconfig['range'] = $a_vip[$id]['range'];
+	$pconfig['subnet'] = $a_vip[$id]['subnet'];
+	$pconfig['subnet_bits'] = $a_vip[$id]['subnet_bits'];
+	$pconfig['descr'] = $a_vip[$id]['descr'];
+	$pconfig['type'] = $a_vip[$id]['type'];
+	$pconfig['interface'] = $a_vip[$id]['interface'];
+}
+
+if ($_POST) {
+	unset($input_errors);
+	$pconfig = $_POST;
+
+	/* input validation */
+	$reqdfields = explode(" ", "mode");
+	$reqdfieldsn = explode(",", "Type");
+
+	do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
+
+	if (($_POST['subnet'] && !is_ipaddr($_POST['subnet']))) {
+		$input_errors[] = "A valid IP address must be specified.";
+	}
+
+	if ($_POST['ipaddr'] == $config['interfaces']['wan']['ipaddr'])
+		$input_errors[] = "The WAN IP address may not be used in a virtual entry.";
+
+	if ($_POST['ipaddr'] == $config['interfaces']['lan']['ipaddr'])
+		$input_errors[] = "The LAN IP address may not be used in a virtual entry.";
+
+	/* check for overlaps with other virtual IP */
+	foreach ($a_vip as $vipent) {
+		if (isset($id) && ($a_vip[$id]) && ($a_vip[$id] === $vipent))
+			continue;
+
+		if (isset($_POST['subnet']) && $_POST['subnet'] == $vipent['subnet']) {
+			$input_errors[] = "There is already a virtual IP entry for the specified IP address.";
+			break;
+		}
+	}
+
+	/* check for overlaps with 1:1 NAT */
+	if (is_array($config['nat']['onetoone'])) {
+		foreach ($config['nat']['onetoone'] as $natent) {
+			if (check_subnets_overlap($_POST['ipaddr'], 32, $natent['external'], $natent['subnet'])) {
+				$input_errors[] = "A 1:1 NAT mapping overlaps with the specified IP address.";
+				break;
+			}
+		}
+	}
+
+	if (!$input_errors) {
+		$vipent = array();
+		
+		$vipent['mode'] = $_POST['mode'];
+		$vipent['interface'] = $_POST['interface'];
+		
+		/* ProxyARP specific fields */
+		if ($_POST['mode'] === "proxyarp") {
+			if ($_POST['type'] == "range") {
+				$vipent['range']['from'] = $_POST['range_from'];
+				$vipent['range']['to'] = $_POST['range_to'];
+			}
+		}
+		
+		/* CARP specific fields */	
+		if ($_POST['mode'] === "carp") {
+			$vipent['vhid'] = $_POST['vhid'];
+			$vipent['advskew'] = $_POST['advskew'];
+		}
+		
+		/* Common fields */
+		$vipent['descr'] = $_POST['descr'];
+		if (isset($_POST['type']))
+			$vipent['type'] = $_POST['type'];
+		else
+			$vipent['type'] = "single";
+
+		if ($vipent['type'] == "single" || $vipent['type'] == "network") {
+			if (!isset($_POST['subnet_bits'])) {
+				$vipent['subnet_bits'] = "32";
+			} else {
+				$vipent['subnet_bits'] = $_POST['subnet_bits'];
+			}
+			$vipent['subnet'] = $_POST['subnet'];		
+		}
+
+		if (isset($id) && $a_vip[$id]) {
+			/* modify all virtual IP rules with this address */
+			for ($i = 0; isset($config['nat']['rule'][$i]); $i++) {
+				if ($config['nat']['rule'][$i]['external-address'] == $a_vip[$id]['ipaddr'])
+					$config['nat']['rule'][$i]['external-address'] = $vipent['ipaddr'];
+			}
+			$a_vip[$id] = $vipent;
+		} else
+			$a_vip[] = $vipent;
+
+		touch($d_vipconfdirty_path);
+
+		write_config();
+
+		header("Location: firewall_virtual_ip.php");
+		exit;
+	}
+}
+
+$pgtitle = "Firewall: Virtual IP Address: Edit";
+include("head.inc");
+
+?>
+
+<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
+<?php include("fbegin.inc"); ?>
+<p class="pgtitle"><?=$pgtitle?></p>
+<script language="JavaScript">
+<!--
+function get_radio_value(obj)
+{
+        for (i = 0; i < obj.length; i++) {
+                if (obj[i].checked)
+                        return obj[i].value;
+        }
+        return null;
+}
+function enable_change(enable_over) {
+        if ((get_radio_value(document.iform.mode) == "carp") || enable_over) {
+                document.iform.vhid.disabled = 0;
+                document.iform.password.disabled = 0;
+                document.iform.advskew.disabled = 0;
+                document.iform.type.disabled = 1;
+        } else {
+                document.iform.vhid.disabled = 1;
+                document.iform.password.disabled = 1;
+                document.iform.advskew.disabled = 1;
+                document.iform.type.disabled = 0;
+        }
+}
+function typesel_change() {
+    switch (document.iform.type.selectedIndex) {
+        case 0: // single
+            document.iform.subnet.disabled = 0;
+            document.iform.subnet_bits.disabled = 1;
+            document.iform.range_from.disabled = 1;
+            document.iform.range_to.disabled = 1;
+            break;
+        case 1: // network
+            document.iform.subnet.disabled = 0;
+            document.iform.subnet_bits.disabled = 0;
+            document.iform.range_from.disabled = 1;
+            document.iform.range_to.disabled = 1;
+            break;
+        case 2: // range
+            document.iform.subnet.disabled = 1;
+            document.iform.subnet_bits.disabled = 1;
+            document.iform.range_from.disabled = 0;
+            document.iform.range_to.disabled = 0;
+            break;
+    }
+}
+//-->
+</script>
+
+<?php if ($input_errors) print_input_errors($input_errors); ?>
+            <form action="firewall_virtual_ip_edit.php" method="post" name="iform" id="iform">
+              <?display_topbar()?>
+              <table width="100%" border="0" cellpadding="6" cellspacing="0">
+                <tr>
+		  		  <td width="22%" valign="top" class="vncellreq">Type</td>
+                  <td width="78%" class="vtable">
+                    <input name="mode" type="radio" onclick="enable_change(false)" value="proxyarp"
+					<?php if ($pconfig['type'] == "proxyarp" || $pconfig['type'] != "carp") echo "checked";?>> Proxy ARP
+					<input name="mode" type="radio" onclick="enable_change(false)" value="carp"
+					<?php if ($pconfig['type'] == "carp") echo "checked";?>> CARP
+				  </td>
+				</tr>
+				<tr> 
+				  <td width="22%" valign="top" class="vncellreq">Interface</td>
+				  <td width="78%" class="vtable">
+					<select name="interface" class="formfld">
+					<?php $interfaces = array('wan' => 'WAN', 'lan' => 'LAN');
+					  for ($i = 1; isset($config['interfaces']['opt' . $i]); $i++) {
+						$interfaces['opt' . $i] = $config['interfaces']['opt' . $i]['descr'];
+					  }
+					  foreach ($interfaces as $iface => $ifacename): ?>
+						<option value="<?=$iface;?>" <?php if ($iface == $pconfig['interface']) echo "selected"; ?>> 
+						<?=htmlspecialchars($ifacename);?>
+						</option>
+					  <?php endforeach; ?>
+					</select>
+				  </td>
+                </tr>
+                <tr>
+                  <td valign="top" class="vncellreq">IP Address(es)</td>
+                  <td class="vtable">
+                    <table border="0" cellspacing="0" cellpadding="0">
+                      <tr>
+                        <td>Type:&nbsp;&nbsp;</td>
+                        <td><select name="type" class="formfld" onChange="typesel_change()">
+                            <option value="single" <?php if ((!$pconfig['range'] && $pconfig['subnet_bits'] == 32) || (!isset($pconfig['ipaddr']))) echo "selected"; ?>>
+                            Single address</option>
+                            <option value="network" <?php if (!$pconfig['range'] && $pconfig['subnet_bits'] != 32 && isset($pconfig['ipaddr'])) echo "selected"; ?>>
+                            Network</option>
+                            <option value="range" <?php if ($pconfig['range']) echo "selected"; ?>>
+                            Range</option>
+                          </select></td>
+                      </tr>
+                      <tr>
+                        <td>Address:&nbsp;&nbsp;</td>
+                        <td><input name="subnet" type="text" class="formfld" id="subnet" size="20" value="<?=htmlspecialchars($pconfig['subnet']);?>">
+/
+                          <select name="subnet_bits" class="formfld" id="select">
+                            <?php for ($i = 32; $i >= 1; $i--): ?>
+                            <option value="<?=$i;?>" <?php if (($i == $pconfig['subnet_bits']) || (!isset($pconfig['ipaddr']) && $i == 32)) echo "selected"; ?>>
+                            <?=$i;?>
+                      </option>
+                            <?php endfor; ?>
+                      </select>
+ 						</td>
+                      </tr>
+                      <tr>
+                        <td>Range:&nbsp;&nbsp;</td>
+                        <td><input name="range_from" type="text" class="formfld" id="range_from" size="20" value="<?=htmlspecialchars($pconfig['range']['from']);?>">
+-
+                          <input name="range_to" type="text" class="formfld" id="range_to" size="20" value="<?=htmlspecialchars($pconfig['range']['to']);?>">
+                          </td>
+					  </tr>
+                    </table>
+                  </td>
+                </tr>
+				<tr valign="top">
+				  <td width="22%" class="vncellreq">Virtual IP Password</td>
+				  <td class="vtable"><input type='password'  name='password' value=''>
+					<br>Enter the VHID group password.
+				  </td>
+				</tr>	  
+				<tr valign="top">
+				  <td width="22%" class="vncellreq">VHID Group</td>
+				  <td class="vtable"><select id='vhid' name='vhid'>
+					<option name='1 (DEFAULT)' value='1'>1 (DEFAULT)</option>
+					<option name='2' value='2'>2</option>
+					<option name='3' value='3'>3</option>
+					<option name='4' value='4'>4</option>
+					<option name='5' value='5'>5</option>
+					<option name='6' value='6'>6</option>
+					<option name='7' value='7'>7</option>
+					<option name='8' value='8'>8</option>
+					<option name='9' value='9'>9</option>
+					<option name='10' value='10'>10</option>
+					<option name='11' value='11'>11</option>
+					<option name='12' value='12'>12</option>
+					<option name='13' value='13'>13</option>
+					<option name='14' value='14'>14</option>
+					<option name='15' value='15'>15</option>
+					<option name='16' value='16'>16</option>
+					<option name='17' value='17'>17</option>
+					<option name='18' value='18'>18</option>
+					<option name='19' value='19'>19</option>
+					<option name='20' value='20'>20</option>
+					<option name='21' value='21'>21</option>
+					<option name='22' value='22'>22</option>
+					<option name='23' value='23'>23</option>
+					<option name='24' value='24'>24</option>
+					<option name='25' value='25'>25</option>
+					<option name='26' value='26'>26</option>
+					<option name='27' value='27'>27</option>
+					<option name='28' value='28'>28</option>
+					<option name='29' value='29'>29</option>
+					<option name='30' value='30'>30</option>
+					</select>
+					<br>Enter the VHID group that the machines will share
+				  </td>
+				</tr>	  
+				<tr valign="top">
+				  <td width="22%" class="vncellreq">Advertising Frequency</td>
+				  <td class="vtable"><select id='advskew' name='advskew'>
+					<option name='0 (DEFAULT)' value='0'>0 (DEFAULT)</option>
+					<option name='1' value='1'>1</option>
+					<option name='2' value='2'>2</option>
+					<option name='3' value='3'>3</option>
+					<option name='4' value='4'>4</option>
+					<option name='5' value='5'>5</option>
+					<option name='6' value='6'>6</option>
+					<option name='7' value='7'>7</option>
+					<option name='8' value='8'>8</option>
+					<option name='9' value='9'>9</option>
+					<option name='10' value='10'>10</option>
+					<option name='11' value='11'>11</option>
+					<option name='12' value='12'>12</option>
+					<option name='13' value='13'>13</option>
+					<option name='14' value='14'>14</option>
+					<option name='15' value='15'>15</option>
+					<option name='16' value='16'>16</option>
+					<option name='17' value='17'>17</option>
+					<option name='18' value='18'>18</option>
+					<option name='19' value='19'>19</option>
+					<option name='20' value='20'>20</option>
+					<option name='21' value='21'>21</option>
+					<option name='22' value='22'>22</option>
+					<option name='23' value='23'>23</option>
+					<option name='24' value='24'>24</option>
+					<option name='25' value='25'>25</option>
+					<option name='26' value='26'>26</option>
+					<option name='27' value='27'>27</option>
+					<option name='28' value='28'>28</option>
+					<option name='29' value='29'>29</option>
+					<option name='30' value='30'>30</option>
+					</select>
+					<br>The frequency that this machine will advertise.  0 = master.   Anything above 0 designates a backup.
+				  </td>
+				</tr>
+                <tr>
+                  <td width="22%" valign="top" class="vncell">Description</td>
+                  <td width="78%" class="vtable">
+                    <input name="descr" type="text" class="formfld" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>">
+                    <br> <span class="vexpl">You may enter a description here for your reference (not parsed).</span></td>
+                </tr>
+                <tr>
+                  <td width="22%" valign="top">&nbsp;</td>
+                  <td width="78%">
+                    <input name="Submit" type="submit" class="formbtn" value="Save"> <input type="button" class="formbtn" value="Cancel" onclick="history.back()">
+                    <?php if (isset($id) && $a_vip[$id]): ?>
+                    <input name="id" type="hidden" value="<?=$id;?>">
+                    <?php endif; ?>
+                  </td>
+                </tr>
+              </table>
+</form>
+<script language="JavaScript">
+<!--
+enable_change(false);
+typesel_change();
+//-->
+</script>
+<?php include("fend.inc"); ?>
+</body>
+</html>
\ No newline at end of file