From 07d6abc33af77982b1d93dc33be0d44e4c9e896a Mon Sep 17 00:00:00 2001
From: Sebastien Boeuf <sebastien.boeuf@intel.com>
Date: Mon, 20 Jan 2020 18:05:10 +0100
Subject: [PATCH] agent: Revert client protocol patch to fix CH and FC

DEBUG

Fixes #666

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
---
 Gopkg.lock                                                  | 6 ++++--
 Gopkg.toml                                                  | 3 ++-
 .../kata-containers/agent/protocols/client/client.go        | 3 +++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Gopkg.lock b/Gopkg.lock
index b9deb339ea..71adf47254 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -419,7 +419,8 @@
   revision = "8cba5a8e5f2816f26f9dc34b8ea968279a5a76eb"
 
 [[projects]]
-  digest = "1:6da9487ef0cc0cca3eeb1a24e3bb018ce2e07b7c2fc4d50975b54efdcc942118"
+  branch = "fix_ch"
+  digest = "1:9226b202fc3c312717471452f6b504744498f715a7545c5edc478c43888f0f7c"
   name = "github.com/kata-containers/agent"
   packages = [
     "pkg/types",
@@ -427,7 +428,8 @@
     "protocols/grpc",
   ]
   pruneopts = "NUT"
-  revision = "1b3628c43660cb198ec055d78e5c7b03809cba60"
+  revision = "8626814a16838091f73d56c6ba5915c106741c11"
+  source = "github.com/sboeuf/agent"
 
 [[projects]]
   digest = "1:58999a98719fddbac6303cb17e8d85b945f60b72f48e3a2df6b950b97fa926f1"
diff --git a/Gopkg.toml b/Gopkg.toml
index e5d65bec20..59cdd2ba1f 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -52,7 +52,8 @@
 
 [[constraint]]
   name = "github.com/kata-containers/agent"
-  revision = "1b3628c43660cb198ec055d78e5c7b03809cba60"
+  branch = "fix_ch"
+  source = "github.com/sboeuf/agent"
 
 [[constraint]]
   name = "github.com/containerd/cri-containerd"
diff --git a/vendor/github.com/kata-containers/agent/protocols/client/client.go b/vendor/github.com/kata-containers/agent/protocols/client/client.go
index 43b9a94525..a25013be4f 100644
--- a/vendor/github.com/kata-containers/agent/protocols/client/client.go
+++ b/vendor/github.com/kata-containers/agent/protocols/client/client.go
@@ -428,6 +428,9 @@ func HybridVSockDialer(sock string, timeout time.Duration) (net.Conn, error) {
 				}
 				return nil, err
 			}
+		} else {
+			conn.Close()
+			return nil, io.EOF
 		}
 
 		return conn, nil