extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2025-01-31 18:39:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Delete route from system only if added by the client

Browse Source 
This adds a flags to check if the addVPNRoute executed without issues before removing a route from the system
This commit is contained in:
Maycon Santos 2024-04-12 18:44:01 +02:00
parent d30cf8706a
commit bf0b6c5f8a
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client/internal/routemanager/client.go
View File

@ -39,6 +39,7 @@ type clientNetwork struct {
chosenRoute *route.Route
network netip.Prefix
updateSerial uint64
systemUpdated bool
}
func newClientNetworkWatcher(ctx context.Context, wgInterface *iface.WGIface, statusRecorder *peer.Status, network netip.Prefix) *clientNetwork {
@ -215,8 +216,11 @@ func (c *clientNetwork) removeRouteFromWireguardPeer(peerKey string) error {
func (c *clientNetwork) removeRouteFromPeerAndSystem() error {
if c.chosenRoute != nil {
if err := removeVPNRoute(c.network, c.wgInterface.Name()); err != nil {
return fmt.Errorf("remove route %s from system, err: %v", c.network, err)
if c.systemUpdated {
if err := removeVPNRoute(c.network, c.wgInterface.Name()); err != nil {
return fmt.Errorf("remove route %s from system, err: %v", c.network, err)
}
c.systemUpdated = false
}
if err := c.removeRouteFromWireguardPeer(c.chosenRoute.Peer); err != nil {
@ -260,6 +264,8 @@ func (c *clientNetwork) recalculateRouteAndUpdatePeerAndSystem() error {
return fmt.Errorf("route %s couldn't be added for peer %s, err: %v",
c.network.String(), c.wgInterface.Address().IP.String(), err)
}
c.systemUpdated = true
}
c.chosenRoute = c.routes[chosen]