From 23781c1305161e990381bb8b0121d6633462dc3b Mon Sep 17 00:00:00 2001
From: braginini <bangvalo@gmail.com>
Date: Tue, 16 Nov 2021 14:59:37 +0100
Subject: [PATCH] chore: cleanup

---
 browser/client/client_js.go | 10 ++++++----
 browser/conn/bind_webrtc.go |  5 ++---
 browser/conn/conn.go        |  2 --
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/browser/client/client_js.go b/browser/client/client_js.go
index 4141098e5..4e1b9bd4d 100644
--- a/browser/client/client_js.go
+++ b/browser/client/client_js.go
@@ -9,8 +9,10 @@ import (
 	"golang.zx2c4.com/wireguard/device"
 	"golang.zx2c4.com/wireguard/tun/netstack"
 	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
+	"io"
 	"log"
 	"net"
+	"net/http"
 	"syscall/js"
 	"time"
 )
@@ -37,7 +39,7 @@ func main() {
 
 		time.Sleep(5 * time.Second)
 
-		tun, _, err := netstack.CreateNetTUN(
+		tun, tnet, err := netstack.CreateNetTUN(
 			[]net.IP{net.ParseIP("10.100.0.1")},
 			[]net.IP{net.ParseIP("8.8.8.8")},
 			1420)
@@ -45,7 +47,7 @@ func main() {
 		b := conn.NewWebRTCBind("chann-1", signalClient, key.PublicKey().String(), remoteKey.String())
 		dev := device.NewDevice(tun, b, device.NewLogger(device.LogLevelVerbose, ""))
 
-		err = dev.IpcSet(fmt.Sprintf("private_key=%s\npublic_key=%s\npersistent_keepalive_interval=10\nendpoint=webrtc://datachannel\nallowed_ip=0.0.0.0/0",
+		err = dev.IpcSet(fmt.Sprintf("private_key=%s\npublic_key=%s\npersistent_keepalive_interval=25\nendpoint=webrtc://datachannel\nallowed_ip=0.0.0.0/0",
 			hex.EncodeToString(key[:]),
 			hex.EncodeToString(remoteKey[:]),
 		))
@@ -61,7 +63,7 @@ func main() {
 
 		log.Printf("device started")
 
-		/*client := http.Client{
+		client := http.Client{
 			Transport: &http.Transport{
 				DialContext: tnet.DialContext,
 			},
@@ -78,7 +80,7 @@ func main() {
 			log.Panic(err)
 		}
 		log.Printf(string(body))
-		log.Printf(resp.Status)*/
+		log.Printf(resp.Status)
 
 		select {}
 	}
diff --git a/browser/conn/bind_webrtc.go b/browser/conn/bind_webrtc.go
index 3c84a522d..7b69ea9ee 100644
--- a/browser/conn/bind_webrtc.go
+++ b/browser/conn/bind_webrtc.go
@@ -18,7 +18,6 @@ const initDataChannelName = "wiretrustee-init"
 
 func (*WebRTCBind) makeReceive(dcConn net.Conn) conn.ReceiveFunc {
 	return func(buff []byte) (int, conn.Endpoint, error) {
-		log.Printf("receiving from endpoint %s", dcConn.RemoteAddr().String())
 		n, err := dcConn.Read(buff)
 		if err != nil {
 			return 0, nil, err
@@ -179,7 +178,7 @@ func (bind *WebRTCBind) Open(port uint16) (fns []conn.ReceiveFunc, actualPort ui
 		go bind.signal.Receive(func(msg *proto.Message) error {
 			log.Printf("received a message from %v -> %v", msg.RemoteKey, msg.Body.Payload)
 			if msg.GetBody().Type == proto.Body_ANSWER {
-				log.Printf("received answer %s", msg.GetBody().GetPayload())
+				log.Printf("received answer")
 				err := setRemoteDescription(bind.pc, msg.GetBody().GetPayload())
 				if err != nil {
 					log.Printf("%v", err)
@@ -195,7 +194,7 @@ func (bind *WebRTCBind) Open(port uint16) (fns []conn.ReceiveFunc, actualPort ui
 		go bind.signal.Receive(func(msg *proto.Message) error {
 			log.Printf("received a message from %v -> %v", msg.RemoteKey, msg.Body.Payload)
 			if msg.GetBody().Type == proto.Body_OFFER {
-				log.Printf("received offer %s", msg.GetBody().GetPayload())
+				log.Printf("received offer")
 
 				err = setRemoteDescription(bind.pc, msg.GetBody().GetPayload())
 				if err != nil {
diff --git a/browser/conn/conn.go b/browser/conn/conn.go
index 84a786f2a..4749336a6 100644
--- a/browser/conn/conn.go
+++ b/browser/conn/conn.go
@@ -86,7 +86,6 @@ func (dc *DataChannelConn) Read(b []byte) (n int, err error) {
 
 func (dc *DataChannelConn) Write(b []byte) (n int, err error) {
 	err = dc.dc.Send(b)
-	log.Printf("writing to channel %s %v", dc.dc.Label(), dc.dc)
 	if err != nil {
 		return 0, err
 	}
@@ -168,7 +167,6 @@ func (cr ContextReadCloser) SetReadDeadline(t time.Time) error {
 }
 
 func (cr ContextReadCloser) Read(p []byte) (n int, err error) {
-	log.Printf("reading bytes ro buf of len %d", len(p))
 	done := make(chan struct{})
 	go func() {
 		n, err = cr.ReadCloser.Read(p)