summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@tailscale.com>2021-09-07 19:28:45 -0700
committerBrad Fitzpatrick <bradfitz@tailscale.com>2021-09-07 19:28:45 -0700
commit48bdffd3953262ab4be89ff84e6be4908d65bda1 (patch)
treeea8e02263576810a8246b9e50c7f928bd911d5e7
parentcf855e898831a9989fd2031a1d145d5b2295ffd4 (diff)
downloadtailscale-bradfitz/portmap_gh_actions.tar.xz
tailscale-bradfitz/portmap_gh_actions.zip
net/portmapper: remove GITHUB_ACTIONS checkbradfitz/portmap_gh_actions
It's now redundant. Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
-rw-r--r--net/portmapper/portmapper.go3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/portmapper/portmapper.go b/net/portmapper/portmapper.go
index a48c1290f..14ece6010 100644
--- a/net/portmapper/portmapper.go
+++ b/net/portmapper/portmapper.go
@@ -14,7 +14,6 @@ import (
"io"
"net"
"net/http"
- "os"
"sync"
"time"
@@ -248,7 +247,7 @@ func (c *Client) listenPacket(ctx context.Context, network, addr string) (net.Pa
// create listening sockets. Such sockets are vulnerable to
// routing loops, but it's tests that don't set up routing loops,
// so we don't care.
- if c.testPxPPort != 0 || c.testUPnPPort != 0 || os.Getenv("GITHUB_ACTIONS") == "true" {
+ if c.testPxPPort != 0 || c.testUPnPPort != 0 {
var lc net.ListenConfig
return lc.ListenPacket(ctx, network, addr)
}