unistack-org/micro
3
0
Fork 2
Code Issues 21 Pull Requests 2 Actions Packages Projects Releases 295 Wiki Activity

Missing fixes for the tunnel

Browse Source
This commit is contained in:
Asim Aslam 2019-09-12 17:12:49 -07:00
parent af585d3a57
commit 2406ef9999
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tunnel/default.go
View File

@ -218,8 +218,6 @@ func (t *tun) monitor() {
log.Debugf("Tunnel failed to setup node link to %s: %v", node, err) log.Debugf("Tunnel failed to setup node link to %s: %v", node, err)
continue continue
} }
// set the link id to the remote address
link.id = link.Remote()
// save the link // save the link
t.Lock() t.Lock()
t.links[node] = link t.links[node] = link
@ -441,7 +439,7 @@ func (t *tun) listen(link *link) {
} }
// set to remote node // set to remote node
link.id = id link.id = link.Remote()
// set as connected // set as connected
link.connected = true link.connected = true
link.Unlock() link.Unlock()
@ -483,10 +481,10 @@ func (t *tun) listen(link *link) {
// otherwise its a session mapping of sorts // otherwise its a session mapping of sorts
case "keepalive": case "keepalive":
log.Debugf("Tunnel link %s received keepalive", link.Remote()) log.Debugf("Tunnel link %s received keepalive", link.Remote())
t.Lock() link.Lock()
// save the keepalive // save the keepalive
link.lastKeepAlive = time.Now() link.lastKeepAlive = time.Now()
t.Unlock() link.Unlock()
continue continue
// a new connection dialled outbound // a new connection dialled outbound
case "open": case "open":
@ -671,6 +669,8 @@ func (t *tun) discover(link *link) {
}); err != nil { }); err != nil {
log.Debugf("Tunnel failed to send discover to link %s: %v", link.id, err) log.Debugf("Tunnel failed to send discover to link %s: %v", link.id, err)
} }
case <-link.closed:
return
case <-t.closed: case <-t.closed:
return return
} }
@ -686,6 +686,8 @@ func (t *tun) keepalive(link *link) {
select { select {
case <-t.closed: case <-t.closed:
return return
case <-link.closed:
return
case <-keepalive.C: case <-keepalive.C:
// send keepalive message // send keepalive message
log.Debugf("Tunnel sending keepalive to link: %v", link.Remote()) log.Debugf("Tunnel sending keepalive to link: %v", link.Remote())
@ -764,6 +766,12 @@ func (t *tun) connect() error {
// create a new link // create a new link
link := newLink(sock) link := newLink(sock)
// start keepalive monitor
go t.keepalive(link)
// discover things on the remote side
go t.discover(link)
// listen for inbound messages. // listen for inbound messages.
// only save the link once connected. // only save the link once connected.
// we do this inside liste // we do this inside liste
@ -793,7 +801,7 @@ func (t *tun) connect() error {
} }
// save the link // save the link
t.links[link.Remote()] = link t.links[node] = link
} }
// process outbound messages to be sent // process outbound messages to be sent