[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.22 and 1.29

version 1.22, 2004/09/17 07:27:28 version 1.29, 2015/10/08 11:49:37
Line 1 
Line 1 
 /*  $OpenXM: OpenXM/src/kan96xx/plugin/oxmisc.c,v 1.21 2004/09/16 23:53:45 takayama Exp $ */  /*  $OpenXM: OpenXM/src/kan96xx/plugin/oxmisc.c,v 1.28 2015/09/27 08:12:42 takayama Exp $ */
 #include <stdio.h>  #include <stdio.h>
   #include <string.h>
 #include <sys/types.h>  #include <sys/types.h>
 #include <sys/stat.h>  #include <sys/stat.h>
 #include <sys/socket.h>  #include <sys/socket.h>
Line 23  FILE *MyErrorOut = NULL;
Line 24  FILE *MyErrorOut = NULL;
   
 #include "ox_kan.h"  #include "ox_kan.h"
   
   
 #define READBUFSIZE 5000  #define READBUFSIZE 5000
   
 int OxVersion = 200012030;  int OxVersion = 200012030;
Line 178  int oxWaitSyncBall(ox_stream ostream)
Line 180  int oxWaitSyncBall(ox_stream ostream)
     fprintf(stderr,"Looking for the next message tag. mtag=%d\n",mtag);      fprintf(stderr,"Looking for the next message tag. mtag=%d\n",mtag);
     /* or stdout */      /* or stdout */
     fflush(NULL);      fflush(NULL);
           if (mtag == -1) {
             fprintf(stderr,"Your peer seems to be dead.\n"); return 0;
           }
   }    }
 }  }
   
Line 344  void oxSendResultOfControl(int fd) 
Line 349  void oxSendResultOfControl(int fd) 
 void oxSendMathCap(ox_stream os,struct mathCap *mathcap)  void oxSendMathCap(ox_stream os,struct mathCap *mathcap)
 {  {
   int i,n,infosize,ncmo;    int i,n,infosize,ncmo;
   struct object mathinfo;    struct object mathinfo = OINIT;
   /* printf("ox sending mathcap\n"); fflush(stdout); */    /* printf("ox sending mathcap\n"); fflush(stdout); */
   mathinfo = *((struct object *)(mathcap->infop));    mathinfo = *((struct object *)(mathcap->infop));
   infosize = getoaSize(mathinfo);    infosize = getoaSize(mathinfo);
Line 618  int oxIsThereErrorClient(oxclientp client) {
Line 623  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 642  oxclientp oxCreateClient(char *sname,int portStream,in
Line 648  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 902  static void cancelConnection() {
Line 925  static void cancelConnection() {
   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__)  #if defined(__CYGWIN__)
   siglongjmp(MyEnv_oxmisc,1);    MYSIGLONGJMP(MyEnv_oxmisc,1);
 #else  #else
   longjmp(MyEnv_oxmisc,1);    MYLONGJMP(MyEnv_oxmisc,1);
 #endif  #endif
 }  }
   
Line 928  oxclientp oxCreateClient2(int fdstream,int portStream,
Line 951  oxclientp oxCreateClient2(int fdstream,int portStream,
   
   v = !Quiet;    v = !Quiet;
 #if defined(__CYGWIN__)  #if defined(__CYGWIN__)
   if (sigsetjmp(MyEnv_oxmisc,1)) {    if (MYSIGSETJMP(MyEnv_oxmisc,1)) {
 #else  #else
   if (setjmp(MyEnv_oxmisc)) {    if (MYSETJMP(MyEnv_oxmisc)) {
 #endif  #endif
     return(NULL);      return(NULL);
   }else{    }else{
Legend:
Removed from v.1.22  
changed lines
  Added in v.1.29
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>