apps/kubevpn
1
0
Fork 0
mirror of https://github.com/kubenetworks/kubevpn.git synced 2025-10-05 23:36:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

hotfix: fix not add route bug (#228)

Browse Source
This commit is contained in:
naison
2024-04-27 09:58:54 +08:00
committed by GitHub
parent f93b06ea1c
commit 6f6d338656
2 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
pkg/handler/connect.go
View File

@@ -18,9 +18,7 @@ import (
"github.com/containernetworking/cni/pkg/types" "github.com/containernetworking/cni/pkg/types"
"github.com/distribution/reference" "github.com/distribution/reference"
"github.com/google/gopacket/routing"
goversion "github.com/hashicorp/go-version" goversion "github.com/hashicorp/go-version"
netroute "github.com/libp2p/go-netroute"
miekgdns "github.com/miekg/dns" miekgdns "github.com/miekg/dns"
"github.com/pkg/errors" "github.com/pkg/errors"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
@@ -368,12 +366,6 @@ func (c *ConnectOptions) startLocalTunServe(ctx context.Context, forwardAddress
// Listen all pod, add route if needed // Listen all pod, add route if needed
func (c *ConnectOptions) addRouteDynamic(ctx context.Context) (err error) { func (c *ConnectOptions) addRouteDynamic(ctx context.Context) (err error) {
var r routing.Router
r, err = netroute.New()
if err != nil {
return
}
var tunName string var tunName string
tunName, err = c.GetTunDeviceName() tunName, err = c.GetTunDeviceName()
if err != nil { if err != nil {
@@ -392,18 +384,13 @@ func (c *ConnectOptions) addRouteDynamic(ctx context.Context) (err error) {
if apiServer.Has(ip) { if apiServer.Has(ip) {
return return
} }
// if route is right, not need add route
iface, _, _, errs := r.Route(net.ParseIP(ip))
if errs == nil && tunName == iface.Name {
return
}
var mask net.IPMask var mask net.IPMask
if net.ParseIP(ip).To4() != nil { if net.ParseIP(ip).To4() != nil {
mask = net.CIDRMask(32, 32) mask = net.CIDRMask(32, 32)
} else { } else {
mask = net.CIDRMask(128, 128) mask = net.CIDRMask(128, 128)
} }
errs = tun.AddRoutes(tunName, types.Route{Dst: net.IPNet{IP: net.ParseIP(ip), Mask: mask}}) errs := tun.AddRoutes(tunName, types.Route{Dst: net.IPNet{IP: net.ParseIP(ip), Mask: mask}})
if errs != nil { if errs != nil {
log.Debugf("[route] add route failed, resource: %s, ip: %s,err: %v", resource, ip, err) log.Debugf("[route] add route failed, resource: %s, ip: %s,err: %v", resource, ip, err)
} }
@@ -840,13 +827,8 @@ func (c *ConnectOptions) addExtraRoute(ctx context.Context, nameserver string) e
if len(c.ExtraRouteInfo.ExtraDomain) == 0 { if len(c.ExtraRouteInfo.ExtraDomain) == 0 {
return nil return nil
} }
r, err := netroute.New()
if err != nil {
return err
}
var tunName string tunName, err := c.GetTunDeviceName()
tunName, err = c.GetTunDeviceName()
if err != nil { if err != nil {
log.Errorf("get tun interface failed: %s", err.Error()) log.Errorf("get tun interface failed: %s", err.Error())
return err return err
@@ -856,18 +838,13 @@ func (c *ConnectOptions) addExtraRoute(ctx context.Context, nameserver string) e
if net.ParseIP(ip) == nil { if net.ParseIP(ip) == nil {
return return
} }
// if route is right, not need add route
iface, _, _, errs := r.Route(net.ParseIP(ip))
if errs == nil && tunName == iface.Name {
return
}
var mask net.IPMask var mask net.IPMask
if net.ParseIP(ip).To4() != nil { if net.ParseIP(ip).To4() != nil {
mask = net.CIDRMask(32, 32) mask = net.CIDRMask(32, 32)
} else { } else {
mask = net.CIDRMask(128, 128) mask = net.CIDRMask(128, 128)
} }
errs = tun.AddRoutes(tunName, types.Route{Dst: net.IPNet{IP: net.ParseIP(ip), Mask: mask}}) errs := tun.AddRoutes(tunName, types.Route{Dst: net.IPNet{IP: net.ParseIP(ip), Mask: mask}})
if errs != nil { if errs != nil {
log.Debugf("[route] add route failed, domain: %s, ip: %s,err: %v", resource, ip, err) log.Debugf("[route] add route failed, domain: %s, ip: %s,err: %v", resource, ip, err)
} }

23
pkg/handler/connect_test.go Normal file
View File

@@ -0,0 +1,23 @@
package handler
import (
"net"
"testing"
"github.com/google/gopacket/routing"
"github.com/libp2p/go-netroute"
)
func TestRoute(t *testing.T) {
var r routing.Router
var err error
r, err = netroute.New()
if err != nil {
t.Fatal(err)
}
iface, gateway, src, err := r.Route(net.ParseIP("8.8.8.8"))
if err != nil {
t.Fatal(err)
}
t.Logf("iface: %s, gateway: %s, src: %s", iface.Name, gateway, src)
}