[BACK]Return to oxf.c CVS log [TXT][DIR] Up to [local] / OpenXM / src / ox_toolkit

Diff for /OpenXM/src/ox_toolkit/oxf.c between version 1.10 and 1.13

version 1.10, 2000/12/14 01:41:03 version 1.13, 2003/01/11 11:42:31
Line 1 
Line 1 
 /* -*- mode: C; coding: euc-japan -*- */  /* -*- mode: C; coding: euc-japan -*- */
 /* $OpenXM: OpenXM/src/ox_toolkit/oxf.c,v 1.9 2000/12/03 16:15:03 ohara Exp $ */  /* $OpenXM: OpenXM/src/ox_toolkit/oxf.c,v 1.12 2002/04/10 08:55:45 ohara Exp $ */
   
 /*  /*
    This module includes functions for sending/receiveng CMO's.     This module includes functions for sending/receiveng CMO's.
Line 16 
Line 16 
 #include <sys/param.h>  #include <sys/param.h>
 #include <time.h>  #include <time.h>
   
   #if defined(__sun__)
   #include <netdb.h>
   #include <sys/types.h>
   #include <netinet/in.h>
   #endif
   
 #include "mysocket.h"  #include "mysocket.h"
 #include "ox_toolkit.h"  #include "ox_toolkit.h"
   
Line 81  static int receive_int32_lbo(OXFILE *oxfp)
Line 87  static int receive_int32_lbo(OXFILE *oxfp)
 OXFILE *oxf_open(int fd)  OXFILE *oxf_open(int fd)
 {  {
     OXFILE *oxfp = (OXFILE *)malloc(sizeof(OXFILE));      OXFILE *oxfp = (OXFILE *)malloc(sizeof(OXFILE));
       oxfp = (OXFILE *)malloc(sizeof(OXFILE));
     oxfp->fd = fd;      oxfp->fd = fd;
     oxfp->send_int32    = send_int32_nbo;      oxfp->send_int32    = send_int32_nbo;
     oxfp->receive_int32 = receive_int32_nbo;      oxfp->receive_int32 = receive_int32_nbo;
Line 170  int oxf_listen(short *portp)
Line 177  int oxf_listen(short *portp)
 OXFILE *oxf_connect_active(char *hostname, short port)  OXFILE *oxf_connect_active(char *hostname, short port)
 {  {
     int fd = mysocketOpen(hostname, port);      int fd = mysocketOpen(hostname, port);
     return oxf_open(fd);      return (fd < 0)? NULL: oxf_open(fd);
 }  }
   
 OXFILE *oxf_connect_passive(int listened)  OXFILE *oxf_connect_passive(int listened)
 {  {
     int fd = mysocketAccept(listened);      int fd = mysocketAccept(listened);
     return oxf_open(fd);      return (fd < 0)? NULL: oxf_open(fd);
 }  }
   
 #define LENGTH_OF_ONETIME_PASSWORD 64  #define LENGTH_OF_ONETIME_PASSWORD 64
Line 264  int oxc_start(char *remote_host, short port, char *pas
Line 271  int oxc_start(char *remote_host, short port, char *pas
         if ((pid = fork()) == 0) {          if ((pid = fork()) == 0) {
             sprintf(ports, "%d", port);              sprintf(ports, "%d", port);
 #ifdef DEBUG  #ifdef DEBUG
             fprintf(stderr, "oxf.c:: oxc_start() does %s(ssh) -f %s -h %s -p %s -c %s\n", remote_host, cmd, localhost, ports, passwd);              fprintf(ox_stderr, "oxf.c:: oxc_start() does %s(ssh) -f %s -h %s -p %s -c %s\n", remote_host, cmd, localhost, ports, passwd);
 #endif  #endif
             execlp("ssh", remote_host, "-f", cmd,              execlp("ssh", remote_host, "-f", cmd,
                   "-h", localhost, "-p", ports,"-c", passwd, NULL);                    "-h", localhost, "-p", ports,"-c", passwd, NULL);
Legend:
Removed from v.1.10  
changed lines
  Added in v.1.13
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>