===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/plugin/oxmisc2.c,v
retrieving revision 1.15
retrieving revision 1.19
diff -u -p -r1.15 -r1.19
--- OpenXM/src/kan96xx/plugin/oxmisc2.c	2002/11/07 23:52:20	1.15
+++ OpenXM/src/kan96xx/plugin/oxmisc2.c	2003/11/17 08:49:16	1.19
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM/src/kan96xx/plugin/oxmisc2.c,v 1.14 2002/11/07 13:32:06 takayama Exp $ */
+/* $OpenXM: OpenXM/src/kan96xx/plugin/oxmisc2.c,v 1.18 2003/11/17 05:45:47 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);
@@ -644,6 +648,63 @@ struct object KoxWatch(struct object client,struct obj
   return(KpoInteger(ans));
 }
 
+struct object KoxLog(struct object client,struct object in,struct object out)
+{
+  int ans,k;
+  static oxclientp cc1 = NULL;
+  struct object rob;
+  rob.tag = Snull;
+  if (cc1 == NULL) {
+    cc1 = (oxclientp) mymalloc(sizeof(oxclient));
+    if (cc1 == NULL) {
+      errorOxmisc2("KoxLog(): no more memory.");
+      return(rob);
+    }
+    oxInitClient(cc1);
+  }
+
+  if (oxObjectToClient(client,cc1) == -1) return(rob);
+  if (cc1 == NULL) {
+    errorOxmisc2("KoxLog(): the first argument must be a client object.");
+    return(rob);
+  }
+
+  if (in.tag != Sfile) {
+	errorOxmisc2("KoxLog(): the second argument is not a file object.");
+	return rob;
+  }
+  if (out.tag != Sfile) {
+	errorOxmisc2("KoxLog(): the third argument is not a file object.");
+	return rob;
+  }
+  k = fp2log(cc1->datafp2,in.rc.file,out.rc.file);
+  fputc(cc1->engineByteOrder,out.rc.file); /* Output engineByteOrder. */
+  /* synchronize cc1 and client. */
+  oxClientToObject(cc1,client);
+
+  return(KpoInteger(ans));
+}
+
+struct object KoxLogStop(struct object client) {
+  static oxclientp cc1 = NULL;
+  struct object rob;
+  rob.tag = Snull;
+  if (cc1 == NULL) {
+    cc1 = (oxclientp) mymalloc(sizeof(oxclient));
+    if (cc1 == NULL) {
+      errorOxmisc2("KoxLog(): no more memory.");
+      return(rob);
+    }
+    oxInitClient(cc1);
+  }
+
+  if (oxObjectToClient(client,cc1) == -1) return(rob);
+  if (cc1 == NULL) {
+    errorOxmisc2("KoxLog(): the first argument must be a client object.");
+    return(rob);
+  }
+  return(KpoInteger(fp2stopLog(cc1->datafp2)));  
+}
     
 struct object KoxCloseClient(struct object client) {
   oxclientp cc1 = NULL;
@@ -1296,7 +1357,8 @@ 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;
@@ -1324,11 +1386,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++;