Stats reporting

tapdance/assets.go

@@ -351,3 +351,7 @@ func (a *assets) saveClientConf() error {
 func (a *assets) SetStatsSocksAddr(addr string) {
 	a.socksAddr = addr
 }
+
+func (a *assets) GetStatsSocksAddr() string {
+	return a.socksAddr
+}

tapdance/conjure.go

@@ -59,9 +59,13 @@ func DialConjure(ctx context.Context, cjSession *ConjureSession) (net.Conn, erro
 	Logger().Debugf("%v Successfully sent registrations, sleeping for: %v ms", cjSession.IDString(), toSleep)
 	time.Sleep(toSleep)
 
-	Logger().Debugf("%v Woke from sleep, attempting to Connect ...", cjSession.IDString())
-	return registration.Connect(ctx)
-	// return Connect(cjSession)
+	Logger().Tracef("%v Woke from sleep, attempting to Connect ...", cjSession.IDString())
+
+	conn, err := registration.Connect(ctx)
+	if conn != nil && err == nil {
+		StatsReporting(cjSession.stats)
+	}
+	return conn, err
 }
 
 // Register - Send registrations equal to the width specified in the Conjure Session

tapdance/logger.go

@@ -1,9 +1,14 @@
 package tapdance
 
 import (
+	"bytes"
 	"fmt"
+	"net/http"
+	"net/url"
 	"sync"
 
+	"github.com/golang/protobuf/proto"
+	pb "github.com/refraction-networking/gotapdance/protobuf"
 	"github.com/sirupsen/logrus"
 )
 
@@ -35,3 +40,36 @@ func Logger() *logrus.Logger {
 	})
 	return logrusLogger
 }
+
+func StatsReporting(stats *pb.SessionStats) {
+	socks_url, err := url.Parse("socks5://" + Assets().GetStatsSocksAddr())
+	// Test socks5 proxy
+	//socks_url, err := url.Parse("socks5://localhost:8080")
+	fmt.Printf("Got %v as socks5 proxy\n", socks_url)
+	if err != nil {
+		// TODO this should be logged, not printed
+		fmt.Printf("Could not parse socks addr %v\n", Assets().GetStatsSocksAddr())
+		return
+	}
+	client := &http.Client{Transport: &http.Transport{Proxy: http.ProxyURL(socks_url)}}
+
+	data, err := proto.Marshal(stats)
+	if err != nil {
+		// TODO this should be logged, not printed
+		fmt.Println("Could not marshal stats protobuf")
+		return
+	}
+
+	// TODO send stats protobuf to some refraction.network endpoint
+	client.Post("https://nzimm.net", "stats", bytes.NewReader(data))
+	return
+
+	/*
+		resp, _ := client.Post("https://nzimm.net", "stats", bytes.NewReader(data))
+		if err != nil {
+			// TODO this should be logged, not printed
+			fmt.Println("Could not parse socks addr %v", Assets().GetStatsSocksAddr())
+			return
+		}
+	*/
+}

tapdance/logger_test.go

@@ -0,0 +1,17 @@
+package tapdance
+
+import (
+	"testing"
+
+	pb "github.com/refraction-networking/gotapdance/protobuf"
+)
+
+func TestStatsReporting(t *testing.T) {
+	reg := ConjureReg{}
+	testRTT := uint32(1000)
+	reg.stats = &pb.SessionStats{
+		TotalTimeToConnect: &testRTT,
+		TcpToDecoy:         &testRTT,
+	}
+	StatsReporting(reg.stats)
+}