wgengine: simplify, change some signatures
* make RouterGen return an error, not take both tunname and tundev * also remove RouteGen taking a wireguard/device.Device; currently unused * remove derp parameter (it'll work differently) * unexport NewUserspaceRouter in per-OS impls, add documented wrapper Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
committed by
Brad Fitzpatrick
parent
9dbc52bb5b
commit
79295b1138
@@ -32,19 +32,24 @@ type linuxRouter struct {
|
||||
routes map[wgcfg.CIDR]struct{}
|
||||
}
|
||||
|
||||
func NewUserspaceRouter(logf logger.Logf, tunname string, dev *device.Device, tuntap tun.Device, netChanged func()) Router {
|
||||
func newUserspaceRouter(logf logger.Logf, _ *device.Device, tunDev tun.Device, netChanged func()) (Router, error) {
|
||||
// TODO: move monitor out of Router, make it created/owned by Engine
|
||||
mon, err := monitor.New(logf, netChanged)
|
||||
if err != nil {
|
||||
log.Fatalf("rtnlmon.New() failed: %v", err)
|
||||
return nil, err
|
||||
}
|
||||
|
||||
r := linuxRouter{
|
||||
tunname, err := tunDev.Name()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return &linuxRouter{
|
||||
logf: logf,
|
||||
tunname: tunname,
|
||||
mon: mon,
|
||||
netChanged: netChanged,
|
||||
}
|
||||
return &r
|
||||
}, nil
|
||||
}
|
||||
|
||||
func cmd(args ...string) *exec.Cmd {
|
||||
|
||||
Reference in New Issue
Block a user