===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/plugin/oxmisc2.c,v
retrieving revision 1.14
retrieving revision 1.17
diff -u -p -r1.14 -r1.17
--- OpenXM/src/kan96xx/plugin/oxmisc2.c	2002/11/07 13:32:06	1.14
+++ OpenXM/src/kan96xx/plugin/oxmisc2.c	2002/11/08 14:18:02	1.17
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM/src/kan96xx/plugin/oxmisc2.c,v 1.13 2002/02/24 10:27:20 takayama Exp $ */
+/* $OpenXM: OpenXM/src/kan96xx/plugin/oxmisc2.c,v 1.16 2002/11/08 02:54:12 takayama Exp $ */
 #include <stdio.h>
 #include "ox_kan.h"
 #include "oxmisc2.h"   /* This file requires sm1 object description. */
@@ -382,6 +382,7 @@ int oxClientToObject(oxclientp client,struct object ro
   }
   putoa(rob,11,KpoInteger(client->engineByteOrder));
   putoa(rob,12,KpoInteger(client->controlByteOrder));
+  putoa(rob,13,KpoInteger(client->engineID));
   return(0);
 }
 
@@ -438,6 +439,9 @@ int oxObjectToClient(struct object ob,oxclientp cp)
   cp->engineByteOrder = KopInteger(ob1);
   ob1 = getoa(ob,12);
   cp->controlByteOrder = KopInteger(ob1);
+
+  ob1 = getoa(ob,13);
+  cp->engineID = KopInteger(ob1);
   
 
   return(0);
@@ -1296,36 +1300,14 @@ oxclientp oxCreateEngine_RFC_101(int fdstream,int port
   client->dataport = portStream;
   client->controlport = -1;
   client->controlfd = -1;
-  client->id = engineID;
+  client->id = oxGetClientID();
+  client->engineID = engineID;
   client->type = CLIENT_SOCKET; /* socket */
   client->engineByteOrder = engineByteOrder;
   client->controlByteOrder = -1;
   return(client);
 }
 
-#define MAX_N_OF_CLIENT 1024
-static struct object OxClientList[MAX_N_OF_CLIENT];
-static 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{
-	errorOxmisc2("oxGetClientID(): the client table is full.\n");
-	return 0;
-  }
-}
 void oxClientListUpdate(struct object ob) {
   int id;
   extern struct object OxClientList[];
@@ -1347,11 +1329,26 @@ void oxClientListRemove(struct object ob) {
 	/* errorOxmisc2("oxClientListRemove(): the client table is full.\n");*/
   }
 }
+static void KoxCleanClientList() {
+  extern int OxClientListn;
+  extern struct object OxClientList[];
+  int i,j,n;
+  struct object ob;
+  n = 0;
+  for (i=0; i<OxClientListn; i++) {
+	if ((OxClientList[i]).tag != Snull) {
+	  if (!isItClientObject(OxClientList[i])) {
+		(OxClientList[i]).tag = Snull;
+	  }
+	}
+  }
+}
 struct object KoxGetClientList() {
   extern int OxClientListn;
   extern struct object OxClientList[];
   int i,j,n;
   struct object rob;
+  KoxCleanClientList();
   n = 0;
   for (i=0; i<OxClientListn; i++) {
 	if ((OxClientList[i]).tag != Snull) n++;