Skip to content

fix: remove gateway when configuring routes #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
encodeous merged 1 commit into from
Nov 27, 2025
Merged

fix: remove gateway when configuring routes #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions core/nylon_wireguard.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (
"cmp"
"encoding/hex"
"fmt"
"net/netip"
"slices"

"github.com/encodeous/nylon/polyamide/conn"
Expand Down Expand Up @@ -87,21 +86,16 @@ listen_port=%d
// configure self
selfSvc := make(map[state.ServiceId]struct{})

var defaultAddr *netip.Addr
for _, svc := range s.GetRouter(s.Id).Services {
prefix := s.GetSvcPrefix(svc)
if defaultAddr == nil {
addr := prefix.Addr()
defaultAddr = &addr
}
selfSvc[svc] = struct{}{}
err = ConfigureAlias(itfName, prefix)
if err != nil {
return err
}
}

if defaultAddr == nil {
if len(s.GetRouter(s.Id).Services) == 0 {
return fmt.Errorf("no address configured for self")
}

Expand All @@ -116,7 +110,7 @@ listen_port=%d
if _, ok := selfSvc[svc]; ok {
continue
}
err = ConfigureRoute(n.Tun, itfName, prefix, *defaultAddr)
err = ConfigureRoute(n.Tun, itfName, prefix)
if err != nil {
return err
}
Expand Down
11 changes: 6 additions & 5 deletions core/sys_darwin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@ package core

import (
"fmt"
"github.com/encodeous/nylon/polyamide/ipc"
"github.com/encodeous/nylon/polyamide/tun"
"github.com/encodeous/nylon/state"
"net"
"net/netip"
"os/exec"
"strings"

"github.com/encodeous/nylon/polyamide/ipc"
"github.com/encodeous/nylon/polyamide/tun"
"github.com/encodeous/nylon/state"
)

func VerifyForwarding() error {
Expand Down Expand Up @@ -46,6 +47,6 @@ func ConfigureAlias(ifName string, prefix netip.Prefix) error {
}
}

func ConfigureRoute(dev tun.Device, itfName string, route netip.Prefix, via netip.Addr) error {
return Exec("/sbin/route", "-n", "add", "-net", route.String(), via.String())
func ConfigureRoute(dev tun.Device, itfName string, route netip.Prefix) error {
return Exec("/sbin/route", "-n", "add", "-net", route.String(), "-interface", itfName)
}
4 changes: 2 additions & 2 deletions core/sys_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ func ConfigureAlias(ifName string, prefix netip.Prefix) error {
return Exec("ip", "addr", "add", prefix.String(), "dev", ifName)
}

func ConfigureRoute(dev tun.Device, itfName string, route netip.Prefix, via netip.Addr) error {
func ConfigureRoute(dev tun.Device, itfName string, route netip.Prefix) error {
err := Exec("ip", "route", "flush", route.String())
if err != nil {
return err
}
return Exec("ip", "route", "add", route.String(), "via", via.String(), "dev", itfName)
return Exec("ip", "route", "add", route.String(), "dev", itfName)
}
13 changes: 7 additions & 6 deletions core/sys_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@ package core

import (
"fmt"
"github.com/encodeous/nylon/polyamide/ipc"
"github.com/encodeous/nylon/polyamide/tun"
"github.com/encodeous/nylon/state"
"github.com/kmahyyg/go-network-compo/wintypes"
"net"
"net/netip"
"strconv"
"strings"

"github.com/encodeous/nylon/polyamide/ipc"
"github.com/encodeous/nylon/polyamide/tun"
"github.com/encodeous/nylon/state"
"github.com/kmahyyg/go-network-compo/wintypes"
)

func VerifyForwarding() error {
Expand Down Expand Up @@ -39,7 +40,7 @@ func ConfigureAlias(ifName string, prefix netip.Prefix) error {
return Exec("netsh", "interface", "ip", "add", "address", ifName, addr.String(), maskStr)
}

func ConfigureRoute(dev tun.Device, itfName string, route netip.Prefix, via netip.Addr) error {
func ConfigureRoute(dev tun.Device, itfName string, route netip.Prefix) error {
addr := route.Addr()
_, mask, _ := net.ParseCIDR(route.String())
maskStr := net.IP(mask.Mask).String()
Expand All @@ -48,5 +49,5 @@ func ConfigureRoute(dev tun.Device, itfName string, route netip.Prefix, via neti
if err != nil {
return err
}
return Exec("route", "add", addr.String(), "mask", maskStr, via.String(), "IF", strconv.FormatUint(uint64(itf.InterfaceIndex), 10))
return Exec("route", "add", addr.String(), "mask", maskStr, "0.0.0.0", "IF", strconv.FormatUint(uint64(itf.InterfaceIndex), 10))
}