pangolin_mirror/olm
1
0
Fork 0
mirror of https://github.com/fosrl/olm.git synced 2026-08-31 19:21:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

parse the serverIP without cidr correctly

Browse Source
This commit is contained in:
Owen
2026-08-07 15:07:00 -04:00
parent ef1db9a676
commit 0f1d9a979c
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
olm/connect.go
View File

@@ -176,7 +176,7 @@ func (o *Olm) handleConnect(msg websocket.WSMessage) {
logger.Error("Failed to o.tunnelConfigure interface: %v", err)
}
if network.AddRoutes([]string{wgData.UtilitySubnet}, o.tunnelConfig.InterfaceName); err != nil { // also route the utility subnet
if err := network.AddRoutes([]string{wgData.UtilitySubnet}, o.tunnelConfig.InterfaceName); err != nil { // also route the utility subnet
logger.Error("Failed to add route for utility subnet: %v", err)
}

12
olm/exitnode.go
View File

@@ -99,7 +99,14 @@ persistent_keepalive_interval=%d`, util.FixKey(cfg.PublicKey), allowedIP, resolv
logger.Warn("Failed to add secondary address %s for exit node: %v", tunnelIP, err)
}
if err := network.AddRouteForServerIP(cfg.ServerIP, interfaceName); err != nil {
// ServerIP arrives as a bare IP with no CIDR suffix, but AddRouteForServerIP
// parses it as a CIDR on darwin (to explicitly route the subnet up the tunnel,
// since unlike Linux, adding the address to the interface does not implicitly
// create a route for it) - without a mask that parse fails and the route (and
// its corresponding NetworkSettings entry, which is what surfaces it via the
// API) is silently never added.
serverIPForRoute := strings.Split(cfg.ServerIP, "/")[0] + "/32"
if err := network.AddRouteForServerIP(serverIPForRoute, interfaceName); err != nil {
logger.Warn("Failed to add route for exit node server IP: %v", err)
}
@@ -163,7 +170,8 @@ func (o *Olm) removeExitNodePeerLocked() error {
}
interfaceName := o.tunnelConfig.InterfaceName
if err := network.RemoveRouteForServerIP(cfg.ServerIP, interfaceName); err != nil {
serverIPForRoute := strings.Split(cfg.ServerIP, "/")[0] + "/32"
if err := network.RemoveRouteForServerIP(serverIPForRoute, interfaceName); err != nil {
logger.Warn("Failed to remove route for exit node server IP: %v", err)
}