upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "ovpn: "openvpn" group name concept is misplaced"

Browse source 
This reverts commit 7c7ed2f7bf.

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.
This commit is contained in:
Franco Fichtner 2024-07-22 10:52:09 +02:00
parent 9cb6d71f6a
commit 4ad7ad40bc
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sys/net/if_ovpn.c
View file

@ -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);