Fix regression in 1.5 login behavior

[rbdr/mobius] / hotline / client_conn.go

diff --git a/hotline/client_conn.go b/hotline/client_conn.go
index 1186947ebeac57d3f469584ae60cafbe66f645ea..14aef9e835ebc7ae5f79a0d826f55930db0046af 100644 (file)
--- 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 {
@@ -80,7 +79,7 @@ func (cc *ClientConn) handleTransaction(transaction *Transaction) error {
 
                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
                }
@@ -102,17 +101,17 @@ func (cc *ClientConn) handleTransaction(transaction *Transaction) error {
                // 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 := big.NewInt(int64(binary.BigEndian.Uint16(cc.Flags)))
                        flagBitmap.SetBit(flagBitmap, userFlagAway, 0)
-                       binary.BigEndian.PutUint16(*cc.Flags, uint16(flagBitmap.Int64()))
+                       binary.BigEndian.PutUint16(cc.Flags, uint16(flagBitmap.Int64()))
                        cc.Idle = false
 
                        cc.sendAll(
                                tranNotifyChangeUser,
                                NewField(fieldUserID, *cc.ID),
-                               NewField(fieldUserFlags, *cc.Flags),
+                               NewField(fieldUserFlags, cc.Flags),
                                NewField(fieldUserName, cc.UserName),
-                               NewField(fieldUserIconID, *cc.Icon),
+                               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
@@ -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},