X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/a6216dd89252fa01dc176f98f1e4ecfd3f637566..a55350daaf83498b7a237c027ad0dd2377f06fee:/hotline/client_conn.go

diff --git a/hotline/client_conn.go b/hotline/client_conn.go
index f73265d..0a7768f 100644
--- a/hotline/client_conn.go
+++ b/hotline/client_conn.go
@@ -54,13 +54,13 @@ func (cc *ClientConn) sendAll(t int, fields ...Field) {
 }
 
 func (cc *ClientConn) handleTransaction(transaction Transaction) error {
-	requestNum := binary.BigEndian.Uint16(transaction.Type)
+	requestNum := binary.BigEndian.Uint16(transaction.Type[:])
 	if handler, ok := TransactionHandlers[requestNum]; ok {
 		for _, reqField := range handler.RequiredFields {
 			field := transaction.GetField(reqField.ID)
 
 			// Validate that required field is present
-			if field.ID == nil {
+			if field.ID == [2]byte{0, 0} {
 				cc.logger.Error(
 					"Missing required field",
 					"RequestType", handler.Name, "FieldID", reqField.ID,
@@ -81,7 +81,7 @@ func (cc *ClientConn) handleTransaction(transaction Transaction) error {
 
 		transactions, err := handler.Handler(cc, &transaction)
 		if err != nil {
-			return err
+			return fmt.Errorf("error handling transaction: %w", err)
 		}
 		for _, t := range transactions {
 			cc.Server.outbox <- t
@@ -166,28 +166,24 @@ func (cc *ClientConn) notifyOthers(t Transaction) (trans []Transaction) {
 
 // NewReply returns a reply Transaction with fields for the ClientConn
 func (cc *ClientConn) NewReply(t *Transaction, fields ...Field) Transaction {
-	reply := Transaction{
-		Flags:     0x00,
+	return Transaction{
 		IsReply:   0x01,
-		Type:      []byte{0x00, 0x00},
+		Type:      [2]byte{0x00, 0x00},
 		ID:        t.ID,
 		clientID:  cc.ID,
-		ErrorCode: []byte{0, 0, 0, 0},
+		ErrorCode: [4]byte{0, 0, 0, 0},
 		Fields:    fields,
 	}
-
-	return reply
 }
 
 // NewErrReply returns an error reply Transaction with errMsg
 func (cc *ClientConn) NewErrReply(t *Transaction, errMsg string) Transaction {
 	return Transaction{
 		clientID:  cc.ID,
-		Flags:     0x00,
 		IsReply:   0x01,
-		Type:      []byte{0, 0},
+		Type:      [2]byte{0, 0},
 		ID:        t.ID,
-		ErrorCode: []byte{0, 0, 0, 1},
+		ErrorCode: [4]byte{0, 0, 0, 1},
 		Fields: []Field{
 			NewField(FieldError, []byte(errMsg)),
 		},