[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.18 and 1.22

version 1.18, 2003/11/19 01:02:39 version 1.22, 2004/09/17 07:27:28
Line 1 
Line 1 
 /*  $OpenXM: OpenXM/src/kan96xx/plugin/oxmisc.c,v 1.17 2003/11/18 11:08:27 takayama Exp $ */  /*  $OpenXM: OpenXM/src/kan96xx/plugin/oxmisc.c,v 1.21 2004/09/16 23:53:45 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 869  char *oxGenPass(void) {
Line 878  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 909  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 958  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 1070  char *oxFIDtoStr(int id) {
Line 1086  char *oxFIDtoStr(int id) {
     return "SM_executeStringByLocalParser"; break;      return "SM_executeStringByLocalParser"; break;
   case SM_executeFunction:    case SM_executeFunction:
     return "SM_executeFunction"; break;      return "SM_executeFunction"; break;
     case SM_executeFunctionWithOptionalArgument:
       return "SM_executeFunctionWithOptionalArgument"; break;
   case SM_popCMO:    case SM_popCMO:
     return "SM_popCMO"; break;      return "SM_popCMO"; break;
   case SM_popString:    case SM_popString:
Legend:
Removed from v.1.18  
changed lines
  Added in v.1.22
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>