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.
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user