TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-02-20 11:58:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

wgengine/magicsock: use netaddr.IP in listenPacket

Browse Source 
It must be an IP address; enforce that at the type level.

Suggested-by: Brad Fitzpatrick <bradfitz@tailscale.com>
Signed-off-by: Josh Bleecher Snyder <josharian@gmail.com>
This commit is contained in:
Josh Bleecher Snyder 2021-04-28 10:28:44 -07:00
parent 4bf6939ee0
commit 7dc7078d96
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
wgengine/magicsock/magicsock.go
View File

@ -2596,10 +2596,17 @@ func (c *Conn) initialBind() error {
return nil return nil
} }
// listenPacket opens a listener. Host must be "" or an IP address. // listenPacket opens a packet listener.
func (c *Conn) listenPacket(network, host string, port uint16) (net.PacketConn, error) { // The network must be "udp4" or "udp6".
// Host is the (local) IP address to listen on; use the zero IP to leave unspecified.
func (c *Conn) listenPacket(network string, host netaddr.IP, port uint16) (net.PacketConn, error) {
ctx := context.Background() // unused without DNS name to resolve ctx := context.Background() // unused without DNS name to resolve
addr := net.JoinHostPort(host, fmt.Sprint(port)) // Translate host to package net: "" for the zero value, the IP address string otherwise.
var s string
if !host.IsZero() {
s = host.String()
}
addr := net.JoinHostPort(s, 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)
} }
@ -2611,11 +2618,15 @@ func (c *Conn) listenPacket(network, host string, port uint16) (net.PacketConn,
// If rucPtr had an existing UDP socket bound, it closes that socket. // If rucPtr had an existing UDP socket bound, it closes that socket.
// The caller is responsible for informing the portMapper of any changes. // The caller is responsible for informing the portMapper of any changes.
func (c *Conn) bindSocket(rucPtr **RebindingUDPConn, network string) error { func (c *Conn) bindSocket(rucPtr **RebindingUDPConn, network string) error {
host := "" var host netaddr.IP
if inTest() && !c.simulatedNetwork { if inTest() && !c.simulatedNetwork {
host = "127.0.0.1" switch network {
if network == "udp6" { case "udp4":
host = "::1" host = netaddr.MustParseIP("127.0.0.1")
case "udp6":
host = netaddr.MustParseIP("::1")
default:
panic("unrecognized network in bindSocket: " + network)
} }
} }