summaryrefslogtreecommitdiffstats
path: root/src/usr
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2016-07-11 11:42:10 -0400
committerjim-p <jimp@pfsense.org>2016-07-11 12:44:44 -0400
commitb5baa9e7a17266e794514747e7046eba6acb1db7 (patch)
treef08fe5be284fd5a92ab9bdbb022a7045182853d6 /src/usr
parent82b8011b321d6e2be4906b42839dcad69c72365f (diff)
downloadpfsense-b5baa9e7a17266e794514747e7046eba6acb1db7.zip
pfsense-b5baa9e7a17266e794514747e7046eba6acb1db7.tar.gz
Remove GRE link flag options from GUI/backend. Keep link1 as it was also used to add an explicit static route, though the GUI previous GUI option name wasn't related to that at all. Updated GUI description to match reality. Ticket #6586
Diffstat (limited to 'src/usr')
-rw-r--r--src/usr/local/www/interfaces_gre_edit.php24
1 files changed, 2 insertions, 22 deletions
diff --git a/src/usr/local/www/interfaces_gre_edit.php b/src/usr/local/www/interfaces_gre_edit.php
index b1bcebd..7a475a0 100644
--- a/src/usr/local/www/interfaces_gre_edit.php
+++ b/src/usr/local/www/interfaces_gre_edit.php
@@ -147,15 +147,9 @@ if ($_POST) {
$gre['tunnel-remote-net'] = $_POST['tunnel-remote-net'];
$gre['remote-addr'] = $_POST['remote-addr'];
$gre['descr'] = $_POST['descr'];
- if (isset($_POST['link0'])) {
- $gre['link0'] = '';
- }
if (isset($_POST['link1'])) {
$gre['link1'] = '';
}
- if (isset($_POST['link2'])) {
- $gre['link2'] = '';
- }
$gre['greif'] = $_POST['greif'];
$gre['greif'] = interface_gre_configure($gre);
@@ -237,26 +231,12 @@ $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. ',
+ 'Add Static Route',
+ 'Add an explicit static route for the remote inner tunnel address/subnet via the local tunnel address',
$pconfig['link1']
));
-$section->addInput(new Form_Checkbox(
- 'link2',
- 'WCCP Version',
- 'Check this box for WCCP encapsulation version 2, or leave unchecked for version 1.',
- $pconfig['link2']
-));
-
$section->addInput(new Form_Input(
'descr',
'Description',
OpenPOWER on IntegriCloud