X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/df1ade5433b027f9cb905e584921692313e647f5..9c44621ee1ca9abfca79c593e80193afd9204c83:/hotline/client_conn.go

diff --git a/hotline/client_conn.go b/hotline/client_conn.go
index 6a27977..48a6947 100644
--- a/hotline/client_conn.go
+++ b/hotline/client_conn.go
@@ -31,20 +31,19 @@ type ClientConn struct {
 	Connection io.ReadWriteCloser
 	RemoteAddr string
 	ID         *[]byte
-	Icon       *[]byte
-	Flags      *[]byte
+	Icon       []byte
+	Flags      []byte
 	UserName   []byte
 	Account    *Account
 	IdleTime   int
 	Server     *Server
-	Version    *[]byte
+	Version    []byte
 	Idle       bool
 	AutoReply  []byte
 
 	transfersMU sync.Mutex
 	transfers   map[int]map[[4]byte]*FileTransfer
 
-	Agreed bool
 	logger *zap.SugaredLogger
 }
 
@@ -54,7 +53,7 @@ func (cc *ClientConn) sendAll(t int, fields ...Field) {
 	}
 }
 
-func (cc *ClientConn) handleTransaction(transaction *Transaction) error {
+func (cc *ClientConn) handleTransaction(transaction Transaction) error {
 	requestNum := binary.BigEndian.Uint16(transaction.Type)
 	if handler, ok := TransactionHandlers[requestNum]; ok {
 		for _, reqField := range handler.RequiredFields {
@@ -78,9 +77,9 @@ func (cc *ClientConn) handleTransaction(transaction *Transaction) error {
 			}
 		}
 
-		cc.logger.Infow("Received Transaction", "RequestType", handler.Name)
+		cc.logger.Debugw("Received Transaction", "RequestType", handler.Name)
 
-		transactions, err := handler.Handler(cc, transaction)
+		transactions, err := handler.Handler(cc, &transaction)
 		if err != nil {
 			return err
 		}
@@ -95,24 +94,24 @@ func (cc *ClientConn) handleTransaction(transaction *Transaction) error {
 	cc.Server.mux.Lock()
 	defer cc.Server.mux.Unlock()
 
-	if requestNum != tranKeepAlive {
+	if requestNum != TranKeepAlive {
 		// reset the user idle timer
 		cc.IdleTime = 0
 
 		// if user was previously idle, mark as not idle and notify other connected clients that
 		// the user is no longer away
 		if cc.Idle {
-			flagBitmap := big.NewInt(int64(binary.BigEndian.Uint16(*cc.Flags)))
-			flagBitmap.SetBit(flagBitmap, userFlagAway, 0)
-			binary.BigEndian.PutUint16(*cc.Flags, uint16(flagBitmap.Int64()))
+			flagBitmap := big.NewInt(int64(binary.BigEndian.Uint16(cc.Flags)))
+			flagBitmap.SetBit(flagBitmap, UserFlagAway, 0)
+			binary.BigEndian.PutUint16(cc.Flags, uint16(flagBitmap.Int64()))
 			cc.Idle = false
 
 			cc.sendAll(
-				tranNotifyChangeUser,
-				NewField(fieldUserID, *cc.ID),
-				NewField(fieldUserFlags, *cc.Flags),
-				NewField(fieldUserName, cc.UserName),
-				NewField(fieldUserIconID, *cc.Icon),
+				TranNotifyChangeUser,
+				NewField(FieldUserID, *cc.ID),
+				NewField(FieldUserFlags, cc.Flags),
+				NewField(FieldUserName, cc.UserName),
+				NewField(FieldUserIconID, cc.Icon),
 			)
 		}
 	}
@@ -135,9 +134,7 @@ func (cc *ClientConn) uint16ID() uint16 {
 
 // Authorize checks if the user account has the specified permission
 func (cc *ClientConn) Authorize(access int) bool {
-	i := big.NewInt(int64(binary.BigEndian.Uint64(*cc.Account.Access)))
-
-	return i.Bit(63-access) == 1
+	return cc.Account.Access.IsSet(access)
 }
 
 // Disconnect notifies other clients that a client has disconnected
@@ -147,7 +144,7 @@ func (cc *ClientConn) Disconnect() {
 
 	delete(cc.Server.Clients, binary.BigEndian.Uint16(*cc.ID))
 
-	for _, t := range cc.notifyOthers(*NewTransaction(tranNotifyDeleteUser, nil, NewField(fieldUserID, *cc.ID))) {
+	for _, t := range cc.notifyOthers(*NewTransaction(TranNotifyDeleteUser, nil, NewField(FieldUserID, *cc.ID))) {
 		cc.Server.outbox <- t
 	}
 
@@ -159,7 +156,7 @@ func (cc *ClientConn) Disconnect() {
 // notifyOthers sends transaction t to other clients connected to the server
 func (cc *ClientConn) notifyOthers(t Transaction) (trans []Transaction) {
 	for _, c := range sortedClients(cc.Server.Clients) {
-		if c.ID != cc.ID && c.Agreed {
+		if c.ID != cc.ID {
 			t.clientID = c.ID
 			trans = append(trans, t)
 		}
@@ -172,7 +169,7 @@ func (cc *ClientConn) NewReply(t *Transaction, fields ...Field) Transaction {
 	reply := Transaction{
 		Flags:     0x00,
 		IsReply:   0x01,
-		Type:      t.Type,
+		Type:      []byte{0x00, 0x00},
 		ID:        t.ID,
 		clientID:  cc.ID,
 		ErrorCode: []byte{0, 0, 0, 0},
@@ -192,7 +189,7 @@ func (cc *ClientConn) NewErrReply(t *Transaction, errMsg string) Transaction {
 		ID:        t.ID,
 		ErrorCode: []byte{0, 0, 0, 1},
 		Fields: []Field{
-			NewField(fieldError, []byte(errMsg)),
+			NewField(FieldError, []byte(errMsg)),
 		},
 	}
 }
@@ -257,5 +254,5 @@ func (cc *ClientConn) String() string {
 		"None.\n",
 	)
 
-	return strings.Replace(template, "\n", "\r", -1)
+	return strings.ReplaceAll(template, "\n", "\r")
 }