===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/plugin/oxmisc.c,v
retrieving revision 1.20
retrieving revision 1.29
diff -u -p -r1.20 -r1.29
--- OpenXM/src/kan96xx/plugin/oxmisc.c	2004/03/08 08:24:42	1.20
+++ OpenXM/src/kan96xx/plugin/oxmisc.c	2015/10/08 11:49:37	1.29
@@ -1,5 +1,6 @@
-/*  $OpenXM: OpenXM/src/kan96xx/plugin/oxmisc.c,v 1.19 2004/02/25 23:14:35 takayama Exp $ */
+/*  $OpenXM: OpenXM/src/kan96xx/plugin/oxmisc.c,v 1.28 2015/09/27 08:12:42 takayama Exp $ */
 #include <stdio.h>
+#include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
@@ -23,6 +24,7 @@ FILE *MyErrorOut = NULL;
 
 #include "ox_kan.h"
 
+
 #define READBUFSIZE 5000
 
 int OxVersion = 200012030;
@@ -178,6 +180,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 0;
+	}
   }
 }
 
@@ -344,7 +349,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);
@@ -618,7 +623,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;
@@ -642,6 +648,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":
@@ -878,14 +901,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);
 }
@@ -900,14 +925,15 @@ static void cancelConnection() {
   signal(SIGALRM,SIG_IGN);
   fprintf(stderr,"Time out in TCP/IP connection.\n");
 #if defined(__CYGWIN__)
-  siglongjmp(MyEnv_oxmisc,1);
+  MYSIGLONGJMP(MyEnv_oxmisc,1);
 #else
-  longjmp(MyEnv_oxmisc,1);
+  MYLONGJMP(MyEnv_oxmisc,1);
 #endif
 }
 
 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;
@@ -925,9 +951,9 @@ oxclientp oxCreateClient2(int fdstream,int portStream,
 
   v = !Quiet;
 #if defined(__CYGWIN__)
-  if (sigsetjmp(MyEnv_oxmisc,1)) {
+  if (MYSIGSETJMP(MyEnv_oxmisc,1)) {
 #else
-  if (setjmp(MyEnv_oxmisc)) {
+  if (MYSETJMP(MyEnv_oxmisc)) {
 #endif
     return(NULL);
   }else{
@@ -955,17 +981,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);