=================================================================== RCS file: /home/cvs/OpenXM/src/kan96xx/plugin/oxmisc.c,v retrieving revision 1.15 retrieving revision 1.31 diff -u -p -r1.15 -r1.31 --- OpenXM/src/kan96xx/plugin/oxmisc.c 2002/11/08 02:54:11 1.15 +++ OpenXM/src/kan96xx/plugin/oxmisc.c 2016/08/29 01:15:01 1.31 @@ -1,5 +1,6 @@ -/* $OpenXM: OpenXM/src/kan96xx/plugin/oxmisc.c,v 1.14 2002/11/07 23:52:20 takayama Exp $ */ +/* $OpenXM: OpenXM/src/kan96xx/plugin/oxmisc.c,v 1.30 2016/03/31 03:22:55 takayama Exp $ */ #include +#include #include #include #include @@ -11,6 +12,7 @@ #include #include #include +#include #define SET_MYERROROUT { if (MyErrorOut == NULL) MyErrorOut=stdout; } /* It is also defined in oxmisc2.c */ FILE *MyErrorOut = NULL; @@ -21,7 +23,9 @@ FILE *MyErrorOut = NULL; #include "../Kan/extern.h" #include "ox_kan.h" +#include "mysig.h" + #define READBUFSIZE 5000 int OxVersion = 200012030; @@ -173,10 +177,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; + } } } @@ -343,7 +368,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 +469,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 +534,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); */ @@ -609,7 +642,8 @@ 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. */ { int v = 0; @@ -633,6 +667,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": @@ -869,14 +920,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; 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) s) + (int) time(NULL)) % 100; + for (i=0; i < n ; i++) random(); + p = random(); sprintf(s,"%ld",p); return(s); } @@ -888,17 +941,18 @@ 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) { int v = 0; int fdControl = -1; @@ -916,15 +970,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 */ @@ -940,28 +994,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)); + m = strlen(passControl); s[0] = 0; read(fdControl,s,m+1); s[m] = '\0'; - if (strcmp(s,pass) != 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,pass) != 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", @@ -1007,17 +1066,17 @@ 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); } @@ -1047,3 +1106,41 @@ int oxGetClientID() { } } +char *oxFIDtoStr(int id) { + switch( id ) { + case SM_mathcap: + return "SM_mathcap"; break; + case SM_setMathCap: + return "SM_setMathCap"; break; + case SM_pops: + return "SM_pops"; break; + case SM_getsp: + return "SM_getsp"; break; + case SM_dupErrors: + return "SM_dupErrors"; break; + case SM_pushCMOtag: + return "SM_pushCMOtag"; break; + case SM_setName: + return "SM_setName"; break; + case SM_evalName: + return "SM_evalName"; break; + case SM_executeStringByLocalParser: + return "SM_executeStringByLocalParser"; break; + case SM_executeFunction: + return "SM_executeFunction"; break; + case SM_executeFunctionWithOptionalArgument: + return "SM_executeFunctionWithOptionalArgument"; break; + case SM_popCMO: + return "SM_popCMO"; break; + case SM_popString: + return "SM_popString"; break; + case SM_shutdown: + return "SM_shutdown"; break; + case SM_beginBlock: + return "SM_beginBlock"; break; + case SM_endBlock: + return "SM_endBlock"; break; + default: + return "Unknown to oxFIDtoStr"; break; + } +}