===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/plugin/oxmisc.c,v
retrieving revision 1.9
retrieving revision 1.15
diff -u -p -r1.9 -r1.15
--- OpenXM/src/kan96xx/plugin/oxmisc.c	2001/05/04 01:06:30	1.9
+++ OpenXM/src/kan96xx/plugin/oxmisc.c	2002/11/08 02:54:11	1.15
@@ -1,4 +1,4 @@
-/*  $OpenXM: OpenXM/src/kan96xx/plugin/oxmisc.c,v 1.8 2000/12/03 07:29:39 takayama Exp $ */
+/*  $OpenXM: OpenXM/src/kan96xx/plugin/oxmisc.c,v 1.14 2002/11/07 23:52:20 takayama Exp $ */
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -598,6 +598,7 @@ int oxInitClient(oxclientp client)
   client->mathcapObjp = NULL;
   client->controlByteOrder = OX_BYTE_NETWORK_BYTE_ORDER;
   client->engineByteOrder = OX_BYTE_NETWORK_BYTE_ORDER;
+  client->engineID = -1;
   return(0);
 }
 
@@ -611,7 +612,6 @@ int oxIsThereErrorClient(oxclientp client) {
 oxclientp oxCreateClient(char *sname,int portStream,int portControl)
      /* you also need to change oxCreateClient2. */
 {
-  static int clnum = 0;
   int v = 0;
   int fdControl = -1;
   int fdStream = -1;
@@ -654,7 +654,7 @@ oxclientp oxCreateClient(char *sname,int portStream,in
   client->dataport = portStream;
   client->controlport = portControl;
   client->controlfd = fdControl;
-  client->id = clnum; clnum++;
+  client->id = oxGetClientID();
   client->type = CLIENT_SOCKET; /* socket */
   client->engineByteOrder = engineByteOrder;
   client->controlByteOrder = controlByteOrder;
@@ -883,16 +883,23 @@ char *oxGenPass(void) {
 
 
 static void cancelConnection() {
+#if defined(__CYGWIN__)
+  extern sigjmp_buf MyEnv_oxmisc;
+#else
   extern jmp_buf MyEnv_oxmisc;
+#endif
   signal(SIGALRM,SIG_IGN);
   fprintf(stderr,"Time out in TCP/IP connection.\n");
+#if defined(__CYGWIN__)
+  siglongjmp(MyEnv_oxmisc,1);
+#else
   longjmp(MyEnv_oxmisc,1);
+#endif
 }
 
 oxclientp oxCreateClient2(int fdstream,int portStream,
                           int fdcontrol,int portControl,int ipmask,char *pass)
 {
-  static int clnum = 0;
   int v = 0;
   int fdControl = -1;
   int fdStream = -1;
@@ -900,15 +907,23 @@ oxclientp oxCreateClient2(int fdstream,int portStream,
 
   char *s;
   oxclientp client;
-  extern jmp_buf MyEnv_oxmisc ;
+#if defined(__CYGWIN__)
+  extern sigjmp_buf MyEnv_oxmisc;
+#else
+  extern jmp_buf MyEnv_oxmisc;
+#endif
   int controlByteOrder, engineByteOrder;
 
   v = !Quiet;
+#if defined(__CYGWIN__)
+  if (sigsetjmp(MyEnv_oxmisc,1)) {
+#else
   if (setjmp(MyEnv_oxmisc)) {
+#endif
     return(NULL);
   }else{
   }
-  alarm((unsigned int) 10);  /* setup timeout. */
+  alarm((unsigned int) 20);  /* setup timeout. */
   signal(SIGALRM,cancelConnection);
   
   switch(ipmask) {
@@ -931,19 +946,21 @@ oxclientp oxCreateClient2(int fdstream,int portStream,
 
   /* Authentication by password. */
   m = strlen(pass);
-  s = (char *)mymalloc(sizeof(char)*(m+1));
-  read(fdControl,s,m+1); s[m] = '\0';
-  if (strcmp(s,pass) != 0) {
-    fprintf(stderr,"oxCreateClient2(): password authentication failed for control channel.\n");
-    close(fdControl);
-    return(NULL);
+  if (m > 0) {
+    s = (char *)mymalloc(sizeof(char)*(m+1));
+    read(fdControl,s,m+1); s[m] = '\0';
+    if (strcmp(s,pass) != 0) {
+      fprintf(stderr,"oxCreateClient2(): password authentication failed for control channel.\n");
+      close(fdControl);
+      return(NULL);
+    }
+    read(fdStream,s,m+1); s[m] = '\0';
+    if (strcmp(s,pass) != 0) {
+      fprintf(stderr,"oxCreateClient2(): password authentication failed for data channel.\n");
+      close(fdStream);
+      return(NULL);
+    }
   }
-  read(fdStream,s,m+1); s[m] = '\0';
-  if (strcmp(s,pass) != 0) {
-    fprintf(stderr,"oxCreateClient2(): password authentication failed for data channel.\n");
-    close(fdStream);
-    return(NULL);
-  }
   signal(SIGALRM,SIG_IGN);
 
   controlByteOrder = oxSetByteOrder(fdControl);
@@ -968,7 +985,7 @@ oxclientp oxCreateClient2(int fdstream,int portStream,
   client->dataport = portStream;
   client->controlport = portControl;
   client->controlfd = fdControl;
-  client->id = clnum; clnum++;
+  client->id = oxGetClientID();
   client->type = CLIENT_SOCKET; /* socket */
   client->engineByteOrder = engineByteOrder;
   client->controlByteOrder = controlByteOrder;
@@ -1006,4 +1023,27 @@ int oxTellMyByteOrder(int fd) {  
 }
 
 
+struct object OxClientList[MAX_N_OF_CLIENT];
+int OxClientListn = 0;
+
+int oxGetClientID() {
+  extern struct object OxClientList[];
+  extern int OxClientListn;
+  extern struct object Nobj;
+  int i;
+  for (i=0; i<OxClientListn; i++) {
+	if ((OxClientList[i]).tag == Snull) {
+	  return i;
+	}
+  }
+  i = OxClientListn;
+  (OxClientList[i]).tag = Snull;
+  if (OxClientListn < MAX_N_OF_CLIENT-1) {
+	OxClientListn++;
+	return i;
+  }else{
+	fprintf(MyErrorOut,"oxGetClientID(): the client table is full. Returns ID = 0.\n");
+	return 0;
+  }
+}