X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/854a92fc2755ace61c405df335ddf69b02a3d932..f4cdaddcc62318dd1a10b4a287102762c41710e2:/hotline/server.go

diff --git a/hotline/server.go b/hotline/server.go
index 5b8aad0..bd15a2e 100644
--- a/hotline/server.go
+++ b/hotline/server.go
@@ -33,13 +33,8 @@ type requestCtx struct {
 	name       string
 }
 
-const (
-	userIdleSeconds        = 300 // time in seconds before an inactive user is marked idle
-	idleCheckInterval      = 10  // time in seconds to check for idle users
-	trackerUpdateFrequency = 300 // time in seconds between tracker re-registration
-)
-
 var nostalgiaVersion = []byte{0, 0, 2, 0x2c} // version ID used by the Nostalgia client
+var frogblastVersion = []byte{0, 0, 0, 0xb9} // version ID used by the Frogblast 1.2.4 client
 
 type Server struct {
 	Port          int
@@ -48,13 +43,18 @@ type Server struct {
 	Clients       map[uint16]*ClientConn
 	fileTransfers map[[4]byte]*FileTransfer
 
-	Config        *Config
-	ConfigDir     string
-	Logger        *zap.SugaredLogger
-	PrivateChats  map[uint32]*PrivateChat
+	Config    *Config
+	ConfigDir string
+	Logger    *zap.SugaredLogger
+
+	PrivateChatsMu sync.Mutex
+	PrivateChats   map[uint32]*PrivateChat
+
 	NextGuestID   *uint16
 	TrackerPassID [4]byte
-	Stats         *Stats
+
+	StatsMu sync.Mutex
+	Stats   *Stats
 
 	FS FileStore // Storage backend to use for File storage
 
@@ -71,6 +71,16 @@ type Server struct {
 	banList   map[string]*time.Time
 }
 
+func (s *Server) CurrentStats() Stats {
+	s.StatsMu.Lock()
+	defer s.StatsMu.Unlock()
+
+	stats := s.Stats
+	stats.CurrentlyConnected = len(s.Clients)
+
+	return *stats
+}
+
 type PrivateChat struct {
 	Subject    string
 	ClientConn map[uint16]*ClientConn
@@ -216,7 +226,7 @@ func NewServer(configDir string, netPort int, logger *zap.SugaredLogger, FS File
 		Logger:        logger,
 		NextGuestID:   new(uint16),
 		outbox:        make(chan Transaction),
-		Stats:         &Stats{StartTime: time.Now()},
+		Stats:         &Stats{Since: time.Now()},
 		ThreadedNews:  &ThreadedNews{},
 		FS:            FS,
 		banList:       make(map[string]*time.Time),
@@ -555,8 +565,13 @@ func (s *Server) handleNewConnection(ctx context.Context, rwc io.ReadWriteCloser
 
 	scanner.Scan()
 
+	// Make a new []byte slice and copy the scanner bytes to it.  This is critical to avoid a data race as the
+	// scanner re-uses the buffer for subsequent scans.
+	buf := make([]byte, len(scanner.Bytes()))
+	copy(buf, scanner.Bytes())
+
 	var clientLogin Transaction
-	if _, err := clientLogin.Write(scanner.Bytes()); err != nil {
+	if _, err := clientLogin.Write(buf); err != nil {
 		return err
 	}
 
@@ -658,7 +673,7 @@ func (s *Server) handleNewConnection(ctx context.Context, rwc io.ReadWriteCloser
 	}
 
 	// Used simplified hotline v1.2.3 login flow for clients that do not send login info in tranAgreed
-	if c.Version == nil || bytes.Equal(c.Version, nostalgiaVersion) {
+	if c.Version == nil || bytes.Equal(c.Version, nostalgiaVersion) || bytes.Equal(c.Version, frogblastVersion) {
 		c.Agreed = true
 		c.logger = c.logger.With("name", string(c.UserName))
 		c.logger.Infow("Login successful", "clientVersion", fmt.Sprintf("%v", func() int { i, _ := byteToInt(c.Version); return i }()))
@@ -676,7 +691,10 @@ func (s *Server) handleNewConnection(ctx context.Context, rwc io.ReadWriteCloser
 		}
 	}
 
-	c.Server.Stats.LoginCount += 1
+	c.Server.Stats.ConnectionCounter += 1
+	if len(s.Clients) > c.Server.Stats.ConnectionPeak {
+		c.Server.Stats.ConnectionPeak = len(s.Clients)
+	}
 
 	// Scan for new transactions and handle them as they come in.
 	for scanner.Scan() {
@@ -698,15 +716,14 @@ func (s *Server) handleNewConnection(ctx context.Context, rwc io.ReadWriteCloser
 }
 
 func (s *Server) NewPrivateChat(cc *ClientConn) []byte {
-	s.mux.Lock()
-	defer s.mux.Unlock()
+	s.PrivateChatsMu.Lock()
+	defer s.PrivateChatsMu.Unlock()
 
 	randID := make([]byte, 4)
 	rand.Read(randID)
 	data := binary.BigEndian.Uint32(randID[:])
 
 	s.PrivateChats[data] = &PrivateChat{
-		Subject:    "",
 		ClientConn: make(map[uint16]*ClientConn),
 	}
 	s.PrivateChats[data].ClientConn[cc.uint16ID()] = cc
@@ -737,6 +754,10 @@ func (s *Server) handleFileTransfer(ctx context.Context, rwc io.ReadWriter) erro
 		delete(s.fileTransfers, t.ReferenceNumber)
 		s.mux.Unlock()
 
+		// Wait a few seconds before closing the connection: this is a workaround for problems
+		// observed with Windows clients where the client must initiate close of the TCP connection before
+		// the server does.  This is gross and seems unnecessary.  TODO: Revisit?
+		time.Sleep(3 * time.Second)
 	}()
 
 	s.mux.Lock()
@@ -766,11 +787,14 @@ func (s *Server) handleFileTransfer(ctx context.Context, rwc io.ReadWriter) erro
 	switch fileTransfer.Type {
 	case bannerDownload:
 		if err := s.bannerDownload(rwc); err != nil {
-			panic(err)
 			return err
 		}
 	case FileDownload:
 		s.Stats.DownloadCounter += 1
+		s.Stats.DownloadsInProgress += 1
+		defer func() {
+			s.Stats.DownloadsInProgress -= 1
+		}()
 
 		var dataOffset int64
 		if fileTransfer.fileResumeData != nil {
@@ -825,6 +849,8 @@ func (s *Server) handleFileTransfer(ctx context.Context, rwc io.ReadWriter) erro
 
 	case FileUpload:
 		s.Stats.UploadCounter += 1
+		s.Stats.UploadsInProgress += 1
+		defer func() { s.Stats.UploadsInProgress -= 1 }()
 
 		var file *os.File
 
@@ -881,7 +907,12 @@ func (s *Server) handleFileTransfer(ctx context.Context, rwc io.ReadWriter) erro
 		}
 
 		rLogger.Infow("File upload complete", "dstFile", fullPath)
+
 	case FolderDownload:
+		s.Stats.DownloadCounter += 1
+		s.Stats.DownloadsInProgress += 1
+		defer func() { s.Stats.DownloadsInProgress -= 1 }()
+
 		// Folder Download flow:
 		// 1. Get filePath from the transfer
 		// 2. Iterate over files
@@ -1045,6 +1076,9 @@ func (s *Server) handleFileTransfer(ctx context.Context, rwc io.ReadWriter) erro
 		}
 
 	case FolderUpload:
+		s.Stats.UploadCounter += 1
+		s.Stats.UploadsInProgress += 1
+		defer func() { s.Stats.UploadsInProgress -= 1 }()
 		rLogger.Infow(
 			"Folder upload started",
 			"dstPath", fullPath,