From: Sergey Matveev <stargrave@stargrave.org>
Date: Sun, 15 Mar 2015 15:53:48 +0000 (+0300)
Subject: Skip heartbeat packets that can appear during rehandshake period
X-Git-Tag: 2.2^2~4
X-Git-Url: http://www.git.cypherpunks.ru/?a=commitdiff_plain;h=a9aa03a0396115af35404a7a2e7755e490d9e5fe;p=govpn.git

Skip heartbeat packets that can appear during rehandshake period

Signed-off-by: Sergey Matveev <stargrave@stargrave.org>
---

diff --git a/cmd/govpn-client/main.go b/cmd/govpn-client/main.go
index e358d43..f4a29eb 100644
--- a/cmd/govpn-client/main.go
+++ b/cmd/govpn-client/main.go
@@ -102,7 +102,9 @@ MainCycle:
 			break MainCycle
 		case ethPkt = <-ethSink:
 			if peer == nil {
-				ethReady <- struct{}{}
+				if len(ethPkt) > 0 {
+					ethReady <- struct{}{}
+				}
 				continue
 			}
 			peer.EthProcess(ethPkt, conn, ethReady)