===================================================================
RCS file: /home/cvs/OpenXM/src/ox_math/Attic/ox.c,v
retrieving revision 1.3
retrieving revision 1.12
diff -u -p -r1.3 -r1.12
--- OpenXM/src/ox_math/Attic/ox.c	1999/11/02 18:58:25	1.3
+++ OpenXM/src/ox_math/Attic/ox.c	1999/11/07 12:12:55	1.12
@@ -1,6 +1,5 @@
 /* -*- mode: C; coding: euc-japan -*- */
-/* $OpenXM: OpenXM/src/ox_math/ox.c,v 1.2 1999/11/02 06:11:57 ohara Exp $ */
-/* $Id: ox.c,v 1.3 1999/11/02 18:58:25 ohara Exp $ */
+/* $OpenXM: OpenXM/src/ox_math/ox.c,v 1.11 1999/11/06 21:39:36 ohara Exp $ */
 
 /*
 関数の名前付け規約(その2):
@@ -32,6 +31,8 @@ YYY_cmo_XXX 関数が処理する.  cmo の内部に cmo_ZZZ への
 #include <errno.h>
 #include <fcntl.h>
 #include <gmp.h>
+#include <unistd.h>
+#include <sys/file.h>
 
 #include "mysocket.h"
 #include "ox.h"
@@ -45,50 +46,59 @@ static int          cmolen_cmo_string(cmo_string* c);
 static int          cmolen_cmo_zz(cmo_zz* c);
 static int          cmolen_cmo_monomial32(cmo_monomial32* c);
 
-static char*        dump_cmo_int32(char* array, cmo_int32* m);
-static char*        dump_cmo_list(char* array, cmo_list* m);
-static char*        dump_cmo_mathcap(char* array, cmo_mathcap* m);
-static char*        dump_cmo_null(char* array, cmo_null* m);
-static char*        dump_cmo_string(char* array, cmo_string* m);
-static char*        dump_cmo_monomial32(char* array, cmo_monomial32* c);
-static char*        dump_cmo_zz(char* array, cmo_zz* c);
-static char*        dump_integer(char* array, int x);
-static char*        dump_mpz(char* array, mpz_ptr mpz);
+static int          dump_cmo_int32(cmo_int32* m);
+static int          dump_cmo_list(cmo_list* m);
+static int          dump_cmo_mathcap(cmo_mathcap* m);
+static int          dump_cmo_null(cmo_null* m);
+static int          dump_cmo_string(cmo_string* m);
+static int          dump_cmo_monomial32(cmo_monomial32* c);
+static int          dump_cmo_zz(cmo_zz* c);
+static int          dump_string(char *s, int len);
+static int          dump_integer(int x);
+static int          dump_mpz(mpz_ptr mpz);
 
 static int          funcs(int cmo_type);
 
+static int          login_with_otp(int fd, char* passwd);
+static char         *create_otp();
+
 /* CMO_xxx の値順にならべること(デバッグのため) */
-static int          read_password(int fd, char* passwd);
-static cmo_null*    receive_cmo_null(int fd);
-static cmo_int32*   receive_cmo_int32(int fd);
-static cmo_string*  receive_cmo_string(int fd);
-static cmo_mathcap* receive_cmo_mathcap(int fd);
-static cmo_list*    receive_cmo_list(int fd);
-static cmo_zz*      receive_cmo_zz(int fd);
-static cmo_zero*    receive_cmo_zero(int fd);
-static cmo_dms_generic* receive_cmo_dms_generic(int fd);
-static cmo_error2*  receive_cmo_error2(int fd);
-static void         receive_mpz(int fd, mpz_ptr mpz);
+static cmo_null*         receive_cmo_null(int fd);
+static cmo_int32*        receive_cmo_int32(int fd);
+static cmo_string*       receive_cmo_string(int fd);
+static cmo_mathcap*      receive_cmo_mathcap(int fd);
+static cmo_list*         receive_cmo_list(int fd);
+static cmo_monomial32*   receive_cmo_monomial32(int fd);
+static cmo_zz*           receive_cmo_zz(int fd);
+static cmo_zero*         receive_cmo_zero(int fd);
+static cmo_dms_generic*  receive_cmo_dms_generic(int fd);
+static cmo_ring_by_name* receive_cmo_ring_by_name(int fd);
+static cmo_distributed_polynomial* receive_cmo_distributed_polynomial(int fd);
 
+static cmo_error2*       receive_cmo_error2(int fd);
+static void              receive_mpz(int fd, mpz_ptr mpz);
+
 static int          send_cmo_null(int fd, cmo_null* c);
 static int          send_cmo_int32(int fd, cmo_int32* m);
 static int          send_cmo_string(int fd, cmo_string* m);
 static int          send_cmo_mathcap(int fd, cmo_mathcap* c);
 static int          send_cmo_list(int fd, cmo_list* c);
+static int          send_cmo_monomial32(int fd, cmo_monomial32* c);
 static int          send_cmo_zz(int fd, cmo_zz* c);
 static int          send_cmo_error2(int fd, cmo_error2* c);
 static int          send_mpz(int fd, mpz_ptr mpz);
+static int          send_cmo_distributed_polynomial(int fd, cmo_distributed_polynomial* c);
 
-
 /* エラーハンドリングのため */
 static int current_received_serial = 0;
 
