From c149f17cc2712855d321a81cad18aa4ea7549f7c Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Thu, 24 Apr 2003 16:44:45 +0000 Subject: [PATCH] convertSocketErrorToString => epicsSocketConvertErrnoToString --- src/ca/ca_client_context.cpp | 8 ++++---- src/ca/casw.cpp | 10 +++++----- src/ca/repeater.cpp | 16 ++++++++-------- src/ca/udpiiu.cpp | 16 ++++++++-------- src/cas/io/bsdSocket/casDGIntfIO.cc | 18 +++++++++--------- src/cas/io/bsdSocket/casIntfIO.cc | 14 +++++++------- src/cas/io/bsdSocket/casStreamIO.cc | 14 +++++++------- src/rsrv/camsgtask.c | 2 +- src/rsrv/caserverio.c | 4 ++-- src/rsrv/caservertask.c | 8 ++++---- src/rsrv/cast_server.c | 8 ++++---- src/rsrv/online_notify.c | 6 +++--- src/util/iocLogServer.c | 16 ++++++++-------- 13 files changed, 70 insertions(+), 70 deletions(-) diff --git a/src/ca/ca_client_context.cpp b/src/ca/ca_client_context.cpp index d587e4d7a..cc6ddf44f 100644 --- a/src/ca/ca_client_context.cpp +++ b/src/ca/ca_client_context.cpp @@ -49,7 +49,7 @@ ca_client_context::ca_client_context ( bool enablePreemptiveCallback ) : this->sock = socket ( AF_INET, SOCK_DGRAM, IPPROTO_UDP ); if ( this->sock == INVALID_SOCKET ) { char sockErrBuf[64]; - convertSocketErrorToString ( sockErrBuf, sizeof ( sockErrBuf ) ); + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); this->printf ( "ca_client_context: unable to create " "datagram socket because = \"%s\"\n", @@ -63,7 +63,7 @@ ca_client_context::ca_client_context ( bool enablePreemptiveCallback ) : FIONBIO, & yes); if ( status < 0 ) { char sockErrBuf[64]; - convertSocketErrorToString ( sockErrBuf, sizeof ( sockErrBuf ) ); + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); socket_close ( this->sock ); this->printf ( "%s: non blocking IO set fail because \"%s\"\n", @@ -83,7 +83,7 @@ ca_client_context::ca_client_context ( bool enablePreemptiveCallback ) : int status = bind (this->sock, &addr.sa, sizeof (addr) ); if ( status < 0 ) { char sockErrBuf[64]; - convertSocketErrorToString ( sockErrBuf, sizeof ( sockErrBuf ) ); + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); socket_close (this->sock); this->printf ( "CAC: unable to bind to an unconstrained " @@ -99,7 +99,7 @@ ca_client_context::ca_client_context ( bool enablePreemptiveCallback ) : int status = getsockname ( this->sock, & tmpAddr.sa, & saddr_length ); if ( status < 0 ) { char sockErrBuf[64]; - convertSocketErrorToString ( sockErrBuf, sizeof ( sockErrBuf ) ); + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); socket_close ( this->sock ); this->printf ( "CAC: getsockname () error was \"%s\"\n", sockErrBuf ); throwWithLocation ( noSocket () ); diff --git a/src/ca/casw.cpp b/src/ca/casw.cpp index f8e2a553a..a7718a686 100644 --- a/src/ca/casw.cpp +++ b/src/ca/casw.cpp @@ -103,7 +103,7 @@ int main ( int argc, char ** argv ) sock = socket ( AF_INET, SOCK_DGRAM, IPPROTO_UDP ); if ( sock == INVALID_SOCKET ) { char sockErrBuf[64]; - convertSocketErrorToString ( + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); errlogPrintf ("casw: unable to create datagram socket because = \"%s\"\n", sockErrBuf ); @@ -117,7 +117,7 @@ int main ( int argc, char ** argv ) status = bind ( sock, &addr.sa, sizeof (addr) ); if ( status < 0 ) { char sockErrBuf[64]; - convertSocketErrorToString ( + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); socket_close ( sock ); errlogPrintf ( "casw: unable to bind to an unconstrained address because = \"%s\"\n", @@ -129,7 +129,7 @@ int main ( int argc, char ** argv ) status = socket_ioctl ( sock, FIONBIO, &yes ); // X aCC 392 if ( status < 0 ) { char sockErrBuf[64]; - convertSocketErrorToString ( + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); socket_close ( sock ); errlogPrintf ( "casw: unable to set socket to nonblocking state because \"%s\"\n", @@ -163,7 +163,7 @@ int main ( int argc, char ** argv ) status = socket_ioctl ( sock, FIONBIO, &no ); // X aCC 392 if ( status < 0 ) { char sockErrBuf[64]; - convertSocketErrorToString ( + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); socket_close ( sock ); errlogPrintf ( "casw: unable to set socket to blocking state because \"%s\"\n", @@ -179,7 +179,7 @@ int main ( int argc, char ** argv ) &addr.sa, &addrSize ); if ( status <= 0 ) { char sockErrBuf[64]; - convertSocketErrorToString ( + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); socket_close ( sock ); errlogPrintf ("casw: error from recv was = \"%s\"\n", diff --git a/src/ca/repeater.cpp b/src/ca/repeater.cpp index 94176196c..481d61cee 100644 --- a/src/ca/repeater.cpp +++ b/src/ca/repeater.cpp @@ -160,7 +160,7 @@ bool repeaterClient::connect () if ( ! makeSocket ( PORT_ANY, false, & this->sock ) ) { char sockErrBuf[64]; - convertSocketErrorToString ( + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); fprintf ( stderr, "%s: no client sock because \"%s\"\n", __FILE__, sockErrBuf ); @@ -170,7 +170,7 @@ bool repeaterClient::connect () status = ::connect ( this->sock, &this->from.sa, sizeof ( this->from.sa ) ); if ( status < 0 ) { char sockErrBuf[64]; - convertSocketErrorToString ( + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); fprintf ( stderr, "%s: unable to connect client sock because \"%s\"\n", __FILE__, sockErrBuf ); @@ -199,7 +199,7 @@ bool repeaterClient::sendConfirm () // X aCC 361 } else { char sockErrBuf[64]; - convertSocketErrorToString ( + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); debugPrintf ( ( "CA Repeater: confirm req err was \"%s\"\n", sockErrBuf) ); return false; @@ -223,7 +223,7 @@ bool repeaterClient::sendMessage ( const void *pBuf, unsigned bufSize ) // X aCC } else { char sockErrBuf[64]; - convertSocketErrorToString ( sockErrBuf, sizeof ( sockErrBuf ) ); + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); debugPrintf ( ( "CA Repeater: UDP send err was \"%s\"\n", sockErrBuf) ); } return false; @@ -309,7 +309,7 @@ bool repeaterClient::verify () // X aCC 361 */ if ( SOCKERRNO != SOCK_EADDRINUSE ) { char sockErrBuf[64]; - convertSocketErrorToString ( + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); fprintf ( stderr, "CA Repeater: bind test err was \"%s\"\n", sockErrBuf ); @@ -391,7 +391,7 @@ static void register_new_client ( osiSockAddr & from, SOCKET sock; if ( ! makeSocket ( PORT_ANY, true, & sock ) ) { char sockErrBuf[64]; - convertSocketErrorToString ( + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); fprintf ( stderr, "%s: Unable to create repeater bind test socket because \"%s\"\n", __FILE__, sockErrBuf ); @@ -517,7 +517,7 @@ void ca_repeater () exit (0); } char sockErrBuf[64]; - convertSocketErrorToString ( + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); fprintf ( stderr, "%s: Unable to create repeater socket because \"%s\" - fatal\n", __FILE__, sockErrBuf ); @@ -543,7 +543,7 @@ void ca_repeater () continue; } char sockErrBuf[64]; - convertSocketErrorToString ( + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); fprintf ( stderr, "CA Repeater: unexpected UDP recv err: %s\n", sockErrBuf ); diff --git a/src/ca/udpiiu.cpp b/src/ca/udpiiu.cpp index 95359f18a..214814fb0 100644 --- a/src/ca/udpiiu.cpp +++ b/src/ca/udpiiu.cpp @@ -106,7 +106,7 @@ udpiiu::udpiiu ( epicsTimerQueueActive & timerQueue, callbackMutex & cbMutex, ca this->sock = socket ( AF_INET, SOCK_DGRAM, IPPROTO_UDP ); if ( this->sock == INVALID_SOCKET ) { char sockErrBuf[64]; - convertSocketErrorToString ( + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); this->printf ("CAC: unable to create datagram socket because = \"%s\"\n", sockErrBuf ); @@ -117,7 +117,7 @@ udpiiu::udpiiu ( epicsTimerQueueActive & timerQueue, callbackMutex & cbMutex, ca (char *) &boolValue, sizeof ( boolValue ) ); if ( status < 0 ) { char sockErrBuf[64]; - convertSocketErrorToString ( + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); this->printf ("CAC: IP broadcasting enable failed because = \"%s\"\n", sockErrBuf ); @@ -136,7 +136,7 @@ udpiiu::udpiiu ( epicsTimerQueueActive & timerQueue, callbackMutex & cbMutex, ca (char *)&size, sizeof (size) ); if (status<0) { char sockErrBuf[64]; - convertSocketErrorToString ( sockErrBuf, sizeof ( sockErrBuf ) ); + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); this->printf ( "CAC: unable to set socket option SO_RCVBUF because \"%s\"\n", sockErrBuf ); } @@ -152,7 +152,7 @@ udpiiu::udpiiu ( epicsTimerQueueActive & timerQueue, callbackMutex & cbMutex, ca status = bind (this->sock, &addr.sa, sizeof (addr) ); if ( status < 0 ) { char sockErrBuf[64]; - convertSocketErrorToString ( + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); socket_close (this->sock); this->printf ( "CAC: unable to bind to an unconstrained address because = \"%s\"\n", @@ -166,7 +166,7 @@ udpiiu::udpiiu ( epicsTimerQueueActive & timerQueue, callbackMutex & cbMutex, ca status = getsockname ( this->sock, &tmpAddr.sa, &saddr_length ); if ( status < 0 ) { char sockErrBuf[64]; - convertSocketErrorToString ( + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); socket_close ( this->sock ); this->printf ( "CAC: getsockname () error was \"%s\"\n", sockErrBuf ); @@ -290,7 +290,7 @@ void udpiiu::recvMsg ( callbackMutex & cbMutex ) return; } char sockErrBuf[64]; - convertSocketErrorToString ( + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); this->printf ( "CAC: UDP recv error was \"%s\"\n", sockErrBuf ); @@ -435,7 +435,7 @@ void epicsShareAPI caRepeaterRegistrationMessage ( errnoCpy != SOCK_ECONNREFUSED && errnoCpy != SOCK_ECONNRESET ) { char sockErrBuf[64]; - convertSocketErrorToString ( + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); fprintf ( stderr, "error sending registration message to CA repeater daemon was \"%s\"\n", sockErrBuf ); @@ -916,7 +916,7 @@ void udpiiu::datagramFlush ( const epicsTime & currentTime ) char buf[64]; sockAddrToDottedIP ( &pNode->addr.sa, buf, sizeof ( buf ) ); char sockErrBuf[64]; - convertSocketErrorToString ( + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); this->printf ( "CAC: error = \"%s\" sending UDP msg to %s\n", diff --git a/src/cas/io/bsdSocket/casDGIntfIO.cc b/src/cas/io/bsdSocket/casDGIntfIO.cc index 127c9f1c8..b05ee6a9a 100644 --- a/src/cas/io/bsdSocket/casDGIntfIO.cc +++ b/src/cas/io/bsdSocket/casDGIntfIO.cc @@ -128,7 +128,7 @@ casDGIntfIO::casDGIntfIO ( caServerI & serverIn, clientBufMemoryManager & memMgr char buf[64]; ipAddrToA ( &serverAddr.ia, buf, sizeof ( buf ) ); char sockErrBuf[64]; - convertSocketErrorToString ( sockErrBuf, sizeof ( sockErrBuf ) ); + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); errPrintf ( S_cas_bindFail, __FILE__, __LINE__, "- bind UDP IP addr=%s failed because %s", buf, sockErrBuf ); socket_close (this->sock); @@ -218,7 +218,7 @@ casDGIntfIO::casDGIntfIO ( caServerI & serverIn, clientBufMemoryManager & memMgr char buf[64]; ipAddrToA ( & serverBCastAddr.ia, buf, sizeof ( buf ) ); char sockErrBuf[64]; - convertSocketErrorToString ( sockErrBuf, sizeof ( sockErrBuf ) ); + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); errPrintf ( S_cas_bindFail, __FILE__, __LINE__, "- bind UDP IP addr=%s failed because %s", buf, sockErrBuf ); @@ -288,7 +288,7 @@ void casDGIntfIO::xSetNonBlocking() status = socket_ioctl(this->sock, FIONBIO, &yes); // X aCC 392 if (status<0) { char sockErrBuf[64]; - convertSocketErrorToString ( sockErrBuf, sizeof ( sockErrBuf ) ); + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); errlogPrintf ( "%s:CAS: UDP non blocking IO set fail because \"%s\"\n", __FILE__, sockErrBuf ); } @@ -317,7 +317,7 @@ casDGIntfIO::osdRecv ( char * pBufIn, bufSizeT size, // X aCC 361 if ( status < 0 ) { if ( SOCKERRNO != SOCK_EWOULDBLOCK ) { char sockErrBuf[64]; - convertSocketErrorToString ( sockErrBuf, sizeof ( sockErrBuf ) ); + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); errlogPrintf ( "CAS: UDP recv error was %s", sockErrBuf ); } } @@ -362,7 +362,7 @@ casDGIntfIO::osdSend ( const char * pBufIn, bufSizeT size, // X aCC 361 char buf[64]; sockAddrToA ( & dest, buf, sizeof ( buf ) ); char sockErrBuf[64]; - convertSocketErrorToString ( sockErrBuf, sizeof ( sockErrBuf ) ); + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); errlogPrintf ( "CAS: UDP socket send to \"%s\" failed because \"%s\"\n", buf, sockErrBuf ); @@ -379,7 +379,7 @@ bufSizeT casDGIntfIO::incomingBytesPresent () const // X aCC 361 status = socket_ioctl ( this->sock, FIONREAD, & nchars ); // X aCC 392 if ( status < 0 ) { char sockErrBuf[64]; - convertSocketErrorToString ( sockErrBuf, sizeof ( sockErrBuf ) ); + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); errlogPrintf ( "CAS: FIONREAD failed because \"%s\"\n", sockErrBuf ); return 0u; @@ -409,7 +409,7 @@ void casDGIntfIO::sendBeaconIO ( char & msg, unsigned length, if (status<0) { ipAddrToDottedIP ( & pAddr->addr.ia, buf, sizeof ( buf ) ); char sockErrBuf[64]; - convertSocketErrorToString ( sockErrBuf, sizeof ( sockErrBuf ) ); + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); errlogPrintf ( "%s: CA beacon routing (connect to \"%s\") error was \"%s\"\n", __FILE__, buf, sockErrBuf ); } @@ -419,7 +419,7 @@ void casDGIntfIO::sendBeaconIO ( char & msg, unsigned length, status = getsockname ( this->beaconSock, &sockAddr.sa, &size ); if ( status < 0 ) { char sockErrBuf[64]; - convertSocketErrorToString ( sockErrBuf, sizeof ( sockErrBuf ) ); + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); errlogPrintf ( "%s: CA beacon routing (getsockname) error was \"%s\"\n", __FILE__, sockErrBuf ); } @@ -430,7 +430,7 @@ void casDGIntfIO::sendBeaconIO ( char & msg, unsigned length, if ( status < 0 ) { ipAddrToA ( &pAddr->addr.ia, buf, sizeof(buf) ); char sockErrBuf[64]; - convertSocketErrorToString ( sockErrBuf, sizeof ( sockErrBuf ) ); + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); errlogPrintf ( "%s: CA beacon (send to \"%s\") error was \"%s\"\n", __FILE__, buf, sockErrBuf ); } diff --git a/src/cas/io/bsdSocket/casIntfIO.cc b/src/cas/io/bsdSocket/casIntfIO.cc index 99f254444..41992f38d 100644 --- a/src/cas/io/bsdSocket/casIntfIO.cc +++ b/src/cas/io/bsdSocket/casIntfIO.cc @@ -52,7 +52,7 @@ casIntfIO::casIntfIO ( const caNetAddr & addrIn ) : this->sock = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP); if (this->sock==INVALID_SOCKET) { char sockErrBuf[64]; - convertSocketErrorToString ( sockErrBuf, sizeof ( sockErrBuf ) ); + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); printf ( "No socket error was %s\n", sockErrBuf ); throw S_cas_noFD; } @@ -74,7 +74,7 @@ casIntfIO::casIntfIO ( const caNetAddr & addrIn ) : sizeof (yes)); if ( status < 0 ) { char sockErrBuf[64]; - convertSocketErrorToString ( sockErrBuf, sizeof ( sockErrBuf ) ); + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); errlogPrintf ( "CAS: server set SO_REUSEADDR failed? %s\n", sockErrBuf ); socket_close (this->sock); @@ -102,7 +102,7 @@ casIntfIO::casIntfIO ( const caNetAddr & addrIn ) : char buf[64]; ipAddrToA (&this->addr, buf, sizeof(buf)); char sockErrBuf[64]; - convertSocketErrorToString ( sockErrBuf, sizeof ( sockErrBuf ) ); + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); errPrintf ( S_cas_bindFail, __FILE__, __LINE__, "- bind TCP IP addr=%s failed because %s", @@ -123,7 +123,7 @@ casIntfIO::casIntfIO ( const caNetAddr & addrIn ) : &addrSize ); if (status) { char sockErrBuf[64]; - convertSocketErrorToString ( sockErrBuf, sizeof ( sockErrBuf ) ); + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); errlogPrintf ( "CAS: getsockname() error %s\n", sockErrBuf ); socket_close (this->sock); @@ -148,7 +148,7 @@ casIntfIO::casIntfIO ( const caNetAddr & addrIn ) : status = listen(this->sock, caServerConnectPendQueueSize); if(status < 0) { char sockErrBuf[64]; - convertSocketErrorToString ( sockErrBuf, sizeof ( sockErrBuf ) ); + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); errlogPrintf ( "CAS: listen() error %s\n", sockErrBuf ); socket_close (this->sock); throw S_cas_internal; @@ -185,7 +185,7 @@ casStreamOS *casIntfIO::newStreamClient ( caServerI & cas, int errnoCpy = SOCKERRNO; if ( errnoCpy != SOCK_EWOULDBLOCK && ! oneMsgFlag ) { char sockErrBuf[64]; - convertSocketErrorToString ( sockErrBuf, sizeof ( sockErrBuf ) ); + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); errlogPrintf ( "CAS: %s accept error \"%s\"\n", __FILE__, sockErrBuf ); oneMsgFlag = true; @@ -229,7 +229,7 @@ void casIntfIO::setNonBlocking() status = socket_ioctl(this->sock, FIONBIO, &yes); // X aCC 392 if ( status < 0 ) { char sockErrBuf[64]; - convertSocketErrorToString ( sockErrBuf, sizeof ( sockErrBuf ) ); + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); errlogPrintf ( "%s:CAS: server non blocking IO set fail because \"%s\"\n", __FILE__, sockErrBuf ); diff --git a/src/cas/io/bsdSocket/casStreamIO.cc b/src/cas/io/bsdSocket/casStreamIO.cc index daf02dddc..021b9efa4 100644 --- a/src/cas/io/bsdSocket/casStreamIO.cc +++ b/src/cas/io/bsdSocket/casStreamIO.cc @@ -32,7 +32,7 @@ casStreamIO::casStreamIO ( caServerI & cas, clientBufMemoryManager & bufMgr, ( char * ) & yes, sizeof ( yes ) ); if ( status < 0 ) { char sockErrBuf[64]; - convertSocketErrorToString ( sockErrBuf, sizeof ( sockErrBuf ) ); + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); errlogPrintf ( "CAS: %s TCP_NODELAY option set failed %s\n", __FILE__, sockErrBuf ); @@ -47,7 +47,7 @@ casStreamIO::casStreamIO ( caServerI & cas, clientBufMemoryManager & bufMgr, (char *) & yes, sizeof ( yes ) ); if (status<0) { char sockErrBuf[64]; - convertSocketErrorToString ( sockErrBuf, sizeof ( sockErrBuf ) ); + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); errlogPrintf ( "CAS: %s SO_KEEPALIVE option set failed %s\n", __FILE__, sockErrBuf ); @@ -130,7 +130,7 @@ outBufClient::flushCondition casStreamIO::osdSend ( const char *pInBuf, bufSizeT char buf[64]; ipAddrToA (&this->addr, buf, sizeof(buf)); char sockErrBuf[64]; - convertSocketErrorToString ( sockErrBuf, sizeof ( sockErrBuf ) ); + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); errlogPrintf ( "CAS: TCP socket send to \"%s\" failed because \"%s\"\n", buf, sockErrBuf ); @@ -171,7 +171,7 @@ casStreamIO::osdRecv ( char * pInBuf, bufSizeT nBytes, // X aCC 361 myerrno != SOCK_ETIMEDOUT ) { ipAddrToA (&this->addr, buf, sizeof(buf)); char sockErrBuf[64]; - convertSocketErrorToString ( sockErrBuf, sizeof ( sockErrBuf ) ); + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); errlogPrintf( "CAS: client %s disconnected because \"%s\"\n", buf, sockErrBuf ); @@ -193,7 +193,7 @@ void casStreamIO::forceDisconnect () int status = ::shutdown ( this->sock, SHUT_RDWR ); if ( status ) { char sockErrBuf[64]; - convertSocketErrorToString ( sockErrBuf, sizeof ( sockErrBuf ) ); + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); errlogPrintf ("CAC TCP socket shutdown error was %s\n", sockErrBuf ); } @@ -229,7 +229,7 @@ void casStreamIO::xSetNonBlocking() } else { char sockErrBuf[64]; - convertSocketErrorToString ( sockErrBuf, sizeof ( sockErrBuf ) ); + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); errlogPrintf ( "%s:CAS: TCP non blocking IO set fail because \"%s\"\n", __FILE__, sockErrBuf ); throw S_cas_internal; @@ -260,7 +260,7 @@ bufSizeT casStreamIO::incomingBytesPresent () const // X aCC 361 char buf[64]; ipAddrToA ( &this->addr, buf, sizeof(buf) ); char sockErrBuf[64]; - convertSocketErrorToString ( sockErrBuf, sizeof ( sockErrBuf ) ); + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); errlogPrintf ("CAS: FIONREAD for %s failed because \"%s\"\n", buf, sockErrBuf ); } diff --git a/src/rsrv/camsgtask.c b/src/rsrv/camsgtask.c index c57a854df..b8099f3e0 100644 --- a/src/rsrv/camsgtask.c +++ b/src/rsrv/camsgtask.c @@ -131,7 +131,7 @@ void camsgtask ( void *pParm ) status = socket_ioctl (client->sock, FIONREAD, &nchars); if (status < 0) { char sockErrBuf[64]; - convertSocketErrorToString ( + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); errlogPrintf("CAS: io ctl err - %s\n", sockErrBuf); diff --git a/src/rsrv/caserverio.c b/src/rsrv/caserverio.c index 00f2656eb..4d9dcaa78 100644 --- a/src/rsrv/caserverio.c +++ b/src/rsrv/caserverio.c @@ -89,7 +89,7 @@ void cas_send_bs_msg ( struct client *pclient, int lock_needed ) anerrno!=SOCK_ETIMEDOUT)|| CASDEBUG>2){ char sockErrBuf[64]; - convertSocketErrorToString ( + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); errlogPrintf ( "CAS: TCP send to \"%s\" failed because \"%s\"\n", @@ -160,7 +160,7 @@ void cas_send_dg_msg ( struct client * pclient ) else { char sockErrBuf[64]; char buf[128]; - convertSocketErrorToString ( + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); ipAddrToDottedIP ( &pclient->addr, buf, sizeof(buf) ); errlogPrintf( diff --git a/src/rsrv/caservertask.c b/src/rsrv/caservertask.c index a13723582..425938a1e 100644 --- a/src/rsrv/caservertask.c +++ b/src/rsrv/caservertask.c @@ -108,7 +108,7 @@ LOCAL void req_server (void *pParm) (char *) &flag, sizeof (flag) ); if ( status < 0 ) { char sockErrBuf[64]; - convertSocketErrorToString ( + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); errlogPrintf ( "%s: set socket option SO_REUSEADDR failed because \"%s\"\n", @@ -138,7 +138,7 @@ LOCAL void req_server (void *pParm) } if ( status < 0 ) { char sockErrBuf[64]; - convertSocketErrorToString ( + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); errlogPrintf ( "CAS: Socket bind error was \"%s\"\n", sockErrBuf ); @@ -155,7 +155,7 @@ LOCAL void req_server (void *pParm) (struct sockaddr *)&serverAddr, &addrSize); if ( status ) { char sockErrBuf[64]; - convertSocketErrorToString ( + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); errlogPrintf ( "CAS: getsockname() error %s\n", sockErrBuf ); @@ -198,7 +198,7 @@ LOCAL void req_server (void *pParm) if ( ( clientSock = accept ( IOC_sock, &sockAddr, &addLen ) ) == INVALID_SOCKET ) { char sockErrBuf[64]; - convertSocketErrorToString ( + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); errlogPrintf("CAS: Client accept error was \"%s\"\n", sockErrBuf ); diff --git a/src/rsrv/cast_server.c b/src/rsrv/cast_server.c index 01599fc58..bd5c7cd7f 100644 --- a/src/rsrv/cast_server.c +++ b/src/rsrv/cast_server.c @@ -182,7 +182,7 @@ void cast_server(void *pParm) (char *) &flag, sizeof (flag) ); if ( status < 0 ) { char sockErrBuf[64]; - convertSocketErrorToString ( + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); errlogPrintf ( "%s: set socket option SO_REUSEADDR failed because \"%s\"\n", @@ -199,7 +199,7 @@ void cast_server(void *pParm) /* get server's Internet address */ if( bind(IOC_cast_sock, (struct sockaddr *)&sin, sizeof (sin)) < 0){ char sockErrBuf[64]; - convertSocketErrorToString ( + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); epicsPrintf ("CAS: UDP server port bind error was \"%s\"\n", sockErrBuf ); socket_close (IOC_cast_sock); @@ -211,7 +211,7 @@ void cast_server(void *pParm) (char *)&flag, sizeof (flag) ); if ( status < 0 ) { char sockErrBuf[64]; - convertSocketErrorToString ( + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); errlogPrintf ( "%s: set socket option SO_REUSEADDR failed because \"%s\"\n", @@ -260,7 +260,7 @@ void cast_server(void *pParm) &recv_addr_size); if (status<0) { char sockErrBuf[64]; - convertSocketErrorToString ( + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); epicsPrintf ("CAS: UDP recv error (errno=%s)\n", sockErrBuf); diff --git a/src/rsrv/online_notify.c b/src/rsrv/online_notify.c index f39c48b65..de0d172fb 100644 --- a/src/rsrv/online_notify.c +++ b/src/rsrv/online_notify.c @@ -210,7 +210,7 @@ void rsrv_online_notify_task(void *pParm) status = connect (sock, &pNode->addr.sa, sizeof(pNode->addr.sa)); if (status<0) { char sockErrBuf[64]; - convertSocketErrorToString ( + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); ipAddrToDottedIP (&pNode->addr.ia, buf, sizeof(buf)); errlogPrintf ( "%s: CA beacon routing (connect to \"%s\") error was \"%s\"\n", @@ -223,7 +223,7 @@ void rsrv_online_notify_task(void *pParm) status = getsockname (sock, (struct sockaddr *) &if_addr, &size); if (status<0) { char sockErrBuf[64]; - convertSocketErrorToString ( sockErrBuf, sizeof ( sockErrBuf ) ); + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); errlogPrintf ( "%s: CA beacon routing (getsockname) error was \"%s\"\n", __FILE__, sockErrBuf); } @@ -235,7 +235,7 @@ void rsrv_online_notify_task(void *pParm) if (status < 0) { char sockErrBuf[64]; ipAddrToDottedIP (&pNode->addr.ia, buf, sizeof(buf)); - convertSocketErrorToString ( sockErrBuf, sizeof ( sockErrBuf ) ); + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); errlogPrintf ( "%s: CA beacon (send to \"%s\") error was \"%s\"\n", __FILE__, buf, sockErrBuf); } diff --git a/src/util/iocLogServer.c b/src/util/iocLogServer.c index ca3e29b90..7d913d194 100644 --- a/src/util/iocLogServer.c +++ b/src/util/iocLogServer.c @@ -131,7 +131,7 @@ int main() pserver->sock = socket(AF_INET, SOCK_STREAM, 0); if (pserver->sock==INVALID_SOCKET) { char sockErrBuf[64]; - convertSocketErrorToString ( sockErrBuf, sizeof ( sockErrBuf ) ); + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); fprintf(stderr, "iocLogServer: sock create err: %s\n", sockErrBuf); return IOCLS_ERROR; } @@ -152,7 +152,7 @@ int main() sizeof(optval)); if(status<0){ char sockErrBuf[64]; - convertSocketErrorToString ( sockErrBuf, sizeof ( sockErrBuf ) ); + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); fprintf(stderr, "iocLogServer: setsockopt err %s\n", sockErrBuf); return IOCLS_ERROR; } @@ -169,7 +169,7 @@ int main() sizeof (serverAddr) ); if (status<0) { char sockErrBuf[64]; - convertSocketErrorToString ( sockErrBuf, sizeof ( sockErrBuf ) ); + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); fprintf(stderr, "iocLogServer: bind err: %s\n", sockErrBuf ); fprintf (stderr, "iocLogServer: a server is already installed on port %u?\n", @@ -181,7 +181,7 @@ int main() status = listen(pserver->sock, 10); if (status<0) { char sockErrBuf[64]; - convertSocketErrorToString ( sockErrBuf, sizeof ( sockErrBuf ) ); + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); fprintf(stderr, "iocLogServer: listen err %s\n", sockErrBuf); return IOCLS_ERROR; } @@ -197,7 +197,7 @@ int main() &optval); if(status<0){ char sockErrBuf[64]; - convertSocketErrorToString ( sockErrBuf, sizeof ( sockErrBuf ) ); + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); fprintf(stderr, "iocLogServer: ioctl FIONBIO err %s\n", sockErrBuf); return IOCLS_ERROR; } @@ -474,7 +474,7 @@ static void acceptNewClient ( void *pParam ) &optval); if(status<0){ char sockErrBuf[64]; - convertSocketErrorToString ( sockErrBuf, sizeof ( sockErrBuf ) ); + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); fprintf(stderr, "%s:%d ioctl FBIO client er %s\n", __FILE__, __LINE__, sockErrBuf); socket_close(pclient->insock); @@ -522,7 +522,7 @@ static void acceptNewClient ( void *pParam ) status = shutdown(pclient->insock, SOCKET_SHUTDOWN_WRITE_SIDE); if(status<0){ char sockErrBuf[64]; - convertSocketErrorToString ( sockErrBuf, sizeof ( sockErrBuf ) ); + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); fprintf (stderr, "%s:%d shutdown err %s\n", __FILE__, __LINE__, sockErrBuf); socket_close(pclient->insock); @@ -579,7 +579,7 @@ static void readFromClient(void *pParam) errnoCpy != SOCK_ETIMEDOUT ) { char sockErrBuf[64]; - convertSocketErrorToString ( sockErrBuf, sizeof ( sockErrBuf ) ); + epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); fprintf(stderr, "%s:%d socket=%d size=%d read error=%s\n", __FILE__, __LINE__, pclient->insock,