=================================================================== RCS file: /home/cvs/OpenXM/src/kan96xx/plugin/oxKan0.h,v retrieving revision 1.1.1.1 retrieving revision 1.11 diff -u -p -r1.1.1.1 -r1.11 --- OpenXM/src/kan96xx/plugin/oxKan0.h 1999/10/08 02:12:05 1.1.1.1 +++ OpenXM/src/kan96xx/plugin/oxKan0.h 2004/09/17 08:46:10 1.11 @@ -1,7 +1,8 @@ +/* $OpenXM: OpenXM/src/kan96xx/plugin/oxKan0.h,v 1.10 2004/09/17 07:27:28 takayama Exp $ */ /* ox_kan0.h */ -#define mymalloc(n) malloc(n) -#define myfree(p) free(p) +#define mymalloc(n) sGC_malloc(n) +#define myfree(p) sGC_free(p) typedef FILE2 * ox_stream; int socketOpen(char *serverName,int portNumber); @@ -65,14 +66,18 @@ typedef struct oxclient { NULL means no restriction.*/ int engineByteOrder; int controlByteOrder; + int engineID; } oxclient; -#define N_OF_CLIENT_FIELDS 13 /* If you add new field to struct oxclient +#define N_OF_CLIENT_FIELDS 14 /* If you add new field to struct oxclient do not forget to increase the number.*/ -/* Change also, oxInitClient, oxCreateClient, oxCreateClientFile oxmisc.c +/* Change also, oxInitClient, oxCreateClient(2), oxCreateClientFile oxmisc.c oxClientToObject, oxObjectToClient oxmisc2.c */ typedef oxclient * oxclientp; +#define AbortIfRFC_101(oxclient) if (oxclient->controlport < 0) {\ + errorOxmisc2("The OpenXM RFC 101 client is used for RFC 100\n"); } + #define CLIENT_SOCKET 0 #define CLIENT_FILE 1 @@ -82,12 +87,13 @@ int oxclientMultiSelect(oxclientp clients[],int datare int oxInitClient(oxclientp c); int oxGetControl(oxclientp client); int oxIsThereErrorClient(oxclientp client); /* 1 : error, 0 : OK. */ -oxclientp oxCreateClient(char *ipname,int portStream,int portControl); +oxclientp oxCreateClient(char *ipname,int portStream,int portControl, + char *passControl,char *passData); oxclientp oxCreateClientFile(char *fileName,char *mode,char *controlFileName,char *cmode); oxclientp oxCreateClient2(int fdstream,int portStream, - int fdcontrol,int portControl,int ipmask,char *pass); + int fdcontrol,int portControl,int ipmask,char *cpass,char *dpass); int oxSetByteOrder(int fd); -int oxTellMyByteOrder(int fd); +int oxTellMyByteOrder(int fdOut,int fdIn); char *oxGenPass(void); @@ -133,6 +139,7 @@ void oxReqSetName(ox_stream os,char *name); void oxReqEvalName(ox_stream os,char *name); void oxReqExecuteStringByLocalParser(ox_stream os,char *s); void oxReqExecuteFunction(ox_stream os,char *s); +void oxReqExecuteFunctionWithOptionalArgument(ox_stream os,char *s); void oxReqPopString(ox_stream os); void oxReqPushString(ox_stream os,char *s); void oxReqPopCMO(ox_stream os); @@ -146,3 +153,7 @@ int oxWritePortFile(int func,int port,char *fname); char *oxGenPortFile(void); int oxRemovePortFile(void); +#define MAX_N_OF_CLIENT 1024 +int oxGetClientID(); + +char *oxFIDtoStr(int id);