X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/0a92e50b2704c1eb02233c9aa5778d21455d345b..e42888eb1a6c2bfb6c8bd73baba6acdfddb1f72e:/hotline/server.go

diff --git a/hotline/server.go b/hotline/server.go
index cf022fc..cfac442 100644
--- a/hotline/server.go
+++ b/hotline/server.go
@@ -236,9 +236,15 @@ func NewServer(configDir, netInterface string, netPort int, logger *zap.SugaredL
 	*server.NextGuestID = 1
 
 	if server.Config.EnableTrackerRegistration {
+		server.Logger.Infow(
+			"Tracker registration enabled",
+			"frequency", fmt.Sprintf("%vs", trackerUpdateFrequency),
+			"trackers", server.Config.Trackers,
+		)
+
 		go func() {
 			for {
-				tr := TrackerRegistration{
+				tr := &TrackerRegistration{
 					Port:        []byte{0x15, 0x7c},
 					UserCount:   server.userCount(),
 					PassID:      server.TrackerPassID,
@@ -246,11 +252,10 @@ func NewServer(configDir, netInterface string, netPort int, logger *zap.SugaredL
 					Description: server.Config.Description,
 				}
 				for _, t := range server.Config.Trackers {
-					server.Logger.Infof("Registering with tracker %v", t)
-
 					if err := register(t, tr); err != nil {
 						server.Logger.Errorw("unable to register with tracker %v", "error", err)
 					}
+					server.Logger.Infow("Sent Tracker registration", "data", tr)
 				}
 
 				time.Sleep(trackerUpdateFrequency * time.Second)
@@ -478,17 +483,29 @@ const (
 	minTransactionLen = 22 // minimum length of any transaction
 )
 
+// dontPanic recovers and logs panics instead of crashing
+// TODO: remove this after known issues are fixed
+func dontPanic(logger *zap.SugaredLogger) {
+	if r := recover(); r != nil {
+		fmt.Println("stacktrace from panic: \n" + string(debug.Stack()))
+		logger.Errorw("PANIC", "err", r, "trace", string(debug.Stack()))
+	}
+}
+
 // handleNewConnection takes a new net.Conn and performs the initial login sequence
 func (s *Server) handleNewConnection(conn net.Conn) error {
-	handshakeBuf := make([]byte, 12) // handshakes are always 12 bytes in length
-	if _, err := conn.Read(handshakeBuf); err != nil {
+	defer dontPanic(s.Logger)
+
+	handshakeBuf := make([]byte, 12)
+	if _, err := io.ReadFull(conn, handshakeBuf); err != nil {
 		return err
 	}
-	if err := Handshake(conn, handshakeBuf[:12]); err != nil {
+	if err := Handshake(conn, handshakeBuf); err != nil {
 		return err
 	}
 
 	buf := make([]byte, 1024)
+	// TODO: fix potential short read with io.ReadFull
 	readLen, err := conn.Read(buf)
 	if readLen < minTransactionLen {
 		return err
@@ -504,13 +521,6 @@ func (s *Server) handleNewConnection(conn net.Conn) error {
 
 	c := s.NewClientConn(conn)
 	defer c.Disconnect()
-	defer func() {
-		if r := recover(); r != nil {
-			fmt.Println("stacktrace from panic: \n" + string(debug.Stack()))
-			c.Server.Logger.Errorw("PANIC", "err", r, "trace", string(debug.Stack()))
-			c.Disconnect()
-		}
-	}()
 
 	encodedLogin := clientLogin.GetField(fieldUserLogin).Data
 	encodedPassword := clientLogin.GetField(fieldUserPassword).Data
@@ -652,12 +662,7 @@ func (s *Server) handleFileTransfer(conn io.ReadWriteCloser) error {
 		}
 	}()
 
-	defer func() {
-		if r := recover(); r != nil {
-			fmt.Println("stacktrace from panic: \n" + string(debug.Stack()))
-			s.Logger.Errorw("PANIC", "err", r, "trace", string(debug.Stack()))
-		}
-	}()
+	defer dontPanic(s.Logger)
 
 	txBuf := make([]byte, 16)
 	if _, err := io.ReadFull(conn, txBuf); err != nil {
@@ -799,7 +804,7 @@ func (s *Server) handleFileTransfer(conn io.ReadWriteCloser) error {
 		s.Logger.Infow("Start folder download", "path", fullFilePath, "ReferenceNumber", fileTransfer.ReferenceNumber)
 
 		nextAction := make([]byte, 2)
-		if _, err := conn.Read(nextAction); err != nil {
+		if _, err := io.ReadFull(conn, nextAction); err != nil {
 			return err
 		}
 
@@ -825,7 +830,7 @@ func (s *Server) handleFileTransfer(conn io.ReadWriteCloser) error {
 			}
 
 			// Read the client's Next Action request
-			if _, err := conn.Read(nextAction); err != nil {
+			if _, err := io.ReadFull(conn, nextAction); err != nil {
 				return err
 			}
 
@@ -838,13 +843,13 @@ func (s *Server) handleFileTransfer(conn io.ReadWriteCloser) error {
 				// client asked to resume this file
 				var frd FileResumeData
 				// get size of resumeData
-				if _, err := conn.Read(nextAction); err != nil {
+				if _, err := io.ReadFull(conn, nextAction); err != nil {
 					return err
 				}
 
 				resumeDataLen := binary.BigEndian.Uint16(nextAction)
 				resumeDataBytes := make([]byte, resumeDataLen)
-				if _, err := conn.Read(resumeDataBytes); err != nil {
+				if _, err := io.ReadFull(conn, resumeDataBytes); err != nil {
 					return err
 				}
 
@@ -921,7 +926,7 @@ func (s *Server) handleFileTransfer(conn io.ReadWriteCloser) error {
 			// TODO: optionally send resource fork header and resource fork data
 
 			// Read the client's Next Action request.  This is always 3, I think?
-			if _, err := conn.Read(nextAction); err != nil {
+			if _, err := io.ReadFull(conn, nextAction); err != nil {
 				return err
 			}
 
@@ -957,7 +962,7 @@ func (s *Server) handleFileTransfer(conn io.ReadWriteCloser) error {
 		readBuffer := make([]byte, 1024)
 
 		for i := 0; i < fileTransfer.ItemCount(); i++ {
-
+			// TODO: fix potential short read with io.ReadFull
 			_, err := conn.Read(readBuffer)
 			if err != nil {
 				return err
@@ -1035,7 +1040,7 @@ func (s *Server) handleFileTransfer(conn io.ReadWriteCloser) error {
 						return err
 					}
 
-					if _, err := conn.Read(fileSize); err != nil {
+					if _, err := io.ReadFull(conn, fileSize); err != nil {
 						return err
 					}