X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/d492c46d7e2087114d25f64823de9027592d5fc4..61c272e101b6f0444c7b2a666b0b5e828ba6db03:/hotline/server.go

diff --git a/hotline/server.go b/hotline/server.go
index 30121a6..c5a29ba 100644
--- a/hotline/server.go
+++ b/hotline/server.go
@@ -111,7 +111,7 @@ func (s *Server) sendTransaction(t Transaction) error {
 	client := s.Clients[uint16(clientID)]
 	s.mux.Unlock()
 	if client == nil {
-		return errors.New("invalid client")
+		return fmt.Errorf("invalid client id %v", *t.clientID)
 	}
 	userName := string(client.UserName)
 	login := client.Account.Login
@@ -169,7 +169,7 @@ func (s *Server) Serve(ctx context.Context, cancelRoot context.CancelFunc, ln ne
 }
 
 const (
-	agreementFile    = "Agreement.txt"
+	agreementFile = "Agreement.txt"
 )
 
 // NewServer constructs a new Server from a config dir
@@ -278,8 +278,8 @@ func (s *Server) keepaliveHandler() {
 		s.mux.Lock()
 
 		for _, c := range s.Clients {
-			*c.IdleTime += idleCheckInterval
-			if *c.IdleTime > userIdleSeconds && !c.Idle {
+			c.IdleTime += idleCheckInterval
+			if c.IdleTime > userIdleSeconds && !c.Idle {
 				c.Idle = true
 
 				flagBitmap := big.NewInt(int64(binary.BigEndian.Uint16(*c.Flags)))
@@ -327,15 +327,13 @@ func (s *Server) NewClientConn(conn net.Conn) *ClientConn {
 		Connection: conn,
 		Server:     s,
 		Version:    &[]byte{},
-		IdleTime:   new(int),
 		AutoReply:  &[]byte{},
 		Transfers:  make(map[int][]*FileTransfer),
+		Agreed:     false,
 	}
 	*s.NextGuestID++
 	ID := *s.NextGuestID
 
-	*clientConn.IdleTime = 0
-
 	binary.BigEndian.PutUint16(*clientConn.ID, ID)
 	s.Clients[ID] = clientConn
 
@@ -377,7 +375,10 @@ func (s *Server) connectedUsers() []Field {
 	defer s.mux.Unlock()
 
 	var connectedUsers []Field
-	for _, c := range s.Clients {
+	for _, c := range sortedClients(s.Clients) {
+		if c.Agreed == false {
+			continue
+		}
 		user := User{
 			ID:    *c.ID,
 			Icon:  *c.Icon,
@@ -536,9 +537,14 @@ func (s *Server) handleNewConnection(conn net.Conn) error {
 	// Show agreement to client
 	c.Server.outbox <- *NewTransaction(tranShowAgreement, c.ID, NewField(fieldData, s.Agreement))
 
-	if _, err := c.notifyNewUserHasJoined(); err != nil {
-		return err
+	// assume simplified hotline v1.2.3 login flow that does not require agreement
+	if *c.Version == nil {
+		c.Agreed = true
+		if _, err := c.notifyNewUserHasJoined(); err != nil {
+			return err
+		}
 	}
+
 	c.Server.Stats.LoginCount += 1
 
 	const readBuffSize = 1024000 // 1KB - TODO: what should this be?
@@ -993,7 +999,6 @@ func transferFile(conn net.Conn, dst string) error {
 	}
 }
 
-
 // sortedClients is a utility function that takes a map of *ClientConn and returns a sorted slice of the values.
 // The purpose of this is to ensure that the ordering of client connections is deterministic so that test assertions work.
 func sortedClients(unsortedClients map[uint16]*ClientConn) (clients []*ClientConn) {