-/* エラーを起こしたときはサーバは次のようにすればよい.  */
-cmo_error2* gen_error_object(int err_code)
+/* エラーを起こしたときにサーバは次を呼び出す.  */
+cmo_error2* make_error_object(int err_code, cmo *ob)
 {
     cmo_list* li = new_cmo_list();
     append_cmo_list(li, (cmo *)new_cmo_int32(current_received_serial));
     append_cmo_list(li, (cmo *)new_cmo_int32(err_code));
+    append_cmo_list(li, ob);
     /* 他の情報を加えるならココ */
     return new_cmo_error2((cmo *)li);
 }
@@ -135,13 +145,12 @@ int send_ox_tag(int fd, int tag)
     return send_int32(fd, next_serial());
 }
 
-
 /* CMO_LIST 関係の関数群 */
-cell* new_cell(cmo* newcmo)
+cell* new_cell()
 {
     cell* h = malloc(sizeof(cell));
     h->next = NULL;
-    h->cmo  = newcmo;
+    h->cmo  = NULL;
     return h;
 }
 
@@ -150,28 +159,28 @@ cell* next_cell(cell* this)
     return this->next;
 }
 
-static cell* *tailp(cmo_list* this) {
-    cell **cp = &this->head;
-    while (*cp != NULL) {
-        cp = &((*cp)->next);
+static cell *tail(cmo_list* this) {
+    cell *cp = this->head;
+    while (cp->next != NULL) {
+        cp = cp->next;
     }
     return cp;
 }
 
-int length_cmo_list(cmo_list* this)
-{
-    return this->length;
-}
-
 int append_cmo_list(cmo_list* this, cmo* newcmo)
 {
-    /* リストの最後尾のNULLを保持している変数へのポインタ */
-    cell **cp = tailp(this);
-    *cp = new_cell(newcmo);
+    cell *cp = tail(this);
+    cp->cmo  = newcmo;
+    cp->next = new_cell();
     this->length++;
     return 0;
 }
 
+int length_cmo_list(cmo_list* this)
+{
+    return this->length;
+}
+
 /** receive_cmo_XXX 関数群 **/
 static cmo_null* receive_cmo_null(int fd)
 {
@@ -203,18 +212,31 @@ static cmo_mathcap* receive_cmo_mathcap(int fd)
 
 static cmo_list* receive_cmo_list(int fd)
 {
-    cmo* newcmo;
+    cmo* ob;
     cmo_list* c = new_cmo_list();
     int len = receive_int32(fd);
 
     while (len>0) {
-        newcmo = receive_cmo(fd);
-        append_cmo_list(c, newcmo);
+        ob = receive_cmo(fd);
+        append_cmo_list(c, ob);
         len--;
     }
     return c;
 }
 
+static cmo_monomial32* receive_cmo_monomial32(int fd)
+{
+    int i;
+    int len = receive_int32(fd);
+    cmo_monomial32* c = new_cmo_monomial32(len);
+
+    for(i=0; i<len; i++) {
+        c->exps[i] = receive_int32(fd);
+    }
+    c->coef = receive_cmo(fd);
+    return c;
+}
+
 static cmo_zz* receive_cmo_zz(int fd)
 {
     cmo_zz* c = new_cmo_zz();
@@ -235,16 +257,86 @@ 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);
-	/* 意味的チェックが必要 */
+    /* 意味的チェックが必要 */
     return new_cmo_ring_by_name(ob);
 }
 
+static cmo_distributed_polynomial* receive_cmo_distributed_polynomial(int fd)
+{
+    cmo* ob;
+    cmo_distributed_polynomial* c = new_cmo_distributed_polynomial();
+    int len = receive_int32(fd);
+    c->ringdef = receive_cmo(fd);
+
+    while (len>0) {
+        ob = receive_cmo(fd);
+        append_cmo_list(c, ob);
+        len--;
+    }
+    return c;
+}
+
 static cmo_error2* receive_cmo_error2(int fd)
 {
     cmo* ob = receive_cmo(fd);
     return new_cmo_error2(ob);
 }
 
+/* receive_ox_tag() == OX_DATA の後に呼び出される */
+/* 関数ポインタを使った方がきれいに書けるような気がする.  */
+/* if (foo[tag] != NULL) foo[tag](fd); とか */
+
+cmo* receive_cmo(int fd)
+{
+    cmo* m;
+    int tag;
+    tag = receive_int32(fd);
+
+    switch(tag) {
+    case CMO_NULL:
+        m = receive_cmo_null(fd);
+        break;
+    case CMO_INT32:
+        m = (cmo *)receive_cmo_int32(fd);
+        break;
+    case CMO_STRING:
+        m = (cmo *)receive_cmo_string(fd);
+        break;
+    case CMO_MATHCAP:
+        m = (cmo *)receive_cmo_mathcap(fd);
+        break;
+    case CMO_LIST:
+        m = (cmo *)receive_cmo_list(fd);
+        break;
+    case CMO_MONOMIAL32:
+        m = (cmo *)receive_cmo_monomial32(fd);
+        break;
+    case CMO_ZZ:
+        m = (cmo *)receive_cmo_zz(fd);
+        break;
+    case CMO_ZERO:
+        m = (cmo *)receive_cmo_zero(fd);
+        break;
+    case CMO_DMS_GENERIC:
+        m = (cmo *)receive_cmo_dms_generic(fd);
+        break;
+    case CMO_RING_BY_NAME:
+        m = (cmo *)receive_cmo_ring_by_name(fd);
+        break;
+    case CMO_DISTRIBUTED_POLYNOMIAL:
+        m = (cmo *)receive_cmo_distributed_polynomial(fd);
+        break;
+    case CMO_ERROR2:
+        m = (cmo *)receive_cmo_error2(fd);
+        break;
+    case CMO_DATUM:
+    case CMO_QQ:
+    default:
+        fprintf(stderr, "unknown cmo-type: tag = (%d)\n", m->tag);
+    }
+    return m;
+}
+
 static void receive_mpz(int fd, mpz_ptr mpz)
 {
     int i;
@@ -283,11 +375,13 @@ cmo_int32* new_cmo_int32(int i)
 cmo_string* new_cmo_string(char* s)
 {
     cmo_string* c = malloc(sizeof(cmo_string));
-	char *s2 = malloc(strlen(s)+1);
-	strcpy(s2, s);
-
     c->tag = CMO_STRING;
-    c->s   = s2;
+    if (s != NULL) {
+        c->s = malloc(strlen(s)+1);
+        strcpy(c->s, s);
+    }else {
+        c->s = NULL;
+    }
     return c;
 }
 
@@ -304,7 +398,7 @@ cmo_list* new_cmo_list()
     cmo_list* c = malloc(sizeof(cmo_list));
     c->tag    = CMO_LIST;
     c->length = 0;
-    c->head   = NULL;
+    c->head->next = NULL;
     return c;
 }
 
@@ -318,10 +412,10 @@ cmo_monomial32* new_cmo_monomial32()
 cmo_monomial32* new_cmo_monomial32_size(int size)
 {
     cmo_monomial32* c = new_cmo_monomial32();
-	if (size>0) {
-		c->length = size;
-		c->exps = malloc(sizeof(int)*size);
-	}
+    if (size>0) {
+        c->length = size;
+        c->exps = malloc(sizeof(int)*size);
+    }
     return c;
 }
 
@@ -347,6 +441,13 @@ cmo_zz* new_cmo_zz_set_si(int i)
     return c;
 }
 
+cmo_zz *new_cmo_zz_set_string(char *s)
+{
+    cmo_zz* c = new_cmo_zz_noinit();
+    mpz_init_set_str(c->mpz, s, 10);
+    return c;
+}
+
 cmo_zz* new_cmo_zz_size(int size)
 {
     cmo_zz* c = new_cmo_zz();
@@ -389,8 +490,8 @@ cmo_distributed_polynomial* new_cmo_distributed_polyno
     cmo_distributed_polynomial* c = malloc(sizeof(cmo_distributed_polynomial));
     c->tag     = CMO_DISTRIBUTED_POLYNOMIAL;
     c->length  = 0;
-    c->head    = NULL;
-	c->ringdef = NULL;
+    c->head->next = NULL;
+    c->ringdef = NULL;
     return c;
 }
 
@@ -402,48 +503,6 @@ cmo_error2* new_cmo_error2(cmo* ob)
     return c;
 }
 
