From 75ffb25d772440a8f64fe94836d330cb2e9cbbfd Mon Sep 17 00:00:00 2001
From: cnderrauber <zengjie9004@gmail.com>
Date: Wed, 6 Sep 2023 14:17:49 +0800
Subject: [PATCH] Parse PortRange of UDPPort from cli flag (#2039)

---
 cmd/server/main.go   | 4 ++--
 go.mod               | 2 +-
 go.sum               | 2 ++
 pkg/config/config.go | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/cmd/server/main.go b/cmd/server/main.go
index 149d4cb23..c53f01640 100644
--- a/cmd/server/main.go
+++ b/cmd/server/main.go
@@ -71,9 +71,9 @@ var baseFlags = []cli.Flag{
 		Usage:   "IP address of the current node, used to advertise to clients. Automatically determined by default",
 		EnvVars: []string{"NODE_IP"},
 	},
-	&cli.IntFlag{
+	&cli.StringFlag{
 		Name:    "udp-port",
-		Usage:   "Single UDP port to use for WebRTC traffic",
+		Usage:   "UDP port(s) to use for WebRTC traffic",
 		EnvVars: []string{"UDP_PORT"},
 	},
 	&cli.StringFlag{
diff --git a/go.mod b/go.mod
index dc465c9d7..69a3398cd 100644
--- a/go.mod
+++ b/go.mod
@@ -17,7 +17,7 @@ require (
 	github.com/hashicorp/golang-lru/v2 v2.0.5
 	github.com/jxskiss/base62 v1.1.0
 	github.com/livekit/mageutil v0.0.0-20230125210925-54e8a70427c1
-	github.com/livekit/mediatransportutil v0.0.0-20230905085142-e1fcf8eae216
+	github.com/livekit/mediatransportutil v0.0.0-20230906055425-e81fd5f6fb3f
 	github.com/livekit/protocol v1.6.2-0.20230828184341-dfb5162c7c86
 	github.com/livekit/psrpc v0.3.3
 	github.com/mackerelio/go-osstat v0.2.4
diff --git a/go.sum b/go.sum
index 40045977d..b43ba3bb2 100644
--- a/go.sum
+++ b/go.sum
@@ -125,6 +125,8 @@ github.com/livekit/mageutil v0.0.0-20230125210925-54e8a70427c1 h1:jm09419p0lqTkD
 github.com/livekit/mageutil v0.0.0-20230125210925-54e8a70427c1/go.mod h1:Rs3MhFwutWhGwmY1VQsygw28z5bWcnEYmS1OG9OxjOQ=
 github.com/livekit/mediatransportutil v0.0.0-20230905085142-e1fcf8eae216 h1:gwGhhhx+vUXR1dZqpKBautkx7qJAXvgCdQxgluBiUqc=
 github.com/livekit/mediatransportutil v0.0.0-20230905085142-e1fcf8eae216/go.mod h1:+WIOYwiBMive5T81V8B2wdAc2zQNRjNQiJIcPxMTILY=
+github.com/livekit/mediatransportutil v0.0.0-20230906055425-e81fd5f6fb3f h1:b4ri7hQESRSzJWzXXcmANG2hJ4HTj5LM01Ekm8lnQmg=
+github.com/livekit/mediatransportutil v0.0.0-20230906055425-e81fd5f6fb3f/go.mod h1:+WIOYwiBMive5T81V8B2wdAc2zQNRjNQiJIcPxMTILY=
 github.com/livekit/protocol v1.6.2-0.20230828184341-dfb5162c7c86 h1:QEzGhfIOmGdRw17xIldbYzb1MTsYuVfXSqz8FTyfjWQ=
 github.com/livekit/protocol v1.6.2-0.20230828184341-dfb5162c7c86/go.mod h1:/JuO+G/btZ5gNwX2+901L6za3UvVO6DHRXHsv8kkLsU=
 github.com/livekit/psrpc v0.3.3 h1:+lltbuN39IdaynXhLLxRShgYqYsRMWeeXKzv60oqyWo=
diff --git a/pkg/config/config.go b/pkg/config/config.go
index e2f165cf8..1f3ab2aba 100644
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -801,7 +801,7 @@ func (conf *Config) updateFromCLI(c *cli.Context, baseFlags []cli.Flag) error {
 		conf.RTC.NodeIP = c.String("node-ip")
 	}
 	if c.IsSet("udp-port") {
-		conf.RTC.UDPPort = rtcconfig.PortRange{Start: (c.Int("udp-port"))}
+		conf.RTC.UDPPort.UnmarshalString(c.String("udp-port"))
 	}
 	if c.IsSet("bind") {
 		conf.BindAddresses = c.StringSlice("bind")