From cf288f26b0f8e8146abce79a418b63be811c17b8 Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Tue, 11 Jun 2013 09:07:23 -0400
Subject: Add another carp status check to quagga package.

---
 config/quagga_ospfd/quagga_ospfd.inc | 13 +++++++++++++
 config/quagga_ospfd/quagga_ospfd.xml |  2 +-
 pkg_config.8.xml                     |  2 +-
 pkg_config.8.xml.amd64               |  2 +-
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/config/quagga_ospfd/quagga_ospfd.inc b/config/quagga_ospfd/quagga_ospfd.inc
index 46037bd9..591b9772 100644
--- a/config/quagga_ospfd/quagga_ospfd.inc
+++ b/config/quagga_ospfd/quagga_ospfd.inc
@@ -243,6 +243,18 @@ function quagga_ospfd_install_conf() {
 	fwrite($fd, $zebraconffile);
 	fclose($fd);
 
+	$carp_ip_status_check = "";
+	if (is_ipaddr($ospfd_conf['carpstatusip'])) {
+		$carpcheckinterface = trim(find_carp_interface($ospfd_conf['carpstatusip']));
+		$carp_ip_status_check = <<<EOF
+CARP_STATUS=`/sbin/ifconfig ${carpcheckinterface} | /usr/bin/grep carp: | /usr/bin/awk '{print $2;}'`
+if [ \${CARP_STATUS} != "MASTER" ]; then
+	exit;
+fi
+EOF;
+	}
+
+
 	// Create rc.d file
 	$rc_file_stop = <<<EOF
 if [ -e /var/run/quagga/zebra.pid ]; then
@@ -274,6 +286,7 @@ fi
 killall -9 zebra 2>/dev/null
 killall -9 ospfd 2>/dev/null
 sleep 1
+{$carp_ip_status_check}
 /usr/local/sbin/zebra -d -f {$quagga_config_base}/zebra.conf
 /usr/local/sbin/ospfd -d -f {$quagga_config_base}/ospfd.conf
 EOF;
diff --git a/config/quagga_ospfd/quagga_ospfd.xml b/config/quagga_ospfd/quagga_ospfd.xml
index c48d0f47..a03f9e3c 100644
--- a/config/quagga_ospfd/quagga_ospfd.xml
+++ b/config/quagga_ospfd/quagga_ospfd.xml
@@ -1,6 +1,6 @@
 <packagegui>
 	<name>quagga_ospfd</name>
-	<version>0.5.3</version>
+	<version>0.5.4</version>
 	<title>Services: Quagga OSPFd</title>
 	<include_file>/usr/local/pkg/quagga_ospfd.inc</include_file>
 	<aftersaveredirect>pkg_edit.php?xml=quagga_ospfd.xml&amp;id=0</aftersaveredirect>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 143729fb..3f99af2d 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -1724,7 +1724,7 @@
 		<name>Quagga OSPF</name>
 		<descr>OSPF routing protocol using Quagga -- WARNING! Installs files to the same place as OpenOSPFD and OpenBGPD. Installing both will break things.</descr>
 		<maintainer>jimp@pfsense.org</maintainer>
-		<version>0.99.20.1 v0.5.3</version>
+		<version>0.99.20.1 v0.5.4</version>
 		<category>Routing</category>
 		<status>BETA</status>
 		<depends_on_package_base_url>http://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 07091d88..2719020d 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -1711,7 +1711,7 @@
 		<name>Quagga OSPF</name>
 		<descr>OSPF routing protocol using Quagga -- WARNING! Installs files to the same place as OpenOSPFD and OpenBGPD. Installing both will break things.</descr>
 		<maintainer>jimp@pfsense.org</maintainer>
-		<version>0.99.20.1 v0.5.3</version>
+		<version>0.99.20.1 v0.5.4</version>
 		<category>Routing</category>
 		<status>BETA</status>
 		<depends_on_package_base_url>http://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url>
-- 
cgit v1.2.3