diff --git a/client.go b/client.go index 8ebf521..54b251d 100644 --- a/client.go +++ b/client.go @@ -48,8 +48,8 @@ func (c *Client) Connect() error { msg := secure.PacketStart{ OperationType: secure.OperationTypeList, ClientName: "Justin Hawkins", - ProtocolVersion: "v1.0", - AuthToken: "abc123", + ProtocolVersion: "1.0", + AuthToken: "dummy", } err := enc.Encode(msg) if err != nil { @@ -76,8 +76,8 @@ func (c *Client) Connect() error { msg := secure.PacketStart{ OperationType: secure.OperationTypeReceive, ClientName: "Justin Hawkins", - ProtocolVersion: "v1.0", - AuthToken: "abc123", + ProtocolVersion: "1.0", + AuthToken: "dummy", } err := enc.Encode(msg) if err != nil { @@ -124,8 +124,8 @@ func (c *Client) Connect() error { msg := secure.PacketStart{ OperationType: secure.OperationTypeSend, ClientName: "Justin Hawkins", - ProtocolVersion: "v1.0", - AuthToken: "abc123", + ProtocolVersion: "1.0", + AuthToken: "dummy", } // gob.Register(secure.PacketSendStart{}) diff --git a/secure/secure_test.go b/secure/secure_test.go index 78ae67f..0eaacb6 100644 --- a/secure/secure_test.go +++ b/secure/secure_test.go @@ -112,6 +112,7 @@ func BenchmarkPPS(b *testing.B) { out := make([]byte, 16384) n, err := dstSecConn.Read(out) + if err != nil { b.Errorf("got error %v", err) } diff --git a/server.go b/server.go index 73d4fde..2229f47 100644 --- a/server.go +++ b/server.go @@ -97,11 +97,23 @@ func handleConnection(conn *net.TCPConn) { log.Printf("connection has been closed prematurely") return } + + // xxx we need to add a response part here so they can be notified if err != nil { log.Printf("error while expecting PacketStart: %v", err) return } + if start.ProtocolVersion != "1.0" { + log.Printf("bad protocol version") + return + } + + if start.AuthToken != "dummy" { + log.Print("bad authtoken") + return + } + conn.SetDeadline(time.Now().Add(time.Second * 5)) if start.OperationType == secure.OperationTypeSend {