From 1909786a4bdb98689e66d41e7b0466e1a4fbfdd4 Mon Sep 17 00:00:00 2001 From: Russ Magee Date: Mon, 19 Nov 2018 14:16:11 -0800 Subject: [PATCH] -Removed Close on null failed Listener (hkexshd) -Removed premature net.Conn.Close() in hkexnet.Close() (hkexnet) Signed-off-by: Russ Magee --- hkexnet/hkexnet.go | 1 - hkexshd/hkexshd.go | 2 -- 2 files changed, 3 deletions(-) diff --git a/hkexnet/hkexnet.go b/hkexnet/hkexnet.go index 8105a35..6fbe2dc 100644 --- a/hkexnet/hkexnet.go +++ b/hkexnet/hkexnet.go @@ -533,7 +533,6 @@ func (hc *Conn) Close() (err error) { binary.BigEndian.PutUint32(s, uint32(*hc.closeStat)) log.Printf("** Writing closeStat %d at Close()\n", *hc.closeStat) hc.WritePacket(s, CSOExitStatus) - err = (*hc.c).Close() logger.LogDebug(fmt.Sprintln("[Conn Closing]")) return } diff --git a/hkexshd/hkexshd.go b/hkexshd/hkexshd.go index 817e3b0..77748d3 100755 --- a/hkexshd/hkexshd.go +++ b/hkexshd/hkexshd.go @@ -433,8 +433,6 @@ func main() { conn, err := l.Accept() if err != nil { log.Printf("Accept() got error(%v), hanging up.\n", err) - conn.Close() - //log.Fatal(err) } else { log.Println("Accepted client")