X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/0da28a1fe47ffc60e40aeca9dddd7ab37e52a999..a7216f677e7b02831328293224730f6f06f2d38a:/hotline/client_conn.go?ds=inline diff --git a/hotline/client_conn.go b/hotline/client_conn.go index 1186947..076919f 100644 --- a/hotline/client_conn.go +++ b/hotline/client_conn.go @@ -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), ) } }