From 40414f9295dd301f1c714bc3067392b7cc8f8427 Mon Sep 17 00:00:00 2001
From: Jeff Halter <868228+jhalter@users.noreply.github.com>
Date: Tue, 7 Jun 2022 16:00:29 -0700
Subject: Fix hardcoded port in tracker registration

---
 hotline/server.go | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'hotline/server.go')

diff --git a/hotline/server.go b/hotline/server.go
index e6322e0..d5da458 100644
--- a/hotline/server.go
+++ b/hotline/server.go
@@ -44,7 +44,7 @@ type Server struct {
 	Logger        *zap.SugaredLogger
 	PrivateChats  map[uint32]*PrivateChat
 	NextGuestID   *uint16
-	TrackerPassID []byte
+	TrackerPassID [4]byte
 	Stats         *Stats
 
 	APIListener  net.Listener
@@ -187,7 +187,6 @@ func NewServer(configDir, netInterface string, netPort int, logger *zap.SugaredL
 		outbox:        make(chan Transaction),
 		Stats:         &Stats{StartTime: time.Now()},
 		ThreadedNews:  &ThreadedNews{},
-		TrackerPassID: make([]byte, 4),
 	}
 
 	ln, err := net.Listen("tcp", fmt.Sprintf("%s:%v", netInterface, netPort))
@@ -207,7 +206,7 @@ func NewServer(configDir, netInterface string, netPort int, logger *zap.SugaredL
 	}
 
 	// generate a new random passID for tracker registration
-	if _, err := rand.Read(server.TrackerPassID); err != nil {
+	if _, err := rand.Read(server.TrackerPassID[:]); err != nil {
 		return nil, err
 	}
 
@@ -246,12 +245,12 @@ func NewServer(configDir, netInterface string, netPort int, logger *zap.SugaredL
 		go func() {
 			for {
 				tr := &TrackerRegistration{
-					Port:        []byte{0x15, 0x7c},
 					UserCount:   server.userCount(),
-					PassID:      server.TrackerPassID,
+					PassID:      server.TrackerPassID[:],
 					Name:        server.Config.Name,
 					Description: server.Config.Description,
 				}
+				binary.BigEndian.PutUint16(tr.Port[:], uint16(server.Port))
 				for _, t := range server.Config.Trackers {
 					if err := register(t, tr); err != nil {
 						server.Logger.Errorw("unable to register with tracker %v", "error", err)
-- 
cgit