[BACK]Return to oxmisc.c CVS log [TXT][DIR] Up to [local] / OpenXM / src / kan96xx / plugin

Diff for /OpenXM/src/kan96xx/plugin/oxmisc.c between version 1.17 and 1.23

version 1.17, 2003/11/18 11:08:27 version 1.23, 2004/09/17 08:46:10
Line 1 
Line 1 
 /*  $OpenXM: OpenXM/src/kan96xx/plugin/oxmisc.c,v 1.16 2003/07/20 07:18:45 takayama Exp $ */  /*  $OpenXM: OpenXM/src/kan96xx/plugin/oxmisc.c,v 1.22 2004/09/17 07:27:28 takayama Exp $ */
 #include <stdio.h>  #include <stdio.h>
 #include <sys/types.h>  #include <sys/types.h>
 #include <sys/stat.h>  #include <sys/stat.h>
Line 11 
Line 11 
 #include <unistd.h>  #include <unistd.h>
 #include <signal.h>  #include <signal.h>
 #include <setjmp.h>  #include <setjmp.h>
   #include <errno.h>
 #define SET_MYERROROUT { if (MyErrorOut == NULL) MyErrorOut=stdout; }  #define SET_MYERROROUT { if (MyErrorOut == NULL) MyErrorOut=stdout; }
 /* It is also defined in oxmisc2.c */  /* It is also defined in oxmisc2.c */
 FILE *MyErrorOut = NULL;  FILE *MyErrorOut = NULL;
Line 444  void oxReqExecuteFunction(ox_stream os,char *s)
Line 445  void oxReqExecuteFunction(ox_stream os,char *s)
   fp2fflush(os);    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)  void oxReqPopString(ox_stream os)
 {  {
   oxSendOXheader(os,OX_COMMAND,SerialOX++);    oxSendOXheader(os,OX_COMMAND,SerialOX++);
Line 500  int oxclientMultiSelect(oxclientp clients[],int datare
Line 510  int oxclientMultiSelect(oxclientp clients[],int datare
   int humanfd = 0;    int humanfd = 0;
   fd_set readfds;    fd_set readfds;
   struct timeval timeout;    struct timeval timeout;
   extern int errno;  
   
   SET_MYERROROUT;    SET_MYERROROUT;
   /** printf("(1)"); fflush(NULL); */    /** printf("(1)"); fflush(NULL); */
Line 609  int oxIsThereErrorClient(oxclientp client) {
Line 618  int oxIsThereErrorClient(oxclientp client) {
   return(0);    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. */       /* you also need to change oxCreateClient2. */
 {  {
   int v = 0;    int v = 0;
Line 633  oxclientp oxCreateClient(char *sname,int portStream,in
Line 643  oxclientp oxCreateClient(char *sname,int portStream,in
     return(NULL);      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);    controlByteOrder = oxSetByteOrder(fdControl);
   if (v) fprintf(stderr,"Byte order for control process is %s.\n",    if (v) fprintf(stderr,"Byte order for control process is %s.\n",
                  (controlByteOrder == 0? "network byte order":                   (controlByteOrder == 0? "network byte order":
Line 869  char *oxGenPass(void) {
Line 896  char *oxGenPass(void) {
   static int seed = 0;    static int seed = 0;
   long p;    long p;
   char *s;    char *s;
   int i;    int i,n;
   if (seed == 0) {    if (seed == 0) {
     seed = (int) time(NULL) + (int) &p;      seed = (int) time(NULL) + (int) &p;
     srandom((unsigned int) seed);      srandom((unsigned int) seed);
   }    }
   for (i=0; i < ((int) &p) % 100 ; i++) random();  
   p = random();  
   s = (char *)malloc(128*sizeof(char));    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);    sprintf(s,"%ld",p);
   return(s);    return(s);
 }  }
Line 898  static void cancelConnection() {
Line 927  static void cancelConnection() {
 }  }
   
 oxclientp oxCreateClient2(int fdstream,int portStream,  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 v = 0;
   int fdControl = -1;    int fdControl = -1;
Line 946  oxclientp oxCreateClient2(int fdstream,int portStream,
Line 976  oxclientp oxCreateClient2(int fdstream,int portStream,
   }    }
   
   /* Authentication by password. */    /* Authentication by password. */
   m = strlen(pass);    m = strlen(passControl)+strlen(passData);
   if (m > 0) {    if (m > 0) {
     s = (char *)mymalloc(sizeof(char)*(m+1));      s = (char *)mymalloc(sizeof(char)*(m+1));
       m = strlen(passControl); s[0] = 0;
     read(fdControl,s,m+1); s[m] = '\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");        fprintf(stderr,"oxCreateClient2(): password authentication failed for control channel.\n");
       close(fdControl);        close(fdControl);
       return(NULL);        return(NULL);
     }      }
       m = strlen(passData); s[0] = 0;
     read(fdStream,s,m+1); s[m] = '\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");        fprintf(stderr,"oxCreateClient2(): password authentication failed for data channel.\n");
       close(fdStream);        close(fdStream);
       return(NULL);        return(NULL);
Line 1048  int oxGetClientID() {
Line 1082  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;
     }
   }
Legend:
Removed from v.1.17  
changed lines
  Added in v.1.23
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>