Project

General

Profile

« Previous | Next » 

Revision a5bed5a2

Added by Luiz Souza almost 10 years ago

Convert CARP interface name to uniqid notation. Ticket #4858

View differences:

src/etc/inc/interfaces.inc
4347 4347 
	if (stripos($interface, "_vip")) {
4348 4348 
		foreach ($config['virtualip']['vip'] as $counter => $vip) {
4349 4349 
			if ($vip['mode'] == "carp") {
4350 
				if ($interface == "{$vip['interface']}_vip{$vip['vhid']}") {
4350 
				if ($interface == "_vip{$vip['uniqid']}") {
4351 4351 
					return $vip['interface'];
4352 4352 
				}
4353 4353 
			}
......
4420 4420 
				if (is_array($config['virtualip']['vip'])) {
4421 4421 
					foreach ($config['virtualip']['vip'] as $counter => $vip) {
4422 4422 
						if ($vip['mode'] == "carp") {
4423 
							if ($interface == "{$vip['interface']}_vip{$vip['vhid']}") {
4423 
							if ($interface == "_vip{$vip['uniqid']}") {
4424 4424 
								return "{$vip['subnet']} - {$vip['descr']}";
4425 4425 
							}
4426 4426 
						}
src/etc/inc/util.inc
1123 1123 
		$viparr = &$config['virtualip']['vip'];
1124 1124 
		foreach ($viparr as $vip) {
1125 1125 
			if ($vip['mode'] == "carp") {
1126 
				$alias_list[] = array("ipaddr" => $vip['subnet'], "if" => "{$vip['interface']}_vip{$vip['vhid']}");
1126 
				$alias_list[] = array("ipaddr" => $vip['subnet'], "if" => "_vip{$vip['uniqid']}");
1127 1127 
			} else {
1128 1128 
				$alias_list[] = array("ipaddr" => $vip['subnet'], "if" => $vip['interface']);
1129 1129 
			}

Also available in: Unified diff