Merge pull request #92 from jhalter/fix_login_regression

[rbdr/mobius] / hotline / client_conn.go

diff --git a/hotline/client_conn.go b/hotline/client_conn.go
index 076919fbd99f73aa9ef4543cba236d473d12ce64..14aef9e835ebc7ae5f79a0d826f55930db0046af 100644 (file)
--- a/hotline/client_conn.go
+++ b/hotline/client_conn.go
@@ -44,7 +44,6 @@ type ClientConn struct {
        transfersMU sync.Mutex
        transfers   map[int]map[[4]byte]*FileTransfer
 
        transfersMU sync.Mutex
        transfers   map[int]map[[4]byte]*FileTransfer
 

-       Agreed bool

        logger *zap.SugaredLogger
 }
 
        logger *zap.SugaredLogger
 }
 


@@ -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 {
 
 // 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
 }
 
 // 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) {
 // 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)
                }
                        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,
        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},
                ID:        t.ID,
                clientID:  cc.ID,
                ErrorCode: []byte{0, 0, 0, 0},