From 474494764213c62591ae13b8b2c7cd7b6e9d1159 Mon Sep 17 00:00:00 2001
From: Monviech <gitacc@pischem.com>
Date: Tue, 18 Aug 2026 15:09:43 +0200
Subject: [PATCH] net/frr: Add address family dropdown to neighbors, replacing
 implicit Multi-Protocol toggle, making it inline with what peergroups offer

---
 .../Quagga/forms/dialogEditBGPNeighbor.xml    | 19 ++---
 .../mvc/app/models/OPNsense/Quagga/BGP.xml    | 12 ++-
 .../OPNsense/Quagga/Migrations/M1_1_3.php     | 75 +++++++++++++++++++
 .../OPNsense/Quagga/Config/bgpd.conf          | 13 ++--
 4 files changed, 97 insertions(+), 22 deletions(-)
 create mode 100644 net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/Migrations/M1_1_3.php

diff --git a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditBGPNeighbor.xml b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditBGPNeighbor.xml
index 245b6505c5..b6a4e4c2c5 100644
--- a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditBGPNeighbor.xml
+++ b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditBGPNeighbor.xml
@@ -45,6 +45,13 @@
       <visible>false</visible>
     </grid_view>
   </field>
+  <field>
+    <id>neighbor.family</id>
+    <label>Address Family</label>
+    <type>dropdown</type>
+    <type>select_multiple</type>
+    <help>Select which address families to activate for this neighbor.</help>
+  </field>
   <field>
     <id>neighbor.password</id>
     <label>BGP MD5 Password</label>
@@ -127,18 +134,6 @@
       <visible>false</visible>
     </grid_view>
   </field>
-  <field>
-    <id>neighbor.multiprotocol</id>
-    <label>Multi-Protocol</label>
-    <type>checkbox</type>
-    <advanced>true</advanced>
-    <help>Enables multiprotocol BGP for support of additional address families like IPv6.</help>
-    <grid_view>
-      <type>boolean</type>
-      <formatter>boolean</formatter>
-      <visible>false</visible>
-    </grid_view>
-  </field>
   <field>
     <id>neighbor.rrclient</id>
     <label>Route Reflector Client</label>
diff --git a/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/BGP.xml b/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/BGP.xml
index 4397fd4a1e..ea8a0d2818 100644
--- a/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/BGP.xml
+++ b/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/BGP.xml
@@ -1,7 +1,7 @@
 <model>
     <mount>//OPNsense/quagga/bgp</mount>
     <description>BGP Routing configuration</description>
-    <version>1.1.2</version>
+    <version>1.1.3</version>
     <items>
         <enabled type="BooleanField">
             <Default>0</Default>
@@ -68,6 +68,15 @@
                 <address type="NetworkField">
                     <Required>Y</Required>
                 </address>
+                <family type="OptionField">
+                    <Required>Y</Required>
+                    <Default>ipv4</Default>
+                    <Multiple>Y</Multiple>
+                    <OptionValues>
+                        <ipv4>IPv4</ipv4>
+                        <ipv6>IPv6</ipv6>
+                    </OptionValues>
+                </family>
                 <remote_as_mode type="OptionField">
                     <BlankDesc>Use Remote AS Number</BlankDesc>
                     <OptionValues>
@@ -104,7 +113,6 @@
                 <nexthopself type="BooleanField"/>
                 <nexthopselfall type="BooleanField"/>
                 <multihop type="BooleanField"/>
-                <multiprotocol type="BooleanField"/>
                 <rrclient type="BooleanField"/>
                 <soft_reconfiguration_inbound type="BooleanField"/>
                 <bfd type="BooleanField"/>
diff --git a/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/Migrations/M1_1_3.php b/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/Migrations/M1_1_3.php
new file mode 100644
index 0000000000..642ab19049
--- /dev/null
+++ b/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/Migrations/M1_1_3.php
@@ -0,0 +1,75 @@
+<?php
+
+/*
+ * Copyright (C) 2026 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 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.
+ */
+
+namespace OPNsense\Quagga\Migrations;
+
+use OPNsense\Base\BaseModelMigration;
+use OPNsense\Core\Config;
+
+class M1_1_3 extends BaseModelMigration
+{
+    public function run($model)
+    {
+        $neighbors = $model->getNodeByReference('neighbors.neighbor');
+
+        if ($neighbors === null) {
+            return;
+        }
+
+        $config = Config::getInstance()->object();
+
+        if (empty($config->OPNsense->quagga->bgp->neighbors->neighbor)) {
+            return;
+        }
+
+        foreach ($neighbors->iterateItems() as $uuid => $neighbor) {
+            $config_neighbor = null;
+            // Could be a lookup table but a migration is one shot anyway
+            foreach ($config->OPNsense->quagga->bgp->neighbors->neighbor as $candidate) {
+                if ((string)$candidate['uuid'] === (string)$uuid) {
+                    $config_neighbor = $candidate;
+                    break;
+                }
+            }
+
+            if ($config_neighbor === null || isset($config_neighbor->family)) {
+                continue;
+            }
+
+            if ((string)$config_neighbor->multiprotocol === '1') {
+                $neighbor->family = 'ipv4,ipv6';
+            } elseif (strpos((string)$config_neighbor->address, ':') !== false) {
+                $neighbor->family = 'ipv6';
+            } else {
+                $neighbor->family = 'ipv4';
+            }
+        }
+    }
+
+    // Model is saved by 'run_migrations.php'
+}
diff --git a/net/frr/src/opnsense/service/templates/OPNsense/Quagga/Config/bgpd.conf b/net/frr/src/opnsense/service/templates/OPNsense/Quagga/Config/bgpd.conf
index 55e2390373..02928d276c 100644
--- a/net/frr/src/opnsense/service/templates/OPNsense/Quagga/Config/bgpd.conf
+++ b/net/frr/src/opnsense/service/templates/OPNsense/Quagga/Config/bgpd.conf
@@ -7,14 +7,11 @@
 
 {%   if helpers.exists('OPNsense.quagga.bgp.neighbors.neighbor') %}
 {%     for neighbor in helpers.toList('OPNsense.quagga.bgp.neighbors.neighbor') %}
-{%       if neighbor.enabled == '1' and neighbor.multiprotocol == '1' %}
-{#         // the .append() method in Jinja2 returns "None", so filter through default() to suppress #}
-{{         neighbors['ipv4'].append(neighbor) | default("", True) }}
-{{         neighbors['ipv6'].append(neighbor) | default("", True) }}
-{%       elif neighbor.enabled == '1' and ':' not in neighbor.address %}
-{{         neighbors['ipv4'].append(neighbor) | default("", True) }}
-{%       elif neighbor.enabled == '1' and ':' in neighbor.address %}
-{{         neighbors['ipv6'].append(neighbor) | default("", True) }}
+{%       if neighbor.enabled == '1' %}
+{%         for family in neighbor.family.split(',') %}
+{#           // the .append() method in Jinja2 returns "None", so filter through default() to suppress #}
+{{           neighbors[family].append(neighbor) | default("", True) }}
+{%         endfor %}
 {%       endif %}
 {%     endfor %}
 {%   endif %}