aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2015-02-24 12:50:56 -0500
committerjim-p <jimp@pfsense.org>2015-02-24 12:50:56 -0500
commit252cc3f596616a30f225849024c33b9e81052134 (patch)
treeeff08ecd973ce5b14cf029a841b5988f09f124b2 /config
parenteab2c01b14b6c7af5a6475fc76e494dbababd3d6 (diff)
downloadpfsense-packages-252cc3f596616a30f225849024c33b9e81052134.tar.gz
pfsense-packages-252cc3f596616a30f225849024c33b9e81052134.tar.bz2
pfsense-packages-252cc3f596616a30f225849024c33b9e81052134.zip
Add CARP plugin support to quagga so it no longer needs a patch to rc.carp(master|backup).
Diffstat (limited to 'config')
-rw-r--r--config/quagga_ospfd/quagga_ospfd.inc33
-rw-r--r--config/quagga_ospfd/quagga_ospfd.xml7
2 files changed, 39 insertions, 1 deletions
diff --git a/config/quagga_ospfd/quagga_ospfd.inc b/config/quagga_ospfd/quagga_ospfd.inc
index d0c73263..3b5c153d 100644
--- a/config/quagga_ospfd/quagga_ospfd.inc
+++ b/config/quagga_ospfd/quagga_ospfd.inc
@@ -422,4 +422,37 @@ function quagga_get_carp_status_by_ip($ipaddr) {
return $status;
}
+function quagga_plugin_carp($pluginparams) {
+ global $config;
+ require_once("service-utils.inc");
+ // Called when a CARP interface changes state
+ // $pluginparams['event'] either 'rc.carpmaster' or 'rc.carpbackup'
+ // $pluginparams['interface'] contains the affected interface
+
+ /* If there is no OSPF config, then stop */
+ if(is_array($config['installedpackages']['quaggaospfd']['config'])) {
+ $ospfd_conf = &$config['installedpackages']['quaggaospfd']['config'][0];
+ } else {
+ return null;
+ }
+ /* If there is no properly configured CARP status check IP, then stop */
+ if (!is_ipaddr($ospfd_conf['carpstatusip'])) {
+ return null;
+ }
+ list($vhid, $iface) = explode("@", trim($pluginparams['interface']));
+ $friendly = convert_real_interface_to_friendly_interface_name($iface);
+ $carp_iface = "{$friendly}_vip${vhid}";
+
+ /* If this CARP transition is not from the IP address to check, then stop. */
+ if (get_interface_ip($carp_iface) != $ospfd_conf['carpstatusip']) {
+ return null;
+ }
+
+ /* Start or stop the service as needed based on the CARP transition. */
+ if ($pluginparams['event'] == "rc.carpmaster") {
+ start_service("Quagga OSPFd");
+ } elseif ($pluginparams['event'] == "rc.carpbackup") {
+ stop_service("Quagga OSPFd");
+ }
+}
?>
diff --git a/config/quagga_ospfd/quagga_ospfd.xml b/config/quagga_ospfd/quagga_ospfd.xml
index 7964d1c0..5de2e3f8 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.6.3</version>
+ <version>0.6.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>
@@ -67,6 +67,11 @@
<executable>zebra</executable>
<description>Quagga core/abstraction daemon</description>
</service>
+ <plugins>
+ <item>
+ <type>plugin_carp</type>
+ </item>
+ </plugins>
<fields>
<field>
<fielddescr>Master Password</fielddescr>