X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/21581958c38861f3a62ef7c27d0a8a6f4db2a1f8..f56220e9c360d83ecc670560b012bbdec08c1a0f:/hotline/client_conn.go?ds=sidebyside

diff --git a/hotline/client_conn.go b/hotline/client_conn.go
index 997b9c9..7f78704 100644
--- a/hotline/client_conn.go
+++ b/hotline/client_conn.go
@@ -2,11 +2,14 @@ package hotline
 
 import (
 	"encoding/binary"
+	"fmt"
 	"go.uber.org/zap"
 	"golang.org/x/crypto/bcrypt"
 	"io"
 	"math/big"
 	"sort"
+	"strings"
+	"sync"
 )
 
 type byClientID []*ClientConn
@@ -23,50 +26,26 @@ func (s byClientID) Less(i, j int) bool {
 	return s[i].uint16ID() < s[j].uint16ID()
 }
 
-const template = `Nickname:   %s
-Name:       %s
-Account:    %s
-Address:    %s
-
--------- File Downloads ---------
-
-%s
-
-------- Folder Downloads --------
-
-None.
-
---------- File Uploads ----------
-
-None.
-
--------- Folder Uploads ---------
-
-None.
-
-------- Waiting Downloads -------
-
-None.
-
-	`
-
 // ClientConn represents a client connected to a Server
 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
-	Transfers  map[int][]*FileTransfer
-	Agreed     bool
-	logger     *zap.SugaredLogger
+
+	transfersMU sync.Mutex
+	transfers   map[int]map[[4]byte]*FileTransfer
+
+	Agreed bool
+	logger *zap.SugaredLogger
 }
 
 func (cc *ClientConn) sendAll(t int, fields ...Field) {
@@ -75,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 {
@@ -99,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
 		}
@@ -123,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),
 			)
 		}
 	}
@@ -156,13 +135,7 @@ func (cc *ClientConn) uint16ID() uint16 {
 
 // Authorize checks if the user account has the specified permission
 func (cc *ClientConn) Authorize(access int) bool {
-	if access == 0 {
-		return true
-	}
-
-	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
@@ -231,3 +204,56 @@ func sortedClients(unsortedClients map[uint16]*ClientConn) (clients []*ClientCon
 	sort.Sort(byClientID(clients))
 	return clients
 }
+
+const userInfoTemplate = `Nickname:   %s
+Name:       %s
+Account:    %s
+Address:    %s
+
+-------- File Downloads ---------
+
+%s
+------- Folder Downloads --------
+
+%s
+--------- File Uploads ----------
+
+%s
+-------- Folder Uploads ---------
+
+%s
+------- Waiting Downloads -------
+
+%s
+`
+
+func formatDownloadList(fts map[[4]byte]*FileTransfer) (s string) {
+	if len(fts) == 0 {
+		return "None.\n"
+	}
+
+	for _, dl := range fts {
+		s += dl.String()
+	}
+
+	return s
+}
+
+func (cc *ClientConn) String() string {
+	cc.transfersMU.Lock()
+	defer cc.transfersMU.Unlock()
+	template := fmt.Sprintf(
+		userInfoTemplate,
+		cc.UserName,
+		cc.Account.Name,
+		cc.Account.Login,
+		cc.RemoteAddr,
+		formatDownloadList(cc.transfers[FileDownload]),
+		formatDownloadList(cc.transfers[FolderDownload]),
+		formatDownloadList(cc.transfers[FileUpload]),
+		formatDownloadList(cc.transfers[FolderUpload]),
+		"None.\n",
+	)
+
+	return strings.Replace(template, "\n", "\r", -1)
+}