mirrors_public/schollz_croc
1
1
Fork 0
mirror of https://github.com/schollz/croc.git synced 2025-10-11 13:21:00 +02:00
Code Activity

addresing CPU usage #168

Browse source
This commit is contained in:
Zack Scholl 2019-11-11 11:26:12 -08:00
parent a0d9d74d5d
commit bdb8bf3ac4
2 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
go.sum
View file

@ -83,8 +83,6 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a h1:aYOabOQFp6Vj6W1F80affTUvO9UxmJRx8K0gsfABByQ= golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a h1:aYOabOQFp6Vj6W1F80affTUvO9UxmJRx8K0gsfABByQ=
golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191002091554-b397fe3ad8ed h1:5TJcLJn2a55mJjzYk0yOoqN8X1OdvBDUnaZaKKyQtkY=
golang.org/x/sys v0.0.0-20191002091554-b397fe3ad8ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191023151326-f89234f9a2c2 h1:I7efaDQAsIQmkTF+WSdcydwVWzK07Yuz8IFF8rNkDe0= golang.org/x/sys v0.0.0-20191023151326-f89234f9a2c2 h1:I7efaDQAsIQmkTF+WSdcydwVWzK07Yuz8IFF8rNkDe0=
golang.org/x/sys v0.0.0-20191023151326-f89234f9a2c2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191023151326-f89234f9a2c2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=

16
src/croc/croc.go
View file

@ -264,8 +264,8 @@ func (c *Client) broadcastOnLocalNetwork() {
}) })
log.Debugf("discoveries: %+v", discoveries) log.Debugf("discoveries: %+v", discoveries)
if err == nil && len(discoveries) > 0 { if err != nil {
log.Debug("using local server") log.Debug(err.Error())
} }
} }
@ -339,7 +339,10 @@ func (c *Client) Send(options TransferOptions) (err error) {
} }
log.Debugf("connection established: %+v", conn) log.Debugf("connection established: %+v", conn)
for { for {
data, _ := conn.Receive() data, errConn := conn.Receive()
if errConn != nil {
log.Debugf("[%+v] had error: %s", conn, errConn.Error())
}
if bytes.Equal(data, []byte("ips?")) { if bytes.Equal(data, []byte("ips?")) {
// recipient wants to try to connect to local ips // recipient wants to try to connect to local ips
var ips []string var ips []string
@ -355,9 +358,12 @@ func (c *Client) Send(options TransferOptions) (err error) {
} }
bips, _ := json.Marshal(ips) bips, _ := json.Marshal(ips)
conn.Send(bips) conn.Send(bips)
} } else if bytes.Equal(data, []byte("handshake")) {
if bytes.Equal(data, []byte("handshake")) {
break break
} else {
log.Debugf("[%+v] got weird bytes: %+v", conn, data)
// throttle the reading
time.Sleep(100 * time.Millisecond)
} }
} }