Project

General

Profile

« Previous | Next » 

Revision 0f98065b

Added by Luiz Souza over 9 years ago

Fix the returned string when no status is found for this CARP.

No functional change.

View differences:

src/etc/inc/pfsense-utils.inc
423 423
	global $config;
424 424

  
425 425
	foreach ($config['virtualip']['vip'] as $carp) {
426
		if ($carp['mode'] != "carp") {
426
		if ($carp['mode'] != "carp")
427 427
			continue;
428
		}
429
		$carpif = "_vip{$carp['uniqid']}";
430
		if ($carpinterface !== $carpif) {
428
		if ($carpinterface !== "_vip{$carp['uniqid']}")
431 429
			continue;
432
		}
433 430

  
434 431
		$interface = get_real_interface($carp['interface']);
435 432
		$vhid = $carp['vhid'];
436 433
		$carp_query = '';
437 434
		$_gb = exec("/sbin/ifconfig $interface | /usr/bin/grep carp: | /usr/bin/grep \"vhid $vhid\"", $carp_query);
438 435
		foreach ($carp_query as $int) {
439
			if (stripos($int, "MASTER")) {
436
			if (stripos($int, "MASTER"))
440 437
				return "MASTER";
441
			}
442
			if (stripos($int, "BACKUP")) {
438
			elseif (stripos($int, "BACKUP"))
443 439
				return "BACKUP";
444
			}
445
			if (stripos($int, "INIT")) {
440
			elseif (stripos($int, "INIT"))
446 441
				return "INIT";
447
			}
448 442
		}
449 443
		break;
450 444
	}
451 445

  
452
	return;
446
	return "";
453 447
}
454 448

  
455 449
/*

Also available in: Unified diff