-/* receive_ox_tag() == OX_DATA の後に呼び出される */
-/* 関数ポインタを使った方がきれいに書けるような気がする.  */
-/* if (foo[tag] != NULL) foo[tag](fd); とか */
-
-cmo* receive_cmo(int fd)
-{
-    cmo* m;
-    int tag;
-    tag = receive_int32(fd);
-
-    switch(tag) {
-    case CMO_NULL:
-        m = receive_cmo_null(fd);
-        break;
-    case CMO_INT32:
-        m = (cmo *)receive_cmo_int32(fd);
-        break;
-    case CMO_STRING:
-        m = (cmo *)receive_cmo_string(fd);
-        break;
-    case CMO_MATHCAP:
-        m = (cmo *)receive_cmo_mathcap(fd);
-        break;
-    case CMO_LIST:
-        m = (cmo *)receive_cmo_list(fd);
-        break;
-    case CMO_ZZ:
-        m = (cmo *)receive_cmo_zz(fd);
-        break;
-    case CMO_ERROR2:
-        m = (cmo *)receive_cmo_error2(fd);
-        break;
-    case CMO_DATUM:
-    case CMO_QQ:
-    case CMO_ZERO:
-    case CMO_DMS:
-    default:
-        fprintf(stderr, "unknown cmo-type: tag = (%d)\n", m->tag);
-    }
-    return m;
-}
-
 void send_ox_command(int fd, int sm_command)
 {
     send_ox_tag(fd, OX_COMMAND);
@@ -453,7 +512,16 @@ void send_ox_command(int fd, int sm_command)
 int print_cmo(cmo* c)
 {
     int tag = c->tag;
-    fprintf(stderr, "local::tag = (%d): ", tag);
+
+#ifdef DEBUG
+    symbol* symp = lookup_by_tag(tag);
+    if (symp != NULL) {
+        fprintf(stderr, "local::tag = %s: ", symp->key);
+    }else {     
+        fprintf(stderr, "local::tag = %d: ", tag);
+    }
+#endif
+
     switch(tag) {
     case CMO_LIST:
         print_cmo_list((cmo_list *)c);
@@ -502,36 +570,23 @@ int print_cmo_string(cmo_string* c)
     fprintf(stderr, "cmo_string = (%s)\n", c->s);
 }
 
-/* ox_start() から呼び出す */
-/* OneTimePassword の処理 */
-static int read_password(int fd, char* passwd)
-{
-    char buff[1024];
-    int n;
-    if ((n = read(fd, buff, 1024)) != strlen(passwd)) {
-        fprintf(stderr, "Socket#%d: Login incorrect.\n", fd);
-        fprintf(stderr, "password = (%s), received = (%s).\n", passwd, buff);
-        fprintf(stderr, "         = (%d), received = (%d).\n", strlen(passwd), n);
-    }
-    fflush(stderr);
-}
-
 void ox_close(ox_file_t sv)
 {
     send_ox_command(sv->control, SM_control_kill);
-#if DEBUG
+#ifdef DEBUG
     sleep(2); /* OpenXM server の終了を待つ. あまり意味はない. */
-    fprintf(stderr, "I have closed an Open XM server.\n");
+    fprintf(stderr, "I have closed the connection to an Open XM server.\n");
 #endif
 }
 
 void ox_executeStringByLocalParser(ox_file_t sv, char* s)
 {
-    /* 文字列ををスタックにプッシュ. */
-    send_ox_cmo(sv->stream, (cmo *)new_cmo_string(s));
-
-    /* サーバに実行させる. */
-    send_ox_command(sv->stream, SM_executeStringByLocalParser);
+    if (s != NULL) {
+        /* 文字列ををスタックにプッシュ. */
+        send_ox_cmo(sv->stream, (cmo *)new_cmo_string(s));
+        /* サーバに実行させる. */
+        send_ox_command(sv->stream, SM_executeStringByLocalParser);
+    }
 }
 
 /* ox_mathcap() をコールする.  */
@@ -560,41 +615,149 @@ cmo* ox_pop_cmo(ox_file_t sv, int fd)
     return receive_cmo(fd);
 }
 
-/* 
+/* 手抜き. (後で改善しよう...) */
+static char *create_otp()
+{
+    static char otp[] = "otpasswd";
+    return otp;
+}
+
+/* OneTimePassword の処理 */
+static int login_with_otp(int fd, char* passwd)
+{
+    int len   = strlen(passwd)+1;
+    char *buf = alloca(len);
+    int n     = read(fd, buf, len);
+    int ret   = strcmp(passwd, buf);
+
+#ifdef DEBUG
+    if (ret != 0) {
+        fprintf(stderr, "Socket#%d: Login incorrect.\n", fd);
+    }else {
+        fprintf(stderr, "Socket#%d: login!.\n", fd);
+    }
+    fprintf(stderr, "password = (%s), %d bytes.\n", passwd, len);
+    fprintf(stderr, "received = (%s), %d bytes.\n", buf, n);
+    fflush(stderr);
+#endif
+
+    return ret;
+}
+
+static int exists_ox(char *dir, char *prog)
+{
+    char *path = alloca(strlen(dir)+strlen(prog)+6);
+    sprintf(path, "%s/%s", dir, prog);
+    return access(path, X_OK|R_OK);
+}
+
+static char *search_ox(char *prog)
+{
+    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;
+}
+
+static int mysocketAccept2(int fd, char *pass)
+{
+    fd = mysocketAccept(fd);
+    if(login_with_otp(fd, pass)==0) {
+        decideByteOrderClient(fd, 0);
+        return fd;
+    }
+    close(fd);
+    return -1;
+}
+
+/*
+   (-reverse 版の ox_start)
    ox_start は クライアントが呼び出すための関数である.
-   サーバでは使われない.  prog1 は コントロールサーバであり,
+   サーバでは使われない.  ctl_prog は コントロールサーバであり,
    -ox, -reverse, -data, -control, -pass, -host
-   というオプションを理解することを仮定する. prog2 は計算サーバである.
+   というオプションを理解することを仮定する. dat_prog は計算サーバである.
    接続時には, sv->control を先にオープンする.
 */
 
-ox_file_t ox_start(char* host, char* prog1, char* prog2)
+ox_file_t ox_start(char* host, char* ctl_prog, char* dat_prog)
 {
-    static char pass[] = "passwd";
+    char *pass;
     char ctl[16], dat[16];
     short portControl = 0; /* short であることに注意 */
     short portStream  = 0;
-    ox_file_t sv = malloc(sizeof(__ox_file_struct));
+    ox_file_t sv = NULL;
+    char *dir;
 
+    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);
+
     sprintf(ctl, "%d", portControl);
     sprintf(dat, "%d", portStream);
+    pass = create_otp();
 
     if (fork() == 0) {
         dup2(2, 1);
         dup2(open(DEFAULT_LOGFILE, O_RDWR|O_CREAT|O_TRUNC, 0644), 2);
-        execl(prog1, prog1, "-reverse", "-ox", prog2,
+        chdir(dir);
+        execl(ctl_prog, ctl_prog, "-reverse", "-ox", dat_prog,
               "-data", dat, "-control", ctl, "-pass", pass,
               "-host", host, NULL);
     }
 
-    sv->control = mysocketAccept(sv->control);
-    decideByteOrderWithReadPasswd(sv->control, sv->control, 0, pass);
+    if ((sv->control = mysocketAccept2(sv->control, pass)) == -1) {
+        close(sv->stream);
+        return NULL;
+    }
+    /* 10マイクロ秒, 時間稼ぎする. */
     usleep(10);
-    sv->stream  = mysocketAccept(sv->stream);
-    decideByteOrderWithReadPasswd(sv->control, sv->control, 0, pass);
+    if((sv->stream  = mysocketAccept2(sv->stream, pass)) == -1) {
+        return NULL;
+    }
+    return sv;
+}
 
+/*
+   (-insecure 版の ox_start)  まだ、中身はありません。
+   ox_start_insecure_nonreverse は クライアントが呼び出すための関数である.
+   接続時には, sv->control を先にオープンする.
+   既定値:
+   portControl = 1200
+   portStream  = 1300
+*/
+
+ox_file_t ox_start_insecure_nonreverse(char* host, short portControl, short portStream)
+{
+    ox_file_t sv = malloc(sizeof(__ox_file_struct));
+
+    sv->control = mysocketOpen(host, portControl);
+#if 0
+    /* ox は insecure のとき byte order の決定が正しくできないようだ... */
+    decideByteOrderClient(sv->control, 0);
+#endif
+    /* 10マイクロ秒, 時間稼ぎする. */
+    usleep(10);
+    sv->stream  = mysocketOpen(host, portStream);
+    decideByteOrderClient(sv->stream, 0);
     return sv;
 }
 
@@ -610,7 +773,7 @@ void ox_reset(ox_file_t sv)
     }
 
     send_ox_tag(sv->stream, OX_SYNC_BALL);
