=================================================================== RCS file: /home/cvs/OpenXM/src/kan96xx/plugin/oxmisc.c,v retrieving revision 1.12 retrieving revision 1.32 diff -u -p -r1.12 -r1.32 --- OpenXM/src/kan96xx/plugin/oxmisc.c 2002/02/24 10:27:20 1.12 +++ OpenXM/src/kan96xx/plugin/oxmisc.c 2020/10/06 11:33:47 1.32 @@ -1,5 +1,6 @@ -/* $OpenXM: OpenXM/src/kan96xx/plugin/oxmisc.c,v 1.11 2001/12/28 08:18:22 takayama Exp $ */ +/* $OpenXM: OpenXM/src/kan96xx/plugin/oxmisc.c,v 1.31 2016/08/29 01:15:01 takayama Exp $ */ #include +#include #include #include #include @@ -11,6 +12,8 @@ #include #include #include +#include +#include #define SET_MYERROROUT { if (MyErrorOut == NULL) MyErrorOut=stdout; } /* It is also defined in oxmisc2.c */ FILE *MyErrorOut = NULL; @@ -21,7 +24,10 @@ FILE *MyErrorOut = NULL; #include "../Kan/extern.h" #include "ox_kan.h" +#include "mysig.h" +void restoreLockCtrlCForOx(); // defined in Kan/stackmachine.c + #define READBUFSIZE 5000 int OxVersion = 200012030; @@ -173,10 +179,31 @@ int oxWaitSyncBall(ox_stream ostream) { int sss; int mtag; + int com; while ((mtag = oxGetOXheader(ostream,&sss)) != OX_SYNC_BALL) { - fprintf(stderr,"Looking for the next message tag. mtag=%d\n",mtag); + switch (mtag) { + case OX_COMMAND: + fprintf(stderr,"Waiting for command body: "); fflush(NULL); + com=oxGetInt32(ostream); + fprintf(stderr,"%d. Done\n",com); + break; + default: /* Todo, need support OX_DATA */ + fprintf(stderr,"Looking for the next message tag. Current unknown or unimplented mtag=%d\n",mtag); + if (UseOXPacketSerial) fprintf(stderr,"Note that we expect the OX message tag with a serial number.\n"); + if (UseOXPacketSerial && (sss == OX_SYNC_BALL)) { + /* dirty trick, it might cause a trouble. */ + fprintf(stderr,"We assume that the serial number is OX_SYNC_BALL\n"); + oxGetInt32(ostream); // discard the serial of OX_SYNC_BALL + goto aaa ; + } + break; + } + aaa: /* or stdout */ fflush(NULL); + if (mtag == -1) { + fprintf(stderr,"Your peer seems to be dead.\n"); return 0; + } } } @@ -218,7 +245,7 @@ void oxfdSendCmoNull(int fd) { char data[4]; *((int *)&data[0]) = htonl(CMO_NULL); - write(fd,data,4); + {int r; r=write(fd,data,4);} fflush((FILE *)NULL); } void oxSendCmoNull(ox_stream os) @@ -250,7 +277,7 @@ void oxfdSendInt32(int fd,int k) { char data[4]; *((int *)&data[0]) = htonl(k); - write(fd,data,4); + {int r; r=write(fd,data,4);} fflush((FILE *)NULL); } void oxSendInt32(ox_stream os,int k) @@ -266,7 +293,7 @@ void oxfdSendCmoInt32(int fd,int k) char data[4*2]; *((int *)&data[0]) = htonl(CMO_INT32); *((int *)&data[4]) = htonl(k); - write(fd,data,4*2); + {int r; r=write(fd,data,4*2);} fflush((FILE *)NULL); } void oxSendCmoInt32(ox_stream os,int k) @@ -287,9 +314,9 @@ void oxfdSendCmoString(int fd,char *s) } *((int *)&data[0]) = htonl(CMO_STRING); *((int *)&data[4]) = htonl(n); - write(fd,data,4*2); + {int r; r=write(fd,data,4*2);} if (s != NULL) { - write(fd,s,n); + {int r; r=write(fd,s,n);} } fflush((FILE *)NULL); } @@ -325,7 +352,7 @@ void oxSendResultOfControlInt32(int fd,int i) oxfdSendOXheader(fd,OX_DATA,SerialOX++); *((int *)&data[0]) = htonl(CMO_INT32); *((int *)&data[4]) = htonl(i); - write(fd,data,4*2); + {int r; r=write(fd,data,4*2);} fflush((FILE *)NULL); } @@ -334,7 +361,7 @@ void oxSendResultOfControl(int fd) char data[4*1]; oxfdSendOXheader(fd,OX_DATA,SerialOX++); *((int *)&data[0]) = htonl(CMO_NULL); - write(fd,data,4*1); + {int r; r=write(fd,data,4*1);} fflush((FILE *)NULL); } @@ -343,7 +370,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); @@ -444,7 +471,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++); @@ -500,7 +536,6 @@ int oxclientMultiSelect(oxclientp clients[],int datare int humanfd = 0; fd_set readfds; struct timeval timeout; - extern int errno; SET_MYERROROUT; /** printf("(1)"); fflush(NULL); */ @@ -598,6 +633,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); } @@ -608,10 +644,10 @@ 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. */ { - static int clnum = 0; int v = 0; int fdControl = -1; int fdStream = -1; @@ -633,6 +669,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": @@ -654,7 +707,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; @@ -788,7 +841,7 @@ int oxGetOXheader(ox_stream ostream,int *sss) } -oxWritePortFile(int func,int port,char *fname) { +int oxWritePortFile(int func,int port,char *fname) { char name[1024]; FILE *fp; strcpy(name,fname); @@ -804,7 +857,7 @@ oxWritePortFile(int func,int port,char *fname) { fclose(fp); } } -oxReadPortFile(int func,char *fname) { +int oxReadPortFile(int func,char *fname) { int port = 0; char name[1024]; FILE *fp; @@ -812,12 +865,12 @@ oxReadPortFile(int func,char *fname) { if (func == 0) { strcat(name,".control"); fp = fopen(name,"r"); - fscanf(fp,"%d",&port); + {int r; r=fscanf(fp,"%d",&port);} fclose(fp); }else { strcat(name,".data"); fp = fopen(name,"r"); - fscanf(fp,"%d",&port); + {int r; r=fscanf(fp,"%d",&port);} fclose(fp); } return(port); @@ -869,14 +922,16 @@ char *oxGenPass(void) { static int seed = 0; long p; char *s; - int i; + int i,n; if (seed == 0) { - seed = (int) time(NULL) + (int) &p; + seed = (int) time(NULL) + (int) ((long) &p); srandom((unsigned int) seed); } - for (i=0; i < ((int) &p) % 100 ; i++) random(); - p = random(); s = (char *)malloc(128*sizeof(char)); + if (s == NULL) { fprintf(stderr,"No more memory.\n"); return(s); } + n = (((int)((long) s)) + (int) time(NULL)) % 100; + for (i=0; i < n ; i++) random(); + p = random(); sprintf(s,"%ld",p); return(s); } @@ -888,19 +943,19 @@ 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) { - static int clnum = 0; int v = 0; int fdControl = -1; int fdStream = -1; @@ -917,15 +972,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 */ @@ -941,28 +996,33 @@ 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); } /* Authentication by password. */ - m = strlen(pass); + m = strlen(passControl)+strlen(passData); if (m > 0) { s = (char *)mymalloc(sizeof(char)*(m+1)); - read(fdControl,s,m+1); s[m] = '\0'; - if (strcmp(s,pass) != 0) { + m = strlen(passControl); s[0] = 0; + {int r; r=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); } - read(fdStream,s,m+1); s[m] = '\0'; - if (strcmp(s,pass) != 0) { + m = strlen(passData); s[0] = 0; + {int r; r=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); } } - signal(SIGALRM,SIG_IGN); + mysignal(SIGALRM,SIG_IGN); controlByteOrder = oxSetByteOrder(fdControl); if (v) fprintf(stderr,"Byte order for control process is %s.\n", @@ -986,7 +1046,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; @@ -998,30 +1058,91 @@ int oxSetByteOrder(int fd) { int peertype; /* It is for client. read and next write. */ /* oxSocketSelect0(fd,10); wait. */ - read(fd,data,1); + {int r; r=read(fd,data,1);} peertype = (unsigned char) data[0]; /* We support only Network byte order */ data[0] = OX_BYTE_NETWORK_BYTE_ORDER; - write(fd,data,1); + {int r; r=write(fd,data,1);} 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? */ + {int r; r=write(fdOut,data,1);} + fsync(fdOut); /* returns 0 if normal. Does it work for socket? */ - read(fd,data,1); + {int r; r=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