From 40ae978391034fcdda7f1efd22e3f86132e44cce Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Mon, 17 Feb 2025 10:52:26 +0100
Subject: [PATCH] interfaces: remove defunct "other" VIP type

---
 .../mvc/app/controllers/OPNsense/Interfaces/forms/dialogVip.xml | 2 +-
 src/opnsense/mvc/app/models/OPNsense/Interfaces/Vip.xml         | 2 --
 src/opnsense/mvc/app/views/OPNsense/Interface/vip.volt          | 1 -
 src/opnsense/scripts/interfaces/reconfigure_vips.php            | 2 +-
 4 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Interfaces/forms/dialogVip.xml b/src/opnsense/mvc/app/controllers/OPNsense/Interfaces/forms/dialogVip.xml
index fd90f018c..64c2fdeb7 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Interfaces/forms/dialogVip.xml
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Interfaces/forms/dialogVip.xml
@@ -3,7 +3,7 @@
         <id>vip.mode</id>
         <label>Mode</label>
         <type>dropdown</type>
-        <help>Proxy ARP and other type Virtual IPs cannot be bound to by anything running on the firewall, such as IPsec, OpenVPN, etc. Use a CARP or IP Alias type address for these cases.</help>
+        <help>Proxy ARP cannot be bound to by anything running on the firewall, such as IPsec, OpenVPN, etc. In most cases an IP alias should be used.</help>
     </field>
     <field>
         <id>vip.interface</id>
diff --git a/src/opnsense/mvc/app/models/OPNsense/Interfaces/Vip.xml b/src/opnsense/mvc/app/models/OPNsense/Interfaces/Vip.xml
index ece1b545c..294b4e572 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Interfaces/Vip.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Interfaces/Vip.xml
@@ -15,8 +15,6 @@
                     <ipalias>IP Alias</ipalias>
                     <carp>CARP</carp>
                     <proxyarp>Proxy ARP</proxyarp>
-                    <!-- madness without function -->
-                    <other>Other</other>
                 </OptionValues>
             </mode>
             <subnet type=".\VipNetworkField">
diff --git a/src/opnsense/mvc/app/views/OPNsense/Interface/vip.volt b/src/opnsense/mvc/app/views/OPNsense/Interface/vip.volt
index e97f21d50..bedd8b1b3 100644
--- a/src/opnsense/mvc/app/views/OPNsense/Interface/vip.volt
+++ b/src/opnsense/mvc/app/views/OPNsense/Interface/vip.volt
@@ -83,7 +83,6 @@
               <option value="ipalias">{{ lang._('IP Alias') }}</option>
               <option value="carp">{{ lang._('CARP') }}</option>
               <option value="proxyarp">{{ lang._('Proxy ARP') }}</option>
-              <option value="other">{{ lang._('Other') }}</option>
           </select>
       </div>
   </div>
diff --git a/src/opnsense/scripts/interfaces/reconfigure_vips.php b/src/opnsense/scripts/interfaces/reconfigure_vips.php
index 74513b981..5dda8f73a 100755
--- a/src/opnsense/scripts/interfaces/reconfigure_vips.php
+++ b/src/opnsense/scripts/interfaces/reconfigure_vips.php
@@ -110,7 +110,7 @@ if (!empty($config['virtualip']['vip'])) {
             if ($vipent['mode'] == 'proxyarp') {
                 $proxyarp = true;
             }
-            if (in_array($vipent['mode'], ['proxyarp', 'other'])) {
+            if ($vipent['mode'] == 'proxyarp') {
                 if (isset($addresses[$subnet])) {
                     legacy_interface_deladdress($addresses[$subnet]['if'], $subnet, is_ipaddrv6($subnet) ? 6 : 4);
                 }