Minor cleanup of transfer

[rbdr/mobius] / hotline / transfer.go

diff --git a/hotline/transfer.go b/hotline/transfer.go
index b8bec1dd9122b40540f48ac033c0c026c0e830b6..fa431cee176de216af5582336c5d3e6f0ecea198 100644 (file)
--- a/hotline/transfer.go
+++ b/hotline/transfer.go
@@ -6,45 +6,23 @@ import (
        "errors"
 )
 
-type Transfer struct {
+type transfer struct {
        Protocol        [4]byte // "HTXF" 0x48545846
        ReferenceNumber [4]byte // Unique ID generated for the transfer
        DataSize        [4]byte // File size
        RSVD            [4]byte // Not implemented in Hotline Protocol
 }
 
-func NewReadTransfer(b []byte) (Transfer, error) {
-       r := bytes.NewReader(b)
-       var transfer Transfer
+var HTXF = [4]byte{0x48, 0x54, 0x58, 0x46} // (HTXF) is the only supported transfer protocol
 
-       if err := binary.Read(r, binary.BigEndian, &transfer); err != nil {
-               return transfer, err
+func (tf *transfer) Write(b []byte) (int, error) {
+       if err := binary.Read(bytes.NewReader(b), binary.BigEndian, tf); err != nil {
+               return 0, err
        }
 
-       // 0x48545846 (HTXF) is the only supported transfer protocol
-       if transfer.Protocol != [4]byte{0x48, 0x54, 0x58, 0x46} {
-               return transfer, errors.New("invalid protocol")
+       if tf.Protocol != HTXF {
+               return 0, errors.New("invalid protocol")
        }
 
-       return transfer, nil
+       return len(b), nil
 }
-
-//
-//type FolderTransfer struct {
-//     Protocol        [4]byte // "HTXF" 0x48545846
-//     ReferenceNumber [4]byte // Unique ID generated for the transfer
-//     DataSize        [4]byte // File size
-//     RSVD            [4]byte // Not implemented in Hotline Protocol
-//     Action          [2]byte // Next file action
-//}
-//
-//func ReadFolderTransfer(b []byte) (FolderTransfer, error) {
-//     r := bytes.NewReader(b)
-//     var decodedEvent FolderTransfer
-//
-//     if err := binary.Read(r, binary.BigEndian, &decodedEvent); err != nil {
-//             return decodedEvent, err
-//     }
-//
-//     return decodedEvent, nil
-//}