X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/3178ae580a3fe97d6a1167b4346d209f04e9b7e3..958108952eec4cef92bcd26cd0c845aaed5a4982:/hotline/client_conn.go diff --git a/hotline/client_conn.go b/hotline/client_conn.go index 41810a8..7f78704 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 @@ -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), ) } } @@ -135,9 +135,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