From 2cfd70b7ebbcfc9058542b58466176ecda217209 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Wed, 24 Nov 2021 20:05:46 +0100
Subject: [PATCH] System: High Availability - optionally disconnect dailup
 interfaces when going into CARP backup mode. while here reformat the HA
 section a bit as state sync is only part of the options. closes
 https://github.com/opnsense/core/issues/3185

---
 src/etc/rc.syshook.d/carp/20-ppp | 63 ++++++++++++++++++++++++++++++++
 src/www/system_hasync.php        | 30 ++++++++++-----
 2 files changed, 83 insertions(+), 10 deletions(-)
 create mode 100755 src/etc/rc.syshook.d/carp/20-ppp

diff --git a/src/etc/rc.syshook.d/carp/20-ppp b/src/etc/rc.syshook.d/carp/20-ppp
new file mode 100755
index 000000000..f7a4b8532
--- /dev/null
+++ b/src/etc/rc.syshook.d/carp/20-ppp
@@ -0,0 +1,63 @@
+#!/usr/local/bin/php
+<?php
+
+/*
+ * Copyright (C) 2021 Deciso B.V.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+require_once("config.inc");
+require_once("interfaces.inc");
+require_once("util.inc");
+
+$subsystem = !empty($argv[1]) ? $argv[1] : '';
+$type = !empty($argv[2]) ? $argv[2] : '';
+
+$a_hasync = &config_read_array('hasync');
+if (!empty($a_hasync['disconnectppps'])) {
+    if ($type != 'MASTER' && $type != 'BACKUP') {
+       log_error("Carp '$type' event unknown from source '{$subsystem}'");
+       exit(1);
+    } elseif (!strstr($subsystem, '@')) {
+       log_error("Carp '$type' event triggered from wrong source '{$subsystem}'");
+       exit(1);
+    }
+
+    list ($vhid, $iface) = explode('@', $subsystem);
+    $a_ppps = &config_read_array('ppps', 'ppp');
+    foreach ($a_ppps as $ppp) {
+        if ($ppp['ports'] == $iface) {
+            foreach($config['interfaces'] as $ifkey => $interface) {
+                if ($ppp['if'] == $interface['if']) {
+                    log_error("{$iface} is connected to ppp interface {$ifkey} set new status {$type}");
+                    if ($type == 'BACKUP') {
+                        interface_bring_down($ifkey);
+                    } else {
+                        interface_ppps_configure(false, $ifkey);
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/www/system_hasync.php b/src/www/system_hasync.php
index 9b3ba8304..ab949c2ba 100644
--- a/src/www/system_hasync.php
+++ b/src/www/system_hasync.php
@@ -35,6 +35,7 @@ $a_hasync = &config_read_array('hasync');
 $checkbox_names = array(
     'pfsyncenabled',
     'disablepreempt',
+    'disconnectppps',
     'synchronizealiases',
     'synchronizeauthservers',
     'synchronizecerts',
@@ -127,12 +128,30 @@ include("head.inc");
             <div class="table-responsive">
               <table class="table table-striped opnsense_standard_table_form">
                 <tr>
-                  <td style="width:22%"><strong><?= gettext('State Synchronization') ?></strong></td>
+                  <td style="width:22%"><strong><?= gettext('General settings') ?></strong></td>
                   <td style="width:78%; text-align:right">
                     <small><?=gettext("full help"); ?> </small>
                     <i class="fa fa-toggle-off text-danger" style="cursor: pointer;" id="show_all_help_page"></i>
                   </td>
                 </tr>
+                <tr>
+                  <td><a id="help_for_disablepreempt" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext('Disable preempt') ?></td>
+                  <td>
+                    <input type="checkbox" name="disablepreempt" value="on" <?= !empty($pconfig['disablepreempt']) ? "checked=\"checked\"" : "";?> />
+                    <div class="hidden" data-for="help_for_disablepreempt">
+                      <?=gettext("When this device is configured as CARP master it will try to switch to master when powering up, this option will keep this one slave if there already is a master on the network. A reboot is required to take effect.");?>
+                    </div>
+                  </td>
+                </tr>
+                <tr>
+                  <td><a id="help_for_disconnectppps" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext('Disconnect dailup interfaces') ?></td>
+                  <td>
+                    <input type="checkbox" name="disconnectppps" value="on" <?= !empty($pconfig['disconnectppps']) ? "checked=\"checked\"" : "";?> />
+                    <div class="hidden" data-for="help_for_disconnectppps">
+                      <?=gettext("When this device is configured as CARP backup it will disconnect all PPP type interfaces and try to reconnect them when becoming master again.");?>
+                    </div>
+                  </td>
+                </tr>
                 <tr>
                   <td><a id="help_for_pfsyncenabled" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext('Synchronize States') ?></td>
                   <td>
@@ -146,15 +165,6 @@ include("head.inc");
                     </div>
                   </td>
                 </tr>
-                <tr>
-                  <td><a id="help_for_disablepreempt" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext('Disable preempt') ?></td>
-                  <td>
-                    <input type="checkbox" name="disablepreempt" value="on" <?= !empty($pconfig['disablepreempt']) ? "checked=\"checked\"" : "";?> />
-                    <div class="hidden" data-for="help_for_disablepreempt">
-                      <?=gettext("When this device is configured as CARP master it will try to switch to master when powering up, this option will keep this one slave if there already is a master on the network. A reboot is required to take effect.");?>
-                    </div>
-                  </td>
-                </tr>
                 <tr>
                   <td><a id="help_for_pfsyncinterface" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext('Synchronize Interface') ?></td>
                   <td>