From 4ad7ad40bc773c9fa58d17340798ee89487a5f90 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Mon, 22 Jul 2024 10:52:09 +0200 Subject: [PATCH] Revert "ovpn: "openvpn" group name concept is misplaced" This reverts commit 7c7ed2f7bf7c825c0f1a3e38c8af9ca0768afa33. This is hardcoded in OpenVPN daemon to break without a proper log message attached, which is beyond silly. I really wish someone competent would have made the driver name match the actual driver name and avoid hardcoding magic strings. --- sys/net/if_ovpn.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/net/if_ovpn.c b/sys/net/if_ovpn.c index b8b348ce60a..7af669c6951 100644 --- a/sys/net/if_ovpn.c +++ b/sys/net/if_ovpn.c @@ -252,6 +252,7 @@ SDT_PROBE_DEFINE2(if_ovpn, tx, route, ip4, "struct in_addr *", "struct ovpn_kpee SDT_PROBE_DEFINE2(if_ovpn, tx, route, ip6, "struct in6_addr *", "struct ovpn_kpeer *"); static const char ovpnname[] = "ovpn"; +static const char ovpngroupname[] = "openvpn"; static MALLOC_DEFINE(M_OVPN, ovpnname, "OpenVPN DCO Interface"); #define MTAG_OVPN_LOOP 0x6f76706e /* ovpn */ @@ -2457,7 +2458,7 @@ ovpn_clone_create(struct if_clone *ifc, char *name, size_t len, ifp = sc->ifp; ifp->if_softc = sc; strlcpy(ifp->if_xname, name, IFNAMSIZ); - ifp->if_dname = ovpnname; + ifp->if_dname = ovpngroupname; ifp->if_dunit = unit; ifp->if_addrlen = 0; @@ -2547,7 +2548,7 @@ vnet_ovpn_init(const void *unused __unused) .create_f = ovpn_clone_create, .destroy_f = ovpn_clone_destroy, }; - V_ovpn_cloner = ifc_attach_cloner(ovpnname, &req); + V_ovpn_cloner = ifc_attach_cloner(ovpngroupname, &req); } VNET_SYSINIT(vnet_ovpn_init, SI_SUB_PSEUDO, SI_ORDER_ANY, vnet_ovpn_init, NULL);