[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.9 and 1.12

version 1.9, 2001/05/04 01:06:30 version 1.12, 2002/02/24 10:27:20
Line 1 
Line 1 
 /*  $OpenXM: OpenXM/src/kan96xx/plugin/oxmisc.c,v 1.8 2000/12/03 07:29:39 takayama Exp $ */  /*  $OpenXM: OpenXM/src/kan96xx/plugin/oxmisc.c,v 1.11 2001/12/28 08:18:22 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 883  char *oxGenPass(void) {
Line 883  char *oxGenPass(void) {
   
   
 static void cancelConnection() {  static void cancelConnection() {
   #if defined(__CYGWIN__)
     extern sigjmp_buf MyEnv_oxmisc;
   #else
   extern jmp_buf MyEnv_oxmisc;    extern jmp_buf MyEnv_oxmisc;
   #endif
   signal(SIGALRM,SIG_IGN);    signal(SIGALRM,SIG_IGN);
   fprintf(stderr,"Time out in TCP/IP connection.\n");    fprintf(stderr,"Time out in TCP/IP connection.\n");
   #if defined(__CYGWIN__)
     siglongjmp(MyEnv_oxmisc,1);
   #else
   longjmp(MyEnv_oxmisc,1);    longjmp(MyEnv_oxmisc,1);
   #endif
 }  }
   
 oxclientp oxCreateClient2(int fdstream,int portStream,  oxclientp oxCreateClient2(int fdstream,int portStream,
Line 900  oxclientp oxCreateClient2(int fdstream,int portStream,
Line 908  oxclientp oxCreateClient2(int fdstream,int portStream,
   
   char *s;    char *s;
   oxclientp client;    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;    int controlByteOrder, engineByteOrder;
   
   v = !Quiet;    v = !Quiet;
   #if defined(__CYGWIN__)
     if (sigsetjmp(MyEnv_oxmisc,1)) {
   #else
   if (setjmp(MyEnv_oxmisc)) {    if (setjmp(MyEnv_oxmisc)) {
   #endif
     return(NULL);      return(NULL);
   }else{    }else{
   }    }
   alarm((unsigned int) 10);  /* setup timeout. */    alarm((unsigned int) 20);  /* setup timeout. */
   signal(SIGALRM,cancelConnection);    signal(SIGALRM,cancelConnection);
   
   switch(ipmask) {    switch(ipmask) {
Line 931  oxclientp oxCreateClient2(int fdstream,int portStream,
Line 947  oxclientp oxCreateClient2(int fdstream,int portStream,
   
   /* Authentication by password. */    /* Authentication by password. */
   m = strlen(pass);    m = strlen(pass);
   s = (char *)mymalloc(sizeof(char)*(m+1));    if (m > 0) {
   read(fdControl,s,m+1); s[m] = '\0';      s = (char *)mymalloc(sizeof(char)*(m+1));
   if (strcmp(s,pass) != 0) {      read(fdControl,s,m+1); s[m] = '\0';
     fprintf(stderr,"oxCreateClient2(): password authentication failed for control channel.\n");      if (strcmp(s,pass) != 0) {
     close(fdControl);        fprintf(stderr,"oxCreateClient2(): password authentication failed for control channel.\n");
     return(NULL);        close(fdControl);
   }        return(NULL);
   read(fdStream,s,m+1); s[m] = '\0';      }
   if (strcmp(s,pass) != 0) {      read(fdStream,s,m+1); s[m] = '\0';
     fprintf(stderr,"oxCreateClient2(): password authentication failed for data channel.\n");      if (strcmp(s,pass) != 0) {
     close(fdStream);        fprintf(stderr,"oxCreateClient2(): password authentication failed for data channel.\n");
     return(NULL);        close(fdStream);
         return(NULL);
       }
   }    }
   signal(SIGALRM,SIG_IGN);    signal(SIGALRM,SIG_IGN);
   
Legend:
Removed from v.1.9  
changed lines
  Added in v.1.12
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>