]> git.r.bdr.sh - rbdr/mobius/blobdiff - hotline/client_conn.go
minor: v0.8.0
[rbdr/mobius] / hotline / client_conn.go
index 1186947ebeac57d3f469584ae60cafbe66f645ea..076919fbd99f73aa9ef4543cba236d473d12ce64 100644 (file)
@@ -31,13 +31,13 @@ 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
 
@@ -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 {
@@ -80,7 +80,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 +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 {
-                       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),
                        )
                }
        }