=================================================================== RCS file: /home/cvs/OpenXM/src/ox_toolkit/oxf_old.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- OpenXM/src/ox_toolkit/oxf_old.c 2000/10/10 05:23:21 1.1 +++ OpenXM/src/ox_toolkit/oxf_old.c 2000/10/12 15:53:25 1.2 @@ -1,5 +1,5 @@ /* -*- mode: C; coding: euc-japan -*- */ -/* $OpenXM$ */ +/* $OpenXM: OpenXM/src/ox_toolkit/oxf_old.c,v 1.1 2000/10/10 05:23:21 ohara Exp $ */ /* このモジュールは互換性のためのものです。*/ @@ -7,7 +7,6 @@ #include #include #include -#include #include #include #include @@ -98,10 +97,12 @@ void set_OpenXM_HOME() } } -void ox_exec_local(char* host, char* ctl_prog, char* dat_prog, int portControl, int portStream, char *passwd) +void ox_exec_local(char* ctl_prog, char* dat_prog, int portControl, int portStream, char *passwd) { char ctl[128], dat[128]; + char localhost[MAXHOSTNAMELEN]; + sprintf(ctl, "%d", portControl); sprintf(dat, "%d", portStream); @@ -109,14 +110,15 @@ void ox_exec_local(char* host, char* ctl_prog, char* d ctl_prog = concat_openxm_home_bin(ctl_prog); dat_prog = concat_openxm_home_bin(dat_prog); - if (fork() == 0) { - execlp("oxlog", "oxlog", "xterm", "-icon", "-e", ctl_prog, - "-reverse", "-ox", dat_prog, - "-data", dat, "-control", ctl, "-pass", passwd, - "-host", host, NULL); - exit(1); - } - + if (gethostname(localhost, MAXHOSTNAMELEN)==0) { + if (fork() == 0) { + execlp("oxlog", "oxlog", "xterm", "-icon", "-e", ctl_prog, + "-reverse", "-ox", dat_prog, + "-data", dat, "-control", ctl, "-pass", passwd, + "-host", localhost, NULL); + exit(1); + } + } } /* @@ -135,11 +137,11 @@ OXFILE *ox_start(char* host, char* ctl_prog, char* dat int listen[2]; short ports[2] = {0}; /* short! */ - listen[0] = mysocketListen(host, &ports[0]); - listen[1] = mysocketListen(host, &ports[1]); + /* host を無視 */ + listen[0] = oxf_listen(&ports[0]); + listen[1] = oxf_listen(&ports[1]); - ox_exec_local(host, ctl_prog, dat_prog, ports[0], ports[1], passwd); - + ox_exec_local(ctl_prog, dat_prog, ports[0], ports[1], passwd); ct = mysocketAccept2(listen[0], passwd); if (ct != NULL) { usleep(10); /* zzz... */