mirror of https://github.com/schollz/croc.git
Merge branch 'master' of github.com:schollz/croc
This commit is contained in:
commit
6ad8e08b0c
|
@ -507,7 +507,7 @@ func (c *Client) Receive() (err error) {
|
||||||
if err1 == nil && len(ipv4discoveries) > 0 {
|
if err1 == nil && len(ipv4discoveries) > 0 {
|
||||||
dmux.Lock()
|
dmux.Lock()
|
||||||
err = err1
|
err = err1
|
||||||
discoveries = ipv4discoveries
|
discoveries = append(discoveries, ipv4discoveries...)
|
||||||
dmux.Unlock()
|
dmux.Unlock()
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
@ -523,13 +523,14 @@ func (c *Client) Receive() (err error) {
|
||||||
if err1 == nil && len(ipv6discoveries) > 0 {
|
if err1 == nil && len(ipv6discoveries) > 0 {
|
||||||
dmux.Lock()
|
dmux.Lock()
|
||||||
err = err1
|
err = err1
|
||||||
discoveries = ipv6discoveries
|
discoveries = append(discoveries, ipv6discoveries...)
|
||||||
dmux.Unlock()
|
dmux.Unlock()
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
wgDiscovery.Wait()
|
wgDiscovery.Wait()
|
||||||
|
|
||||||
if err == nil && len(discoveries) > 0 {
|
if err == nil && len(discoveries) > 0 {
|
||||||
|
log.Debugf("all discoveries: %+v", discoveries)
|
||||||
for i := 0; i < len(discoveries); i++ {
|
for i := 0; i < len(discoveries); i++ {
|
||||||
log.Debugf("discovery %d has payload: %+v", i, discoveries[i])
|
log.Debugf("discovery %d has payload: %+v", i, discoveries[i])
|
||||||
if !bytes.HasPrefix(discoveries[i].Payload, []byte("croc")) {
|
if !bytes.HasPrefix(discoveries[i].Payload, []byte("croc")) {
|
||||||
|
|
Loading…
Reference in New Issue