TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-02-19 19:38:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

wgengine/tsdns: use netns to obtain a socket

Browse Source 
Fixes #789

Signed-off-by: Josh Bleecher Snyder <josh@tailscale.com>
This commit is contained in:
Josh Bleecher Snyder 2020-09-24 15:41:33 -07:00 committed by Josh Bleecher Snyder
parent 6e8328cba5
commit f0ef561049
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
wgengine/tsdns/forwarder.go
View File

@ -19,6 +19,7 @@ import (
"inet.af/netaddr"
"tailscale.com/logtail/backoff"
"tailscale.com/net/netns"
"tailscale.com/types/logger"
)
@ -290,7 +291,7 @@ type fwdConn struct {
// closed tracks whether fwdConn has been permanently closed.
closed bool
// conn is the current active connection.
conn *net.UDPConn
conn net.PacketConn
}
func newFwdConn(logf logger.Logf, idx int) *fwdConn {
@ -388,7 +389,7 @@ func (c *fwdConn) send(packet []byte, dst net.Addr) {
func (c *fwdConn) read(out []byte) int {
for {
// Gather the current connection.
// We can't hold the lock while we call Read.
// We can't hold the lock while we call ReadFrom.
c.mu.Lock()
conn := c.conn
closed := c.closed
@ -406,7 +407,7 @@ func (c *fwdConn) read(out []byte) int {
c.mu.Unlock()
c.wg.Add(1)
n, err := conn.Read(out)
n, _, err := conn.ReadFrom(out)
c.wg.Done()
if err == nil {
// Success.
@ -428,9 +429,9 @@ func (c *fwdConn) read(out []byte) int {
func (c *fwdConn) reconnectLocked() {
c.closeConnLocked()
// Make a new connection.
conn, err := net.ListenUDP("udp", nil)
conn, err := netns.Listener().ListenPacket(context.Background(), "udp", "")
if err != nil {
c.logf("ListenUDP failed: %v", err)
c.logf("ListenPacket failed: %v", err)
} else {
c.conn = conn
}