Commit45ef86b

committed

fix(vpn): handle sending nil router config

1 parenta21306e commit45ef86bCopy full SHA for 45ef86b

File tree

-5

lines changed

-5

lines changed

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,10 @@ func (*vpnRouter) Up() error {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`func (vvpnRouter)Set(cfgrouter.Config)error {`
`25`		`-req:=convertRouterConfig(cfg)`
	`25`	`+ifcfg==nil {`
	`26`	`+returnnil`
	`27`	`+}`
	`28`	`+req:=convertRouterConfig(*cfg)`
`26`	`29`	`returnv.tunnel.ApplyNetworkSettings(v.tunnel.ctx,req)`
`27`	`30`	`}`
`28`	`31`
`@@ -31,7 +34,7 @@ func (*vpnRouter) Close() error {`
`31`	`34`	`returnnil`
`32`	`35`	`}`
`33`	`36`
`34`		`-funcconvertRouterConfig(cfgrouter.Config)NetworkSettingsRequest {`
	`37`	`+funcconvertRouterConfig(cfg router.Config)*NetworkSettingsRequest {`
`35`	`38`	`v4LocalAddrs:=make([]string,0)`
`36`	`39`	`v6LocalAddrs:=make([]string,0)`
`37`	`40`	`for_,addrs:=rangecfg.LocalAddrs {`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,12 +13,12 @@ func TestConvertRouterConfig(t *testing.T) {`
`13`	`13`
`14`	`14`	`tests:= []struct {`
`15`	`15`	`namestring`
`16`		`-cfg*router.Config`
	`16`	`+cfg router.Config`
`17`	`17`	`expected*NetworkSettingsRequest`
`18`	`18`	`}{`
`19`	`19`	`{`
`20`	`20`	`name:"IPv4 and IPv6 configuration",`
`21`		`-cfg:&router.Config{`
	`21`	`+cfg: router.Config{`
`22`	`22`	`LocalAddrs: []netip.Prefix{netip.MustParsePrefix("100.64.0.1/32"),netip.MustParsePrefix("fd7a:115c:a1e0::1/128")},`
`23`	`23`	`Routes: []netip.Prefix{netip.MustParsePrefix("192.168.0.0/24"),netip.MustParsePrefix("fd00::/64")},`
`24`	`24`	`LocalRoutes: []netip.Prefix{netip.MustParsePrefix("10.0.0.0/8"),netip.MustParsePrefix("2001:db8::/32")},`
`@@ -48,7 +48,7 @@ func TestConvertRouterConfig(t *testing.T) {`
`48`	`48`	`},`
`49`	`49`	`{`
`50`	`50`	`name:"Empty",`
`51`		`-cfg:&router.Config{},`
	`51`	`+cfg: router.Config{},`
`52`	`52`	`expected:&NetworkSettingsRequest{`
`53`	`53`	`Ipv4Settings:&NetworkSettingsRequest_IPv4Settings{`
`54`	`54`	`Addrs: []string{},`

Comments

(0)