===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/plugin/oxmisc.c,v
retrieving revision 1.12
retrieving revision 1.15
diff -u -p -r1.12 -r1.15
--- OpenXM/src/kan96xx/plugin/oxmisc.c	2002/02/24 10:27:20	1.12
+++ 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.11 2001/12/28 08:18:22 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;
@@ -900,7 +900,6 @@ static void cancelConnection() {
 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;
@@ -986,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;
@@ -1024,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;
+  }
+}