TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-29 13:05:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

wgengine/magicsock: accept a host and port instead of an addr in listenPacket

Browse Source 
This simplifies call sites and prevents accidental failure to use net.JoinHostPort.

Signed-off-by: Josh Bleecher Snyder <josharian@gmail.com>
This commit is contained in:
Josh Bleecher Snyder 2021-04-19 14:14:35 -07:00
parent f42ded7acf
commit 15ceacc4c5
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
wgengine/magicsock/magicsock.go
View File

@ -2595,7 +2595,8 @@ func (c *Conn) initialBind() error {
return nil return nil
} }
func (c *Conn) listenPacket(ctx context.Context, network, addr string) (net.PacketConn, error) { func (c *Conn) listenPacket(ctx context.Context, network, host string, port uint16) (net.PacketConn, error) {
addr := net.JoinHostPort(host, fmt.Sprint(port))
if c.packetListener != nil { if c.packetListener != nil {
return c.packetListener.ListenPacket(ctx, network, addr) return c.packetListener.ListenPacket(ctx, network, addr)
} }
@ -2614,13 +2615,13 @@ func (c *Conn) bind1(ruc **RebindingUDPConn, which string) error {
var err error var err error
listenCtx := context.Background() // unused without DNS name to resolve listenCtx := context.Background() // unused without DNS name to resolve
if c.port == 0 && DefaultPort != 0 { if c.port == 0 && DefaultPort != 0 {
pc, err = c.listenPacket(listenCtx, which, net.JoinHostPort(host, fmt.Sprint(DefaultPort))) pc, err = c.listenPacket(listenCtx, which, host, DefaultPort)
if err != nil { if err != nil {
c.logf("magicsock: bind: default port %s/%v unavailable; picking random", which, DefaultPort) c.logf("magicsock: bind: default port %s/%v unavailable; picking random", which, DefaultPort)
} }
} }
if pc == nil { if pc == nil {
pc, err = c.listenPacket(listenCtx, which, net.JoinHostPort(host, fmt.Sprint(c.port))) pc, err = c.listenPacket(listenCtx, which, host, c.port)
} }
if err != nil { if err != nil {
c.logf("magicsock: bind(%s/%v): %v", which, c.port, err) c.logf("magicsock: bind(%s/%v): %v", which, c.port, err)
@ -2648,10 +2649,10 @@ func (c *Conn) Rebind() {
if err := c.pconn4.pconn.Close(); err != nil { if err := c.pconn4.pconn.Close(); err != nil {
c.logf("magicsock: link change close failed: %v", err) c.logf("magicsock: link change close failed: %v", err)
} }
packetConn, err := c.listenPacket(listenCtx, "udp4", net.JoinHostPort(host, fmt.Sprint(c.port))) packetConn, err := c.listenPacket(listenCtx, "udp4", host, c.port)
if err != nil { if err != nil {
c.logf("magicsock: link change unable to bind fixed port %d: %v, falling back to random port", c.port, err) c.logf("magicsock: link change unable to bind fixed port %d: %v, falling back to random port", c.port, err)
packetConn, err = c.listenPacket(listenCtx, "udp4", net.JoinHostPort(host, "0")) packetConn, err = c.listenPacket(listenCtx, "udp4", host, 0)
if err != nil { if err != nil {
c.logf("magicsock: link change failed to bind random port: %v", err) c.logf("magicsock: link change failed to bind random port: %v", err)
c.pconn4.mu.Unlock() c.pconn4.mu.Unlock()
@ -2666,7 +2667,7 @@ func (c *Conn) Rebind() {
c.pconn4.mu.Unlock() c.pconn4.mu.Unlock()
} else { } else {
c.logf("magicsock: link change, binding new port") c.logf("magicsock: link change, binding new port")
packetConn, err := c.listenPacket(listenCtx, "udp4", host+":0") packetConn, err := c.listenPacket(listenCtx, "udp4", host, 0)
if err != nil { if err != nil {
c.logf("magicsock: link change failed to bind new port: %v", err) c.logf("magicsock: link change failed to bind new port: %v", err)
return return