===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/plugin/oxmisc.c,v
retrieving revision 1.12
retrieving revision 1.26
diff -u -p -r1.12 -r1.26
--- OpenXM/src/kan96xx/plugin/oxmisc.c	2002/02/24 10:27:20	1.12
+++ OpenXM/src/kan96xx/plugin/oxmisc.c	2006/05/06 10:53:36	1.26
@@ -1,5 +1,6 @@
-/*  $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.25 2005/07/03 11:08:54 ohara Exp $ */
 #include <stdio.h>
+#include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
@@ -11,6 +12,7 @@
 #include <unistd.h>
 #include <signal.h>
 #include <setjmp.h>
+#include <errno.h>
 #define SET_MYERROROUT { if (MyErrorOut == NULL) MyErrorOut=stdout; }
 /* It is also defined in oxmisc2.c */
 FILE *MyErrorOut = NULL;
@@ -177,6 +179,9 @@ int oxWaitSyncBall(ox_stream ostream)
     fprintf(stderr,"Looking for the next message tag. mtag=%d\n",mtag);
     /* or stdout */
     fflush(NULL);
+	if (mtag == -1) {
+	  fprintf(stderr,"Your peer seems to be dead.\n"); return;
+	}
   }
 }
 
@@ -343,7 +348,7 @@ void oxSendResultOfControl(int fd) 
 void oxSendMathCap(ox_stream os,struct mathCap *mathcap)
 {
   int i,n,infosize,ncmo;
-  struct object mathinfo;
+  struct object mathinfo = OINIT;
   /* printf("ox sending mathcap\n"); fflush(stdout); */
   mathinfo = *((struct object *)(mathcap->infop));
   infosize = getoaSize(mathinfo);
@@ -444,7 +449,16 @@ void oxReqExecuteFunction(ox_stream os,char *s)
   fp2fflush(os);
 }
 
+void oxReqExecuteFunctionWithOptionalArgument(ox_stream os,char *s)
+{
+  oxSendOXheader(os,OX_DATA,SerialOX++);
+  oxSendCmoString(os,s);
+  oxSendOXheader(os,OX_COMMAND,SerialOX++);
+  oxSendInt32(os,SM_executeFunctionWithOptionalArgument);
+  fp2fflush(os);
+}
 
+
 void oxReqPopString(ox_stream os)
 {
   oxSendOXheader(os,OX_COMMAND,SerialOX++);
@@ -500,7 +514,6 @@ int oxclientMultiSelect(oxclientp clients[],int datare
   int humanfd = 0;
   fd_set readfds;
   struct timeval timeout;
-  extern int errno;
 
   SET_MYERROROUT;
   /** printf("(1)"); fflush(NULL); */
@@ -598,6 +611,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);
 }
 
@@ -608,10 +622,10 @@ int oxIsThereErrorClient(oxclientp client) {
   return(0);
 }
 
