X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/9067f2344057a247dab19e6ce6756cb7d560d992..52f2aea827bed9c6d26a72072b16857bdc6f7743:/hotline/transaction.go?ds=sidebyside

diff --git a/hotline/transaction.go b/hotline/transaction.go
index ece2924..88e17df 100644
--- a/hotline/transaction.go
+++ b/hotline/transaction.go
@@ -131,23 +131,24 @@ func ReadTransaction(buf []byte) (*Transaction, int, error) {
 	}, 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