Delete cmd/mobius-hotline-server/mobius/config/Files/hello.txt

[rbdr/mobius] / hotline / transfer.go

diff --git a/hotline/transfer.go b/hotline/transfer.go
index 2acb5d6b6e6b689c59e776daca8db8e2ef2f5f28..53dd356a24440133c909f433b1d907f66a3faaec 100644 (file)
--- a/hotline/transfer.go
+++ b/hotline/transfer.go
@@ -4,14 +4,13 @@ import (
        "bytes"
        "encoding/binary"
        "errors"
+       "fmt"
        "io"
-       "os"
-       "path/filepath"
 )
 
 type transfer struct {
        Protocol        [4]byte // "HTXF" 0x48545846
-       ReferenceNumber [4]byte // Unique ID generated for the transfer
+       ReferenceNumber [4]byte // Unique Type generated for the transfer
        DataSize        [4]byte // File size
        RSVD            [4]byte // Not implemented in Hotline Protocol
 }
@@ -33,37 +32,27 @@ func (tf *transfer) Write(b []byte) (int, error) {
 func receiveFile(r io.Reader, targetFile, resForkFile, infoFork, counterWriter io.Writer) error {
        var ffo flattenedFileObject
        if _, err := ffo.ReadFrom(r); err != nil {
-               return err
+               return fmt.Errorf("read flatted file object: %v", err)
        }
 
        // Write the information fork
-       _, err := infoFork.Write(ffo.FlatFileInformationFork.MarshalBinary())
+       _, err := io.Copy(infoFork, &ffo.FlatFileInformationFork)
        if err != nil {
-               return err
+               return fmt.Errorf("write the information fork: %v", err)
        }
 
        if _, err = io.CopyN(targetFile, io.TeeReader(r, counterWriter), ffo.dataSize()); err != nil {
-               return err
+               return fmt.Errorf("copy file data to partial file: %v", err)
        }
 
        if ffo.FlatFileHeader.ForkCount == [2]byte{0, 3} {
                if err := binary.Read(r, binary.BigEndian, &ffo.FlatFileResForkHeader); err != nil {
-                       return err
+                       return fmt.Errorf("read resource fork header: %v", err)
                }
 
                if _, err = io.CopyN(resForkFile, io.TeeReader(r, counterWriter), ffo.rsrcSize()); err != nil {
-                       return err
+                       return fmt.Errorf("read resource fork: %v", err)
                }
        }
        return nil
 }
-
-func (s *Server) bannerDownload(w io.Writer) error {
-       bannerBytes, err := os.ReadFile(filepath.Join(s.ConfigDir, s.Config.BannerFile))
-       if err != nil {
-               return err
-       }
-       _, err = w.Write(bannerBytes)
-
-       return err
-}