===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/plugin/oxmisc.c,v
retrieving revision 1.5
retrieving revision 1.8
diff -u -p -r1.5 -r1.8
--- OpenXM/src/kan96xx/plugin/oxmisc.c	2000/03/20 01:53:47	1.5
+++ OpenXM/src/kan96xx/plugin/oxmisc.c	2000/12/03 07:29:39	1.8
@@ -1,4 +1,4 @@
-/*  $OpenXM: OpenXM/src/kan96xx/plugin/oxmisc.c,v 1.4 1999/11/27 01:41:11 takayama Exp $ */
+/*  $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>
@@ -24,7 +24,7 @@ FILE *MyErrorOut = NULL;
 
 #define READBUFSIZE 5000
 
-int OxVersion = 199909080;
+int OxVersion = 200012030;
 int UseOXPacketSerial = 1;
 int SerialOX = 1;
 extern int Quiet;
@@ -48,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]);
@@ -94,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;
@@ -517,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;
       }
     }
   }
@@ -925,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+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+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);
   }