cwtch.im
/
cwtch
16
20
Fork 15
Code Issues 10 Pull Requests 1 Releases 163 Wiki Activity

contact retry force disconnect internally any connecting over 2xcircut timeout #521

Merged
sarah merged 1 commits from crForceDisconn into master 2023-07-25 21:22:39 +00:00
Conversation 4 Commits 1 Files Changed 1 +10
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/plugins/contactRetry.go
View File

@ -212,6 +212,16 @@ func (cr *contactRetry) run() {
}
cr.lastCheck = time.Now()
}
// regardless of if we're up, run manual force deconnectiong of timed out connections
cr.connections.Range(func(k, v interface{}) bool {
p := v.(*contact)
if p.state == connections.CONNECTING && time.Since(p.lastAttempt) > time.Duration(circuitTimeoutSecs)*time.Second*2 {
// we have been "connecting" for twice the circuttimeout so it's failed, we just didn't learn about it, manually disconnect
cr.handleEvent(p.id, connections.DISCONNECTED, p.ctype)
dan marked this conversation as resolved Outdated
sarah commented 2023-07-20 20:06:14 +00:00
Outdated
Review
Copy Link

this needs to log an Error. In normal operation this should not happen, and very likely indicates a failure to handle a missing connection issue somewhere else.

this needs to log an Error. In normal operation this should not happen, and very likely indicates a failure to handle a missing connection issue somewhere else.
log.Errorf("had to manually set peer %v of profile %v to DISCONNECTED due to assumed circuit timeout (%v) seconds", p.id, cr.onion, circuitTimeoutSecs*2)
dan marked this conversation as resolved Outdated
decentral1se commented 2023-07-21 12:25:44 +00:00
Outdated
Review
Copy Link

for connecting for 2xcircutTimeout -> due to a circuit timeout perhaps? circut has a typo also.

`for connecting for 2xcircutTimeout` -> `due to a circuit timeout` perhaps? `circut` has a typo also.
}
return true
})
select {
case e := <-cr.queue.OutChan():