[Openvpn-devel,v1] tun: make delete_route_connected_v6_net() and create_arbitrary_remote() static

Message ID 20261104124915.18463-1-gert@greenie.muc.de
State New
Headers
Series [Openvpn-devel,v1] tun: make delete_route_connected_v6_net() and create_arbitrary_remote() static |

Commit Message

Gert Doering Nov. 4, 2026, 12:49 p.m. UTC
  From: Razvan Cojocaru <razvanc@mailbox.org>

Neither is used outside tun.c or declared in a header.

create_arbitrary_remote() has had no FreeBSD/DragonFly caller since
94db3261 ("FreeBSD: for topology subnet, put tun interface into
IFF_BROADCAST mode"), so limit it to NetBSD and OpenBSD to avoid an
unused static function there.

Change-Id: I766eff47993375c80895755355919ede11b488db
Signed-off-by: Razvan Cojocaru <razvanc@mailbox.org>
Acked-by: Frank Lichtenheld <frank@lichtenheld.com>
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/2124
---

This change was reviewed on Gerrit and approved by at least one
developer. I request to merge it to master.

Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/2124
This mail reflects revision 1 of this Change.

Acked-by according to Gerrit (reflected above):
Frank Lichtenheld <frank@lichtenheld.com>
  

Patch

diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c
index 225d8b1..b6728fa 100644
--- a/src/openvpn/tun.c
+++ b/src/openvpn/tun.c
@@ -988,7 +988,7 @@ 
     add_route_ipv6(&r6, tt, 0, es, NULL);
 }
 
-void
+static void
 delete_route_connected_v6_net(const struct tuntap *tt)
 {
     struct route_ipv6 r6;
@@ -1005,8 +1005,7 @@ 
 #endif /* if defined(_WIN32) || defined(TARGET_DARWIN) || defined(TARGET_NETBSD) || \
           defined(TARGET_OPENBSD) */
 
-#if defined(TARGET_FREEBSD) || defined(TARGET_DRAGONFLY) || defined(TARGET_NETBSD) \
-    || defined(TARGET_OPENBSD)
+#if defined(TARGET_NETBSD) || defined(TARGET_OPENBSD)
 /* we can't use true subnet mode on tun on all platforms, as that
  * conflicts with IPv6 (wants to use ND then, which we don't do),
  * but the OSes want "a remote address that is different from ours"
@@ -1016,7 +1015,7 @@ 
  * is still point to point and no layer 2 resolution is done...
  */
 
-in_addr_t
+static in_addr_t
 create_arbitrary_remote(const struct tuntap *tt)
 {
     in_addr_t remote;