===================================================================
RCS file: /home/cvs/OpenXM/src/ox_toolkit/ox.c,v
retrieving revision 1.1
retrieving revision 1.7
diff -u -p -r1.1 -r1.7
--- OpenXM/src/ox_toolkit/ox.c	1999/12/09 22:44:56	1.1
+++ 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: 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 <unistd.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <gmp.h>
-#include <unistd.h>
 #include <sys/file.h>
+#include <gmp.h>
 
 #include "mysocket.h"
 #include "ox.h"
@@ -60,7 +59,7 @@ static int          dump_mpz(mpz_ptr mpz);
 static int          login_with_otp(int fd, char* passwd);
 static char         *create_otp();
 
-/* CMO_xxx の値順にならべること(デバッグのため) */
+/* CMO_xxx の値の順にならべること(デバッグのため) */
 static cmo_null*         receive_cmo_null(int fd);
 static cmo_int32*        receive_cmo_int32(int fd);
 static cmo_string*       receive_cmo_string(int fd);
@@ -89,11 +88,56 @@ static int          send_cmo_distributed_polynomial(in
 
 static void         resize_mpz(mpz_ptr mpz, int size);
 
+static int          print_cmo_int32(cmo_int32* c);
+static int          print_cmo_list(cmo_list* li);
+static int          print_cmo_mathcap(cmo_mathcap* c);
+static int          print_cmo_string(cmo_string* c);
 
-/* エラーハンドリングのため */
+static char*        new_string_set_cmo_null();
+static char*        new_string_set_cmo_int32(int integer);
+static char*        new_string_set_cmo_list(cmo_list *c);
+static char*        new_string_set_cmo_zz(cmo_zz *c);
+
+int current_fd = 0;
+int set_current_fd(int fd)
+{
+	current_fd = fd;
+}
+
+/* hook 関数 */
+static hook_t hook_before_send_cmo = NULL;
+static hook_t hook_after_send_cmo  = NULL;
+
+int add_hook_before_send_cmo(hook_t func)
+{
+	hook_before_send_cmo = func;
+}
+
+int add_hook_after_send_cmo(hook_t func)
+{
+	hook_after_send_cmo = func;
+}
+
+static cmo *call_hook_before_send_cmo(int fd, cmo *c)
+{
+	if (hook_before_send_cmo != NULL) {
+		return hook_before_send_cmo(fd, c);
+	}
+	return c;
+}
+
+static cmo *call_hook_after_send_cmo(int fd, cmo *c)
+{
+	if (hook_after_send_cmo != NULL) {
+		return hook_after_send_cmo(fd, 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();
@@ -108,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;
@@ -130,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;
@@ -139,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));
@@ -177,12 +221,24 @@ int append_cmo_list(cmo_list* this, cmo* newcmo)
     return 0;
 }
 
+cmo *nth_cmo_list(cmo_list* this, int n)
+{
+	cell *cp = this->head;
+	if(this->length <= n) {
+		return NULL;
+	}
+	while(n-- > 0) {
+		cp = cp->next;
+	}
+	return cp->cmo;
+}
+
 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();
@@ -258,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);
 }
 
@@ -356,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));
@@ -442,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();
@@ -547,12 +610,12 @@ int print_cmo(cmo* c)
     }
 }
 
-int print_cmo_int32(cmo_int32* c)
+static int print_cmo_int32(cmo_int32* c)
 {
     fprintf(stderr, ", %d)", c->i);
 }
 
