Merge pull request #2825 from weaveworks/issues/2824-fastdp-timer-race

Do not reset fastdp heartbeat timer for non-confirmed connections.  Fixes #2824
This commit is contained in:
Bryan Boreham authored and GitHub committed 2017-03-06 10:45:45 +00:00
commit 640b487914
1 file changed
+5 -3
+5 -3
View File
@@ -577,8 +577,8 @@ type fastDatapathForwarder struct {
confirmed bool confirmed bool
remoteAddr *net.UDPAddr remoteAddr *net.UDPAddr
heartbeatInterval time.Duration heartbeatInterval time.Duration
heartbeatTimer *time.Timer heartbeatTimer *time.Timer // for sending
heartbeatTimeout *time.Timer heartbeatTimeout *time.Timer // for receiving
ackedHeartbeat bool ackedHeartbeat bool
stopChan chan struct{} stopChan chan struct{}
stopped bool stopped bool
@@ -856,7 +856,9 @@ func (fwd *fastDatapathForwarder) handleCryptoInitSARemote(msg []byte) {
return return
} }
if !fwd.isOutboundIPSecEstablished { // FastDatapathCryptoInitSARemote can be received before Confirm'ing
// connection, thus before InitSALocal.
if fwd.confirmed && !fwd.isOutboundIPSecEstablished {
fwd.isOutboundIPSecEstablished = true fwd.isOutboundIPSecEstablished = true
fwd.heartbeatTimer.Reset(0) fwd.heartbeatTimer.Reset(0)
} }