From 642168efe19689e1e4dbad1b0f42f39b0472c0cf Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@gmail.com>
Date: Thu, 16 Jan 2020 09:22:23 -0800
Subject: [PATCH] ipAddrToDottedIP() consistent buffer size

IPv4 + port "XXX.XXX.XXX.XXX:12345" is 4*4 + 5 + 1 == 22

rounding up to 24 for no good reason.
---
 src/remote/abstractResponseHandler.cpp | 2 +-
 src/remote/blockingTCPAcceptor.cpp     | 6 +++---
 src/remote/blockingTCPConnector.cpp    | 4 ++--
 src/remote/codec.cpp                   | 4 ++--
 src/server/responseHandlers.cpp        | 2 +-
 src/server/serverContext.cpp           | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/remote/abstractResponseHandler.cpp b/src/remote/abstractResponseHandler.cpp
index f2d5f2d..f2ef79f 100644
--- a/src/remote/abstractResponseHandler.cpp
+++ b/src/remote/abstractResponseHandler.cpp
@@ -36,7 +36,7 @@ void ResponseHandler::handleResponse(osiSockAddr* responseFrom,
         Transport::shared_pointer const & transport, int8 version, int8 command,
         size_t payloadSize, ByteBuffer* payloadBuffer) {
     if(_debugLevel >= 3) {   // TODO make a constant of sth (0 - off, 1 - debug, 2 - more/trace, 3 - messages)
-        char ipAddrStr[48];
+        char ipAddrStr[24];
         ipAddrToDottedIP(&responseFrom->ia, ipAddrStr, sizeof(ipAddrStr));
 
         std::cerr<<"Message [0x"<<std::hex<<(int)command<<", v0x"<<std::hex
diff --git a/src/remote/blockingTCPAcceptor.cpp b/src/remote/blockingTCPAcceptor.cpp
index 48edb02..a95a4fe 100644
--- a/src/remote/blockingTCPAcceptor.cpp
+++ b/src/remote/blockingTCPAcceptor.cpp
@@ -47,7 +47,7 @@ BlockingTCPAcceptor::~BlockingTCPAcceptor() {
 
 int BlockingTCPAcceptor::initialize() {
 
-    char ipAddrStr[48];
+    char ipAddrStr[24];
     ipAddrToDottedIP(&_bindAddress.ia, ipAddrStr, sizeof(ipAddrStr));
 
     int tryCount = 0;
@@ -133,7 +133,7 @@ int BlockingTCPAcceptor::initialize() {
 
 void BlockingTCPAcceptor::run() {
     // rise level if port is assigned dynamically
-    char ipAddrStr[48];
+    char ipAddrStr[24];
     ipAddrToDottedIP(&_bindAddress.ia, ipAddrStr, sizeof(ipAddrStr));
     LOG(logLevelDebug, "Accepting connections at %s.", ipAddrStr);
 
@@ -240,7 +240,7 @@ void BlockingTCPAcceptor::destroy() {
     }
 
     if(sock!=INVALID_SOCKET) {
-        char ipAddrStr[48];
+        char ipAddrStr[24];
         ipAddrToDottedIP(&_bindAddress.ia, ipAddrStr, sizeof(ipAddrStr));
         LOG(logLevelDebug, "Stopped accepting connections at %s.", ipAddrStr);
 
diff --git a/src/remote/blockingTCPConnector.cpp b/src/remote/blockingTCPConnector.cpp
index ddd31de..b2b879d 100644
--- a/src/remote/blockingTCPConnector.cpp
+++ b/src/remote/blockingTCPConnector.cpp
@@ -33,7 +33,7 @@ BlockingTCPConnector::BlockingTCPConnector(
 
 SOCKET BlockingTCPConnector::tryConnect(osiSockAddr& address, int tries) {
 
-    char strBuffer[64];
+    char strBuffer[24];
     ipAddrToDottedIP(&address.ia, strBuffer, sizeof(strBuffer));
 
     for(int tryCount = 0; tryCount<tries; tryCount++) {
@@ -75,7 +75,7 @@ Transport::shared_pointer BlockingTCPConnector::connect(std::tr1::shared_ptr<Cli
 
     SOCKET socket = INVALID_SOCKET;
 
-    char ipAddrStr[64];
+    char ipAddrStr[24];
     ipAddrToDottedIP(&address.ia, ipAddrStr, sizeof(ipAddrStr));
 
     Context::shared_pointer context = _context.lock();
diff --git a/src/remote/codec.cpp b/src/remote/codec.cpp
index 138aba6..69fa37b 100644
--- a/src/remote/codec.cpp
+++ b/src/remote/codec.cpp
@@ -1264,7 +1264,7 @@ BlockingTCPTransportCodec::BlockingTCPTransportCodec(bool serverFlag, const Cont
             errStr);
         _socketName = "<unknown>:0";
     } else {
-        char ipAddrStr[64];
+        char ipAddrStr[24];
         ipAddrToDottedIP(&_socketAddress.ia, ipAddrStr, sizeof(ipAddrStr));
         _socketName = ipAddrStr;
     }
@@ -1395,7 +1395,7 @@ void BlockingTCPTransportCodec::authNZMessage(epics::pvData::PVStructure::shared
         sess->messageReceived(data);
     else
     {
-        char ipAddrStr[48];
+        char ipAddrStr[24];
         ipAddrToDottedIP(&_socketAddress.ia, ipAddrStr, sizeof(ipAddrStr));
         LOG(logLevelWarn, "authNZ message received from '%s' but no security plug-in session active.", ipAddrStr);
     }
diff --git a/src/server/responseHandlers.cpp b/src/server/responseHandlers.cpp
index 4479d60..6534f1e 100644
--- a/src/server/responseHandlers.cpp
+++ b/src/server/responseHandlers.cpp
@@ -92,7 +92,7 @@ void ServerBadResponse::handleResponse(osiSockAddr* responseFrom,
     AbstractServerResponseHandler::handleResponse(responseFrom,
             transport, version, command, payloadSize, payloadBuffer);
 
-    char ipAddrStr[48];
+    char ipAddrStr[24];
     ipAddrToDottedIP(&responseFrom->ia, ipAddrStr, sizeof(ipAddrStr));
 
     LOG(logLevelInfo,
diff --git a/src/server/serverContext.cpp b/src/server/serverContext.cpp
index d8126cc..82151e9 100644
--- a/src/server/serverContext.cpp
+++ b/src/server/serverContext.cpp
@@ -223,7 +223,7 @@ ServerContextImpl::getCurrentConfig()
 #define SET(K, V) B.add(K, V);
 
     {
-        char buf[50];
+        char buf[24];
         ipAddrToDottedIP(&_ifaceAddr.ia, buf, sizeof(buf));
         buf[sizeof(buf)-1] = '\0';
         SET("EPICS_PVAS_INTF_ADDR_LIST", buf);