Fix "No Agreement" behavior for 1.2.3 clients

[rbdr/mobius] / hotline / client_conn.go

diff --git a/hotline/client_conn.go b/hotline/client_conn.go
index 6a279776e7a38876164f931a727a322c1ba7c3b0..076919fbd99f73aa9ef4543cba236d473d12ce64 100644 (file)
--- a/hotline/client_conn.go
+++ b/hotline/client_conn.go
@@ -31,13 +31,13 @@ type ClientConn struct {
        Connection io.ReadWriteCloser
        RemoteAddr string
        ID         *[]byte
        Connection io.ReadWriteCloser
        RemoteAddr string
        ID         *[]byte

-       Icon       *[]byte
-       Flags      *[]byte
+       Icon       []byte
+       Flags      []byte

        UserName   []byte
        Account    *Account
        IdleTime   int
        Server     *Server
        UserName   []byte
        Account    *Account
        IdleTime   int
        Server     *Server

-       Version    *[]byte
+       Version    []byte

        Idle       bool
        AutoReply  []byte
 
        Idle       bool
        AutoReply  []byte
 


@@ -54,7 +54,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 {
        requestNum := binary.BigEndian.Uint16(transaction.Type)
        if handler, ok := TransactionHandlers[requestNum]; ok {
                for _, reqField := range handler.RequiredFields {


@@ -78,9 +78,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
                }
                if err != nil {
                        return err
                }


@@ -102,17 +102,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 {
                // 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)
                        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),
                        cc.Idle = false
 
                        cc.sendAll(
                                tranNotifyChangeUser,
                                NewField(fieldUserID, *cc.ID),

-                               NewField(fieldUserFlags, *cc.Flags),
+                               NewField(fieldUserFlags, cc.Flags),

                                NewField(fieldUserName, cc.UserName),
                                NewField(fieldUserName, cc.UserName),

-                               NewField(fieldUserIconID, *cc.Icon),
+                               NewField(fieldUserIconID, cc.Icon),

                        )
                }
        }
                        )
                }
        }