From ac8eba7d0f49855fb6538ea551a0fbaf6b5de96c Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Tue, 13 Sep 2016 20:28:30 +0200
Subject: [PATCH] another test

---
 src/etc/inc/interfaces.inc | 16 ----------------
 src/etc/rc.carpbackup      |  6 ------
 src/etc/rc.carpmaster      |  6 ------
 src/etc/rc.linkup          | 19 ++++++++++++++++++-
 4 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc
index df297cf7c..6f0a59874 100644
--- a/src/etc/inc/interfaces.inc
+++ b/src/etc/inc/interfaces.inc
@@ -1158,18 +1158,6 @@ function interface_reconfigure($interface = 'wan', $reloadall = false)
     interface_configure($interface, $reloadall);
 }
 
-function interface_vips_bring_down($intf)
-{
-      global $config;
-      if (!empty($config['virtualip']['vip'])) {
-          foreach ($config['virtualip']['vip'] as $vip) {
-              if ($vip['interface'] == $intf) {
-                  interface_vip_bring_down($vip);
-              }
-          }
-      }
-}
-
 function interface_vip_bring_down($vip)
 {
     $vipif = get_real_interface($vip['interface']);
@@ -1946,10 +1934,6 @@ function interfaces_vips_configure($interface = '')
                     if ($interface <> "" && $vip['interface'] <> $interface) {
                         continue;
                     }
-                    if (!$carp_setuped) {
-                        // interfaces_carp_setup will enable carp when pfsync completes.
-                        set_single_sysctl("net.inet.carp.allow", "0");
-                    }
                     if ($carp_setuped == false) {
                         $carp_setuped = true;
                     }
diff --git a/src/etc/rc.carpbackup b/src/etc/rc.carpbackup
index c77ef4340..5d202ffb9 100755
--- a/src/etc/rc.carpbackup
+++ b/src/etc/rc.carpbackup
@@ -58,9 +58,3 @@ if (is_array($config['openvpn']) && is_array($config['openvpn']['openvpn-client'
 	}
 }
 
-$pluginparams = array();
-$pluginparams['type'] = 'carp';
-$pluginparams['event'] = 'rc.carpbackup';
-$pluginparams['interface'] = $argv[1];
-
-?>
diff --git a/src/etc/rc.carpmaster b/src/etc/rc.carpmaster
index 4988ac0f4..b7d131c1a 100755
--- a/src/etc/rc.carpmaster
+++ b/src/etc/rc.carpmaster
@@ -66,9 +66,3 @@ if (is_array($config['openvpn']) && is_array($config['openvpn']['openvpn-server'
 	}
 }
 
-$pluginparams = array();
-$pluginparams['type'] = 'carp';
-$pluginparams['event'] = 'rc.carpmaster';
-$pluginparams['interface'] = $argv[1];
-
-?>
diff --git a/src/etc/rc.linkup b/src/etc/rc.linkup
index 354dda46e..bdc5e4c2e 100755
--- a/src/etc/rc.linkup
+++ b/src/etc/rc.linkup
@@ -38,6 +38,23 @@ require_once("system.inc");
 require_once("unbound.inc");
 require_once("services.inc");
 
+/**
+ * signal CARP to go down when there's a ip configured on the provided interface
+ * interfaces_carp_setup will enable carp when pfsync completes.
+ */
+function interface_signal_carp($intf)
+{
+      global $config;
+      if (!empty($config['virtualip']['vip'])) {
+          foreach ($config['virtualip']['vip'] as $vip) {
+              if ($vip['interface'] == $intf && $vip['mode'] == 'carp') {
+                  set_single_sysctl("net.inet.carp.allow", "0");
+              }
+          }
+      }
+}
+
+
 function handle_argument_group($iface, $argument2) {
     global $config;
 
@@ -68,7 +85,7 @@ function handle_argument_group($iface, $argument2) {
                 case "stop":
                     log_error("DEVD Ethernet detached event for {$iface}");
                     interface_bring_down($iface);
-                    interface_vips_bring_down($iface);
+                    interface_signal_carp($iface);
                     break;
                 case "start":
                     log_error("DEVD Ethernet attached event for {$iface}");