===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/plugin/oxmisc.c,v
retrieving revision 1.1.1.1
retrieving revision 1.8
diff -u -p -r1.1.1.1 -r1.8
--- OpenXM/src/kan96xx/plugin/oxmisc.c	1999/10/08 02:12:05	1.1.1.1
+++ OpenXM/src/kan96xx/plugin/oxmisc.c	2000/12/03 07:29:39	1.8
@@ -1,3 +1,4 @@
+/*  $OpenXM: OpenXM/src/kan96xx/plugin/oxmisc.c,v 1.7 2000/09/08 17:30:50 takayama Exp $ */
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -10,7 +11,9 @@
 #include <unistd.h>
 #include <signal.h>
 #include <setjmp.h>
-FILE *MyErrorOut = stdout;
+#define SET_MYERROROUT { if (MyErrorOut == NULL) MyErrorOut=stdout; }
+/* It is also defined in oxmisc2.c */
+FILE *MyErrorOut = NULL;
 
 /* Include files to understand object */
 #include "../Kan/datatype.h"
@@ -21,7 +24,7 @@ FILE *MyErrorOut = stdout;
 
 #define READBUFSIZE 5000
 
-int OxVersion = 199909080;
+int OxVersion = 200012030;
 int UseOXPacketSerial = 1;
 int SerialOX = 1;
 extern int Quiet;
@@ -36,6 +39,7 @@ int readOneByte(int fd)   /* blocking */
   int ans;
   int watch = 1;
 
