X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/40414f9295dd301f1c714bc3067392b7cc8f8427..8168522a18e78acff2f6ca2f04b9f9300c6ee7a1:/hotline/server.go

diff --git a/hotline/server.go b/hotline/server.go
index d5da458..b1d8849 100644
--- a/hotline/server.go
+++ b/hotline/server.go
@@ -1,6 +1,7 @@
 package hotline
 
 import (
+	"bytes"
 	"context"
 	"encoding/binary"
 	"errors"
@@ -31,6 +32,8 @@ const (
 	trackerUpdateFrequency = 300 // time in seconds between tracker re-registration
 )
 
+var nostalgiaVersion = []byte{0, 0, 2, 0x2c} // version ID used by the Nostalgia client
+
 type Server struct {
 	Port          int
 	Accounts      map[string]*Account
@@ -47,8 +50,6 @@ type Server struct {
 	TrackerPassID [4]byte
 	Stats         *Stats
 
-	APIListener  net.Listener
-	FileListener net.Listener
 
 	// newsReader io.Reader
 	// newsWriter io.WriteCloser
@@ -65,27 +66,41 @@ type PrivateChat struct {
 }
 
 func (s *Server) ListenAndServe(ctx context.Context, cancelRoot context.CancelFunc) error {
-	s.Logger.Infow("Hotline server started", "version", VERSION)
+	s.Logger.Infow("Hotline server started",
+		"version", VERSION,
+		"API port", fmt.Sprintf(":%v", s.Port),
+		"Transfer port", fmt.Sprintf(":%v", s.Port+1),
+	)
+
 	var wg sync.WaitGroup
 
 	wg.Add(1)
-	go func() { s.Logger.Fatal(s.Serve(ctx, cancelRoot, s.APIListener)) }()
+	go func() {
+		ln, err := net.Listen("tcp", fmt.Sprintf("%s:%v", "", s.Port))
+		if err != nil {
+			s.Logger.Fatal(err)
+		}
+
+		s.Logger.Fatal(s.Serve(ctx, cancelRoot, ln))
+	}()
 
 	wg.Add(1)
-	go func() { s.Logger.Fatal(s.ServeFileTransfers(s.FileListener)) }()
+	go func() {
+		ln, err := net.Listen("tcp", fmt.Sprintf("%s:%v", "", s.Port+1))
+		if err != nil {
+			s.Logger.Fatal(err)
+
+		}
+
+		s.Logger.Fatal(s.ServeFileTransfers(ln))
+	}()
 
 	wg.Wait()
 
 	return nil
 }
 
-func (s *Server) APIPort() int {
-	return s.APIListener.Addr().(*net.TCPAddr).Port
-}
-
 func (s *Server) ServeFileTransfers(ln net.Listener) error {
-	s.Logger.Infow("Hotline file transfer server started", "Addr", fmt.Sprintf(":%v", s.Port+1))
-
 	for {
 		conn, err := ln.Accept()
 		if err != nil {
@@ -138,7 +153,6 @@ func (s *Server) sendTransaction(t Transaction) error {
 }
 
 func (s *Server) Serve(ctx context.Context, cancelRoot context.CancelFunc, ln net.Listener) error {
-	s.Logger.Infow("Hotline server started", "Addr", fmt.Sprintf(":%v", s.Port))
 
 	for {
 		conn, err := ln.Accept()
@@ -189,28 +203,13 @@ func NewServer(configDir, netInterface string, netPort int, logger *zap.SugaredL
 		ThreadedNews:  &ThreadedNews{},
 	}
 
-	ln, err := net.Listen("tcp", fmt.Sprintf("%s:%v", netInterface, netPort))
-	if err != nil {
-		return nil, err
-	}
-	server.APIListener = ln
-
-	if netPort != 0 {
-		netPort += 1
-	}
-
-	ln2, err := net.Listen("tcp", fmt.Sprintf("%s:%v", netInterface, netPort))
-	server.FileListener = ln2
-	if err != nil {
-		return nil, err
-	}
+	var err error
 
 	// generate a new random passID for tracker registration
 	if _, err := rand.Read(server.TrackerPassID[:]); err != nil {
 		return nil, err
 	}
 
-	server.Logger.Debugw("Loading Agreement", "path", configDir+agreementFile)
 	if server.Agreement, err = os.ReadFile(configDir + agreementFile); err != nil {
 		return nil, err
 	}
@@ -369,8 +368,6 @@ func (s *Server) UpdateUser(login, newLogin, name, password string, access []byt
 	s.mux.Lock()
 	defer s.mux.Unlock()
 
-	fmt.Printf("login: %v, newLogin: %v: ", login, newLogin)
-
 	// update renames the user login
 	if login != newLogin {
 		err := os.Rename(s.ConfigDir+"Users/"+login+".yaml", s.ConfigDir+"Users/"+newLogin+".yaml")
@@ -578,8 +575,8 @@ func (s *Server) handleNewConnection(conn net.Conn, remoteAddr string) error {
 	// Show agreement to client
 	c.Server.outbox <- *NewTransaction(tranShowAgreement, c.ID, NewField(fieldData, s.Agreement))
 
-	// assume simplified hotline v1.2.3 login flow that does not require agreement
-	if *c.Version == nil {
+	// 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) {
 		c.Agreed = true
 
 		c.notifyOthers(