Project

General

Profile

« Previous | Next » 

Revision 1d66a364

Added by Ermal LUÇI over 12 years ago

Handle _stf interface in convertion from real to friendly. Also do no cal lpfSense_module function if not used

View differences:

etc/inc/interfaces.inc
3708 3708
	$ifdescrs = &$config['interfaces'];
3709 3709
	//$ifdescrs = get_configured_interface_list(false, true);
3710 3710

  
3711
	if (strstr($interface, "_stf"))
3712
		$interface = str_replace("_stf", "", $interface);
3713

  
3711 3714
	foreach ($ifdescrs as $if => $ifname) {
3712 3715
		if ($if == $interface || $config['interfaces'][$if]['if'] == $interface)
3713 3716
			return $if;
......
3723 3726
			return $ifname;
3724 3727
		 */
3725 3728
	}
3729

  
3726 3730
	return NULL;
3727 3731
}
3728 3732

  
......
4310 4314

  
4311 4315
	/* Setup IP cache */
4312 4316
	if (!isset($interface_ipv6_arr_cache[$interface]) or $flush) {
4313
		$ifinfo = pfSense_get_interface_addresses($interface);
4314 4317
		// FIXME: Add IPv6 support to the pfSense module
4318
		$ifinfo = array();
4315 4319
		exec("/sbin/ifconfig {$interface} inet6", $output);
4316 4320
		foreach($output as $line) {
4317 4321
			if(preg_match("/inet6/", $line)) {

Also available in: Unified diff