From 9b3bd6b78b21f4ef57c8370fece24513e8bc256c Mon Sep 17 00:00:00 2001 From: Russ Magee Date: Fri, 12 Jan 2018 22:24:40 -0800 Subject: [PATCH] Added client/server host:port, addr:port options --- demo/client.go | 4 +++- demo/server.go | 10 ++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/demo/client.go b/demo/client.go index 8ca6bca..0b1b512 100644 --- a/demo/client.go +++ b/demo/client.go @@ -16,12 +16,14 @@ import ( func main() { var cAlg string var hAlg string + var server string flag.StringVar(&cAlg, "c", "C_AES_256", "cipher [\"C_AES_256\" | \"C_TWOFISH_128\" | \"C_BLOWFISH_64\"]") flag.StringVar(&hAlg, "h", "H_SHA256", "hmac [\"H_SHA256\"]") + flag.StringVar(&server, "s", "localhost:2000", "server hostname/address[:port]") flag.Parse() - conn, err := hkex.Dial("tcp", "localhost:2000", cAlg, hAlg) + conn, err := hkex.Dial("tcp", server, cAlg, hAlg) if err != nil { // handle error fmt.Println("Err!") diff --git a/demo/server.go b/demo/server.go index 180f911..99ccade 100644 --- a/demo/server.go +++ b/demo/server.go @@ -1,6 +1,7 @@ package main import ( + "flag" "fmt" "log" "time" @@ -14,15 +15,20 @@ import ( // Listener and Conns. The KEx and encrypt/decrypt is done within the type. // Compare to 'serverp.go' in this directory to see the equivalence. func main() { + var laddr string + + flag.StringVar(&laddr, "l", ":2000", "interface[:port] to listen") + flag.Parse() + // Listen on TCP port 2000 on all available unicast and // anycast IP addresses of the local system. - l, err := hkex.Listen("tcp", ":2000") + l, err := hkex.Listen("tcp", laddr) if err != nil { log.Fatal(err) } defer l.Close() - fmt.Println("Serving on port 2000") + fmt.Println("Serving on", laddr) for { // Wait for a connection. conn, err := l.Accept()