===================================================================
RCS file: /home/cvs/OpenXM/src/ox_toolkit/ox_toolkit.h,v
retrieving revision 1.3
retrieving revision 1.11
diff -u -p -r1.3 -r1.11
--- OpenXM/src/ox_toolkit/ox_toolkit.h	2000/10/11 08:22:58	1.3
+++ OpenXM/src/ox_toolkit/ox_toolkit.h	2003/01/13 12:03:12	1.11
@@ -1,34 +1,41 @@
 /* -*- mode: C -*- */
-/* $OpenXM: OpenXM/src/ox_toolkit/ox_toolkit.h,v 1.2 2000/10/10 05:23:20 ohara Exp $ */
+/* $OpenXM: OpenXM/src/ox_toolkit/ox_toolkit.h,v 1.10 2003/01/11 11:42:31 ohara Exp $ */
 
 #ifndef _OX_TOOLKIT_H_
 
 #define _OX_TOOLKIT_H_
 
 #include <stdio.h>
-#include <gmp.h>  
-#include "ox_toolkit_tags.h"
+#include <gmp.h>
+#include <ox/cmotag.h>
+#include <ox/oxMessageTag.h>
+#include <ox/smCommand.h>
 
 #if !defined(__GNUC__) && !defined(__inline__)
 #define __inline__
 #endif
 
-/* functions related to ox.c */
+/* Mathcap Local Database */
+typedef struct {
+    int tag;
+    int flag;
+} table;
 
-#define LOGOXFILE  "/tmp/oxtk.XXXXXX"
+typedef struct mathcap {
+    table *cmotbl;
+    table *smtbl;
+} mathcap;
 
-#define MATHCAP_FLAG_DENY   0
-#define MATHCAP_FLAG_ALLOW  1
-
-/* Open Xm File Descripter */
+/* OpenXM File Descripter */
 typedef struct OXFILE{
-	int fd;
-/*    FILE *fp; */
-	int (*send_int32)(struct OXFILE *oxfp, int int32);
-	int (*receive_int32)(struct OXFILE *oxfp);
-	int serial_number;
-	struct OXFILE *control;  /* pointer to his control server. */
-	int error;
+    int fd;
+    int (*send_int32)(struct OXFILE *oxfp, int int32);
+    int (*receive_int32)(struct OXFILE *oxfp);
+    int serial_number;
+    int received_serial_number;
+    struct OXFILE *control;  /* pointer to his control server. */
+    struct mathcap *mathcap;
+    int error;
 } OXFILE;
 
 typedef struct {
@@ -145,7 +152,6 @@ ox_sync_ball*      new_ox_sync_ball();
 char*              new_string_set_cmo(cmo* m);
 
 cmo_error2*        make_error_object(int err_code, cmo* ob);
-cmo*               make_mathcap_object(int version, char *id_string);
 
 /* Low level API */
 cmo*               receive_cmo(OXFILE *fp);
@@ -215,23 +221,17 @@ symbol_t lookup(int i);
 char *symbol_get_key(symbol_t sp);
 
 /* for mathcap database */
-cmo_mathcap *mathcap_get();
-int mathcap_cmo_isallow_cmo(cmo *ob);
-void mathcap_cmo_allow(int tag);
-void mathcap_cmo_deny(int tag);
-void mathcap_cmo_deny_all();
-void mathcap_cmo_allow_all();
-cmo_list *mathcap_cmo_get_allow_all();
-cmo_list *mathcap_sm_get_all();
-cmo_list *mathcap_sysinfo_get_all();
-void mathcap_sysinfo_set(int version, char *id, char *sysname);
+mathcap *new_mathcap();
+void mathcap_init(int ver, char *vstr, char *sysname, int cmos[], int sms[]);
+cmo_mathcap* mathcap_get(mathcap *this);
+mathcap *mathcap_update(mathcap *this, cmo_mathcap *mc);
+int mathcap_allowQ_cmo(mathcap *this, cmo *ob);
 
-
-
 int oxf_read(void *buffer, size_t size, size_t num, OXFILE *oxfp);
 int oxf_write(void *buffer, size_t size, size_t num, OXFILE *oxfp);
 
 /* for OXFILE */
+int oxf_listen(short *portp);
 OXFILE *oxf_connect_active(char *hostname, short port);
 OXFILE *oxf_connect_passive(int listened);
 OXFILE *oxf_open(int fd);
@@ -244,15 +244,14 @@ void oxf_close(OXFILE *oxfp);
 void oxf_setopt(OXFILE *oxfp, int mode);
 void oxf_determine_byteorder_client(OXFILE *oxfp);
 void oxf_determine_byteorder_server(OXFILE *oxfp);
+OXFILE *oxf_execute_cmd(OXFILE *oxfp, char *cmd);
+cmo_mathcap *oxf_cmo_mathcap(OXFILE *oxfp);
+void oxf_mathcap_update(OXFILE *oxfp, cmo_mathcap *ob);
 
-int send_int32_lbo(OXFILE *oxfp, int int32);
-int send_int32_nbo(OXFILE *oxfp, int int32);
-int receive_int32_lbo(OXFILE *oxfp);
-int receive_int32_nbo(OXFILE *oxfp);
-
 /* example: which("xterm", getenv("PATH")); */
 char *which(char *exe, const char *env);
 char *generate_otp();
 
-
+int ox_stderr_init(FILE *fp);
+int ox_printf(char *format, ...);
 #endif /* _OX_TOOLKIT_H_ */