X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fgipc.c;h=68811095df12d4abc5dc34c845f41ee355de438e;hb=373495ef158d123d95ab44465d4249e65847492b;hp=81167457d5a73bff216c39c25ca4e3e40371e279;hpb=ad67147ba5d2e4287bacfcbdaac2e5d9058cb400;p=egate.git

diff --git a/util/gipc.c b/util/gipc.c
index 8116745..6881109 100644
--- a/util/gipc.c
+++ b/util/gipc.c
@@ -1,8 +1,80 @@
+/*
+ * Copyright (c) 1995, the EUROPAGATE consortium (see below).
+ *
+ * The EUROPAGATE consortium members are:
+ *
+ *    University College Dublin
+ *    Danmarks Teknologiske Videnscenter
+ *    An Chomhairle Leabharlanna
+ *    Consejo Superior de Investigaciones Cientificas
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation, in whole or in part, for any purpose, is hereby granted,
+ * provided that:
+ *
+ * 1. This copyright and permission notice appear in all copies of the
+ * software and its documentation. Notices of copyright or attribution
+ * which appear at the beginning of any file must remain unchanged.
+ *
+ * 2. The names of EUROPAGATE or the project partners may not be used to
+ * endorse or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * 3. Users of this software (implementors and gateway operators) agree to
+ * inform the EUROPAGATE consortium of their use of the software. This
+ * information will be used to evaluate the EUROPAGATE project and the
+ * software, and to plan further developments. The consortium may use
+ * the information in later publications.
+ * 
+ * 4. Users of this software agree to make their best efforts, when
+ * documenting their use of the software, to acknowledge the EUROPAGATE
+ * consortium, and the role played by the software in their work.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ * IN NO EVENT SHALL THE EUROPAGATE CONSORTIUM OR ITS MEMBERS BE LIABLE
+ * FOR ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF
+ * ANY KIND, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA
+ * OR PROFITS, WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND
+ * ON ANY THEORY OF LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE
+ * USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
 /* Gateway kernel
  * Europagate, 1995
  *
  * $Log: gipc.c,v $
- * Revision 1.1  1995/03/27 08:24:59  adam
+ * Revision 1.10  1995/05/22 11:43:01  adam
+ * Minor changes on dtbsun - include of errno.h.
+ *
+ * Revision 1.9  1995/05/18  12:03:41  adam
+ * Bug fix in gipc_open: didn't catch EINTR.
+ * Memory leak fix in strqueue.c.
+ *
+ * Revision 1.8  1995/05/17  10:51:43  adam
+ * Bug fix.
+ *
+ * Revision 1.7  1995/05/16  09:40:52  adam
+ * LICENSE.
+ *
+ * Revision 1.6  1995/05/01  16:27:29  adam
+ * Various improvements. Close-on-exec and close on failure on either
+ * read or write FIFO.
+ *
+ * Revision 1.5  1995/04/21  16:38:07  adam
+ * Added more debugging logs.
+ *
+ * Revision 1.4  1995/04/20  15:12:45  adam
+ * Minor hacks really.
+ *
+ * Revision 1.3  1995/04/19  16:02:06  adam
+ * Some hacks to get the FIFO communication work!! Isn't reliable.
+ *
+ * Revision 1.2  1995/03/28  08:03:46  adam
+ * Non-blocking open used when sync is set.
+ *
+ * Revision 1.1  1995/03/27  08:24:59  adam
  * New module gip: Gateway IPc module.
  * New module gw-db: Gateway hash-db module (user information table).
  *
@@ -14,7 +86,9 @@
 #include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <errno.h>
 
+#include <gw-log.h>
 #include <gip.h>
 
 GIP gipc_initialize (const char *name)
@@ -31,24 +105,72 @@ int gipc_open (GIP gip, const char *server, int sync)
 {
     if (sync) 
     {
-        gip->rfd = open (gip->name, O_RDONLY);
-	gip->wfd = open (server, O_WRONLY);
+        gw_log (GW_LOG_DEBUG, "gipc", "Open sync writeonly of %s", server);
+        while (1)
+        {
+            gip->wfd = open (server, O_WRONLY);
+            gw_log (GW_LOG_DEBUG, "gipc", "got wfd %d", gip->wfd);
+            
+            if (gip->wfd != -1)
+                break;
+            gw_log (GW_LOG_DEBUG|GW_LOG_ERRNO, "gipc", "Cannot open %s",
+                    server);
+            if (errno != EINTR)
+                return -2;
+        }
+        gw_log (GW_LOG_DEBUG, "gipc", "Open sync readonly of %s", gip->name);
+        do
+        {
+            gip->rfd = open (gip->name, O_RDONLY);
+            gw_log (GW_LOG_DEBUG, "gipc", "got rfd %d", gip->rfd);
+        } while (gip->rfd == -1 && errno == EINTR);
     }
     else
     {
-        gip->wfd = open (server, O_WRONLY);
-	gip->rfd = open (gip->name, O_RDONLY);
+        gw_log (GW_LOG_DEBUG, "gipc", "Open readonly of %s", gip->name);
+	gip->rfd = open (gip->name, O_RDONLY|O_NONBLOCK);
+        gw_log (GW_LOG_DEBUG, "gipc", "got rfd %d", gip->rfd);
+
+        gw_log (GW_LOG_DEBUG, "gipc", "Open witeonly of %s", server);
+        gip->wfd = open (server, O_WRONLY|O_NONBLOCK);
+        gw_log (GW_LOG_DEBUG, "gipc", "got wfd %d", gip->wfd);
     }
     if (gip->rfd == -1)
+    {
+        gw_log (GW_LOG_DEBUG|GW_LOG_ERRNO, "gipc", "Cannot open %s",
+                gip->name);
+        if (gip->wfd != -1)
+        {
+            close (gip->wfd);
+            gip->wfd = -1;
+        }
         return -1;
+    }
     if (gip->wfd == -1)
-        return -1;
+    {
+        gw_log (GW_LOG_DEBUG|GW_LOG_ERRNO, "gipc", "Cannot open %s", server);
+        close (gip->rfd);
+        gip->rfd = -1;
+        return -2;
+    }
+    fcntl (gip->wfd, F_SETFL, 0);
+    fcntl (gip->rfd, F_SETFL, 0);
+    fcntl (gip->wfd, F_SETFD, FD_CLOEXEC);
+    fcntl (gip->rfd, F_SETFD, FD_CLOEXEC);
     return 0;
 }
 
 int gipc_close (GIP gip)
 {
-    close (gip->rfd);
-    close (gip->wfd);
+    if (gip->rfd != -1)
+    {
+        close (gip->rfd);
+	gip->rfd = -1;
+    }
+    if (gip->wfd != -1)
+    {
+        close (gip->wfd);
+        gip->wfd = -1;
+    }
     return 0;
 }