cmd/q3rcon-proxy/main.go

@@ -5,7 +5,6 @@ import (
 	"os"
 	"slices"
 	"strings"
-	"time"
 
 	log "github.com/sirupsen/logrus"
 
@@ -31,28 +30,20 @@ func main() {
 		host = "0.0.0.0"
 	}
 
-	staleTimeout, err := getEnvInt("Q3RCON_STALE_SESSION_TIMEOUT")
-	if err != nil {
-		log.Fatalf("unable to parse Q3RCON_STALE_SESSION_TIMEOUT: %s", err.Error())
-	}
-
 	for _, proxy := range strings.Split(proxies, ";") {
-		go start(host, proxy, staleTimeout)
+		go start(host, proxy)
 	}
 
 	<-make(chan int)
 }
 
-func start(host, proxy string, staleTimeout int) {
+func start(host, proxy string) {
 	port, target := func() (string, string) {
 		x := strings.Split(proxy, ":")
 		return x[0], x[1]
 	}()
 
-	c, err := udpproxy.New(
+	c, err := udpproxy.New(fmt.Sprintf("%s:%s", host, port), fmt.Sprintf("127.0.0.1:%s", target))
-		fmt.Sprintf("%s:%s", host, port),
-		fmt.Sprintf("127.0.0.1:%s", target),
-		udpproxy.WithStaleTimeout(time.Duration(staleTimeout)*time.Minute))
 	if err != nil {
 		log.Fatal(err)
 	}

pkg/udpproxy/udpproxy.go

@@ -8,21 +8,6 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
-// Option is a functional option type that allows us to configure the Client.
-type Option func(*Client)
-
-// WithStaleTimeout is a functional option to set the stale session timeout
-func WithStaleTimeout(timeout time.Duration) Option {
-	return func(c *Client) {
-		if timeout < time.Minute {
-			log.Warnf("cannot set stale session timeout to less than 1 minute.. defaulting to 5 minutes")
-			return
-		}
-
-		c.timeout = timeout
-	}
-}
-
 type Client struct {
 	laddr *net.UDPAddr
 	raddr *net.UDPAddr
@@ -31,11 +16,9 @@ type Client struct {
 
 	mutex    sync.RWMutex
 	sessions map[string]*session
-
-	timeout time.Duration
 }
 
-func New(port, target string, options ...Option) (*Client, error) {
+func New(port, target string) (*Client, error) {
 	laddr, err := net.ResolveUDPAddr("udp", port)
 	if err != nil {
 		return nil, err
@@ -46,19 +29,12 @@ func New(port, target string, options ...Option) (*Client, error) {
 		return nil, err
 	}
 
-	c := &Client{
+	return &Client{
 		laddr:    laddr,
 		raddr:    raddr,
 		mutex:    sync.RWMutex{},
 		sessions: map[string]*session{},
-		timeout:  5 * time.Minute,
+	}, nil
-	}
-
-	for _, o := range options {
-		o(c)
-	}
-
-	return c, nil
 }
 
 func (c *Client) ListenAndServe() error {
@@ -100,9 +76,8 @@ func (c *Client) pruneSessions() {
 	for range ticker.C {
 		for _, session := range c.sessions {
 			c.mutex.RLock()
-			if time.Since(session.updateTime) > c.timeout {
+			if time.Since(session.updateTime) > time.Minute*5 {
 				delete(c.sessions, session.caddr.String())
-				log.Tracef("session for %s deleted", session.caddr)
 			}
 			c.mutex.RUnlock()
 		}