mirrors/tailscale
1
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

wgengine/router: take a link monitor

Browse Source 
Prep for #1591 which will need to make Linux's router react to changes
that the link monitor observes.

The router package already depended on the monitor package
transitively. Now it's explicit.

Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick
2021-07-20 13:28:06 -07:00
committed by Brad Fitzpatrick
parent 24db1a3c9b
commit ed8587f90d
11 changed files with 56 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
wgengine/router/router_userspace_bsd.go
View File

@ -17,16 +17,18 @@ import (
"tailscale.com/net/tsaddr"
"tailscale.com/types/logger"
"tailscale.com/version"
"tailscale.com/wgengine/monitor"
)
type userspaceBSDRouter struct {
logf logger.Logf
linkMon *monitor.Mon
tunname string
local []netaddr.IPPrefix
routes map[netaddr.IPPrefix]struct{}
}
func newUserspaceBSDRouter(logf logger.Logf, tundev tun.Device) (Router, error) {
func newUserspaceBSDRouter(logf logger.Logf, tundev tun.Device, linkMon *monitor.Mon) (Router, error) {
tunname, err := tundev.Name()
if err != nil {
return nil, err
@ -34,6 +36,7 @@ func newUserspaceBSDRouter(logf logger.Logf, tundev tun.Device) (Router, error)
return &userspaceBSDRouter{
logf: logf,
linkMon: linkMon,
tunname: tunname,
}, nil
}