Account for the root

[rbdr/mobius] / hotline / server.go

diff --git a/hotline/server.go b/hotline/server.go
index 758f7ff8a3fa9aeacfb2c9b9a4bb65b46f715141..a521a6bfecd22adc2a28c68ca1a4b6062ca3bbed 100644 (file)
--- a/hotline/server.go
+++ b/hotline/server.go
@@ -174,7 +174,7 @@ func (s *Server) ServeFileTransfers(ctx context.Context, ln net.Listener) error
                        )
 
                        if err != nil {
-                               s.Logger.Error("file transfer error", "reason", err)
+                               s.Logger.Error("file transfer error", "err", err)
                        }
                }()
        }
@@ -265,6 +265,10 @@ const trackerUpdateFrequency = 300
 // registerWithTrackers runs every trackerUpdateFrequency seconds to update the server's tracker entry on all configured
 // trackers.
 func (s *Server) registerWithTrackers(ctx context.Context) {
+       if s.Config.EnableTrackerRegistration {
+               s.Logger.Info("Tracker registration enabled", "trackers", s.Config.Trackers)
+       }
+
        for {
                if s.Config.EnableTrackerRegistration {
                        for _, t := range s.Config.Trackers {
@@ -599,10 +603,20 @@ func (s *Server) handleFileTransfer(ctx context.Context, rwc io.ReadWriter) erro
                        s.Stats.Decrement(StatUploadsInProgress)
                }()
 
+               var transferSizeValue uint32
+               switch len(fileTransfer.TransferSize) {
+                       case 2: // 16-bit
+                               transferSizeValue = uint32(binary.BigEndian.Uint16(fileTransfer.TransferSize))
+                       case 4: // 32-bit
+                               transferSizeValue = binary.BigEndian.Uint32(fileTransfer.TransferSize)
+                       default:
+                               rLogger.Warn("Unexpected TransferSize length: %d bytes", len(fileTransfer.TransferSize))
+               }
+
                rLogger.Info(
                        "Folder upload started",
                        "dstPath", fullPath,
-                       "TransferSize", binary.BigEndian.Uint32(fileTransfer.TransferSize),
+                       "TransferSize", transferSizeValue,
                        "FolderItemCount", fileTransfer.FolderItemCount,
                )