-int print_cmo_list(cmo_list* li)
+static int print_cmo_list(cmo_list* li)
 {
     cell* cp = li->head;
     while(cp->next != NULL) {
@@ -563,14 +626,14 @@ int print_cmo_list(cmo_list* li)
     fprintf(stderr, ")");
 }
 
-int print_cmo_mathcap(cmo_mathcap* c)
+static int print_cmo_mathcap(cmo_mathcap* c)
 {
     fprintf(stderr, ", ");
     print_cmo(c->ob);
     fprintf(stderr, ")");
 }
 
-int print_cmo_string(cmo_string* c)
+static int print_cmo_string(cmo_string* c)
 {
     fprintf(stderr, ", \"%s\")", c->s);
 }
@@ -579,22 +642,40 @@ 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_executeStringByLocalParser(ox_file_t sv, char* s)
+void ox_shutdown(ox_file_t sv)
 {
-    if (s != NULL) {
-        /* 文字列ををスタックにプッシュ. */
-        send_ox_cmo(sv->stream, (cmo *)new_cmo_string(s));
-        /* サーバに実行させる. */
-        send_ox_command(sv->stream, SM_executeStringByLocalParser);
-    }
+	/* We need to use SM_shutdown but yet ... */
+	ox_close(sv);
 }
 
-/* ox_mathcap() をコールする.  */
+int ox_cmo_rpc(ox_file_t sv, char *function, int argc, cmo *argv[])
+{
+	int i = argc;
+	while(i-- > 0) {
+		send_ox_cmo(sv->stream, argv[i]);
+	}
+	send_ox_cmo(sv->stream, (cmo *)new_cmo_int32(argc));
+	send_ox_cmo(sv->stream, (cmo *)new_cmo_string(function));
+	send_ox_command(sv->stream, SM_executeFunction);
+}
+
+void ox_execute_string(ox_file_t sv, char* s)
+{
+	send_ox_cmo(sv->stream, (cmo *)new_cmo_string(s));
+	send_ox_command(sv->stream, SM_executeStringByLocalParser);
+}
+
+void ox_push_cmd(ox_file_t sv, int sm_code)
+{
+    send_ox_command(sv->stream, sm_code);
+}
+
 cmo_mathcap* ox_mathcap(ox_file_t sv)
 {
     send_ox_command(sv->stream, SM_mathcap);
@@ -603,31 +684,48 @@ cmo_mathcap* ox_mathcap(ox_file_t sv)
     return (cmo_mathcap *)receive_cmo(sv->stream);
 }
 
-char* ox_popString(ox_file_t sv, int fd)
+char* ox_popString(ox_file_t sv)
 {
     cmo_string* m = NULL;
 
-    send_ox_command(fd, SM_popString);
-    receive_ox_tag(fd); /* OX_DATA */
-    m = (cmo_string *)receive_cmo(fd);
+    send_ox_command(sv->stream, SM_popString);
+    receive_ox_tag(sv->stream); /* OX_DATA */
+    m = (cmo_string *)receive_cmo(sv->stream);
     return m->s;
 }
 
-cmo* ox_pop_cmo(ox_file_t sv, int fd)
+int ox_pops(ox_file_t sv, int num)
 {
-    send_ox_command(fd, SM_popCMO);
-    receive_ox_tag(fd); /* OX_DATA */
-    return receive_cmo(fd);
+	send_ox_cmo(sv->stream, (cmo *)new_cmo_int32(num));
+    send_ox_command(sv->stream, SM_pops);
 }
 
-/* 手抜き. (後で改善しよう...) */
+cmo* ox_pop_cmo(ox_file_t sv)
+{
+    send_ox_command(sv->stream, SM_popCMO);
+    receive_ox_tag(sv->stream); /* OX_DATA */
+    return receive_cmo(sv->stream);
+}
+
+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;
@@ -649,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)
@@ -690,10 +793,13 @@ 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 は クライアントが呼び出すための関数である.
-   サーバでは使われない.  ctl_prog は コントロールサーバであり,
+   サーバでは使われない.  ctl_prog はコントロールサーバであり,
    -ox, -reverse, -data, -control, -pass, -host
    というオプションを理解することを仮定する. dat_prog は計算サーバである.
    接続時には, sv->control を先にオープンする.
@@ -701,17 +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);
@@ -721,12 +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(ctl_prog, 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) {
@@ -741,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 は クライアントが呼び出すための関数である.
@@ -766,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);
@@ -1023,23 +1154,21 @@ int dump_ox_command(ox_command* m)
     dump_integer(m->command);
 }
 
