sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-05-19 07:09:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: cleanup

Browse Source
This commit is contained in:
braginini
2021-11-16 14:59:37 +01:00
parent b35dcd21df
commit 23781c1305
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
browser/client/client_js.go
View File

@@ -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 {}
}

5
browser/conn/bind_webrtc.go
View File

@@ -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 {

2
browser/conn/conn.go
View File

@@ -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)