=================================================================== RCS file: /home/cvs/OpenXM/src/ox_toolkit/oxf.c,v retrieving revision 1.8 retrieving revision 1.16 diff -u -p -r1.8 -r1.16 --- OpenXM/src/ox_toolkit/oxf.c 2000/12/01 07:27:03 1.8 +++ OpenXM/src/ox_toolkit/oxf.c 2003/05/29 15:50:49 1.16 @@ -1,9 +1,9 @@ /* -*- mode: C; coding: euc-japan -*- */ -/* $OpenXM: OpenXM/src/ox_toolkit/oxf.c,v 1.7 2000/11/28 22:11:14 ohara Exp $ */ +/* $OpenXM: OpenXM/src/ox_toolkit/oxf.c,v 1.15 2003/03/23 20:17:35 ohara Exp $ */ /* This module includes functions for sending/receiveng CMO's. - Some commnets is written in Japanese by the EUC-JP coded + Some commnets are written in Japanese by the EUC-JP coded character set. */ @@ -16,6 +16,12 @@ #include #include +#if defined(__sun__) +#include +#include +#include +#endif + #include "mysocket.h" #include "ox_toolkit.h" @@ -26,6 +32,20 @@ static int send_int32_nbo(OXFILE *oxfp, int int32); static int receive_int32_lbo(OXFILE *oxfp); static int receive_int32_nbo(OXFILE *oxfp); +/* enable write buffering */ +int oxf_setbuffer(OXFILE *oxfp, char *buf, int size) +{ + if (buf == NULL && size > 0) { + buf = malloc(size); + } + if (oxfp->wbuf != NULL) { + oxf_flush(oxfp); + } + oxfp->wbuf = buf; + oxfp->wbuf_size = size; + oxfp->wbuf_count = 0; +} + int oxf_read(void *buffer, size_t size, size_t num, OXFILE *oxfp) { int n = read(oxfp->fd, buffer, size*num); @@ -37,7 +57,17 @@ int oxf_read(void *buffer, size_t size, size_t num, OX int oxf_write(void *buffer, size_t size, size_t num, OXFILE *oxfp) { - return write(oxfp->fd, buffer, size*num); + size_t sz = size*num; + if (oxfp->wbuf == NULL) { /* no buffering */ + return write(oxfp->fd, buffer, sz); + } + if ((oxfp->wbuf_count + sz) >= oxfp->wbuf_size) { + oxf_flush(oxfp); + return write(oxfp->fd, buffer, sz); + } + memcpy(oxfp->wbuf + oxfp->wbuf_count, buffer, sz); + oxfp->wbuf_count += sz; + return sz; } /* sending an object of int32 type with Network Byte Order. @@ -73,14 +103,15 @@ static int receive_int32_lbo(OXFILE *oxfp) return tag; } -/* socket システムコールなどで socket を開いたのち、 - fdopen(sd, "a+") でバッファリングする(予定)。("w+" ではない) - バッファリングの後、バイトオーダを決定し、 - oxf_setopt() で関数ポインタを設定し直す。*/ - +/* (1) getting the fd by socket(2). + (2) preparing a buffer by fdopen(fd, "a+"). (not "w+") + (3) determing the byte order of the OX connection. + (4) setting function pointers by oxf_setopt(). +*/ OXFILE *oxf_open(int fd) { OXFILE *oxfp = (OXFILE *)malloc(sizeof(OXFILE)); + oxfp = (OXFILE *)malloc(sizeof(OXFILE)); oxfp->fd = fd; oxfp->send_int32 = send_int32_nbo; oxfp->receive_int32 = receive_int32_nbo; @@ -88,6 +119,9 @@ OXFILE *oxf_open(int fd) oxfp->control = NULL; oxfp->error = 0; oxfp->mathcap = NULL; + oxfp->wbuf = NULL; + oxfp->wbuf_size = 0; + oxfp->wbuf_count = 0; return oxfp; /* oxfp->fp = fdopen(fd, "a+"); */ /* return (oxfp->fp != NULL)? oxfp: NULL; */ @@ -120,8 +154,7 @@ void oxf_determine_byteorder_client(OXFILE *oxfp) oxf_setopt(oxfp, mode); } -/* Server 側ではこちらを用いる */ -/* いまの実装は dup されていることが前提になっている */ +/* If the program is an OX server, then you must use this function. */ void oxf_determine_byteorder_server(OXFILE *oxfp) { int offer = OX_BYTE_LITTLE_ENDIAN; @@ -136,13 +169,16 @@ void oxf_determine_byteorder_server(OXFILE *oxfp) void oxf_flush(OXFILE *oxfp) { - /* fflush(oxfp->fp); */ + if (oxfp->wbuf != NULL) { + write(oxfp->fd, oxfp->wbuf, oxfp->wbuf_count); + oxfp->wbuf_count = 0; + } } void oxf_close(OXFILE *oxfp) { + oxf_flush(oxfp); close(oxfp->fd); - /* fclose(oxfp->fp); */ } #define OXF_SETOPT_NBO 0 @@ -171,13 +207,13 @@ int oxf_listen(short *portp) OXFILE *oxf_connect_active(char *hostname, short port) { int fd = mysocketOpen(hostname, port); - return oxf_open(fd); + return (fd < 0)? NULL: oxf_open(fd); } OXFILE *oxf_connect_passive(int listened) { int fd = mysocketAccept(listened); - return oxf_open(fd); + return (fd < 0)? NULL: oxf_open(fd); } #define LENGTH_OF_ONETIME_PASSWORD 64 @@ -264,9 +300,7 @@ int oxc_start(char *remote_host, short port, char *pas if (gethostname(localhost, MAXHOSTNAMELEN)==0) { if ((pid = fork()) == 0) { sprintf(ports, "%d", port); -#ifdef DEBUG - fprintf(stderr, "oxf.c:: oxc_start() does %s(ssh) -f %s -h %s -p %s -c %s\n", remote_host, cmd, localhost, ports, passwd); -#endif + ox_printf("oxf.c:: oxc_start() does %s(ssh) -f %s -h %s -p %s -c %s\n", remote_host, cmd, localhost, ports, passwd); execlp("ssh", remote_host, "-f", cmd, "-h", localhost, "-p", ports,"-c", passwd, NULL); } @@ -300,22 +334,12 @@ int oxc_start_with_pipe(char *remote_host, int port, c return pid; } -/* pipe_*_info で送る情報の形式の定義 */ -/* Integer port : 4byte, ポート番号, Network byte order - String hostname: ホスト名 - String password: パスワード - - String は C のストリングではなくて、cmo_string のような、長さ付きの - ストリングである。ただし、\0 文字を含む。 - すなわち、"Hello" は (int32)6 H e l l o \0 に展開される(合計10byte)。 -*/ - static void pipe_send_string(int fd, char *s) { - int len = strlen(s)+1; + int len = strlen(s); int lenN = htonl(len); write(fd, &lenN, sizeof(int)); - write(fd, s, len); + write(fd, s, len+1); } static char *pipe_read_string() @@ -323,12 +347,13 @@ static char *pipe_read_string() int len; char *s; read(0, &len, sizeof(int)); - len = ntohl(len); + len = ntohl(len)+1; s = malloc(len); read(0, s, len); return s; } +/* The data format used by pipe_send_info() is defined in OX-RFC-101. */ void pipe_send_info(int fd, char *hostname, int port, char *password) { port = htonl(port); @@ -355,11 +380,9 @@ OXFILE *oxf_execute_cmd(OXFILE *oxfp, char *cmd) int listened; if ((listened = oxf_listen(&port)) != -1) { - send_ox_cmo(oxfp, (cmo *)new_cmo_int32(port)); - send_ox_cmo(oxfp, (cmo *)new_cmo_string(cmd)); - send_ox_cmo(oxfp, (cmo *)new_cmo_int32(2)); /* number of arguments */ - send_ox_cmo(oxfp, (cmo *)new_cmo_string("oxc_open")); - send_ox_command(oxfp, SM_executeFunction); + cmo_list *args = list_appendl(NULL, list_append(new_cmo_list(), new_cmo_int32(port)), new_cmo_string(cmd), NULL); + send_ox_cmo(oxfp, (cmo *)args); + send_ox_command(oxfp, SM_control_spawn_server); return oxf_connect_passive(listened); } return NULL;