lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-14 08:34:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

interfaces: kill the ancient OpenVPN-tap-on-a-bridge magic on IPv4 reload

Browse Source 
This brings IPv4 and IPv6 closer together as both now support GIF/GRE
exclusively.  OpenVPN devices are created on boot since 44cd7aee8e.
This commit is contained in:
Franco Fichtner 2023-09-12 10:59:34 +02:00
parent a744327574
commit 58b45cd533
1 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/etc/rc.newwanip
View File

@ -62,20 +62,9 @@ if (!isset($config['interfaces'][$interface]['enable'])) {
system_resolver_configure();
list ($ip) = interfaces_primary_address($interface);
if (!is_ipaddr($ip)) {
/*
* Take care of OpenVPN and similar if you generate the event
* to reconfigure an interface. OpenVPN might be in tap(4)
* mode and not have an IP address.
*/
if (substr($device, 0, 4) != 'ovpn') {
log_msg("Failed to detect IP for interface {$interface}", LOG_INFO);
return;
}
/* force a non-IP value here that makes the problem explicit when debugged */
$ip = 'openvpn_xxx';
log_msg("Failed to detect IP for interface {$interface}", LOG_INFO);
return;
}
$cacheip_file = "/tmp/{$device}_oldip";
@ -93,12 +82,6 @@ interfaces_vips_configure($interface, 4);
$greifs = link_interface_to_gre($interface, true, 4);
$gififs = link_interface_to_gif($interface, true, 4);
$bridge = link_interface_to_bridge($interface);
if (!empty($bridge)) {
/* XXX _interfaces_bridge_configure() is probably cleaner */
interface_bridge_add_member($bridge, $device);
}
switch ($config['interfaces'][$interface]['ipaddrv6'] ?? 'none') {
case '6to4':
interface_6to4_configure($interface, $config['interfaces'][$interface], true);