=================================================================== RCS file: /home/cvs/OpenXM/src/kan96xx/plugin/oxmisc.c,v retrieving revision 1.1.1.1 retrieving revision 1.24 diff -u -p -r1.1.1.1 -r1.24 --- OpenXM/src/kan96xx/plugin/oxmisc.c 1999/10/08 02:12:05 1.1.1.1 +++ OpenXM/src/kan96xx/plugin/oxmisc.c 2005/06/16 05:07:24 1.24 @@ -1,3 +1,4 @@ +/* $OpenXM: OpenXM/src/kan96xx/plugin/oxmisc.c,v 1.23 2004/09/17 08:46:10 takayama Exp $ */ #include #include #include @@ -10,7 +11,10 @@ #include #include #include -FILE *MyErrorOut = stdout; +#include +#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 +25,7 @@ FILE *MyErrorOut = stdout; #define READBUFSIZE 5000 -int OxVersion = 199909080; +int OxVersion = 200012030; int UseOXPacketSerial = 1; int SerialOX = 1; extern int Quiet; @@ -36,6 +40,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 +49,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 +69,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,8 +95,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; @@ -122,6 +128,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 +141,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"); @@ -168,7 +176,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); } } @@ -178,11 +186,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. */ @@ -200,7 +209,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); } } @@ -334,8 +343,8 @@ void oxSendResultOfControl(int fd) void oxSendMathCap(ox_stream os,struct mathCap *mathcap) { - int i,n,infosize; - struct object mathinfo; + int i,n,infosize,ncmo; + struct object mathinfo = OINIT; /* printf("ox sending mathcap\n"); fflush(stdout); */ mathinfo = *((struct object *)(mathcap->infop)); infosize = getoaSize(mathinfo); @@ -363,23 +372,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; iox)[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; icmo)[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; icmo)[i]); - /* printf("i=%d %d, ",i,(mathcap->cmo)[i]); */ - } /* printf("\n"); fflush(stdout); */ } @@ -436,7 +445,16 @@ void oxReqExecuteFunction(ox_stream os,char *s) fp2fflush(os); } +void oxReqExecuteFunctionWithOptionalArgument(ox_stream os,char *s) +{ + oxSendOXheader(os,OX_DATA,SerialOX++); + oxSendCmoString(os,s); + oxSendOXheader(os,OX_COMMAND,SerialOX++); + oxSendInt32(os,SM_executeFunctionWithOptionalArgument); + fp2fflush(os); +} + void oxReqPopString(ox_stream os) { oxSendOXheader(os,OX_COMMAND,SerialOX++); @@ -473,6 +491,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."); @@ -484,15 +503,15 @@ 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; int humanfd = 0; fd_set readfds; struct timeval timeout; - extern int errno; + SET_MYERROROUT; /** printf("(1)"); fflush(NULL); */ FD_ZERO(&readfds); timeout.tv_sec = 0; @@ -507,28 +526,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; } } } @@ -553,7 +576,7 @@ int oxclientMultiSelect(oxclientp clients[],int datare } int oxGetControl(oxclientp client) -/* synchronized. */ + /* synchronized. */ { int ans; ox_stream os; @@ -584,6 +607,7 @@ int oxInitClient(oxclientp client) client->mathcapObjp = NULL; client->controlByteOrder = OX_BYTE_NETWORK_BYTE_ORDER; client->engineByteOrder = OX_BYTE_NETWORK_BYTE_ORDER; + client->engineID = -1; return(0); } @@ -594,10 +618,10 @@ int oxIsThereErrorClient(oxclientp client) { return(0); } -oxclientp oxCreateClient(char *sname,int portStream,int portControl) - /* you also need to change oxCreateClient2. */ +oxclientp oxCreateClient(char *sname,int portStream,int portControl, + char *passControl, char *passData) + /* you also need to change oxCreateClient2. */ { - static int clnum = 0; int v = 0; int fdControl = -1; int fdStream = -1; @@ -619,16 +643,33 @@ 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": - (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); @@ -640,7 +681,7 @@ oxclientp oxCreateClient(char *sname,int portStream,in client->dataport = portStream; client->controlport = portControl; client->controlfd = fdControl; - client->id = clnum; clnum++; + client->id = oxGetClientID(); client->type = CLIENT_SOCKET; /* socket */ client->engineByteOrder = engineByteOrder; client->controlByteOrder = controlByteOrder; @@ -707,7 +748,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; @@ -829,6 +870,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,29 +893,43 @@ int oxRemovePortFile(void) { } char *oxGenPass(void) { - int seed; + static int seed = 0; long p; char *s; - seed = (int) time(NULL); - srandom((unsigned int) seed); - p = random(); + int i,n; + if (seed == 0) { + seed = (int) time(NULL) + (int) &p; + srandom((unsigned int) seed); + } 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); } static void cancelConnection() { +#if defined(__CYGWIN__) + extern sigjmp_buf MyEnv_oxmisc; +#else extern jmp_buf MyEnv_oxmisc; +#endif signal(SIGALRM,SIG_IGN); fprintf(stderr,"Time out in TCP/IP connection.\n"); +#if defined(__CYGWIN__) + siglongjmp(MyEnv_oxmisc,1); +#else longjmp(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) { - static int clnum = 0; int v = 0; int fdControl = -1; int fdStream = -1; @@ -881,15 +937,23 @@ oxclientp oxCreateClient2(int fdstream,int portStream, char *s; oxclientp client; - extern jmp_buf MyEnv_oxmisc ; +#if defined(__CYGWIN__) + extern sigjmp_buf MyEnv_oxmisc; +#else + extern jmp_buf MyEnv_oxmisc; +#endif int controlByteOrder, engineByteOrder; v = !Quiet; +#if defined(__CYGWIN__) + if (sigsetjmp(MyEnv_oxmisc,1)) { +#else if (setjmp(MyEnv_oxmisc)) { +#endif return(NULL); }else{ } - alarm((unsigned int) 10); /* setup timeout. */ + alarm((unsigned int) 20); /* setup timeout. */ signal(SIGALRM,cancelConnection); switch(ipmask) { @@ -906,37 +970,44 @@ oxclientp oxCreateClient2(int fdstream,int portStream, if (v) fprintf(stderr,"\nStream port %d : Connected.\n",portStream); if (fdStream == -1 || fdControl == -1) { - fprintf(stderr,"\nOpen error in oxCreateClient.\n"); + fprintf(stderr,"\nOpen error in oxCreateClient2.\n"); + fprintf(stderr,"fdStream=%d, fdControl=%d\n",fdStream,fdControl); return(NULL); } - /* Authentification by password. */ - m = strlen(pass); - s = (char *)mymalloc(sizeof(char)*(m+1)); - read(fdControl,s,m); s[m] = '\0'; - if (strcmp(s,pass) != 0) { - fprintf(stderr,"oxCreateClient2(): password authentification failed for control channel.\n"); - close(fdControl); - return(NULL); + /* Authentication by password. */ + 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,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,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); + } } - read(fdStream,s,m); 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)); @@ -949,7 +1020,7 @@ oxclientp oxCreateClient2(int fdstream,int portStream, client->dataport = portStream; client->controlport = portControl; client->controlfd = fdControl; - client->id = clnum; clnum++; + client->id = oxGetClientID(); client->type = CLIENT_SOCKET; /* socket */ client->engineByteOrder = engineByteOrder; client->controlByteOrder = controlByteOrder; @@ -971,20 +1042,81 @@ int oxSetByteOrder(int fd) { return(OX_BYTE_NETWORK_BYTE_ORDER); } -int oxTellMyByteOrder(int fd) { +int oxTellMyByteOrder(int fdOut, int fdIn) { char data[1]; int peertype; /* It is for server. read and next write. */ /* We support only Network byte order */ data[0] = OX_BYTE_NETWORK_BYTE_ORDER; - write(fd,data,1); - fsync(fd); /* returns 0 if normal. Does it work for socket? */ + write(fdOut,data,1); + fsync(fdOut); /* returns 0 if normal. Does it work for socket? */ - read(fd,data,1); + read(fdIn,data,1); /* Read pear's byte order */ return(OX_BYTE_NETWORK_BYTE_ORDER); } +struct object OxClientList[MAX_N_OF_CLIENT]; +int OxClientListn = 0; +int oxGetClientID() { + extern struct object OxClientList[]; + extern int OxClientListn; + extern struct object Nobj; + int i; + for (i=0; i