=================================================================== RCS file: /home/cvs/OpenXM/src/ox_math/math2ox.c,v retrieving revision 1.3 retrieving revision 1.5 diff -u -p -r1.3 -r1.5 --- OpenXM/src/ox_math/math2ox.c 1999/11/04 17:53:04 1.3 +++ OpenXM/src/ox_math/math2ox.c 1999/11/06 21:39:36 1.5 @@ -1,6 +1,5 @@ /* -*- mode: C; coding: euc-japan -*- */ -/* $OpenXM: OpenXM/src/ox_math/math2ox.c,v 1.2 1999/11/02 06:11:57 ohara Exp $ */ -/* $Id: math2ox.c,v 1.3 1999/11/04 17:53:04 ohara Exp $ */ +/* $OpenXM: OpenXM/src/ox_math/math2ox.c,v 1.4 1999/11/04 19:33:17 ohara Exp $ */ #include #include @@ -47,17 +46,21 @@ int OX_reset() } /* 文字列 s を parse() にかけて生成された cmo を サーバに送る. */ -/* s は "...\n" の形でなければならない(??). */ int OX_parse(char *s) { cmo *m; + symbol *symp; int len = strlen(s); setmode_mygetc(s, len); if(s != NULL && len > 0 && (m = parse()) != NULL) { - /* 本来 m->tag のチェックをして CMO であることを - 確かめなければならない. */ - send_ox_cmo(sv->stream, m); + if (m->tag == OX_DATA) { + send_ox_cmo(sv->stream, ((ox_data *)m)->cmo); + }else if (m->tag == OX_COMMAND) { + send_ox_command(sv->stream, ((ox_command *)m)->command); + }else { + send_ox_cmo(sv->stream, m); + } return 0; } return -1; /* 失敗した場合 */ @@ -70,6 +73,23 @@ int OX_start(char* s) } sv = ox_start(host, ctlserv, oxprog); fprintf(stderr, "open (%s)\n", "localhost"); + return 0; +} + +int OX_start_insecure(char *host, int portCtl, int portDat) +{ + if (host != NULL || host[0] == '\0') { + host = "localhost"; + } + if (portCtl == 0) { + portCtl = 1200; + } + if (portDat == 0) { + portDat = 1300; + } + + sv = ox_start_insecure_nonreverse(host, portCtl, portDat); + fprintf(stderr, "math2ox :: connect to \"%s\" with (ctl, dat) = (%d, %d)\n", host, portCtl, portDat); return 0; }