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

rsrv: use SOCKERRNO

Browse Source 
Must use OSI SOCKERRNO for correct handling
of errors w/ winsock
This commit is contained in:
Michael Davidsaver
2016-02-25 11:32:56 -05:00
parent 88b47c021c
commit 7b3a040b34
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/ioc/rsrv/caservertask.c
View File

@@ -137,7 +137,7 @@ int tryBind(SOCKET sock, const osiSockAddr* addr, const char *name)
{
if(bind(sock, (struct sockaddr *) &addr->sa, sizeof(*addr))<0) {
char sockErrBuf[64];
if(errno!=SOCK_EADDRINUSE)
if(SOCKERRNO!=SOCK_EADDRINUSE)
{
epicsSocketConvertErrnoToString (
sockErrBuf, sizeof ( sockErrBuf ) );
@@ -216,8 +216,9 @@ SOCKET* rsrv_grab_tcp(unsigned short *port)
assert(scratch.ia.sin_port!=0);
}
} else {
int errcode = SOCKERRNO;
/* bind fails. React harshly to unexpected errors to avoid an infinite loop */
if(errno==SOCK_EADDRNOTAVAIL) {
if(errcode==SOCK_EADDRNOTAVAIL) {
/* this is not a bind()able address. */
int j;
char name[40];
@@ -237,7 +238,7 @@ SOCKET* rsrv_grab_tcp(unsigned short *port)
/* if SOCK_EADDRINUSE then try again with a different port number.
* otherwise, fail hard
*/
if(errno!=SOCK_EADDRINUSE && errno!=SOCK_EADDRNOTAVAIL) {
if(errcode!=SOCK_EADDRINUSE) {
char name[40];
char sockErrBuf[64];
epicsSocketConvertErrnoToString (