+  SET_MYERROROUT;
   if (fd < 0) {
     fprintf(MyErrorOut,"readOneByte fd < 0 ??? .\n");
     return(-1);
@@ -44,7 +48,7 @@ int readOneByte(int fd)   /* blocking */
   if (oxSocketSelect0(fd,-1)) { /* block */
     size = read(fd,data,1);
     if (size == 0) {
-      fprintf(MyErrorOut,"oxSocketSelect0() returns 1, but there is no data. You peer may be killed.\n");
+      fprintf(MyErrorOut,"oxSocketSelect0() returns 1, but there is no data. Your peer may be killed.\n");
       return(-1);
     }
     return(data[0]);
@@ -64,6 +68,7 @@ int readOneByte_org(int fd)   /* blocking */
   int ans;
   int watch = 1;
 
+  SET_MYERROROUT;
   if ((thisFd == -1) && (fd >= 0)) {thisFd = fd;}
   if (fd < 0) {
     fprintf(MyErrorOut,"readOneByte fd < 0 ??? .\n");
@@ -89,7 +94,7 @@ int readOneByte_org(int fd)   /* blocking */
     if (oxSocketSelect0(fd,-1)) { /* block */
       size = read(fd,data,READBUFSIZE-1);
       if (size == 0) {
-	fprintf(MyErrorOut,"oxSocketSelect0() returns 1, but there is no data. You peer may be killed.\n");
+	fprintf(MyErrorOut,"oxSocketSelect0() returns 1, but there is no data. Your peer may be killed.\n");
 	return(-1);
       }
       from = 0;
@@ -122,6 +127,7 @@ int oxGetInt32(ox_stream ostream)
 int oxGetCMOInt32(ox_stream ostream)
 {
   int id;
+  SET_MYERROROUT;
   id = oxGetInt32(ostream);
   if (id != CMO_INT32) {
     fprintf(MyErrorOut,"It is not CMO_INT32.\n");
@@ -134,6 +140,7 @@ char *oxGetCMOString(ox_stream ostream) {
   int size;
   char *r;
   int i;
+  SET_MYERROROUT;
   id = oxGetInt32(ostream);
   if (id != CMO_STRING) {
     fprintf(MyErrorOut,"It is not CMO_STRING.\n");
@@ -178,6 +185,7 @@ int oxWaitSyncBall_org(ox_stream ostream)
   int mtag;
   char data[4];
   int c;
+  SET_MYERROROUT;
   data[0] = data[1] = data[2] = data[3] = 0xff;
   while (1) {
     /* This part should be revised so that this part understands
@@ -334,7 +342,7 @@ void oxSendResultOfControl(int fd) 
 
 void oxSendMathCap(ox_stream os,struct mathCap *mathcap)
 {
-  int i,n,infosize;
+  int i,n,infosize,ncmo;
   struct object mathinfo;
   /* printf("ox sending mathcap\n"); fflush(stdout); */
   mathinfo = *((struct object *)(mathcap->infop));
@@ -363,23 +371,23 @@ void oxSendMathCap(ox_stream os,struct mathCap *mathca
 
   /* [2] */
   oxSendInt32(os,CMO_LIST);
-  oxSendInt32(os,2);
+  n = mathcap->oxSize;
+  oxSendInt32(os,n);
 
-  /* first element */
   oxSendInt32(os,CMO_LIST);
-  oxSendInt32(os,mathcap->oxSize);
-  n = mathcap->oxSize;
+  oxSendInt32(os,2);
   for (i=0; i<n; i++) {
+    /* OX_DATA_xxx */
     oxSendCmoInt32(os,(mathcap->ox)[i]);
+    /* OX_DATA_xxx tags. In case of CMO, it is CMO tags. */
+    oxSendInt32(os,CMO_LIST);
+    oxSendInt32(os,mathcap->n);
+    ncmo = mathcap->n;
+    for (i=0; i<ncmo; i++) {
+      oxSendCmoInt32(os,(mathcap->cmo)[i]);
+      /* printf("i=%d %d, ",i,(mathcap->cmo)[i]); */
+    }
   }
-  /* second element */
-  oxSendInt32(os,CMO_LIST);
-  oxSendInt32(os,mathcap->n);
-  n = mathcap->n;
-  for (i=0; i<n; i++) {
-    oxSendCmoInt32(os,(mathcap->cmo)[i]);
-    /* printf("i=%d %d, ",i,(mathcap->cmo)[i]); */
-  }
   /* printf("\n"); fflush(stdout); */
 }
 
@@ -473,6 +481,7 @@ void oxReqPopCMO(ox_stream os) {
 
 int oxGetResultOfControlInt32(int fd) {
   int k; int sss;
+  SET_MYERROROUT;
   k = oxfdGetOXheader(fd,&sss);
   if (k != OX_DATA) {
     fprintf(MyErrorOut,"oxGetResultOfControlInt32: wrong header.");
@@ -493,6 +502,7 @@ int oxclientMultiSelect(oxclientp clients[],int datare
   struct timeval timeout;
   extern int errno;
 
+  SET_MYERROROUT;
   /** printf("(1)"); fflush(NULL); */
   FD_ZERO(&readfds);
   timeout.tv_sec = 0;
@@ -507,28 +517,32 @@ int oxclientMultiSelect(oxclientp clients[],int datare
       fd = (fd<humanfd?humanfd:fd);
       FD_SET(humanfd,&readfds);
       if (oxSocketSelect0(humanfd,0)) {
-	ddd = dataready[i] = 1; controlready[i] = 0;
+		ddd = dataready[i] = 1; controlready[i] = 0;
       }else{
-	dataready[i] = 0; controlready[i] = 0;
+		dataready[i] = 0; controlready[i] = 0;
       }
     }else{
-      fd = (fd<clients[i]->controlfd?clients[i]->controlfd:fd);
-      FD_SET(clients[i]->controlfd,&readfds);
-      if (oxSocketSelect0(clients[i]->controlfd,0)) {
-	ddd = controlready[i] = 1;
-      }else{
-	controlready[i] = 0;
-      }
+	  if (clients[i]->controlport < 0) { /* For RFC_101 */
+		controlready[i] = 0;  
+	  }else{
+		fd = (fd<clients[i]->controlfd?clients[i]->controlfd:fd);
+		FD_SET(clients[i]->controlfd,&readfds);
+		if (oxSocketSelect0(clients[i]->controlfd,0)) {
+		  ddd = controlready[i] = 1;
+		}else{
+		  controlready[i] = 0;
+		}
+	  }
       if (clients[i]->datafp2 != NULL) {
-	fd = (fd<clients[i]->datafp2->fd?clients[i]->datafp2->fd:fd);
-	FD_SET(clients[i]->datafp2->fd,&readfds);
-	if (fp2select(clients[i]->datafp2,0)) {
-	  ddd = dataready[i] = 1;
-	}else{
-	  dataready[i] = 0;
-	}
+		fd = (fd<clients[i]->datafp2->fd?clients[i]->datafp2->fd:fd);
+		FD_SET(clients[i]->datafp2->fd,&readfds);
+		if (fp2select(clients[i]->datafp2,0)) {
+		  ddd = dataready[i] = 1;
+		}else{
+		  dataready[i] = 0;
+		}
       }else{
-	dataready[i] = 0;
+		dataready[i] = 0;
       }
     }
   }
@@ -829,6 +843,7 @@ char *oxGenPortFile(void) {
 int oxRemovePortFile(void) {
   char fname[1024];
   FILE *fp;
+  SET_MYERROROUT;
   strcpy(fname,OxPortFileName);
   strcat(fname,".control");
   if ((fp=fopen(fname,"r")) == NULL) {
@@ -851,11 +866,15 @@ int oxRemovePortFile(void) {
 }
   
 char *oxGenPass(void) {
-  int seed;
+  static int seed = 0;
   long p;
   char *s;
-  seed = (int) time(NULL);
-  srandom((unsigned int) seed);
+  int i;
+  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));
   sprintf(s,"%ld",p);
@@ -910,18 +929,18 @@ oxclientp oxCreateClient2(int fdstream,int portStream,
     return(NULL);
   }
 
-  /* Authentification by password. */
+  /* Authentication by password. */
   m = strlen(pass);
   s = (char *)mymalloc(sizeof(char)*(m+1));
-  read(fdControl,s,m); s[m] = '\0';
+  read(fdControl,s,m+1); s[m] = '\0';
   if (strcmp(s,pass) != 0) {
-    fprintf(stderr,"oxCreateClient2(): password authentification failed for control channel.\n");
+    fprintf(stderr,"oxCreateClient2(): password authentication failed for control channel.\n");
     close(fdControl);
     return(NULL);
   }
-  read(fdStream,s,m); s[m] = '\0';
+  read(fdStream,s,m+1); s[m] = '\0';
   if (strcmp(s,pass) != 0) {
-    fprintf(stderr,"oxCreateClient2(): password authentification failed for data channel.\n");
+    fprintf(stderr,"oxCreateClient2(): password authentication failed for data channel.\n");
     close(fdStream);
     return(NULL);
   }