From 508558ca669697a12ad715d082e7027d1b7de0a4 Mon Sep 17 00:00:00 2001
From: Tom Early <n7tae@tearly.net>
Date: Sun, 7 Apr 2019 18:47:16 -0700
Subject: [PATCH] htons missing in class init

---
 SockAddress.h             | 8 ++++----
 TCPReaderWriterClient.cpp | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/SockAddress.h b/SockAddress.h
index 120a9ef..ccbe5d7 100644
--- a/SockAddress.h
+++ b/SockAddress.h
@@ -45,7 +45,7 @@ public:
 		if (AF_INET==family && address) {
 			struct sockaddr_in *addr4 = (struct sockaddr_in *)&addr;
 			addr4->sin_family = AF_INET;
-			addr4->sin_port = port;
+			addr4->sin_port = htons(port);
 			if (*address=='l' || *address =='L')
 				inet_pton(AF_INET, "127.0.0.1", &(addr4->sin_addr));
 			else if (*address=='a' || *address=='A')
@@ -55,7 +55,7 @@ public:
 		} else if (AF_INET6==family && address) {
 			struct sockaddr_in6 *addr6 = (struct sockaddr_in6 *)&addr;
 			addr6->sin6_family = AF_INET6;
-			addr6->sin6_port = port;
+			addr6->sin6_port = htons(port);
 			if (*address=='l' || *address =='L')
 				inet_pton(AF_INET6, "::1", &(addr6->sin6_addr));
 			else if (*address=='a' || *address=='A')
@@ -73,7 +73,7 @@ public:
 		addr.ss_family = (sa_family_t)family;
 		if (AF_INET == family) {
 			struct sockaddr_in *addr4 = (struct sockaddr_in *)&addr;
-			addr4->sin_port = port;
+			addr4->sin_port = htons(port);
 			if (address) {
 				if (*address=='l' || *address=='L')
 					inet_pton(AF_INET, "127.0.0.1", &(addr4->sin_addr));
@@ -84,7 +84,7 @@ public:
 			}
 		} else {
 			struct sockaddr_in6 *addr6 = (struct sockaddr_in6 *)&addr;
-			addr6->sin6_port = port;
+			addr6->sin6_port = htons(port);
 			if (address) {
 				if (*address=='l' || *address=='L')
 					inet_pton(AF_INET6, "::1", &(addr6->sin6_addr));
diff --git a/TCPReaderWriterClient.cpp b/TCPReaderWriterClient.cpp
index b2d4743..7a539f3 100644
--- a/TCPReaderWriterClient.cpp
+++ b/TCPReaderWriterClient.cpp
@@ -80,7 +80,7 @@ bool CTCPReaderWriterClient::Open()
 		// connecting to a server, so we can wait until it's ready
 		s = getaddrinfo(m_address.c_str(), m_port.c_str(), &hints, &res);
 		if (s && s != EAI_AGAIN) {
-			fprintf(stderr, "ERROR: getaddrinfo for %s: %s\n", m_address.c_str(), gai_strerror(s));
+			fprintf(stderr, "ERROR: getaddrinfo of %s: %s\n", m_address.c_str(), gai_strerror(s));
 			return true;
 		}
 		std::this_thread::sleep_for(std::chrono::seconds(3));
@@ -98,7 +98,7 @@ bool CTCPReaderWriterClient::Open()
 		} else {
 			char buf[INET6_ADDRSTRLEN];
 			if (inet_ntop(rp->ai_family, rp->ai_addr, buf, INET6_ADDRSTRLEN))
-				fprintf(stderr, "Successfully connected %s to %s:%s\n", m_address.c_str(), buf, m_port.c_str());
+				fprintf(stderr, "Successfully connected to %s at %s on port %s\n", m_address.c_str(), buf, m_port.c_str());
 			break;
 		}
 	}