-#if DEBUG
+#ifdef DEBUG
     fprintf(stderr, "I have reset an Open XM server.\n");
 #endif
 }
@@ -642,10 +805,10 @@ static int cmolen_cmo_mathcap(cmo_mathcap* c)
 
 static int cmolen_cmo_list(cmo_list* c)
 {
-    int size = sizeof(c->head);
+    int size = sizeof(int);
     cell* cp = c->head;
 
-    while(cp != NULL) {
+    while(cp->next != NULL) {
         size += cmolen_cmo(cp->cmo);
         cp = cp->next;
     }
@@ -654,8 +817,8 @@ static int cmolen_cmo_list(cmo_list* c)
 
 static int cmolen_cmo_monomial32(cmo_monomial32* c)
 {
-	int len = (c->length + 1)*sizeof(int);
-	return len + cmolen_cmo(c->coef);
+    int len = (c->length + 1)*sizeof(int);
+    return len + cmolen_cmo(c->coef);
 }
 
 static int cmolen_cmo_zz(cmo_zz* c)
@@ -666,7 +829,7 @@ static int cmolen_cmo_zz(cmo_zz* c)
 
 static int cmolen_cmo_distributed_polynomial(cmo_distributed_polynomial* c)
 {
-	return cmolen_cmo_list((cmo_list *)c) + cmolen_cmo(c->ringdef);
+    return cmolen_cmo_list((cmo_list *)c) + cmolen_cmo(c->ringdef);
 }
 
 /* CMO がバイトエンコードされた場合のバイト列の長さを求める */
@@ -688,6 +851,7 @@ int cmolen_cmo(cmo* c)
         break;
     case CMO_MATHCAP:
     case CMO_RING_BY_NAME:
+    case CMO_INDETERMINATE:
     case CMO_ERROR2:
         size += cmolen_cmo_mathcap((cmo_mathcap *)c);
         break;
@@ -700,129 +864,160 @@ int cmolen_cmo(cmo* c)
     case CMO_ZZ:
         size += cmolen_cmo_zz((cmo_zz *)c);
         break;
-	case CMO_DISTRIBUTED_POLYNOMIAL:
-		size += cmolen_cmo_distributed_polynomial((cmo_distributed_polynomial *)c);
-		break;
+    case CMO_DISTRIBUTED_POLYNOMIAL:
+        size += cmolen_cmo_distributed_polynomial((cmo_distributed_polynomial *)c);
+        break;
     default:
     }
     return size;
 }
 
