Changes to support non-NameServer-capable slaves on Linux

[ipc/ipcdev.git] / linux / src / daemon / NameServer_daemon.c

diff --git a/linux/src/daemon/NameServer_daemon.c b/linux/src/daemon/NameServer_daemon.c
index 7445bed5a461e38400d8dbd9c2f3230cbf47cd25..70742765d97d434c1ce51265573d1b732dd4e904 100644 (file)
--- a/linux/src/daemon/NameServer_daemon.c
+++ b/linux/src/daemon/NameServer_daemon.c
@@ -33,14 +33,12 @@
  *  @file       NameServer.c
  *
  *  @brief      NameServer Manager
- *
  */
 
+/* Standard IPC headers */
+#include <ti/ipc/Std.h>
 
-/* Standard headers */
-#include <Std.h>
-
-/* Linux specific header files, replacing OSAL: */
+/* POSIX thread support */
 #include <pthread.h>
 
 /* Socket Headers */
@@ -58,7 +56,7 @@
 #include <unistd.h>
 #include <assert.h>
 
-/* SysLink Socket Protocol        Family */
+/* Socket Protocol Family */
 #include <net/rpmsg.h>
 
 /* Module level headers */
@@ -466,15 +464,15 @@ Int NameServer_setup(Void)
 
             err = SocketBindAddr(sock, procId, NAME_SERVER_RPMSG_ADDR);
             if (err < 0) {
-               status = NameServer_E_FAIL;
-               LOG2("NameServer_setup: bind failed: %d, %s\n",
+                status = NameServer_E_FAIL;
+                LOG2("NameServer_setup: bind failed: %d, %s\n",
                     errno, strerror(errno))
 
                 LOG1("    closing recv socket: %d\n", sock)
                 close(sock);
             }
             else {
-               NameServer_module->recvSock[procId] = sock;
+                NameServer_module->recvSock[procId] = sock;
             }
         }
     }
@@ -491,6 +489,17 @@ Int NameServer_setup(Void)
 
         status = NameServer_E_FAIL;
     }
+    else {
+        /* look for at least one good send/recv pair to indicate success */
+        for (procId = 0; procId < numProcs; procId++) {
+            if (NameServer_module->sendSock[procId] != INVALIDSOCKET &&
+                NameServer_module->recvSock[procId] != INVALIDSOCKET) {
+                status = NameServer_S_SUCCESS;
+
+                break;
+            }
+        }
+    }
 
 exit:
     LOG1("NameServer_setup: exiting, refCount=%d\n", NameServer_module->refCount)
@@ -934,11 +943,18 @@ Int NameServer_getRemote(NameServer_Handle handle,
     int err;
 
     /* Set Timeout to wait: */
-    tv.tv_sec = NAMESERVER_GET_TIMEOUT;
-    tv.tv_usec = 0;
+    tv.tv_sec = 0;
+    tv.tv_usec = NAMESERVER_GET_TIMEOUT;
 
     /* Create request message and send to remote: */
     sock = NameServer_module->sendSock[procId];
+    if (sock == INVALIDSOCKET) {
+        LOG1("NameServer_getRemote: no socket connection to processor %d\n",
+             procId);
+        status = NameServer_E_RESOURCE;
+        goto exit;
+    }
+
     LOG1("NameServer_getRemote: Sending request via sock: %d\n", sock)
 
     /* Create request message and send to remote processor: */
@@ -1041,7 +1057,8 @@ Int NameServer_get(NameServer_Handle handle,
                 status = NameServer_getRemote(handle, name, value, len, i);
 
                 if ((status >= 0) ||
-                    ((status < 0) && (status != NameServer_E_NOTFOUND))) {
+                    ((status < 0) && (status != NameServer_E_NOTFOUND) &&
+                                     (status != NameServer_E_RESOURCE))) {
                     break;
                 }
             }
@@ -1062,7 +1079,8 @@ Int NameServer_get(NameServer_Handle handle,
             }
 
             if ((status >= 0) ||
-                ((status < 0) && (status != NameServer_E_NOTFOUND))) {
+                ((status < 0) && (status != NameServer_E_NOTFOUND) &&
+                                 (status != NameServer_E_RESOURCE))) {
                 break;
             }
 
@@ -1070,6 +1088,10 @@ Int NameServer_get(NameServer_Handle handle,
         }
     }
 
+    if (status == NameServer_E_RESOURCE) {
+        status = NameServer_E_NOTFOUND;
+    }
+
     return (status);
 }