From 3781d8099c40be8cf61e210c7fcc77fcb16e0115 Mon Sep 17 00:00:00 2001
From: Ermal <eri@pfsense.org>
Date: Thu, 2 Jun 2011 08:14:10 +0000
Subject: Correct input object name from wrong copy/pasto. Reported-by:
 http://forum.pfsense.org/index.php/topic,37369.0.html

---
 usr/local/www/system_advanced_misc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'usr')

diff --git a/usr/local/www/system_advanced_misc.php b/usr/local/www/system_advanced_misc.php
index 21bff54..2264365 100644
--- a/usr/local/www/system_advanced_misc.php
+++ b/usr/local/www/system_advanced_misc.php
@@ -280,7 +280,7 @@ function maxmss_checked(obj) {
 							<tr>
 								<td width="22%" valign="top" class="vncell"><?=gettext("Load Balancing"); ?></td>
 								<td width="78%" class="vtable">
-									<input name="lb_use_sticky" type="checkbox" id="gw_switch_default" value="yes" <?php if ($pconfig['gw_switch_default']) echo "checked=\"checked\""; ?> />
+									<input name="gw_switch_default" type="checkbox" id="gw_switch_default" value="yes" <?php if ($pconfig['gw_switch_default']) echo "checked=\"checked\""; ?> />
 									<strong><?=gettext("Allow default gateway switching"); ?></strong><br/>
 									<?=gettext("If the link where the default gateway resides fails " .
 									"switch the default gateway to another available one."); ?>
-- 
cgit v1.1


From 0640a65b13e6bb4d262730b9a3cc8d225e16094a Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Thu, 2 Jun 2011 09:07:26 -0400
Subject: Add "Default" choice that will unset the media/mediaopt, otherwise
 whatever is first in the list is saved in the config.

---
 usr/local/www/interfaces.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'usr')

diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php
index b3e7b0a..fc905b4 100755
--- a/usr/local/www/interfaces.php
+++ b/usr/local/www/interfaces.php
@@ -1192,6 +1192,7 @@ $types = array("none" => gettext("None"), "static" => gettext("Static"), "dhcp"
 							if ($mediaopt_from_config == 'autoselect ' || $mediaopt_from_config == ' ') echo "style='display:none'>";
 							else echo '>';
 								echo '<select name="mediaopt" class="formselect" id="mediaopt">';
+								print "<option value=\"\">Default</option>";
 								foreach($mediaopts_list as $mediaopt){
 									if ($mediaopt != rtrim($mediaopt_from_config)){
 										print "<option value=\"$mediaopt\">" . gettext("$mediaopt") . "</option>";
-- 
cgit v1.1


From e96bbf82c76923d334a024fa9fa12790ece43267 Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Thu, 2 Jun 2011 11:43:05 -0400
Subject: Patch from EvgenyY to allow editing an existing p2 without it being
 flagged a duplicate.

---
 usr/local/www/vpn_ipsec_phase2.php | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

(limited to 'usr')

diff --git a/usr/local/www/vpn_ipsec_phase2.php b/usr/local/www/vpn_ipsec_phase2.php
index 6985b2b..395b81e 100644
--- a/usr/local/www/vpn_ipsec_phase2.php
+++ b/usr/local/www/vpn_ipsec_phase2.php
@@ -143,7 +143,7 @@ if ($_POST) {
 	/* Validate enabled phase2's are not duplicates */
 	if (isset($pconfig['mobile'])){
 		/* User is adding phase 2 for mobile phase1 */
-		foreach($a_phase2 as $name){
+		foreach($a_phase2 as $key => $name){
 			if (isset($name['mobile'])){
 				/* check duplicate localids only for mobile clents */
 				$localid_data = ipsec_idinfo_to_cidr($name['localid']);
@@ -152,16 +152,23 @@ if ($_POST) {
 				if (isset($pconfig['localid_address'])) $entered['address'] = $pconfig['localid_address'];
 				if (isset($pconfig['localid_netbits'])) $entered['netbits'] = $pconfig['localid_netbits'];
 				$entered_localid_data = ipsec_idinfo_to_cidr($entered);
-				if ($localid_data == $entered_localid_data){ 
-					$input_errors[] = gettext("Phase2 with this Local Network is already defined for mobile clients.");
-					break;
+				if ($localid_data == $entered_localid_data){
+					if (!isset($pconfig['p2index'])){
+						/* adding new p2 entry */
+						$input_errors[] = gettext("Phase2 with this Local Network is already defined for mobile clients.");
+						break;
+					}else if ($pconfig['p2index'] != $key){
+						/* editing p2 and entered p2 networks match with different p2 for given p1 */
+						$input_errors[] = gettext("Phase2 with this Local Network is already defined for mobile clients.");
+						break;
+					}
 				}
 			}
 		}
 	}else{
 		/* User is adding phase 2 for site-to-site phase1 */
 		$input_error = 0;
-		foreach($a_phase2 as $name){
+		foreach($a_phase2 as $key => $name){
 			if (!isset($name['mobile']) && $pconfig['ikeid'] == $name['ikeid']){
 				/* check duplicate subnets only for given phase1 */
 				$localid_data = ipsec_idinfo_to_cidr($name['localid']);
@@ -177,8 +184,15 @@ if ($_POST) {
 				if (isset($pconfig['remoteid_netbits'])) $entered_remote['netbits'] = $pconfig['remoteid_netbits'];
 				$entered_remoteid_data = ipsec_idinfo_to_cidr($entered_remote);
 				if ($localid_data == $entered_localid_data && $remoteid_data == $entered_remoteid_data) { 
-					$input_errors[] = gettext("Phase2 with this Local/Remote networks combination is already defined for this Phase1.");
-					break;
+					if (!isset($pconfig['p2index'])){
+						/* adding new p2 entry */
+						$input_errors[] = gettext("Phase2 with this Local/Remote networks combination is already defined for this Phase1.");
+						break;
+					}else if ($pconfig['p2index'] != $key){
+						/* editing p2 and entered p2 networks match with different p2 for given p1 */
+						$input_errors[] = gettext("Phase2 with this Local/Remote networks combination is already defined for this Phase1.");
+						break;
+					}
 				}
 			}
 		}
-- 
cgit v1.1


From f451ea09a29a7ba21bd67bdfbc8c66f89245f0a9 Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Thu, 2 Jun 2011 12:47:53 -0400
Subject: Show how much data has passed on an SAD entry.

---
 usr/local/www/diag_ipsec_sad.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'usr')

diff --git a/usr/local/www/diag_ipsec_sad.php b/usr/local/www/diag_ipsec_sad.php
index 7ee8b72..e08feba 100755
--- a/usr/local/www/diag_ipsec_sad.php
+++ b/usr/local/www/diag_ipsec_sad.php
@@ -90,6 +90,7 @@ if ($_GET['act'] == "del") {
 							<td nowrap class="listhdrr"><?=gettext("SPI");?></td>
 							<td nowrap class="listhdrr"><?=gettext("Enc. alg.");?></td>
 							<td nowrap class="listhdr"><?=gettext("Auth. alg.");?></td>
+							<td nowrap class="listhdr"><?=gettext("Data");?></td>
 							<td nowrap class="list"></td>
 						</tr>
 						<?php foreach ($sad as $sa): ?>
@@ -100,6 +101,7 @@ if ($_GET['act'] == "del") {
 							<td class="listr"><?=htmlspecialchars($sa['spi']);?></td>
 							<td class="listr"><?=htmlspecialchars($sa['ealgo']);?></td>
 							<td class="listr"><?=htmlspecialchars($sa['aalgo']);?></td>
+							<td class="listr"><?=htmlspecialchars($sa['data']);?></td>
 							<td class="list" nowrap>
 								<?php
 									$args = "src=" . rawurlencode($sa['src']);
-- 
cgit v1.1