Add a class method to cac for creating sockets

When EPICS_CAC_AVOID_LOW_FDS exists in the environment, all client socket fds are renumbered to above FD_SETSIZE, allowing the client library to play nice with applications like the CA gateway which use select() for their own sockets.
anjohnson · Jan 15, 2025 · 3047681 · 3047681
1 parent 8cfde70
commit 3047681
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 4 deletions.
diff --git a/modules/ca/src/client/ca_client_context.cpp b/modules/ca/src/client/ca_client_context.cpp
@@ -87,7 +87,7 @@ ca_client_context::ca_client_context ( bool enablePreemptiveCallback ) :
         }
     }
 
-    this->sock = epicsSocketCreate ( AF_INET, SOCK_DGRAM, IPPROTO_UDP );
+    this->sock = cac::SocketCreate ( AF_INET, SOCK_DGRAM, IPPROTO_UDP );
     if ( this->sock == INVALID_SOCKET ) {
         char sockErrBuf[64];
         epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) );

diff --git a/modules/ca/src/client/cac.cpp b/modules/ca/src/client/cac.cpp
@@ -385,6 +385,21 @@ unsigned cac::highestPriorityLevelBelow ( unsigned priority )
     return belowPriority;
 }
 
+SOCKET cac::SocketCreate (
+    int domain,
+    int type,
+    int protocol )
+{
+    SOCKET sock = epicsSocketCreate ( domain, type, protocol );
+#ifdef HAS_SOCK_RENUMBER
+    static bool renumber = getenv ( "EPICS_CAC_AVOID_LOW_FDS" );
+    if ( renumber ) {
+        sock = epicsSocketRenumber ( sock );
+    }
+#endif
+    return sock;
+}
+
 //
 // set the push pending flag on all virtual circuits
 //

diff --git a/modules/ca/src/client/cac.h b/modules/ca/src/client/cac.h
@@ -204,6 +204,8 @@ class cac :
 
     const char * pLocalHostName ();
 
+    static SOCKET SocketCreate ( int domain, int type, int protocol );
+
 private:
     epicsSingleton < localHostName > :: reference _refLocalHostName;
     chronIntIdResTable < nciu > chanTable;

diff --git a/modules/ca/src/client/tcpiiu.cpp b/modules/ca/src/client/tcpiiu.cpp
@@ -717,7 +717,7 @@ tcpiiu::tcpiiu (
     if(!pCurData)
         throw std::bad_alloc();
 
-    this->sock = epicsSocketCreate ( AF_INET, SOCK_STREAM, IPPROTO_TCP );
+    this->sock = cac::SocketCreate ( AF_INET, SOCK_STREAM, IPPROTO_TCP );
     if ( this->sock == INVALID_SOCKET ) {
         freeListFree(this->cacRef.tcpSmallRecvBufFreeList, this->pCurData);
         char sockErrBuf[64];

diff --git a/modules/ca/src/client/udpiiu.cpp b/modules/ca/src/client/udpiiu.cpp
@@ -168,7 +168,7 @@ udpiiu::udpiiu (
         envGetInetPortConfigParam ( &EPICS_CA_REPEATER_PORT,
                                     static_cast <unsigned short> (CA_REPEATER_PORT) );
 
-    this->sock = epicsSocketCreate ( AF_INET, SOCK_DGRAM, IPPROTO_UDP );
+    this->sock = cac::SocketCreate ( AF_INET, SOCK_DGRAM, IPPROTO_UDP );
     if ( this->sock == INVALID_SOCKET ) {
         char sockErrBuf[64];
         epicsSocketConvertErrnoToString (
@@ -594,7 +594,7 @@ void epicsStdCall caStartRepeaterIfNotInstalled ( unsigned repeaterPort )
         return;
     }
 
-    tmpSock = epicsSocketCreate ( AF_INET, SOCK_DGRAM, IPPROTO_UDP );
+    tmpSock = cac::SocketCreate ( AF_INET, SOCK_DGRAM, IPPROTO_UDP );
     if ( tmpSock != INVALID_SOCKET ) {
         ca_uint16_t port = static_cast < ca_uint16_t > ( repeaterPort );
         memset ( (char *) &bd, 0, sizeof ( bd ) );