-static char* dump_cmo_null(char* array, cmo_null* m)
+static int  d_ptr;
+static char *d_buf;
+
+int init_dump_buffer(char *s)
 {
-    return array;
+    d_buf = s;
+    d_ptr = 0;
 }
 
-static char* dump_cmo_int32(char* array, cmo_int32* m)
+static int dump_cmo_null(cmo_null* m)
 {
-    return dump_integer(array, m->i);
+    return 0;
 }
 
-static char* dump_cmo_string(char* array, cmo_string* m)
+static int dump_cmo_int32(cmo_int32* m)
 {
+    dump_integer(m->i);
+}
+
+static int dump_cmo_string(cmo_string* m)
+{
     int len = strlen(m->s);
-    array = dump_integer(array, len);
-    memcpy(array, m->s, len);
-    return array + len;
+    dump_integer(len);
+    dump_string(m->s, len);
 }
 
-static char* dump_cmo_mathcap(char* array, cmo_mathcap* c)
+static int dump_cmo_mathcap(cmo_mathcap* c)
 {
-    return dump_cmo(array, c->ob);
+    dump_cmo(c->ob);
 }
 
-static char* dump_cmo_list(char* array, cmo_list* m)
+static int dump_cmo_list(cmo_list* m)
 {
     cell* cp = m->head;
     int len = length_cmo_list(m);
-    array = dump_integer(array, len);
+    dump_integer(len);
 
-    while(cp != NULL) {
-        array = dump_cmo(array, cp->cmo);
+    while(cp->next != NULL) {
+        dump_cmo(cp->cmo);
         cp = cp->next;
     }
-    return array;
 }
 
-static char* dump_cmo_monomial32(char* array, cmo_monomial32* c)
+static int dump_cmo_monomial32(cmo_monomial32* c)
 {
-	int i;
-	int length = c->length;
-	array = dump_integer(array, c->length);
-	for(i=0; i<length; i++) {
-		array = dump_integer(array, c->exps[i]);
-	}
-	array = dump_cmo(array, c->coef);
-	return array;	
+    int i;
+    int length = c->length;
+    dump_integer(c->length);
+    for(i=0; i<length; i++) {
+        dump_integer(c->exps[i]);
+    }
+    dump_cmo(c->coef);
 }
 
-static char* dump_cmo_zz(char* array, cmo_zz* c)
+static int dump_cmo_zz(cmo_zz* c)
 {
-    return dump_mpz(array, c->mpz);
+    dump_mpz(c->mpz);
 }
 
-static char* dump_cmo_distributed_polynomial(char* array, cmo_distributed_polynomial* m)
+static int dump_cmo_distributed_polynomial(cmo_distributed_polynomial* m)
 {
     cell* cp = m->head;
-    int len = length_cmo_list(m);
-    array = dump_integer(array, len);
-	array = dump_cmo(array, m->ringdef);
+    int len = length_cmo_list((cmo_list *)m);
+    dump_integer(len);
+    dump_cmo(m->ringdef);
     while(cp != NULL) {
-        array = dump_cmo(array, cp->cmo);
+        dump_cmo(cp->cmo);
         cp = cp->next;
     }
-    return array;
 }
 
 /* タグを書き出してから、各関数を呼び出す */
-char* dump_cmo(char* array, cmo* m)
+int dump_cmo(cmo* m)
 {
-    array = dump_integer(array, m->tag);
+    dump_integer(m->tag);
     switch(m->tag) {
     case CMO_NULL:
     case CMO_ZERO:
     case CMO_DMS_GENERIC:
-        return dump_cmo_null(array, m);
+        dump_cmo_null(m);
+        break;
     case CMO_INT32:
-        return dump_cmo_int32(array, (cmo_int32 *)m);
+        dump_cmo_int32((cmo_int32 *)m);
+        break;
     case CMO_STRING:
-        return dump_cmo_string(array, (cmo_string *)m);
+        dump_cmo_string((cmo_string *)m);
+        break;
     case CMO_MATHCAP:
     case CMO_RING_BY_NAME:
+    case CMO_INDETERMINATE:
     case CMO_ERROR2:
-        return dump_cmo_mathcap(array, (cmo_mathcap *)m);
+        dump_cmo_mathcap((cmo_mathcap *)m);
+        break;
     case CMO_LIST:
-        return dump_cmo_list(array, (cmo_list *)m);
+        dump_cmo_list((cmo_list *)m);
+        break;
     case CMO_MONOMIAL32:
-        return dump_cmo_monomial32(array, (cmo_monomial32 *)m);
+        dump_cmo_monomial32((cmo_monomial32 *)m);
+        break;
     case CMO_ZZ:
-        return dump_cmo_zz(array, (cmo_zz *)m);
+        dump_cmo_zz((cmo_zz *)m);
+        break;
     case CMO_DISTRIBUTED_POLYNOMIAL:
-        return dump_cmo_distributed_polynomial(array, (cmo_distributed_polynomial *)m);
+        dump_cmo_distributed_polynomial((cmo_distributed_polynomial *)m);
+        break;
     default:
-        return NULL;
     }
 }
 
-static char* dump_integer(char* array, int x)
+static int dump_mpz(mpz_ptr mpz)
 {
-    int nx = htonl(x);
-    memcpy(array, &nx, sizeof(int));
-    return array + sizeof(int);
-}
-
-static char* dump_mpz(char* array, mpz_ptr mpz)
-{
     int i;
     int len = abs(mpz->_mp_size);
-    array = dump_integer(array, mpz->_mp_size);
+    dump_integer(mpz->_mp_size);
     for(i=0; i<len; i++) {
-        array = dump_integer(array, mpz->_mp_d[i]);
+        dump_integer(mpz->_mp_d[i]);
     }
-    return array;
+    return;
 }
 
+static int dump_string(char *s, int len)
+{
+    memcpy(&d_buf[d_ptr], s, len);
+    d_ptr += len;
+}
 
+static int dump_integer(int x)
+{
+    int nx = htonl(x);
+    dump_string((char *)&nx, sizeof(int));
+}
+
+int dump_ox_data(ox_data* m)
+{
+    dump_integer(OX_DATA);
+    dump_integer(-1);
+    dump_cmo(m->cmo);
+}
+
+int dump_ox_command(ox_command* m)
+{
+    dump_integer(OX_COMMAND);
+    dump_integer(-1);
+    dump_integer(m->command);
+}
+
 int send_ox(ox_file_t s, ox *m)
 {
     int tag = m->tag;
@@ -862,7 +1057,7 @@ static int send_cmo_int32(int fd, cmo_int32* m)
 
 static int send_cmo_string(int fd, cmo_string* m)
 {
-    int len = strlen(m->s);
+    int len = (m->s != NULL)? strlen(m->s): 0;
     send_int32(fd, len);
     if (len > 0) {
         write(fd, m->s, len);
@@ -882,16 +1077,43 @@ static int send_cmo_list(int fd, cmo_list* c)
     int len = length_cmo_list(c);
     send_int32(fd, len);
 
-    while(cp != NULL) {
+    while(cp->next != NULL) {
         send_cmo(fd, cp->cmo);
         cp = cp->next;
     }
     return 0;
 }
 
+static int send_cmo_distributed_polynomial(int fd, cmo_distributed_polynomial* c)
+{
+    cell* cp = c->head;
+    int len = length_cmo_list((cmo_list *)c);
+    send_int32(fd, len);
+    send_cmo(fd, c->ringdef);
+
+    while(cp->next != NULL) {
+        send_cmo(fd, cp->cmo);
+        cp = cp->next;
+    }
+    return 0;
+}
+
+static int send_cmo_monomial32(int fd, cmo_monomial32* c)
+{
+    int i;
+    int len = c->length;
+    send_int32(fd, len);
+    for(i=0; i<len; i++) {
+        send_int32(fd, c->exps[i]);
+    }
+    send_cmo(fd, c->coef);
+    return 0;
+}
+
 static int send_cmo_zz(int fd, cmo_zz* c)
 {
     send_mpz(fd, c->mpz);
+    return 0;
 }
 
 static int send_cmo_error2(int fd, cmo_error2* c)
@@ -908,6 +1130,8 @@ int send_cmo(int fd, cmo* c)
     send_int32(fd, tag);
     switch(tag) {
     case CMO_NULL:
+    case CMO_ZERO:
+    case CMO_DMS_GENERIC:
         send_cmo_null(fd, c);  /* 空の関数 */
         break;
     case CMO_INT32:
@@ -917,16 +1141,22 @@ int send_cmo(int fd, cmo* c)
         send_cmo_string(fd, (cmo_string *)c);
         break;
     case CMO_MATHCAP:
+    case CMO_ERROR2:
+    case CMO_RING_BY_NAME:
+    case CMO_INDETERMINATE:
         send_cmo_mathcap(fd, (cmo_mathcap *)c);
         break;
     case CMO_LIST:
         send_cmo_list(fd, (cmo_list *)c);
         break;
+    case CMO_MONOMIAL32:
+        send_cmo_monomial32(fd, (cmo_monomial32 *)c);
+        break;
     case CMO_ZZ:
         send_cmo_zz(fd, (cmo_zz *)c);
         break;
-    case CMO_ERROR2:
-        send_cmo_error2(fd, (cmo_error2 *)c);
+    case CMO_DISTRIBUTED_POLYNOMIAL:
+        send_cmo_distributed_polynomial(fd, (cmo_distributed_polynomial *)c);
         break;
     default:
     }
@@ -959,20 +1189,6 @@ ox_command* new_ox_command(int sm_code)
     return m;
 }
 
-char* dump_ox_data(char* array, ox_data* m)
-{
-    array = dump_integer(array, OX_DATA);
-    array = dump_integer(array, -1);
-    return dump_cmo(array, m->cmo);
-}
-
-char* dump_ox_command(char* array, ox_command* m)
-{
-    array = dump_integer(array, OX_COMMAND);
-    array = dump_integer(array, -1);
-    return dump_integer(array, m->command);
-}
-
 #define  MAX_TYPES  8
 static int known_types[] = {
     -1,   /* gate keeper */
@@ -985,42 +1201,48 @@ static int known_types[] = {
     CMO_ERROR2,
 };
 
-#define ID_TEMP   "(CMO_MATHCAP, (CMO_LIST, (CMO_LIST, (CMO_INT32, %d), (CMO_STRING, \"%s\"), (CMO_STRING, \"%s\"), (CMO_STRING, \"%s\")), (CMO_LIST, (CMO_INT32, 1), (CMO_INT32, 2), (CMO_INT32, 4), (CMO_INT32, 5), (CMO_INT32, 17), (CMO_INT32, 20), (CMO_INT32, 2130706434))))\n"
+#define ID_TEMP   "(CMO_LIST, (CMO_INT32, %d), (CMO_STRING, \"%s\"), (CMO_STRING, \"%s\"), (CMO_STRING, \"%s\"))"
 
-cmo* make_mathcap_object2(int ver, char* ver_s, char* sysname)
+
+static cmo_list* make_list_of_id(int ver, char* ver_s, char* sysname)
 {
-    cmo *cap;
-    char buff[8192];
+    cmo_list *cap;
+    char buff[512];
 
     setgetc(mygetc);
     sprintf(buff, ID_TEMP, ver, sysname, ver_s, getenv("HOSTTYPE"));
-    setmode_mygetc(buff, 8192);
+    setmode_mygetc(buff, 512);
     cap = parse();
     resetgetc();
 
     return cap;
 }
 
-cmo* make_mathcap_object(int version, char* id_string)
+static cmo_list *make_list_of_tag(int type)
 {
-    cmo_list *li_ver, *li_cmo, *li;
-    
-    int i;
-    li_ver = new_cmo_list();
-    append_cmo_list(li_ver, (cmo *)new_cmo_int32(version));
-    append_cmo_list(li_ver, (cmo *)new_cmo_string(id_string));
-
-    li_cmo = new_cmo_list();
-    for(i=0; i<MAX_TYPES; i++) {
-        if (known_types[i] != -1) {
-            append_cmo_list(li_cmo, (cmo *)new_cmo_int32(known_types[i]));
+    cmo_list *li = new_cmo_list();
+    symbol *symp;
+    int i = 0;
+    while((symp = lookup(i++))->key != NULL) {
+        if (symp->type == type) {
+            append_cmo_list(li, (cmo *)new_cmo_int32(symp->tag));
         }
     }
+    return li;
+}
 
-    li = new_cmo_list();
+cmo* make_mathcap_object(int version, char *id_string)
+{
+    char sysname[]   = "ox_math";
+    cmo_list *li     = new_cmo_list();
+    cmo_list *li_ver = make_list_of_id(version, id_string, sysname);
+    cmo_list *li_cmo = make_list_of_tag(IS_CMO);
+    cmo_list *li_sm  = make_list_of_tag(IS_SM);
+
     append_cmo_list(li, (cmo *)li_ver);
     append_cmo_list(li, (cmo *)li_cmo);
-    
+    append_cmo_list(li, (cmo *)li_sm);
+
     return (cmo *)new_cmo_mathcap((cmo *)li);
 }
 
@@ -1040,6 +1262,7 @@ void setCmotypeDisable(int type)
     int i = funcs(type);
     known_types[i] = -1;
 }
+
 #if 0
 cmo* (*received_funcs[])(int fd) = {
     NULL,  /* gate keeper */
@@ -1064,76 +1287,61 @@ cmo* receive_cmo2(int fd)
 
 /* ファイルディスクリプタ fd の通信路での integer の byte order を決定する */
 /* 実際には order (0,1,or 0xFF)をみてはいない */
-int decideByteOrderWithReadPasswd(int fd_read, int fd_write, int order, char* passwd)
+int decideByteOrderClient(oxfd fd, int order)
 {
     char zero = OX_BYTE_NETWORK_BYTE_ORDER;
     char dest;
-	read_password(fd_read, passwd);
-    write(fd_write, &zero, sizeof(char));
-    read(fd_read, &dest, sizeof(char));
+    read(fd, &dest, sizeof(char));
+    write(fd, &zero, sizeof(char));
     return 0;
 }
 
-/* ファイルディスクリプタ fd の通信路での integer の byte order を決定する */
-/* 実際には order (0,1,or 0xFF)をみてはいない */
-int decideByteOrder(int fd_read, int fd_write, int order)
-{
-    char zero = OX_BYTE_NETWORK_BYTE_ORDER;
-    char dest;
-    write(fd_write, &zero, sizeof(char));
-    read(fd_read, &dest, sizeof(char));
-    return 0;
-}
-
 /* Server 側ではこちらを用いる */
-int decideByteOrder2(int fd_read, int fd_write, int order)
+/* いまの実装は dup されていることが前提になっている */
+int decideByteOrderServer(oxfd fd, int order)
 {
     char zero = OX_BYTE_NETWORK_BYTE_ORDER;
     char dest;
-    read(fd_read, &dest, sizeof(char));
-    write(fd_write, &zero, sizeof(char));
+    write(fd, &zero, sizeof(char));
+    read(fd, &dest, sizeof(char));
     return 0;
 }
 
-/* cmo と string の変換関数群 */
-
-cmo_zz *new_cmo_zz_set_string(char *s)
+/* cmo と string (ここではC言語のstring) の変換関数群 */
+char *convert_zz_to_string(cmo_zz *c)
 {
-    cmo_zz* c = new_cmo_zz_noinit();
-    mpz_init_set_str(c->mpz, s, 10);
-    return c;
-}
-
-char *convert_zz_to_cstring(cmo_zz *c)
-{
     return mpz_get_str(NULL, 10, c->mpz);
 }
 
-char *convert_cmo_to_cstring(cmo *m)
+char *convert_cmo_to_string(cmo *m)
 {
+    symbol *symp;
     switch(m->tag) {
     case CMO_ZZ:
-        return convert_zz_to_cstring((cmo_zz *)m);
+        return convert_zz_to_string((cmo_zz *)m);
     case CMO_INT32:
-        return convert_int_to_cstring(((cmo_int32 *)m)->i);
+        return convert_int_to_string(((cmo_int32 *)m)->i);
     case CMO_STRING:
         return ((cmo_string *)m)->s;
     case CMO_NULL:
-        return convert_null_to_cstring();
+        return convert_null_to_string();
     default:
-        fprintf(stderr, "sorry, not implemented CMO\n");
+#ifdef DEBUG
+        symp = lookup_by_tag(m->tag);
+        fprintf(stderr, "I do not know how to convert %s to a string.\n", symp->key);
+#endif
         /* まだ実装していません. */
         return NULL;
     }
 }
 
-char *convert_null_to_cstring()
+char *convert_null_to_string()
 {
     static char* null_string = "";
     return null_string;
 }
 
-char *convert_int_to_cstring(int integer)
+char *convert_int_to_string(int integer)
 {
     char buff[1024];
     char *s;