From 6bc0e5e71c9e847c42436a15372ec18c76b6ae2b Mon Sep 17 00:00:00 2001
From: Murali Reddy <muralimmreddy@gmail.com>
Date: Wed, 11 Mar 2020 21:26:09 +0530
Subject: [PATCH] send FastDatapathCryptoInitSARemote control message only if
 encryption is enabled

Fixes #3781
---
 router/fastdp.go | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/router/fastdp.go b/router/fastdp.go
index 5f2a101b..a25df7d4 100644
--- a/router/fastdp.go
+++ b/router/fastdp.go
@@ -694,10 +694,12 @@ func (fwd *fastDatapathForwarder) Confirm() {
 
 	fwd.lock.Unlock() // unlock before calling send() which may block
 
-	if err := fwd.sendControlMsg(FastDatapathCryptoInitSARemote, controlMsg); err != nil {
-		log.Error(fwd.logPrefix(), "ipsec send InitSARemote failed: ", err)
-		fwd.handleError(err)
-		return
+	if len(controlMsg) > 0 {
+		if err := fwd.sendControlMsg(FastDatapathCryptoInitSARemote, controlMsg); err != nil {
+			log.Error(fwd.logPrefix(), "ipsec send InitSARemote failed: ", err)
+			fwd.handleError(err)
+			return
+		}
 	}
 
 	go fwd.doHeartbeats()