Merge pull request #54 from jhalter/fix_send_priv_message_permission

[rbdr/mobius] / hotline / transaction.go

diff --git a/hotline/transaction.go b/hotline/transaction.go
index 9eb879474e43b7e018d605350906825a482cd088..88e17dfcad2471d707575b6ba5422546e2578632 100644 (file)
--- a/hotline/transaction.go
+++ b/hotline/transaction.go
@@ -31,6 +31,7 @@ const (
        tranNotifyChatSubject    = 119
        tranSetChatSubject       = 120
        tranAgreed               = 121
        tranNotifyChatSubject    = 119
        tranSetChatSubject       = 120
        tranAgreed               = 121

+       tranServerBanner         = 122

        tranGetFileNameList      = 200
        tranDownloadFile         = 202
        tranUploadFile           = 203
        tranGetFileNameList      = 200
        tranDownloadFile         = 202
        tranUploadFile           = 203


@@ -39,10 +40,10 @@ const (
        tranGetFileInfo          = 206
        tranSetFileInfo          = 207
        tranMoveFile             = 208
        tranGetFileInfo          = 206
        tranSetFileInfo          = 207
        tranMoveFile             = 208

-       tranMakeFileAlias        = 209 // TODO: implement file alias command
+       tranMakeFileAlias        = 209

        tranDownloadFldr         = 210
        // tranDownloadInfo         = 211 TODO: implement file transfer queue
        tranDownloadFldr         = 210
        // tranDownloadInfo         = 211 TODO: implement file transfer queue

-       // tranDownloadBanner     = 212 TODO: figure out what this is used for
+       tranDownloadBanner     = 212

        tranUploadFldr         = 213
        tranGetUserNameList    = 300
        tranNotifyChangeUser   = 301
        tranUploadFldr         = 213
        tranGetUserNameList    = 300
        tranNotifyChangeUser   = 301


@@ -130,23 +131,24 @@ func ReadTransaction(buf []byte) (*Transaction, int, error) {
        }, tranLen, nil
 }
 
        }, tranLen, nil
 }
 

-func readTransactions(buf []byte) ([]Transaction, int, error) {
-       var transactions []Transaction
+const tranHeaderLen = 20 // fixed length of transaction fields before the variable length fields

 
 

-       bufLen := len(buf)
+// transactionScanner implements bufio.SplitFunc for parsing incoming byte slices into complete tokens
+func transactionScanner(data []byte, _ bool) (advance int, token []byte, err error) {
+       // The bytes that contain the size of a transaction are from 12:16, so we need at least 16 bytes
+       if len(data) < 16 {
+               return 0, nil, nil
+       }

 
 

-       var bytesRead = 0
-       for bytesRead < bufLen {
-               t, tReadLen, err := ReadTransaction(buf[bytesRead:])
-               if err != nil {
-                       return transactions, bytesRead, err
-               }
-               bytesRead += tReadLen
+       totalSize := binary.BigEndian.Uint32(data[12:16])

 
 

-               transactions = append(transactions, *t)
+       // tranLen represents the length of bytes that are part of the transaction
+       tranLen := int(tranHeaderLen + totalSize)
+       if tranLen > len(data) {
+               return 0, nil, nil

        }
 
        }
 

-       return transactions, bytesRead, nil
+       return tranLen, data[0:tranLen], nil

 }
 
 const minFieldLen = 4
 }
 
 const minFieldLen = 4