Include tracker.preterhuman.net in default config

[rbdr/mobius] / hotline / client_conn.go

diff --git a/hotline/client_conn.go b/hotline/client_conn.go
index b43a6ff65a371dcca85a169404ae98b5346f5b72..65e18eead5ea526b963f9515486ec55cc8d8e42b 100644 (file)
--- a/hotline/client_conn.go
+++ b/hotline/client_conn.go
@@ -1,9 +1,7 @@
 package hotline
 
 import (
 package hotline
 
 import (

-       "bytes"

        "encoding/binary"
        "encoding/binary"

-       "errors"

        "golang.org/x/crypto/bcrypt"
        "math/big"
        "net"
        "golang.org/x/crypto/bcrypt"
        "math/big"
        "net"


@@ -35,7 +33,7 @@ type ClientConn struct {
        Server     *Server
        Version    *[]byte
        Idle       bool
        Server     *Server
        Version    *[]byte
        Idle       bool

-       AutoReply  *[]byte
+       AutoReply  []byte

        Transfers  map[int][]*FileTransfer
        Agreed     bool
 }
        Transfers  map[int][]*FileTransfer
        Agreed     bool
 }


@@ -54,7 +52,7 @@ func (cc *ClientConn) handleTransaction(transaction *Transaction) error {
 
                        // Validate that required field is present
                        if field.ID == nil {
 
                        // Validate that required field is present
                        if field.ID == nil {

-                               cc.Server.Logger.Infow(
+                               cc.Server.Logger.Errorw(

                                        "Missing required field",
                                        "Account", cc.Account.Login, "UserName", string(cc.UserName), "RequestType", handler.Name, "FieldID", reqField.ID,
                                )
                                        "Missing required field",
                                        "Account", cc.Account.Login, "UserName", string(cc.UserName), "RequestType", handler.Name, "FieldID", reqField.ID,
                                )


@@ -153,21 +151,21 @@ func (cc *ClientConn) Authorize(access int) bool {
 }
 
 // Disconnect notifies other clients that a client has disconnected
 }
 
 // Disconnect notifies other clients that a client has disconnected

-func (cc ClientConn) Disconnect() {
+func (cc *ClientConn) Disconnect() {

        cc.Server.mux.Lock()
        defer cc.Server.mux.Unlock()
 
        delete(cc.Server.Clients, binary.BigEndian.Uint16(*cc.ID))
 
        cc.Server.mux.Lock()
        defer cc.Server.mux.Unlock()
 
        delete(cc.Server.Clients, binary.BigEndian.Uint16(*cc.ID))
 

-       cc.NotifyOthers(*NewTransaction(tranNotifyDeleteUser, nil, NewField(fieldUserID, *cc.ID)))
+       cc.notifyOthers(*NewTransaction(tranNotifyDeleteUser, nil, NewField(fieldUserID, *cc.ID)))

 
        if err := cc.Connection.Close(); err != nil {
                cc.Server.Logger.Errorw("error closing client connection", "RemoteAddr", cc.Connection.RemoteAddr())
        }
 }
 
 
        if err := cc.Connection.Close(); err != nil {
                cc.Server.Logger.Errorw("error closing client connection", "RemoteAddr", cc.Connection.RemoteAddr())
        }
 }
 

-// NotifyOthers sends transaction t to other clients connected to the server
-func (cc ClientConn) NotifyOthers(t Transaction) {
+// notifyOthers sends transaction t to other clients connected to the server
+func (cc *ClientConn) notifyOthers(t Transaction) {

        for _, c := range sortedClients(cc.Server.Clients) {
                if c.ID != cc.ID && c.Agreed {
                        t.clientID = c.ID
        for _, c := range sortedClients(cc.Server.Clients) {
                if c.ID != cc.ID && c.Agreed {
                        t.clientID = c.ID


@@ -176,47 +174,6 @@ func (cc ClientConn) NotifyOthers(t Transaction) {
        }
 }
 
        }
 }
 

-type handshake struct {
-       Protocol    [4]byte // Must be 0x54525450 TRTP
-       SubProtocol [4]byte
-       Version     [2]byte // Always 1
-       SubVersion  [2]byte
-}
-
-// Handshake
-// After establishing TCP connection, both client and server start the handshake process
-// in order to confirm that each of them comply with requirements of the other.
-// The information provided in this initial data exchange identifies protocols,
-// and their versions, used in the communication. In the case where, after inspection,
-// the capabilities of one of the subjects do not comply with the requirements of the other,
-// the connection is dropped.
-//
-// The following information is sent to the server:
-// Description         Size    Data    Note
-// Protocol ID         4               TRTP    0x54525450
-// Sub-protocol ID     4               HOTL    User defined
-// VERSION                     2               1               Currently 1
-// Sub-version         2               2               User defined
-//
-// The server replies with the following:
-// Description         Size    Data    Note
-// Protocol ID         4               TRTP
-//Error code           4                               Error code returned by the server (0 = no error)
-func Handshake(conn net.Conn, buf []byte) error {
-       var h handshake
-       r := bytes.NewReader(buf)
-       if err := binary.Read(r, binary.BigEndian, &h); err != nil {
-               return err
-       }
-
-       if h.Protocol != [4]byte{0x54, 0x52, 0x54, 0x50} {
-               return errors.New("invalid handshake")
-       }
-
-       _, err := conn.Write([]byte{84, 82, 84, 80, 0, 0, 0, 0})
-       return err
-}
-

 // NewReply returns a reply Transaction with fields for the ClientConn
 func (cc *ClientConn) NewReply(t *Transaction, fields ...Field) Transaction {
        reply := Transaction{
 // NewReply returns a reply Transaction with fields for the ClientConn
 func (cc *ClientConn) NewReply(t *Transaction, fields ...Field) Transaction {
        reply := Transaction{