epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

sockAddrToDottedIP needs to return the string size

Browse Source
This commit is contained in:
Jeff Hill
2004-10-19 18:21:02 +00:00
parent 1069541aa6
commit 9df773e88f
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/libCom/osi/osiSock.c
View File

@@ -118,19 +118,26 @@ unsigned epicsShareAPI ipAddrToA (
/*
* sockAddrToDottedIP ()
*/
unsigned epicsShareAPI sockAddrToDottedIP
( const struct sockaddr *paddr, char *pBuf, unsigned bufSize )
unsigned epicsShareAPI sockAddrToDottedIP (
const struct sockaddr * paddr, char * pBuf, unsigned bufSize )
{
if ( paddr->sa_family != AF_INET ) {
strncpy ( pBuf, "<Ukn Addr Type>", bufSize - 1 );
/*
* force null termination
*/
pBuf[bufSize-1] = '\0';
const char * pErrStr = "<Ukn Addr Type>";
unsigned errStrLen = strlen ( pErrStr );
if ( errStrLen < bufSize ) {
strcpy ( pBuf, pErrStr );
return errStrLen;
}
else {
unsigned reducedSize = bufSize - 1u;
strncpy ( pBuf, pErrStr, reducedSize );
pBuf[reducedSize] = '\0';
return reducedSize;
}
}
else {
const struct sockaddr_in *paddr_in = ( const struct sockaddr_in * ) paddr;
ipAddrToDottedIP ( paddr_in, pBuf, bufSize );
return ipAddrToDottedIP ( paddr_in, pBuf, bufSize );
}
}