client: imlement client, fix #4

client.go

@@ -0,0 +1,5 @@
+package stun
+
+// Client implements STUN client.
+type Client struct {
+}

stun-cli/main.go

@@ -5,22 +5,29 @@ import (
 	"fmt"
 	"net"
 	"os"
-	"strings"
 	"time"
 
+	"github.com/Sirupsen/logrus"
 	"github.com/codegangsta/cli"
 	"github.com/cydev/stun"
 )
 
-var (
+const (
-	serverAddress string
+	version = "0.1"
 )
 
-func discover(c *cli.Context) error {
+func wrapLogrus(f func(c *cli.Context) error) func(c *cli.Context) error {
-	if !strings.Contains(serverAddress, ":") {
+	return func(c *cli.Context) error {
-		serverAddress = fmt.Sprintf("%s:%d", serverAddress, stun.DefaultPort)
+		err := f(c)
+		if err != nil {
+			logrus.Errorln("discover error:", err)
+		}
+		return err
 	}
-	conn, err := net.Dial("udp", serverAddress)
+}
+
+func discover(c *cli.Context) error {
+	conn, err := net.Dial("udp", stun.Normalize(c.String("server")))
 	if err != nil {
 		return err
 	}
@@ -31,6 +38,13 @@ func discover(c *cli.Context) error {
 	}
 	m.TransactionID = stun.NewTransactionID()
 	m.AddSoftware("cydev/stun alpha")
+	m = stun.AcquireFields(stun.Message{
+		TransactionID: stun.NewTransactionID(),
+		Type: stun.MessageType{
+			Method: stun.MethodBinding,
+			Class: stun.ClassRequest,
+		},
+	})
 	m.WriteHeader()
 	timeout := 100 * time.Millisecond
 	for i := 0; i < 9; i++ {
@@ -81,10 +95,9 @@ func main() {
 			Name:        "server",
 			Value:       "ci.cydev.ru",
 			Usage:       "STUN server address",
-			Destination: &serverAddress,
 		},
 	}
-	app.Action = discover
+	app.Action = wrapLogrus(discover)
-
+	app.Version = version
 	app.Run(os.Args)
 }

stun.go

@@ -28,12 +28,27 @@ import (
 	"fmt"
 	"io"
 	"strconv"
+	"strings"
 	"sync"
 
 	"github.com/cydev/buffer"
 	"github.com/pkg/errors"
 )
 
+// Normalize returns normalized address.
+func Normalize(address string) string {
+	if len(address) == 0 {
+		address = "0.0.0.0"
+	}
+	if !strings.Contains(address, ":") {
+		address = fmt.Sprintf("%s:%d", address, DefaultPort)
+	}
+	return address
+}
+
+// DefaultPort is IANA assigned port for "stun" protocol.
+const DefaultPort = 3478
+
 const (
 	// magicCookie is fixed value that aids in distinguishing STUN packets
 	// from packets of other protocols when STUN is multiplexed with those