===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/plugin/oxmisc.c,v
retrieving revision 1.21
retrieving revision 1.30
diff -u -p -r1.21 -r1.30
--- OpenXM/src/kan96xx/plugin/oxmisc.c	2004/09/16 23:53:45	1.21
+++ OpenXM/src/kan96xx/plugin/oxmisc.c	2016/03/31 03:22:55	1.30
@@ -1,5 +1,6 @@
-/*  $OpenXM: OpenXM/src/kan96xx/plugin/oxmisc.c,v 1.20 2004/03/08 08:24:42 takayama Exp $ */
+/*  $OpenXM: OpenXM/src/kan96xx/plugin/oxmisc.c,v 1.29 2015/10/08 11:49:37 takayama Exp $ */
 #include <stdio.h>
+#include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
@@ -22,7 +23,9 @@ FILE *MyErrorOut = NULL;
 #include "../Kan/extern.h"
 
 #include "ox_kan.h"
+#include "mysig.h"
 
+
 #define READBUFSIZE 5000
 
 int OxVersion = 200012030;
@@ -178,6 +181,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 +350,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 +624,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 +649,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":
@@ -899,17 +923,18 @@ static void cancelConnection() {
 #else
   extern jmp_buf MyEnv_oxmisc;
 #endif
-  signal(SIGALRM,SIG_IGN);
+  mysignal(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;
@@ -927,15 +952,15 @@ 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{
   }
   alarm((unsigned int) 20);  /* setup timeout. */
-  signal(SIGALRM,cancelConnection);
+  mysignal(SIGALRM,cancelConnection);
   
   switch(ipmask) {
   case 0:/* only local */
@@ -957,23 +982,27 @@ 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);
     }
   }
-  signal(SIGALRM,SIG_IGN);
+  mysignal(SIGALRM,SIG_IGN);
 
   controlByteOrder = oxSetByteOrder(fdControl);
   if (v) fprintf(stderr,"Byte order for control process is %s.\n",