lzc256
/
tailscale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wgengine/router: add OpenBSD IPv6 support. 

Similar to FreeBSD in https://github.com/tailscale/tailscale/issues/1307,
add IPv6 addresses with a prefix length of 48.

Fixes https://github.com/tailscale/tailscale/issues/1372

Signed-off-by: Denton Gentry <dgentry@tailscale.com>
pull/1502/head
Denton Gentry 2021-03-08 17:07:05 -08:00 committed by Denton Gentry
parent c445e3d327
commit 04e72f95cc
1 changed files with 76 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
wgengine/router/router_openbsd.go
View File

@ -24,7 +24,8 @@ import (
type openbsdRouter struct { type openbsdRouter struct {
logf logger.Logf logf logger.Logf
tunname string tunname string
local netaddr.IPPrefix local4 netaddr.IPPrefix
local6 netaddr.IPPrefix
routes map[netaddr.IPPrefix]struct{} routes map[netaddr.IPPrefix]struct{}
dns *dns.Manager dns *dns.Manager
@ -73,17 +74,30 @@ func (r *openbsdRouter) Set(cfg *Config) error {
if len(cfg.LocalAddrs) == 0 { if len(cfg.LocalAddrs) == 0 {
return nil return nil
} }
if len(cfg.LocalAddrs) > 1 { numIPv4 := 0
return errors.New("freebsd doesn't support setting multiple local addrs yet") numIPv6 := 0
localAddr4 := netaddr.IPPrefix{}
localAddr6 := netaddr.IPPrefix{}
for _, addr := range cfg.LocalAddrs {
if addr.IP.Is4() {
numIPv4++
localAddr4 = addr
}
if addr.IP.Is6() {
numIPv6++
localAddr6 = addr
}
}
if numIPv4 > 1 || numIPv6 > 1 {
return errors.New("openbsd doesn't support setting multiple local addrs yet")
} }
localAddr := cfg.LocalAddrs[0]
var errq error var errq error
if localAddr != r.local { if localAddr4 != r.local4 {
if !r.local.IsZero() { if !r.local4.IsZero() {
addrdel := []string{"ifconfig", r.tunname, addrdel := []string{"ifconfig", r.tunname,
"inet", r.local.String(), "-alias"} "inet", r.local4.String(), "-alias"}
out, err := cmd(addrdel...).CombinedOutput() out, err := cmd(addrdel...).CombinedOutput()
if err != nil { if err != nil {
r.logf("addr del failed: %v: %v\n%s", addrdel, err, out) r.logf("addr del failed: %v: %v\n%s", addrdel, err, out)
@ -93,8 +107,8 @@ func (r *openbsdRouter) Set(cfg *Config) error {
} }
routedel := []string{"route", "-q", "-n", routedel := []string{"route", "-q", "-n",
"del", "-inet", r.local.String(), "del", "-inet", r.local4.String(),
"-iface", r.local.IP.String()} "-iface", r.local4.IP.String()}
if out, err := cmd(routedel...).CombinedOutput(); err != nil { if out, err := cmd(routedel...).CombinedOutput(); err != nil {
r.logf("route del failed: %v: %v\n%s", routedel, err, out) r.logf("route del failed: %v: %v\n%s", routedel, err, out)
if errq == nil { if errq == nil {
@ -103,23 +117,58 @@ func (r *openbsdRouter) Set(cfg *Config) error {
} }
} }
addradd := []string{"ifconfig", r.tunname, if !localAddr4.IsZero() {
"inet", localAddr.String(), "alias"} addradd := []string{"ifconfig", r.tunname,
out, err := cmd(addradd...).CombinedOutput() "inet", localAddr4.String(), "alias"}
if err != nil { out, err := cmd(addradd...).CombinedOutput()
r.logf("addr add failed: %v: %v\n%s", addradd, err, out) if err != nil {
if errq == nil { r.logf("addr add failed: %v: %v\n%s", addradd, err, out)
errq = err if errq == nil {
errq = err
}
}
routeadd := []string{"route", "-q", "-n",
"add", "-inet", localAddr4.String(),
"-iface", localAddr4.IP.String()}
if out, err := cmd(routeadd...).CombinedOutput(); err != nil {
r.logf("route add failed: %v: %v\n%s", routeadd, err, out)
if errq == nil {
errq = err
}
}
}
}
if !localAddr6.IsZero() {
// in https://github.com/tailscale/tailscale/issues/1307 we made
// FreeBSD use a /48 for IPv6 addresses, which is nice because we
// don't need to additionally add routing entries. Do that here too.
localAddr6 = netaddr.IPPrefix{localAddr6.IP, 48}
}
if localAddr6 != r.local6 {
if !r.local6.IsZero() {
addrdel := []string{"ifconfig", r.tunname,
"inet6", r.local6.String(), "delete"}
out, err := cmd(addrdel...).CombinedOutput()
if err != nil {
r.logf("addr del failed: %v: %v\n%s", addrdel, err, out)
if errq == nil {
errq = err
}
} }
} }
routeadd := []string{"route", "-q", "-n", if !localAddr6.IsZero() {
"add", "-inet", localAddr.String(), addradd := []string{"ifconfig", r.tunname,
"-iface", localAddr.IP.String()} "inet6", localAddr6.String()}
if out, err := cmd(routeadd...).CombinedOutput(); err != nil { out, err := cmd(addradd...).CombinedOutput()
r.logf("route add failed: %v: %v\n%s", routeadd, err, out) if err != nil {
if errq == nil { r.logf("addr add failed: %v: %v\n%s", addradd, err, out)
errq = err if errq == nil {
errq = err
}
} }
} }
} }
@ -135,7 +184,7 @@ func (r *openbsdRouter) Set(cfg *Config) error {
nstr := fmt.Sprintf("%v/%d", nip, route.Bits) nstr := fmt.Sprintf("%v/%d", nip, route.Bits)
routedel := []string{"route", "-q", "-n", routedel := []string{"route", "-q", "-n",
"del", "-inet", nstr, "del", "-inet", nstr,
"-iface", localAddr.IP.String()} "-iface", localAddr4.IP.String()}
out, err := cmd(routedel...).CombinedOutput() out, err := cmd(routedel...).CombinedOutput()
if err != nil { if err != nil {
r.logf("route del failed: %v: %v\n%s", routedel, err, out) r.logf("route del failed: %v: %v\n%s", routedel, err, out)
@ -152,7 +201,7 @@ func (r *openbsdRouter) Set(cfg *Config) error {
nstr := fmt.Sprintf("%v/%d", nip, route.Bits) nstr := fmt.Sprintf("%v/%d", nip, route.Bits)
routeadd := []string{"route", "-q", "-n", routeadd := []string{"route", "-q", "-n",
"add", "-inet", nstr, "add", "-inet", nstr,
"-iface", localAddr.IP.String()} "-iface", localAddr4.IP.String()}
out, err := cmd(routeadd...).CombinedOutput() out, err := cmd(routeadd...).CombinedOutput()
if err != nil { if err != nil {
r.logf("addr add failed: %v: %v\n%s", routeadd, err, out) r.logf("addr add failed: %v: %v\n%s", routeadd, err, out)
@ -163,7 +212,8 @@ func (r *openbsdRouter) Set(cfg *Config) error {
} }
} }
r.local = localAddr r.local4 = localAddr4
r.local6 = localAddr6
r.routes = newRoutes r.routes = newRoutes
if err := r.dns.Set(cfg.DNS); err != nil { if err := r.dns.Set(cfg.DNS); err != nil {