Project

General

Profile

« Previous | Next » 

Revision 43c40296

Added by Jim Pingle almost 9 years ago

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

View differences:

src/etc/inc/interfaces.inc
876 876
	} else {
877 877
		mwexec("/sbin/ifconfig {$greif} " . escapeshellarg($gre['tunnel-local-addr']) . " " . escapeshellarg($gre['tunnel-remote-addr']) . " netmask " . gen_subnet_mask($gre['tunnel-remote-net']));
878 878
	}
879
	if (isset($gre['link0'])) {
880
		pfSense_interface_flags($greif, IFF_LINK0);
881
	}
882
	if (isset($gre['link1'])) {
883
		pfSense_interface_flags($greif, IFF_LINK1);
884
	}
885
	if (isset($gre['link2'])) {
886
		pfSense_interface_flags($greif, IFF_LINK2);
887
	}
888 879

  
889 880
	if ($greif) {
890 881
		interfaces_bring_up($greif);
src/usr/local/www/interfaces_gre_edit.php
147 147
		$gre['tunnel-remote-net'] = $_POST['tunnel-remote-net'];
148 148
		$gre['remote-addr'] = $_POST['remote-addr'];
149 149
		$gre['descr'] = $_POST['descr'];
150
		if (isset($_POST['link0'])) {
151
			$gre['link0'] = '';
152
		}
153 150
		if (isset($_POST['link1'])) {
154 151
			$gre['link1'] = '';
155 152
		}
156
		if (isset($_POST['link2'])) {
157
			$gre['link2'] = '';
158
		}
159 153
		$gre['greif'] = $_POST['greif'];
160 154

  
161 155
		$gre['greif'] = interface_gre_configure($gre);
......
236 230
	array_combine(range(128, 1, -1), range(128, 1, -1))
237 231
))->setHelp('The subnet is used for determining the network that is tunnelled.');
238 232

  
239
$section->addInput(new Form_Checkbox(
240
	'link0',
241
	'Route Caching',
242
	'Specify if route caching can be enabled. (Be careful with these settings on dynamic networks.)',
243
	$pconfig['link0']
244
));
245

  
246 233
$section->addInput(new Form_Checkbox(
247 234
	'link1',
248
	'ECN friendly behavior',
249
	'ECN friendly behavior violates RFC2893. This should be used in mutual agreement with the peer. ',
235
	'Add Static Route',
236
	'Add an explicit static route for the remote inner tunnel address/subnet via the local tunnel address',
250 237
	$pconfig['link1']
251 238
));
252 239

  
253
$section->addInput(new Form_Checkbox(
254
	'link2',
255
	'WCCP Version',
256
	'Check this box for WCCP encapsulation version 2, or leave unchecked for version 1.',
257
	$pconfig['link2']
258
));
259

  
260 240
$section->addInput(new Form_Input(
261 241
	'descr',
262 242
	'Description',

Also available in: Unified diff