From 740e3c006ceda147808edfa7fc0e73ce21f0301a Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Tue, 8 Mar 2022 07:12:07 -0800 Subject: [PATCH] cmd/derper: add --stun-port flag And flesh out docs on the --http-port flag. Change-Id: If9d42665f67409082081cb9a25ad74e98869337b Signed-off-by: Brad Fitzpatrick --- cmd/derper/derper.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cmd/derper/derper.go b/cmd/derper/derper.go index a2bb59606..5513a2062 100644 --- a/cmd/derper/derper.go +++ b/cmd/derper/derper.go @@ -39,7 +39,8 @@ import ( var ( dev = flag.Bool("dev", false, "run in localhost development mode") addr = flag.String("a", ":443", "server HTTPS listen address, in form \":port\", \"ip:port\", or for IPv6 \"[ip]:port\". If the IP is omitted, it defaults to all interfaces.") - httpPort = flag.Int("http-port", 80, "The port on which to serve HTTP. Set to -1 to disable") + httpPort = flag.Int("http-port", 80, "The port on which to serve HTTP. Set to -1 to disable. The listener is bound to the same IP (if any) as specified in the -a flag.") + stunPort = flag.Int("stun-port", 3478, "The UDP port on which to serve STUN. The listener is bound to the same IP (if any) as specified in the -a flag.") configPath = flag.String("c", "", "config file path") certMode = flag.String("certmode", "letsencrypt", "mode for getting a cert. possible options: manual, letsencrypt") certDir = flag.String("certdir", tsweb.DefaultCertDir("derper-certs"), "directory to store LetsEncrypt certs, if addr's port is :443") @@ -212,7 +213,7 @@ func main() { debug.Handle("traffic", "Traffic check", http.HandlerFunc(s.ServeDebugTraffic)) if *runSTUN { - go serveSTUN(listenHost) + go serveSTUN(listenHost, *stunPort) } httpsrv := &http.Server{ @@ -322,8 +323,8 @@ func probeHandler(w http.ResponseWriter, r *http.Request) { } } -func serveSTUN(host string) { - pc, err := net.ListenPacket("udp", net.JoinHostPort(host, "3478")) +func serveSTUN(host string, port int) { + pc, err := net.ListenPacket("udp", net.JoinHostPort(host, fmt.Sprint(port))) if err != nil { log.Fatalf("failed to open STUN listener: %v", err) }