===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/plugin/oxmisc.c,v
retrieving revision 1.18
retrieving revision 1.25
diff -u -p -r1.18 -r1.25
--- OpenXM/src/kan96xx/plugin/oxmisc.c	2003/11/19 01:02:39	1.18
+++ OpenXM/src/kan96xx/plugin/oxmisc.c	2005/07/03 11:08:54	1.25
@@ -1,5 +1,6 @@
-/*  $OpenXM: OpenXM/src/kan96xx/plugin/oxmisc.c,v 1.17 2003/11/18 11:08:27 takayama Exp $ */
+/*  $OpenXM: OpenXM/src/kan96xx/plugin/oxmisc.c,v 1.24 2005/06/16 05:07:24 takayama 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;
@@ -343,7 +345,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 +446,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 +511,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); */
@@ -609,7 +619,8 @@ 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. */
 {
   int v = 0;
@@ -633,6 +644,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":
@@ -869,14 +897,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,7 +928,8 @@ 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)
 {
   int v = 0;
   int fdControl = -1;
@@ -946,17 +977,21 @@ oxclientp oxCreateClient2(int fdstream,int portStream,
   }
 
   /* 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);
@@ -1070,6 +1105,8 @@ char *oxFIDtoStr(int id) {
     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: