=================================================================== RCS file: /home/cvs/OpenXM/src/ox_toolkit/ox.c,v retrieving revision 1.4 retrieving revision 1.7 diff -u -p -r1.4 -r1.7 --- OpenXM/src/ox_toolkit/ox.c 1999/12/15 05:57:35 1.4 +++ OpenXM/src/ox_toolkit/ox.c 2000/01/17 19:55:55 1.7 @@ -1,5 +1,5 @@ /* -*- mode: C; coding: euc-japan -*- */ -/* $OpenXM: OpenXM/src/ox_toolkit/ox.c,v 1.3 1999/12/14 09:29:13 ohara Exp $ */ +/* $OpenXM: OpenXM/src/ox_toolkit/ox.c,v 1.6 1999/12/22 11:26:37 ohara Exp $ */ /* 関数の名前付け規約(その2): @@ -30,9 +30,8 @@ YYY_cmo_XXX 関数が処理する. cmo の内部に cmo_ZZZ への #include #include #include -#include -#include #include +#include #include "mysocket.h" #include "ox.h" @@ -135,10 +134,10 @@ static cmo *call_hook_after_send_cmo(int fd, cmo *c) return c; } -/* エラーハンドリングのため */ +/* Handling an error. */ static int current_received_serial = 0; -/* エラーを起こしたときにサーバは次を呼び出す. */ +/* If an error object be needed, then a server call the following function. */ cmo_error2* make_error_object(int err_code, cmo *ob) { cmo_list* li = new_cmo_list(); @@ -153,21 +152,21 @@ cmo_error2* make_error_object(int err_code, cmo *ob) #define DEFAULT_SERIAL_NUMBER 0x0000ffff #define receive_serial_number(x) (receive_int32(x)) -/* 新しいシリアル番号を得る */ +/* getting a next serial number. */ int next_serial() { static int serial_number = DEFAULT_SERIAL_NUMBER; return serial_number++; } -/* int32 型のオブジェクトを送信する. */ +/* sending an object of int32 type. (not equal to cmo_int32 type) */ int send_int32(int fd, int int32) { int32 = htonl(int32); return write(fd, &int32, sizeof(int)); } -/* int32 型のオブジェクトを受信する. */ +/* receiving an object of int32 type. (not equal to cmo_int32 type) */ int receive_int32(int fd) { int tag; @@ -175,7 +174,7 @@ int receive_int32(int fd) return ntohl(tag); } -/* (OX_tag, serial number) を受信する. */ +/* receiving an (OX_tag, serial number) */ int receive_ox_tag(int fd) { int serial; @@ -184,14 +183,14 @@ int receive_ox_tag(int fd) return tag; } -/* (OX_tag, serial number) を送信する. */ +/* sending an (OX_tag, serial number) */ int send_ox_tag(int fd, int tag) { send_int32(fd, tag); return send_int32(fd, next_serial()); } -/* CMO_LIST 関係の関数群 */ +/* functions for a cmo_list */ cell* new_cell() { cell* h = malloc(sizeof(cell)); @@ -239,7 +238,7 @@ int length_cmo_list(cmo_list* this) return this->length; } -/** receive_cmo_XXX 関数群 **/ +/* functions named receive_cmo_*. */ static cmo_null* receive_cmo_null(int fd) { return new_cmo_null(); @@ -315,7 +314,7 @@ static cmo_dms_generic* receive_cmo_dms_generic(int fd static cmo_ring_by_name* receive_cmo_ring_by_name(int fd) { cmo* ob = receive_cmo(fd); - /* 意味的チェックが必要 */ + /* We need to check semantics but yet ... */ return new_cmo_ring_by_name(ob); } @@ -413,7 +412,7 @@ static void resize_mpz(mpz_ptr mpz, int size) mpz->_mp_size = size; } -/** new_cmo_XXX 関数群 **/ +/* functions named new_cmo_*. */ cmo_null* new_cmo_null() { cmo_null* m = malloc(sizeof(cmo_null)); @@ -499,6 +498,13 @@ cmo_zz* new_cmo_zz_set_si(int i) return c; } +cmo_zz* new_cmo_zz_set_mpz(mpz_ptr z) +{ + cmo_zz* c = new_cmo_zz(); + mpz_set(c->mpz, z); + return c; +} + cmo_zz *new_cmo_zz_set_string(char *s) { cmo_zz* c = new_cmo_zz_noinit(); @@ -636,14 +642,15 @@ void ox_close(ox_file_t sv) { send_ox_command(sv->control, SM_control_kill); #ifdef DEBUG - sleep(2); /* OpenXM server の終了を待つ. あまり意味はない. */ + sleep(2); + /* We wait thar an OpenXM server terminates. */ fprintf(stderr, "I have closed the connection to an Open XM server.\n"); #endif } void ox_shutdown(ox_file_t sv) { - /* 後で SM_shutdown を用いるものに書き換える予定. */ + /* We need to use SM_shutdown but yet ... */ ox_close(sv); } @@ -669,7 +676,6 @@ void ox_push_cmd(ox_file_t sv, int sm_code) send_ox_command(sv->stream, sm_code); } -/* ox_mathcap() をコールする. */ cmo_mathcap* ox_mathcap(ox_file_t sv) { send_ox_command(sv->stream, SM_mathcap); @@ -706,20 +712,20 @@ void ox_push_cmo(ox_file_t sv, cmo *c) send_ox_cmo(sv->stream, c); } -/* バッファのフラッシュの振りをする. */ +/* a dummy function for flushing a connection. */ int ox_flush(ox_file_t sv) { return 1; } -/* 手抜き. (後で改善しよう...) */ +/* a dummy password function. */ static char *create_otp() { static char otp[] = "otpasswd"; return otp; } -/* OneTimePassword の処理 */ +/* proceeding an one time password. */ static int login_with_otp(int fd, char* passwd) { int len = strlen(passwd)+1; @@ -741,34 +747,39 @@ static int login_with_otp(int fd, char* passwd) return ret; } -static int exists_ox(char *dir, char *prog) +static int chdir_openxm_home_bin() { - char *path = alloca(strlen(dir)+strlen(prog)+6); - sprintf(path, "%s/%s", dir, prog); - return access(path, X_OK|R_OK); + char *dir; + char *base = getenv("OpenXM_HOME"); + + if (base != NULL) { + dir = alloca(strlen(base)+5); + sprintf(dir, "%s/bin", base); + }else { + dir = "/usr/local/OpenXM/bin"; + } + return chdir(dir); } -static char *search_ox(char *prog) +/* example: which("xterm", getenv("PATH")); */ +static char *which(char *prog, char *path_env) { - char *env = getenv("OpenXM_HOME"); - char *dir; - if (env != NULL) { - dir = malloc(strlen(env)+5); - sprintf(dir, "%s/bin", env); - if (exists_ox(dir, prog) == 0) { - return dir; - } - free(dir); - } - dir = "/usr/local/OpenXM/bin"; - if (exists_ox(dir, prog) == 0) { - return dir; - } - dir = "."; - if (exists_ox(dir, prog) == 0) { - return dir; - } - return NULL; + char *tok; + char *path; + char delim[] = ":"; + char *e = alloca(strlen(path_env)+1); + strcpy(e, path_env); + tok = strtok(e, delim); + while (tok != NULL) { + char *path = malloc(strlen(tok)+strlen(prog)+2); + sprintf(path, "%s/%s", tok, prog); + if (access(path, X_OK&R_OK) == 0) { + return path; + } + free(path); + tok = strtok(NULL, delim); + } + return NULL; } static int mysocketAccept2(int fd, char *pass) @@ -782,6 +793,9 @@ static int mysocketAccept2(int fd, char *pass) return -1; } +/* 0 でなければ、oxlog を介して ox を起動する。*/ +static int flag_ox_start_with_oxlog = 1; + /* (-reverse 版の ox_start) ox_start は クライアントが呼び出すための関数である. @@ -793,19 +807,14 @@ static int mysocketAccept2(int fd, char *pass) ox_file_t ox_start(char* host, char* ctl_prog, char* dat_prog) { + ox_file_t sv = NULL; char *pass; - char ctl[16], dat[16]; + char ctl[128], dat[128]; short portControl = 0; /* short であることに注意 */ short portStream = 0; - ox_file_t sv = NULL; char *dir; char *oxlog = "oxlog"; - if ((dir = search_ox(ctl_prog)) == NULL) { - fprintf(stderr, "client:: %s not found.\n", ctl_prog); - return NULL; - } - sv = malloc(sizeof(__ox_file_struct)); sv->control = mysocketListen(host, &portControl); sv->stream = mysocketListen(host, &portStream); @@ -815,13 +824,20 @@ ox_file_t ox_start(char* host, char* ctl_prog, char* d pass = create_otp(); if (fork() == 0) { - dup2(2, 1); - dup2(open(DEFAULT_LOGFILE, O_RDWR|O_CREAT|O_TRUNC, 0644), 2); - chdir(dir); - execl(oxlog, oxlog, "/usr/X11R6/bin/xterm", "-icon", "-e", - ctl_prog, "-reverse", "-ox", dat_prog, - "-data", dat, "-control", ctl, "-pass", pass, - "-host", host, NULL); + chdir_openxm_home_bin(); + if (flag_ox_start_with_oxlog) { + execl(oxlog, oxlog, "xterm", "-icon", "-e", ctl_prog, + "-reverse", "-ox", dat_prog, + "-data", dat, "-control", ctl, "-pass", pass, + "-host", host, NULL); + }else { + dup2(2, 1); + dup2(open(tempnam("/tmp", "ox."), O_RDWR|O_CREAT|O_TRUNC, 0644), 2); + execl(ctl_prog, ctl_prog, "-reverse", "-ox", dat_prog, + "-data", dat, "-control", ctl, "-pass", pass, + "-host", host, NULL); + } + exit(1); } if ((sv->control = mysocketAccept2(sv->control, pass)) == -1) { @@ -836,6 +852,17 @@ ox_file_t ox_start(char* host, char* ctl_prog, char* d return sv; } +/* ssh -f host oxlog xterm -e ox -ox ox_asir ... */ +int ssh_ox_server(char *host, char *ctl_prog, char *dat_prog, short portControl, short portStream) +{ + if (fork() == 0) { + execl("ssh", "ssh", "-f", host, "oxlog", "xterm", "-icon", + "-e", ctl_prog, "-insecure", "-ox", dat_prog, + "-data", portStream, "-control", portControl, "-host", host, NULL); + exit(1); + } +} + /* (-insecure 版の ox_start) まだ、中身はありません。 ox_start_insecure_nonreverse は クライアントが呼び出すための関数である. @@ -861,6 +888,15 @@ ox_file_t ox_start_insecure_nonreverse(char* host, sho return sv; } +ox_file_t ox_start_insecure_nonreverse2(char* host, char *ctl_prog, char *dat_prog) +{ + short portControl= 1200; /* 自動生成させよう... */ + short portStream = 1300; + + ssh_ox_server(host, ctl_prog, dat_prog, portControl, portStream); + return ox_start_insecure_nonreverse(host, portControl, portStream); +} + void ox_reset(ox_file_t sv) { send_ox_command(sv->control, SM_control_reset_connection); @@ -1304,11 +1340,9 @@ static cmo_list* make_list_of_id(int ver, char* ver_s, cmo_list *cap; char buff[512]; - setgetc(mygetc); sprintf(buff, ID_TEMP, ver, sysname, ver_s, getenv("HOSTTYPE")); - setmode_mygetc(buff, 512); + init_parser(buff); cap = (cmo_list *)parse(); - resetgetc(); return cap; }