From 5ae6c8075b5cede948b7bbba9175690299c50b0e Mon Sep 17 00:00:00 2001
From: Russ Magee <rmagee@gmail.com>
Date: Thu, 19 Jul 2018 22:39:06 -0700
Subject: [PATCH] Grouped types

---
 TODO.txt           |  2 +-
 hkexnet/hkexnet.go | 64 +++++++++++++++++++++++++---------------------
 2 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/TODO.txt b/TODO.txt
index 4c7c4d8..c8486e9 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -6,7 +6,7 @@ Chaff Improvements
 - Client-input chaff file data (ie., Moby Dick)
 
 Architecture
-- Move hkexnet components other than key exchange into a proper hkex package
+(DONE) - Move hkexnet components other than key exchange into a proper hkex package
   (ie., hkexsh imports hkex) - hkex should be usable for other client/svr utils,
   ala 'hkex-netcat')
 - Make KEx fully-pluggable: isolate all code to do with Herradura into a
diff --git a/hkexnet/hkexnet.go b/hkexnet/hkexnet.go
index dad88a4..85f92d5 100644
--- a/hkexnet/hkexnet.go
+++ b/hkexnet/hkexnet.go
@@ -44,39 +44,45 @@ const (
 
 /*---------------------------------------------------------------------*/
 
-type WinSize struct {
-	Rows uint16
-	Cols uint16
-}
+type (
+	WinSize struct {
+		Rows uint16
+		Cols uint16
+	}
 
-type ChaffConfig struct {
-	shutdown bool //set to inform chaffHelper to shut down
-	enabled  bool
-	msecsMin uint //msecs min interval
-	msecsMax uint //msecs max interval
-	szMax    uint // max size in bytes
-}
+	// chaffconfig captures attributes used to send chaff packets betwixt
+	// client and server connections, to obscure true traffic timing and
+	// patterns
+	// see: https://en.wikipedia.org/wiki/chaff_(countermeasure)
+	ChaffConfig struct {
+		shutdown bool //set to inform chaffHelper to shut down
+		enabled  bool
+		msecsMin uint //msecs min interval
+		msecsMax uint //msecs max interval
+		szMax    uint // max size in bytes
+	}
 
-// Conn is a HKex connection - a superset of net.Conn
-type Conn struct {
-	m          *sync.Mutex
-	c          net.Conn // which also implements io.Reader, io.Writer, ...
-	h          *hkex.HerraduraKEx
-	cipheropts uint32 // post-KEx cipher/hmac options
-	opts       uint32 // post-KEx protocol options (caller-defined)
-	WinCh      chan WinSize
-	Rows       uint16
-	Cols       uint16
+	// Conn is a HKex connection - a superset of net.Conn
+	Conn struct {
+		m          *sync.Mutex
+		c          net.Conn // which also implements io.Reader, io.Writer, ...
+		h          *hkex.HerraduraKEx
+		cipheropts uint32 // post-KEx cipher/hmac options
+		opts       uint32 // post-KEx protocol options (caller-defined)
+		WinCh      chan WinSize
+		Rows       uint16
+		Cols       uint16
 
-	chaff ChaffConfig
+		chaff ChaffConfig
 
-	closeStat *uint8        // close status (shell exit status: UNIX uint8)
-	r         cipher.Stream //read cipherStream
-	rm        hash.Hash
-	w         cipher.Stream //write cipherStream
-	wm        hash.Hash
-	dBuf      *bytes.Buffer //decrypt buffer for Read()
-}
+		closeStat *uint8        // close status (shell exit status: UNIX uint8)
+		r         cipher.Stream //read cipherStream
+		rm        hash.Hash
+		w         cipher.Stream //write cipherStream
+		wm        hash.Hash
+		dBuf      *bytes.Buffer //decrypt buffer for Read()
+	}
+)
 
 func (hc Conn) GetStatus() uint8 {
 	return *hc.closeStat