From ab28a01043fa2dfe018de521af53ca48982757bc Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Mon, 11 Jul 2016 12:04:36 -0400
Subject: Align GIF link options with those currently supported by the base OS.
 Ticket #6587

---
 src/etc/inc/interfaces.inc                |  6 +++---
 src/usr/local/www/interfaces_gif_edit.php | 22 +++++++++++-----------
 2 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc
index 1639353..e845c29 100644
--- a/src/etc/inc/interfaces.inc
+++ b/src/etc/inc/interfaces.inc
@@ -987,12 +987,12 @@ function interface_gif_configure(&$gif, $gifkey = "") {
 	} else {
 		mwexec("/sbin/ifconfig {$gifif} " . escapeshellarg($gif['tunnel-local-addr']) . " " . escapeshellarg($gif['tunnel-remote-addr']) . " netmask " . gen_subnet_mask($gif['tunnel-remote-net']));
 	}
-	if (isset($gif['link0'])) {
-		pfSense_interface_flags($gifif, IFF_LINK0);
-	}
 	if (isset($gif['link1'])) {
 		pfSense_interface_flags($gifif, IFF_LINK1);
 	}
+	if (isset($gif['link2'])) {
+		pfSense_interface_flags($gifif, IFF_LINK2);
+	}
 	if ($gifif) {
 		interfaces_bring_up($gifif);
 		$gifmtu = "";
diff --git a/src/usr/local/www/interfaces_gif_edit.php b/src/usr/local/www/interfaces_gif_edit.php
index 53c5219..1eb0999 100644
--- a/src/usr/local/www/interfaces_gif_edit.php
+++ b/src/usr/local/www/interfaces_gif_edit.php
@@ -86,7 +86,7 @@ if (isset($id) && $a_gifs[$id]) {
 	$pconfig['tunnel-local-addr'] = $a_gifs[$id]['tunnel-local-addr'];
 	$pconfig['tunnel-remote-addr'] = $a_gifs[$id]['tunnel-remote-addr'];
 	$pconfig['link1'] = isset($a_gifs[$id]['link1']);
-	$pconfig['link0'] = isset($a_gifs[$id]['link0']);
+	$pconfig['link2'] = isset($a_gifs[$id]['link2']);
 	$pconfig['descr'] = $a_gifs[$id]['descr'];
 }
 
@@ -154,12 +154,12 @@ if ($_POST) {
 		$gif['tunnel-remote-net'] = $_POST['tunnel-remote-net'];
 		$gif['remote-addr'] = $_POST['remote-addr'];
 		$gif['descr'] = $_POST['descr'];
-		if (isset($_POST['link0'])) {
-			$gif['link0'] = '';
-		}
 		if (isset($_POST['link1'])) {
 			$gif['link1'] = '';
 		}
+		if (isset($_POST['link2'])) {
+			$gif['link2'] = '';
+		}
 		$gif['gifif'] = $_POST['gifif'];
 		$gif['gifif'] = interface_gif_configure($gif);
 
@@ -241,19 +241,19 @@ $section->addInput(new Form_Select(
 ))->setHelp('The subnet is used for determining the network that is tunnelled.');
 
 $section->addInput(new Form_Checkbox(
-	'link0',
-	'Route Caching',
-	'Specify if route caching can be enabled. (Be careful with these settings on dynamic networks.)',
-	$pconfig['link0']
-));
-
-$section->addInput(new Form_Checkbox(
 	'link1',
 	'ECN friendly behavior',
 	'ECN friendly behavior violates RFC2893. This should be used in mutual agreement with the peer. ',
 	$pconfig['link1']
 ));
 
+$section->addInput(new Form_Checkbox(
+	'link2',
+	'Outer Source Filtering',
+	'Disable automatic filtering of the outer GIF source which ensures a match with the configured remote peer. When disabled, martian and inbound filtering is not performed which allows asymmetric routing of the outer traffic.',
+	$pconfig['link2']
+));
+
 $section->addInput(new Form_Input(
 	'descr',
 	'Description',
-- 
cgit v1.1