=================================================================== RCS file: /home/cvs/OpenXM/src/kan96xx/plugin/oxmisc.c,v retrieving revision 1.4 retrieving revision 1.11 diff -u -p -r1.4 -r1.11 --- OpenXM/src/kan96xx/plugin/oxmisc.c 1999/11/27 01:41:11 1.4 +++ OpenXM/src/kan96xx/plugin/oxmisc.c 2001/12/28 08:18:22 1.11 @@ -1,4 +1,4 @@ -/* $OpenXM: OpenXM/src/kan96xx/plugin/oxmisc.c,v 1.3 1999/11/03 08:29:40 takayama Exp $ */ +/* $OpenXM: OpenXM/src/kan96xx/plugin/oxmisc.c,v 1.10 2001/08/10 13:48:39 takayama Exp $ */ #include #include #include @@ -11,7 +11,9 @@ #include #include #include -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" @@ -22,7 +24,7 @@ FILE *MyErrorOut = stdout; #define READBUFSIZE 5000 -int OxVersion = 199909080; +int OxVersion = 200012030; int UseOXPacketSerial = 1; int SerialOX = 1; extern int Quiet; @@ -37,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); @@ -45,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]); @@ -65,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"); @@ -90,8 +94,8 @@ 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"); - return(-1); + fprintf(MyErrorOut,"oxSocketSelect0() returns 1, but there is no data. Your peer may be killed.\n"); + return(-1); } from = 0; to = size; @@ -123,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"); @@ -135,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"); @@ -169,7 +175,7 @@ int oxWaitSyncBall(ox_stream ostream) int mtag; while ((mtag = oxGetOXheader(ostream,&sss)) != OX_SYNC_BALL) { fprintf(stderr,"Looking for the next message tag. mtag=%d\n",mtag); - /* or stdout */ + /* or stdout */ fflush(NULL); } } @@ -179,11 +185,12 @@ 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 the cmo format. - */ + */ if ((c = fp2fgetc(ostream)) < 0) { /* never use read directory. readOneByte() is buffers every thing. */ @@ -201,7 +208,7 @@ int oxWaitSyncBall_org(ox_stream ostream) return(mtag); } fprintf(stderr,"Looking for the next message tag.. %2x, mtag=%d\n",c,mtag); - /* or stdout */ + /* or stdout */ fflush(NULL); } } @@ -474,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."); @@ -485,7 +493,7 @@ int oxGetResultOfControlInt32(int fd) { } int oxclientMultiSelect(oxclientp clients[],int dataready[], - int controlready[], int size, int t) + int controlready[], int size, int t) { int i, ddd; int fd; @@ -494,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; @@ -508,28 +517,32 @@ int oxclientMultiSelect(oxclientp clients[],int datare fd = (fdcontrolfd?clients[i]->controlfd:fd); - FD_SET(clients[i]->controlfd,&readfds); - if (oxSocketSelect0(clients[i]->controlfd,0)) { - ddd = controlready[i] = 1; + if (clients[i]->controlport < 0) { /* For RFC_101 */ + controlready[i] = 0; }else{ - controlready[i] = 0; + fd = (fdcontrolfd?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 = (fddatafp2->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 = (fddatafp2->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; } } } @@ -554,7 +567,7 @@ int oxclientMultiSelect(oxclientp clients[],int datare } int oxGetControl(oxclientp client) -/* synchronized. */ + /* synchronized. */ { int ans; ox_stream os; @@ -596,7 +609,7 @@ int oxIsThereErrorClient(oxclientp client) { } oxclientp oxCreateClient(char *sname,int portStream,int portControl) - /* you also need to change oxCreateClient2. */ + /* you also need to change oxCreateClient2. */ { static int clnum = 0; int v = 0; @@ -622,14 +635,14 @@ oxclientp oxCreateClient(char *sname,int portStream,in controlByteOrder = oxSetByteOrder(fdControl); if (v) fprintf(stderr,"Byte order for control process is %s.\n", - (controlByteOrder == 0? "network byte order": - (controlByteOrder == 1? "little indican": - "big indian"))); + (controlByteOrder == 0? "network byte order": + (controlByteOrder == 1? "little indican": + "big indian"))); engineByteOrder = oxSetByteOrder(fdStream); if (v) fprintf(stderr,"Byte order for engine process is %s.\n", - (engineByteOrder == 0? "network byte order": - (engineByteOrder == 1? "little indican": - "big indian"))); + (engineByteOrder == 0? "network byte order": + (engineByteOrder == 1? "little indican": + "big indian"))); client = (oxclientp) mymalloc(sizeof(oxclient)); oxInitClient(client); @@ -708,7 +721,7 @@ oxclientp oxCreateClientFile(char *fname,char *mode,ch } void oxSendOXheader_generic(int type,int fd,ox_stream ox, - int k,int serial) + int k,int serial) { static int ss = 0; extern int UseOXPacketSerial; @@ -830,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) { @@ -876,7 +890,7 @@ static void cancelConnection() { } oxclientp oxCreateClient2(int fdstream,int portStream, - int fdcontrol,int portControl,int ipmask,char *pass) + int fdcontrol,int portControl,int ipmask,char *pass) { static int clnum = 0; int v = 0; @@ -894,7 +908,7 @@ oxclientp oxCreateClient2(int fdstream,int portStream, return(NULL); }else{ } - alarm((unsigned int) 10); /* setup timeout. */ + alarm((unsigned int) 20); /* setup timeout. */ signal(SIGALRM,cancelConnection); switch(ipmask) { @@ -915,33 +929,35 @@ 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"); - close(fdControl); - return(NULL); + if (m > 0) { + s = (char *)mymalloc(sizeof(char)*(m+1)); + read(fdControl,s,m+1); s[m] = '\0'; + if (strcmp(s,pass) != 0) { + 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 authentication failed for data channel.\n"); + close(fdStream); + 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"); - close(fdStream); - return(NULL); - } signal(SIGALRM,SIG_IGN); controlByteOrder = oxSetByteOrder(fdControl); if (v) fprintf(stderr,"Byte order for control process is %s.\n", - (controlByteOrder == 0? "network byte order": - (controlByteOrder == 1? "little indican": - "big indian"))); + (controlByteOrder == 0? "network byte order": + (controlByteOrder == 1? "little indican": + "big indian"))); engineByteOrder = oxSetByteOrder(fdStream); if (v) fprintf(stderr,"Byte order for engine process is %s.\n", - (engineByteOrder == 0? "network byte order": - (engineByteOrder == 1? "little indican": - "big indian"))); + (engineByteOrder == 0? "network byte order": + (engineByteOrder == 1? "little indican": + "big indian"))); client = (oxclientp) mymalloc(sizeof(oxclient));