-int send_ox(ox_file_t s, ox *m)
+int send_ox(int fd, ox *m)
 {
-    int tag = m->tag;
     int code;
-    if (tag == OX_DATA) {
-        send_ox_cmo(s->stream, ((ox_data *)m)->cmo);
-    }else if (tag == OX_COMMAND) {
-        code = ((ox_command *)m)->command;
-        if (code >= 1024) {
-            /* control command */
-            send_ox_command(s->control, code);
-        }else {
-            send_ox_command(s->stream, code);
-        }
-    }else {
+	switch(m->tag) {
+	case OX_DATA:
+        send_ox_cmo(fd, ((ox_data *)m)->cmo);
+		break;
+	case OX_COMMAND:
+		send_ox_command(fd, ((ox_command *)m)->command);
+		break;
+	default:
+#if 0
         /* CMO?? */
         send_ox_cmo(s->stream, (cmo *)m);
+#endif
     }
 }
 
@@ -1132,6 +1261,8 @@ int send_cmo(int fd, cmo* c)
 {
     int tag = c->tag;
 
+	c = call_hook_before_send_cmo(fd, c);
+
     send_int32(fd, tag);
     switch(tag) {
     case CMO_NULL:
@@ -1164,6 +1295,7 @@ int send_cmo(int fd, cmo* c)
         send_cmo_distributed_polynomial(fd, (cmo_distributed_polynomial *)c);
         break;
     default:
+		call_hook_after_send_cmo(fd, c);
     }
 }
 
@@ -1208,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;
 }
@@ -1274,18 +1404,18 @@ int decideByteOrderServer(oxfd fd, int order)
 }
 
 /* cmo と string (ここではC言語のstring) の変換関数群 */
-char *convert_zz_to_string(cmo_zz *c)
+static char *new_string_set_cmo_zz(cmo_zz *c)
 {
     return mpz_get_str(NULL, 10, c->mpz);
 }
 
-char *convert_null_to_string()
+static char *new_string_set_cmo_null()
 {
     static char* null_string = "";
     return null_string;
 }
 
-char *convert_int_to_string(int integer)
+static char *new_string_set_cmo_int32(int integer)
 {
     char buff[1024];
     char *s;
@@ -1297,7 +1427,7 @@ char *convert_int_to_string(int integer)
     return s;
 }
 
-char *convert_cmo_list_to_string(cmo_list *m)
+static char *new_string_set_cmo_list(cmo_list *m)
 {
     char *s;
     int i;
@@ -1307,7 +1437,7 @@ char *convert_cmo_list_to_string(cmo_list *m)
 
     cell *cp = m->head;
     for(i = 0; i < len; i++) {
-        sp[i] = convert_cmo_to_string(cp->cmo);
+        sp[i] = new_string_set_cmo(cp->cmo);
         size += strlen(sp[i]) + 3;
         cp = cp->next;
     }
@@ -1323,20 +1453,20 @@ char *convert_cmo_list_to_string(cmo_list *m)
     return s;
 }
 
-char *convert_cmo_to_string(cmo *m)
+char *new_string_set_cmo(cmo *m)
 {
     symbol *symp;
     switch(m->tag) {
     case CMO_ZZ:
-        return convert_zz_to_string((cmo_zz *)m);
+        return new_string_set_cmo_zz((cmo_zz *)m);
     case CMO_INT32:
-        return convert_int_to_string(((cmo_int32 *)m)->i);
+        return new_string_set_cmo_int32(((cmo_int32 *)m)->i);
     case CMO_STRING:
         return ((cmo_string *)m)->s;
     case CMO_NULL:
-        return convert_null_to_string();
+        return new_string_set_cmo_null();
     case CMO_LIST:
-        return convert_cmo_list_to_string((cmo_list *)m);
+        return new_string_set_cmo_list((cmo_list *)m);
     default:
 #ifdef DEBUG
         symp = lookup_by_tag(m->tag);