Changeset 35310

Timestamp:

Mar 13, 2013, 6:11:52 AM (13 years ago)

Author:

eugene

Message:

fix the problem of connecting to the wrong port owner

File:

• branches/eam_branches/ipp-20130307/Ohana/src/libkapa/src/KapaOpen.c (modified) (7 diffs)

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

@@ -4 +4 @@
 # define MY_PORT_MAX 2520
 # define MY_WAIT 100000
-# define DEBUG 1
+# define DEBUG 0
 
 static int Nvalid = 0;
@@ -120 +120 @@
   return (-1);
 
-accepted:
+ accepted:
   {
     // we need to do some minimal handshake here.  I will send out 
@@ -126 +126 @@
     int Nout = write (BindSocket, "KAPA", 4);
     if (Nout != 4) {
-      fprintf (stderr, "connection failed\n");
+      if (DEBUG) fprintf (stderr, "connection failed\n");
       close (BindSocket);
       return (-1);
@@ -221 +221 @@
   int Nout = read (InitSocket, line, 4);
   if (Nout != 4) {
-    fprintf (stderr, "connection failed\n");
+    if (DEBUG) fprintf (stderr, "connection failed\n");
     close (InitSocket);
     return (-1);
   }
   if (strncmp (line, "KAPA", 4)) {
-    fprintf (stderr, "connection to the wrong survey\n");
+    if (DEBUG) fprintf (stderr, "connection to the wrong server\n");
     close (InitSocket);
     return (-1);
@@ -259 +259 @@
   }
 
-# if (0)
   int pid = KapaLaunchCommand (line);
   if (!pid) {
@@ -265 +264 @@
     return (-1);
   }
-# else
-  int pid = 1;
-# endif
 
 # define NTRY 500
@@ -320 +316 @@
 
   if (name == NULL) {
-    sprintf (temp, "%s -socket %s &", kapa_exec, socket_name);
+    sprintf (temp, "%s -socket %s", kapa_exec, socket_name);
   } else {
-    sprintf (temp, "%s -socket %s -name %s &", kapa_exec, socket_name, name);
+    sprintf (temp, "%s -socket %s -name %s", kapa_exec, socket_name, name);
   }