Changeset 35309

Timestamp:

Mar 13, 2013, 5:16:35 AM (13 years ago)

Author:

eugene

Message:

try to handshake in case we got the wrong client on this port

Location:

branches/eam_branches/ipp-20130307/Ohana/src

Files:

• libdvo/src/dbExtractAverages.c (modified) (2 diffs)
• libkapa/src/KapaOpen.c (modified) (5 diffs)
• relastro/src/UpdateObjects.c (modified) (3 diffs)

branches/eam_branches/ipp-20130307/Ohana/src/libdvo/src/dbExtractAverages.c

@@ -141 +141 @@
       value.Flt = average[0].ChiSqPar;
       break;
+
+    // XXX case AVE_PM_GROUPS:
+    // XXX   value.Int = GetProperMotionGroups (average, measure);
+    // XXX   break;
 
     case AVE_TMEAN:
@@ -278 +282 @@
 }  
 
+// XXX int GetProperMotionGroups (Average *average, Measure *measure) {
+// XXX   // need the times, excluding ignored detections
+// XXX   // sort the images
+// XXX   for (i = 0; i < Ntimes - 1; i++)  {
+// XXX     if (time[i+1] - time[i] < TRANGE) Ngroup ++;
+// XXX   }
+// XXX   return Ngroup;
+// XXX }
+// XXX 

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

@@ -4 +4 @@
 # define MY_PORT_MAX 2520
 # define MY_WAIT 100000
-# define DEBUG 0
+# define DEBUG 1
 
 static int Nvalid = 0;
@@ -121 +121 @@
 
 accepted:
+  {
+    // we need to do some minimal handshake here.  I will send out 
+    // a 4 char message : KAPA
+    int Nout = write (BindSocket, "KAPA", 4);
+    if (Nout != 4) {
+      fprintf (stderr, "connection failed\n");
+      close (BindSocket);
+      return (-1);
+    }
+  }
+  
   if (DEBUG) fprintf (stderr, "connection accepted\n");
   return (BindSocket);
@@ -205 +216 @@
   }
 
+  // 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) {
+    fprintf (stderr, "connection failed\n");
+    close (InitSocket);
+    return (-1);
+  }
+  if (strncmp (line, "KAPA", 4)) {
+    fprintf (stderr, "connection to the wrong survey\n");
+    close (InitSocket);
+    return (-1);
+  }
+
   if (DEBUG) fprintf (stderr, "connected on port: %d\n", Address.sin_port);
   if (DEBUG) fprintf (stderr, "connected\n");
@@ -233 +259 @@
   }
 
+# if (0)
   int pid = KapaLaunchCommand (line);
   if (!pid) {
@@ -238 +265 @@
     return (-1);
   }
+# else
+  int pid = 1;
+# endif
 
 # define NTRY 500

branches/eam_branches/ipp-20130307/Ohana/src/relastro/src/UpdateObjects.c

@@ -224 +224 @@
 
       if ((mode == FIT_PM_ONLY) || (mode == FIT_PM_AND_PAR)) {
-        // project all of the R,D coordinates to a plane centered on this coordinate set
+        // project all of the R,D coordinates to a plane centered on this coordinate. set
         // the times to be relative to Tmean (this is required for parallax as well)
         for (k = 0; k < N; k++) {
@@ -270 +270 @@
           catalog[i].average[j].flags |= ID_STAR_FIT_PAR;
           Npar ++;
+        } else {
+          // need to set mode = FIT_PM_ONLY if we do not fit for parallax
+          mode = FIT_PM_ONLY;
         }
       }   
@@ -321 +324 @@
                           fit.uD);
 
-      //make sure that the fit succeeded
+      // make sure that the fit succeeded
       status = TRUE;
       status &= finite(fit.Ro);