-oxclientp oxCreateClient(char *sname,int portStream,int portControl)
+oxclientp oxCreateClient(char *sname,int portStream,int portControl,
+                         char *passControl, char *passData)
      /* you also need to change oxCreateClient2. */
 {
-  static int clnum = 0;
   int v = 0;
   int fdControl = -1;
   int fdStream = -1;
@@ -633,6 +647,23 @@ oxclientp oxCreateClient(char *sname,int portStream,in
     return(NULL);
   }
 
+  if (passControl != NULL) {
+    if (v) fprintf(stderr,"Sending password %s for the control channel.\n",
+                   passControl);
+    if (write(fdControl,passControl,strlen(passControl)+1) < 0) {
+      fprintf(stderr,"oxCreateClient(): failed to send passControl.\n");
+      return(NULL);
+    }
+  }
+  if (passData != NULL) {
+    if (v) fprintf(stderr,"Sending password %s for the data channel.\n",
+                   passData);
+    if (write(fdStream,passData,strlen(passData)+1) < 0) {
+      fprintf(stderr,"oxCreateClient(): failed to send passData.\n");
+      return(NULL);
+    }
+  }
+
   controlByteOrder = oxSetByteOrder(fdControl);
   if (v) fprintf(stderr,"Byte order for control process is %s.\n",
                  (controlByteOrder == 0? "network byte order":
@@ -654,7 +685,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;
@@ -869,14 +900,16 @@ char *oxGenPass(void) {
   static int seed = 0;
   long p;
   char *s;
-  int i;
+  int i,n;
   if (seed == 0) {
     seed = (int) time(NULL) + (int) &p;
     srandom((unsigned int) seed);
   }
-  for (i=0; i < ((int) &p) % 100 ; i++) random();
-  p = random();
   s = (char *)malloc(128*sizeof(char));
+  if (s == NULL) { fprintf(stderr,"No more memory.\n"); return(s); }
+  n = (((int) s) + (int) time(NULL)) % 100;
+  for (i=0; i < n ; i++) random();
+  p = random();
   sprintf(s,"%ld",p);
   return(s);
 }
@@ -898,9 +931,9 @@ static void cancelConnection() {
 }
 
 oxclientp oxCreateClient2(int fdstream,int portStream,
-                          int fdcontrol,int portControl,int ipmask,char *pass)
+                          int fdcontrol,int portControl,int ipmask,
+                          char *passControl, char *passData)
 {
-  static int clnum = 0;
   int v = 0;
   int fdControl = -1;
   int fdStream = -1;
@@ -941,22 +974,27 @@ oxclientp oxCreateClient2(int fdstream,int portStream,
   if (v) fprintf(stderr,"\nStream port %d : Connected.\n",portStream);
 
   if (fdStream == -1 || fdControl == -1) {
-    fprintf(stderr,"\nOpen error in oxCreateClient.\n");
+    fprintf(stderr,"\nOpen error in oxCreateClient2.\n");
+    fprintf(stderr,"fdStream=%d, fdControl=%d\n",fdStream,fdControl);
     return(NULL);
   }
 
   /* Authentication by password. */
-  m = strlen(pass);
+  m = strlen(passControl)+strlen(passData);
   if (m > 0) {
     s = (char *)mymalloc(sizeof(char)*(m+1));
+    m = strlen(passControl); s[0] = 0;
     read(fdControl,s,m+1); s[m] = '\0';
-    if (strcmp(s,pass) != 0) {
+    if (strcmp(s,passControl) != 0) {
+      fprintf(stderr,"s=%s, passControl=%s\n",s,passControl);
       fprintf(stderr,"oxCreateClient2(): password authentication failed for control channel.\n");
       close(fdControl);
       return(NULL);
     }
+    m = strlen(passData); s[0] = 0;
     read(fdStream,s,m+1); s[m] = '\0';
-    if (strcmp(s,pass) != 0) {
+    if (strcmp(s,passData) != 0) {
+      fprintf(stderr,"s=%s, passData=%s\n",s,passData);
       fprintf(stderr,"oxCreateClient2(): password authentication failed for data channel.\n");
       close(fdStream);
       return(NULL);
@@ -986,7 +1024,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;
@@ -1008,20 +1046,81 @@ int oxSetByteOrder(int fd) {
   return(OX_BYTE_NETWORK_BYTE_ORDER);
 }
 
-int oxTellMyByteOrder(int fd) {  
+int oxTellMyByteOrder(int fdOut, int fdIn) {  
   char data[1];
   int peertype;
   /* It is for server. read and next write. */
 
   /* We support only Network byte order */
   data[0] = OX_BYTE_NETWORK_BYTE_ORDER;
-  write(fd,data,1);
-  fsync(fd);  /* returns 0 if normal. Does it work for socket? */
+  write(fdOut,data,1);
+  fsync(fdOut);  /* returns 0 if normal. Does it work for socket? */
 
-  read(fd,data,1);
+  read(fdIn,data,1); /* Read pear's byte order */
 
   return(OX_BYTE_NETWORK_BYTE_ORDER);
 }
 
 
+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;
+  }
+}
+
+char *oxFIDtoStr(int id) {
+  switch( id ) {
+  case SM_mathcap:
+    return "SM_mathcap"; break;
+  case SM_setMathCap:
+    return "SM_setMathCap"; break;
+  case SM_pops:
+    return "SM_pops"; break;
+  case SM_getsp:
+    return "SM_getsp"; break;
+  case SM_dupErrors:
+    return "SM_dupErrors"; break;
+  case SM_pushCMOtag:
+    return "SM_pushCMOtag"; break;
+  case SM_setName:
+    return "SM_setName"; break;
+  case SM_evalName:
+    return "SM_evalName"; break;
+  case SM_executeStringByLocalParser:
+    return "SM_executeStringByLocalParser"; break;
+  case SM_executeFunction:
+    return "SM_executeFunction"; break;
+  case SM_executeFunctionWithOptionalArgument:
+    return "SM_executeFunctionWithOptionalArgument"; break;
+  case SM_popCMO:
+    return "SM_popCMO"; break;
+  case SM_popString:
+    return "SM_popString"; break;
+  case SM_shutdown:
+    return "SM_shutdown"; break;
+  case SM_beginBlock:
+    return "SM_beginBlock"; break;
+  case SM_endBlock:
+    return "SM_endBlock"; break;
+  default:
+    return "Unknown to oxFIDtoStr"; break;
+  }
+}