From cec4f4e24bbd29606d99e4cca4802f00adc5a7e3 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Fri, 20 Oct 2017 14:12:49 -0500 Subject: [PATCH] Unify rsrv socket errors, add missing error string --- src/ioc/rsrv/camsgtask.c | 2 +- src/ioc/rsrv/caserverio.c | 6 +++--- src/ioc/rsrv/caservertask.c | 15 ++++++++------- src/ioc/rsrv/cast_server.c | 2 +- src/ioc/rsrv/online_notify.c | 4 ++-- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/ioc/rsrv/camsgtask.c b/src/ioc/rsrv/camsgtask.c index e2a0d3e18..04a7e780e 100644 --- a/src/ioc/rsrv/camsgtask.c +++ b/src/ioc/rsrv/camsgtask.c @@ -59,7 +59,7 @@ void camsgtask ( void *pParm ) epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); - errlogPrintf("CAS: ioctl error - %s\n", + errlogPrintf("CAS: FIONREAD error: %s\n", sockErrBuf); cas_send_bs_msg(client, TRUE); } diff --git a/src/ioc/rsrv/caserverio.c b/src/ioc/rsrv/caserverio.c index 7250ae6db..20a1c1c5b 100644 --- a/src/ioc/rsrv/caserverio.c +++ b/src/ioc/rsrv/caserverio.c @@ -114,7 +114,7 @@ void cas_send_bs_msg ( struct client *pclient, int lock_needed ) char sockErrBuf[64]; epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); - errlogPrintf ( "CAS: TCP send to %s failed - %s\n", + errlogPrintf ( "CAS: TCP send to %s failed: %s\n", buf, sockErrBuf); } pclient->disconnect = TRUE; @@ -140,7 +140,7 @@ void cas_send_bs_msg ( struct client *pclient, int lock_needed ) char sockErrBuf[64]; epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); - errlogPrintf ("CAS: Socket shutdown error - %s\n", + errlogPrintf ("CAS: Socket shutdown error: %s\n", sockErrBuf ); } } @@ -218,7 +218,7 @@ void cas_send_dg_msg ( struct client * pclient ) epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); ipAddrToDottedIP ( &pclient->addr, buf, sizeof(buf) ); - errlogPrintf( "CAS: UDP send to %s failed - %s\n", + errlogPrintf( "CAS: UDP send to %s failed: %s\n", buf, sockErrBuf); } diff --git a/src/ioc/rsrv/caservertask.c b/src/ioc/rsrv/caservertask.c index fda442168..80310a422 100644 --- a/src/ioc/rsrv/caservertask.c +++ b/src/ioc/rsrv/caservertask.c @@ -71,7 +71,7 @@ static void req_server (void *pParm) char sockErrBuf[64]; epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); - errlogPrintf ( "CAS: Listen error %s\n", + errlogPrintf ( "CAS: Listen error: %s\n", sockErrBuf ); epicsSocketDestroy (IOC_sock); epicsThreadSuspendSelf (); @@ -93,7 +93,7 @@ static void req_server (void *pParm) char sockErrBuf[64]; epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); - errlogPrintf("CAS: Client accept error was \"%s\"\n", + errlogPrintf("CAS: Client accept error: %s\n", sockErrBuf ); epicsThreadSleep(15.0); continue; @@ -138,7 +138,7 @@ int tryBind(SOCKET sock, const osiSockAddr* addr, const char *name) { epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); - errlogPrintf ( "CAS: %s bind error: \"%s\"\n", + errlogPrintf ( "CAS: %s bind error: %s\n", name, sockErrBuf ); epicsThreadSuspendSelf (); } @@ -203,7 +203,7 @@ SOCKET* rsrv_grab_tcp(unsigned short *port) char sockErrBuf[64]; epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); - errlogPrintf ( "CAS: getsockname error was \"%s\"\n", + errlogPrintf ( "CAS: getsockname error: %s\n", sockErrBuf ); epicsThreadSuspendSelf (); ok = 0; @@ -242,7 +242,7 @@ SOCKET* rsrv_grab_tcp(unsigned short *port) epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); ipAddrToDottedIP(&scratch.ia, name, sizeof(name)); - cantProceed( "CAS: Socket bind %s error was %s\n", + cantProceed( "CAS: Socket bind %s error: %s\n", name, sockErrBuf ); } ok = 0; @@ -314,7 +314,8 @@ void rsrv_build_addr_lists(void) char sockErrBuf[64]; epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); - errlogPrintf("rsrv: failed to set mcast loopback\n"); + errlogPrintf("CAS: failed to set mcast loopback: %s\n", + sockErrBuf); } } #endif @@ -639,7 +640,7 @@ int rsrv_init (void) epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); ipAddrToDottedIP (&temp, name, sizeof(name)); - fprintf(stderr, "CAS: Socket mcast join %s to %s failed with \"%s\"\n", + errlogPrintf("CAS: Socket mcast join %s to %s failed: %s\n", ifaceName, name, sockErrBuf ); } } diff --git a/src/ioc/rsrv/cast_server.c b/src/ioc/rsrv/cast_server.c index b6bed8484..74add9fb4 100644 --- a/src/ioc/rsrv/cast_server.c +++ b/src/ioc/rsrv/cast_server.c @@ -176,7 +176,7 @@ void cast_server(void *pParm) char sockErrBuf[64]; epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); - epicsPrintf ("CAS: UDP recv error (errno=%s)\n", + epicsPrintf ("CAS: UDP recv error: %s\n", sockErrBuf); epicsThreadSleep(1.0); } diff --git a/src/ioc/rsrv/online_notify.c b/src/ioc/rsrv/online_notify.c index d1d557943..b2547c464 100644 --- a/src/ioc/rsrv/online_notify.c +++ b/src/ioc/rsrv/online_notify.c @@ -87,8 +87,8 @@ void rsrv_online_notify_task(void *pParm) char sockErrBuf[64]; epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); ipAddrToDottedIP (&pAddr->addr.ia, buf, sizeof(buf)); - errlogPrintf ( "%s: CA beacon (send to \"%s\") error was \"%s\"\n", - __FILE__, buf, sockErrBuf); + errlogPrintf ( "CAS: CA beacon send to %s error: %s\n", + buf, sockErrBuf); } else { assert (status == sizeof(msg));