From fcd6ebb06e4cfe78684bb048b34562c87e452413 Mon Sep 17 00:00:00 2001
From: Audrius Butkevicius <audrius.butkevicius@gmail.com>
Date: Fri, 17 Jul 2015 20:17:49 +0100
Subject: [PATCH] General cleanup

---
 cmd/relaysrv/client/methods.go   |  4 ++--
 cmd/relaysrv/protocol/packets.go | 14 ++++++++++++++
 cmd/relaysrv/testutil/main.go    | 10 +++++-----
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/cmd/relaysrv/client/methods.go b/cmd/relaysrv/client/methods.go
index c9b7a265c..ef6145e9c 100644
--- a/cmd/relaysrv/client/methods.go
+++ b/cmd/relaysrv/client/methods.go
@@ -16,7 +16,7 @@ import (
 
 func GetInvitationFromRelay(uri *url.URL, id syncthingprotocol.DeviceID, certs []tls.Certificate) (protocol.SessionInvitation, error) {
 	if uri.Scheme != "relay" {
-		return protocol.SessionInvitation{}, fmt.Errorf("Unsupported relay schema:", uri.Scheme)
+		return protocol.SessionInvitation{}, fmt.Errorf("Unsupported relay scheme:", uri.Scheme)
 	}
 
 	conn, err := tls.Dial("tcp", uri.Host, configForCerts(certs))
@@ -49,7 +49,7 @@ func GetInvitationFromRelay(uri *url.URL, id syncthingprotocol.DeviceID, certs [
 		return protocol.SessionInvitation{}, fmt.Errorf("Incorrect response code %d: %s", msg.Code, msg.Message)
 	case protocol.SessionInvitation:
 		if debug {
-			l.Debugln("Received invitation via", conn.LocalAddr())
+			l.Debugln("Received invitation", msg, "via", conn.LocalAddr())
 		}
 		ip := net.IP(msg.Address)
 		if len(ip) == 0 || ip.IsUnspecified() {
diff --git a/cmd/relaysrv/protocol/packets.go b/cmd/relaysrv/protocol/packets.go
index 658bc536d..84316da98 100644
--- a/cmd/relaysrv/protocol/packets.go
+++ b/cmd/relaysrv/protocol/packets.go
@@ -5,6 +5,12 @@
 
 package protocol
 
+import (
+	"fmt"
+	syncthingprotocol "github.com/syncthing/protocol"
+	"net"
+)
+
 const (
 	messageTypePing int32 = iota
 	messageTypePong
@@ -45,3 +51,11 @@ type SessionInvitation struct {
 	Port         uint16
 	ServerSocket bool
 }
+
+func (i *SessionInvitation) String() string {
+	return fmt.Sprintf("%s@%s", syncthingprotocol.DeviceIDFromBytes(i.From), i.AddressString())
+}
+
+func (i *SessionInvitation) AddressString() string {
+	return fmt.Sprintf("%s:%d", net.IP(i.Address), i.Port)
+}
diff --git a/cmd/relaysrv/testutil/main.go b/cmd/relaysrv/testutil/main.go
index 10c222457..69dbb00a1 100644
--- a/cmd/relaysrv/testutil/main.go
+++ b/cmd/relaysrv/testutil/main.go
@@ -51,9 +51,9 @@ func main() {
 	go stdinReader(stdin)
 
 	if join {
-		log.Printf("Creating client")
+		log.Println("Creating client")
 		relay := client.NewProtocolClient(uri, []tls.Certificate{cert}, nil)
-		log.Printf("Created client")
+		log.Println("Created client")
 
 		go relay.Serve()
 
@@ -64,9 +64,9 @@ func main() {
 			for invite := range relay.Invitations {
 				select {
 				case recv <- invite:
-					log.Printf("Received invitation from %s on %s:%d", syncthingprotocol.DeviceIDFromBytes(invite.From), net.IP(invite.Address), invite.Port)
+					log.Println("Received invitation", invite)
 				default:
-					log.Printf("Discarding invitation", invite)
+					log.Println("Discarding invitation", invite)
 				}
 			}
 		}()
@@ -91,7 +91,7 @@ func main() {
 			log.Fatal(err)
 		}
 
-		log.Printf("Received invitation from %s on %s:%d", syncthingprotocol.DeviceIDFromBytes(invite.From), net.IP(invite.Address), invite.Port)
+		log.Println("Received invitation", invite)
 		conn, err := client.JoinSession(invite)
 		if err != nil {
 			log.Fatalln("Failed to join", err)