Changeset 36740

Timestamp:

May 10, 2014, 2:44:40 PM (12 years ago)

Author:

eugene

Message:

catch the case where KapaClient connects to the wrong server

Location:

branches/eam_branches/ipp-20140423/Ohana/src

Files:

• kapa2/src/CheckPipe.c (modified) (2 diffs)
• libkapa/src/KapaOpen.c (modified) (1 diff)

branches/eam_branches/ipp-20140423/Ohana/src/kapa2/src/CheckPipe.c

@@ -1 +1 @@
 # include "Ximage.h"
+# include <errno.h>
 # define STRCONST(A) ((int)(0x1000000*A[0] + 0x10000*A[1] + 0x100*A[2] + 0x1*A[3]))
 
@@ -41 +42 @@
   word[4] = 0;
   switch (status) {
-  case -1:                          /* no input from pipe: continue */
-    return (TRUE);
+  case -1:
+    if (errno == EAGAIN) {
+      /* no input from pipe: continue */
+      return (TRUE);
+    } 
+    perror ("exiting due to problem with socket connection in CheckPipe");
+    return (FALSE);
     break;
 

branches/eam_branches/ipp-20140423/Ohana/src/libkapa/src/KapaOpen.c

@@ -218 +218 @@
   // apparently, I can connect on someone else's port (eg GoogleTalkPlugin)
   // do a simple handshake before we set !NONBLOCK:
-  char line[5];
-  int Nout = read (InitSocket, line, 4);
-  if (Nout != 4) {
-    if (DEBUG) fprintf (stderr, "connection failed\n");
-    close (InitSocket);
-    return (-1);
-  }
-  if (strncmp (line, "KAPA", 4)) {
-    if (DEBUG) fprintf (stderr, "connection to the wrong server\n");
-    close (InitSocket);
-    return (-1);
+
+  // ensure the socket is NONBLOCK first...
+  fcntl (InitSocket, F_SETFL, O_NONBLOCK);
+
+  int Ntry = 0;
+retry_message:
+  { 
+    char line[5];
+    int Nout = read (InitSocket, line, 4);
+    if ((Nout == -1) && (errno == EAGAIN)) {
+      Ntry ++;
+      if (Ntry > 500) {
+        if (DEBUG) fprintf (stderr, "handshake failure\n");
+        close (InitSocket);
+        return (-1);
+      }
+      goto retry_message;
+    }
+    if (Nout != 4) {
+      if (DEBUG) fprintf (stderr, "connection failed\n");
+      close (InitSocket);
+      return (-1);
+    }
+    if (strncmp (line, "KAPA", 4)) {
+      if (DEBUG) fprintf (stderr, "connection to the wrong server\n");
+      close (InitSocket);
+      return (-1);
+    }
   }