=================================================================== RCS file: /home/cvs/OpenXM/src/kan96xx/plugin/oxmisc2.c,v retrieving revision 1.13 retrieving revision 1.28 diff -u -p -r1.13 -r1.28 --- OpenXM/src/kan96xx/plugin/oxmisc2.c 2002/02/24 10:27:20 1.13 +++ OpenXM/src/kan96xx/plugin/oxmisc2.c 2020/10/06 11:33:47 1.28 @@ -1,5 +1,7 @@ -/* $OpenXM: OpenXM/src/kan96xx/plugin/oxmisc2.c,v 1.12 2001/05/04 01:06:30 takayama Exp $ */ +/* $OpenXM: OpenXM/src/kan96xx/plugin/oxmisc2.c,v 1.27 2013/11/06 06:23:24 takayama Exp $ */ #include +#include +#include #include "ox_kan.h" #include "oxmisc2.h" /* This file requires sm1 object description. */ #include "cmo.h" @@ -23,7 +25,7 @@ int oxGet(oxclientp client, struct object *op,int *isO int ans; ox_stream os; int m; - struct object rob; + struct object rob = OINIT; int sss; /* Serial number of the recieved packet. */ *isObj = 0; op->tag = Snull; @@ -140,13 +142,13 @@ int oxReq(oxclientp client,int func,struct object ob) ob3 ob2 */ /* oxtags [[OX_DATA, [cmo numbers]],[OX_DATA_LOCAL,[opt]],...]*/ { - struct object ob1; - struct object ob2; - struct object ob3; - struct object obm; - struct object smtags; - struct object oxtags; - struct object ox; + struct object ob1 = OINIT; + struct object ob2 = OINIT; + struct object ob3 = OINIT; + struct object obm = OINIT; + struct object smtags = OINIT; + struct object oxtags = OINIT; + struct object ox = OINIT; int n,i; struct mathCap mathcap; @@ -226,6 +228,14 @@ int oxReq(oxclientp client,int func,struct object ob) oxReqExecuteFunction(client->datafp2,KopString(ob)); client->dstate = DSTATE_ANY; break; + case SM_executeFunctionWithOptionalArgument: + if (ob.tag != Sdollar) { + errorOxmisc2("SM_executeFunctionWithOptionalArgument : the argument must be a string."); + return(-1); + } + oxReqExecuteFunctionWithOptionalArgument(client->datafp2,KopString(ob)); + client->dstate = DSTATE_ANY; + break; case SM_popString: oxReqPopString(client->datafp2); client->dstate = DSTATE_ANY; @@ -254,6 +264,10 @@ int oxReq(oxclientp client,int func,struct object ob) oxReqSingleOperand(client->datafp2,SM_dupErrors); client->dstate = DSTATE_ANY; break; + case SM_pushCMOtag: + oxReqSingleOperand(client->datafp2,SM_pushCMOtag); + client->dstate = DSTATE_ANY; + break; default: fprintf(MyErrorOut,"func=%d ",func); errorOxmisc2("This function is not implemented."); @@ -265,10 +279,13 @@ int oxReq(oxclientp client,int func,struct object ob) struct object KoxCreateClient(struct object ip, struct object portStream, - struct object portControl) + struct object portControl,struct object pass) { - struct object rob; + struct object rob = OINIT; oxclientp client; + char *passControl; char *passData; + struct object tob = OINIT; + passControl = NULL; passData = NULL; rob.tag = Snull; if (ip.tag != Sdollar) { errorOxmisc2("KoxCreateClient(): The first argument must be a hostname given by a string."); @@ -294,13 +311,32 @@ struct object KoxCreateClient(struct object ip, errorOxmisc2("KoxCreateClient(): The third argument must be a port number given in an integer."); return(rob); } - client = oxCreateClient(KopString(ip),KopInteger(portStream),KopInteger(portControl)); + if (pass.tag == Sarray) { + if (getoaSize(pass) < 2) { + errorOxmisc2("KoxCreateClient(): the fourth argument --- pass must be an array of strings."); + return rob; + } + tob = getoa(pass,0); + if (tob.tag != Sdollar) { + errorOxmisc2("KoxCreateClient(): the fourth argument --- pass must be an array of strings."); + return rob; + } + passControl = KopString(tob); + tob = getoa(pass,1); + if (tob.tag != Sdollar) { + errorOxmisc2("KoxCreateClient(): the fourth argument --- pass must be an array of strings."); + return rob; + } + passData = KopString(tob); + } + client = oxCreateClient(KopString(ip),KopInteger(portStream),KopInteger(portControl),passControl,passData); if (client == NULL) { errorOxmisc2("KoxCreateClient(): Open error."); return(rob); } rob = newObjectArray(N_OF_CLIENT_FIELDS); oxClientToObject(client,rob); + oxClientListUpdate(rob); return(rob); } @@ -332,7 +368,7 @@ static int isItClientObject(struct object ob) struct object KoxIsThereErrorClient(struct object ob) { - struct object rob; + struct object rob = OINIT; int ans; int size; oxclient cc; @@ -348,8 +384,8 @@ struct object KoxIsThereErrorClient(struct object ob) int oxClientToObject(oxclientp client,struct object rob) { - struct object ob; - if (client == NULL) return; + struct object ob = OINIT; + if (client == NULL) return 0; /* rob = newObjectArray(N_OF_CLIENT_FIELDS); */ if (rob.tag != Sarray) { errorOxmisc2("oxClientToObject(): the second argument must be an array."); @@ -381,12 +417,13 @@ int oxClientToObject(oxclientp client,struct object ro } putoa(rob,11,KpoInteger(client->engineByteOrder)); putoa(rob,12,KpoInteger(client->controlByteOrder)); + putoa(rob,13,KpoInteger(client->engineID)); return(0); } int oxObjectToClient(struct object ob,oxclientp cp) { - struct object ob1; + struct object ob1 = OINIT; struct object *obp; if (cp == NULL) { errorOxmisc2("oxObjectToClient(): the second argument is NULL"); @@ -437,6 +474,9 @@ int oxObjectToClient(struct object ob,oxclientp cp) cp->engineByteOrder = KopInteger(ob1); ob1 = getoa(ob,12); cp->controlByteOrder = KopInteger(ob1); + + ob1 = getoa(ob,13); + cp->engineID = KopInteger(ob1); return(0); @@ -448,7 +488,7 @@ struct object KoxReq(struct object client, { int ans; static oxclientp cc1 = NULL; - struct object rob; + struct object rob = OINIT; rob.tag = Snull; if (cc1 == NULL) { cc1 = (oxclientp) mymalloc(sizeof(oxclient)); @@ -479,7 +519,7 @@ struct object KoxGet(struct object client) { int ans,k; static oxclientp cc1 = NULL; - struct object rob; + struct object rob = OINIT; rob.tag = Snull; if (cc1 == NULL) { cc1 = (oxclientp) mymalloc(sizeof(oxclient)); @@ -510,7 +550,7 @@ struct object KoxGetFromControl(struct object client) { int ans; static oxclientp cc1 = NULL; - struct object rob; + struct object rob = OINIT; rob.tag = Snull; if (cc1 == NULL) { cc1 = (oxclientp) mymalloc(sizeof(oxclient)); @@ -540,12 +580,12 @@ struct object KoxMultiSelect(struct object oclients,st static int csize = 0; static oxclientp *clients = NULL; oxclientp cc1; - struct object rob; + struct object rob = OINIT; int i; int tt; - struct object ob1; - struct object ob2; - struct object ob0; + struct object ob1 = OINIT; + struct object ob2 = OINIT; + struct object ob0 = OINIT; int size; int ans; int dataready[1024]; @@ -610,7 +650,7 @@ struct object KoxWatch(struct object client,struct obj { int ans,k; static oxclientp cc1 = NULL; - struct object rob; + struct object rob = OINIT; extern int WatchStream; rob.tag = Snull; if (client.tag == Sinteger) { @@ -619,7 +659,7 @@ struct object KoxWatch(struct object client,struct obj }else{ WatchStream = 0; } - return; + return rob; } if (cc1 == NULL) { cc1 = (oxclientp) mymalloc(sizeof(oxclient)); @@ -643,11 +683,68 @@ struct object KoxWatch(struct object client,struct obj return(KpoInteger(ans)); } +struct object KoxLog(struct object client,struct object in,struct object out) +{ + int ans,k; + static oxclientp cc1 = NULL; + struct object rob = OINIT; + rob.tag = Snull; + if (cc1 == NULL) { + cc1 = (oxclientp) mymalloc(sizeof(oxclient)); + if (cc1 == NULL) { + errorOxmisc2("KoxLog(): no more memory."); + return(rob); + } + oxInitClient(cc1); + } + + if (oxObjectToClient(client,cc1) == -1) return(rob); + if (cc1 == NULL) { + errorOxmisc2("KoxLog(): the first argument must be a client object."); + return(rob); + } + + if (in.tag != Sfile) { + errorOxmisc2("KoxLog(): the second argument is not a file object."); + return rob; + } + if (out.tag != Sfile) { + errorOxmisc2("KoxLog(): the third argument is not a file object."); + return rob; + } + k = fp2log(cc1->datafp2,in.rc.file,out.rc.file); + fputc(cc1->engineByteOrder,out.rc.file); /* Output engineByteOrder. */ + /* synchronize cc1 and client. */ + oxClientToObject(cc1,client); + + return(KpoInteger(ans)); +} + +struct object KoxLogStop(struct object client) { + static oxclientp cc1 = NULL; + struct object rob = OINIT; + rob.tag = Snull; + if (cc1 == NULL) { + cc1 = (oxclientp) mymalloc(sizeof(oxclient)); + if (cc1 == NULL) { + errorOxmisc2("KoxLog(): no more memory."); + return(rob); + } + oxInitClient(cc1); + } + + if (oxObjectToClient(client,cc1) == -1) return(rob); + if (cc1 == NULL) { + errorOxmisc2("KoxLog(): the first argument must be a client object."); + return(rob); + } + return(KpoInteger(fp2stopLog(cc1->datafp2))); +} struct object KoxCloseClient(struct object client) { oxclientp cc1 = NULL; oxclient cc; - struct object rob; + struct object rob = OINIT; rob.tag = Snull; cc1 = &cc; if (oxObjectToClient(client,cc1) == -1) return(rob); @@ -664,16 +761,17 @@ struct object KoxCloseClient(struct object client) { switch (cc1->type) { case CLIENT_SOCKET: fp2fclose(cc1->datafp2); - close(cc1->controlfd); + {int r; r=close(cc1->controlfd);} break; case CLIENT_FILE: fp2fclose(cc1->datafp2); - close(cc1->controlfd); + {int r; r=close(cc1->controlfd);} break; default: errorOxmisc2("Unknown client->type\n"); break; } + oxClientListRemove(client); return(KpoInteger(0)); } @@ -703,6 +801,7 @@ static int cmoCheck00(struct object obj,int cmo[], int /* typeTrans[Spoly] = CMO_DMS; */ typeTrans[Spoly] = CMO_DISTRIBUTED_POLYNOMIAL; typeTrans[Sdouble] = CMO_64BIT_MACHINE_DOUBLE; + typeTrans[SrationalFunction] = CMO_RATIONAL; typeTrans[CLASSNAME_ERROR_PACKET] = CMO_ERROR2; typeTrans[CLASSNAME_mathcap] = CMO_MATHCAP; typeTrans[CLASSNAME_indeterminate] = CMO_INDETERMINATE; @@ -754,13 +853,13 @@ static int cmoCheck00(struct object obj,int cmo[], int int cmoCheckMathCap(struct object obj, struct object *obp) { - struct object mathcap; - struct object cmolist; - struct object mathcapMain; - struct object mathcapThird; - struct object ox; - struct object oxtag; - struct object ob0; + struct object mathcap = OINIT; + struct object cmolist = OINIT; + struct object mathcapMain = OINIT; + struct object mathcapThird = OINIT; + struct object ox = OINIT; + struct object oxtag = OINIT; + struct object ob0 = OINIT; int oxsize; int n; int i; @@ -872,7 +971,7 @@ int cmoCheckMathCap(struct object obj, struct object * struct object KoxGenPortFile(void) { - struct object ob; + struct object ob = OINIT; ob = KpoString(oxGenPortFile()); return(ob); } @@ -882,20 +981,20 @@ void KoxRemovePortFile(void) { void oxPushMathCap(struct mathCap *mathcap) { - struct object rob; + struct object rob = OINIT; rob = newMathCap(mathcap); Kpush(rob); } struct object KoxGenPass(void) { - struct object rob; + struct object rob = OINIT; rob = KpoString(oxGenPass()); return(rob); } struct object KoxGetPort(struct object host) { - struct object rob; + struct object rob = OINIT; int fdStream, fdControl; int portStream, portControl; extern int OpenedSocket; @@ -919,7 +1018,7 @@ struct object KoxGetPort(struct object host) } struct object KoxGetPort1(struct object host) { - struct object rob; + struct object rob = OINIT; int fdStream; int portStream; extern int OpenedSocket; @@ -942,11 +1041,13 @@ struct object KoxCreateClient2(struct object peer, struct object ipmask, struct object pass) { - struct object rob; + struct object rob = OINIT; oxclientp client; int fdStream, portStream, fdControl, portControl; int i; - struct object ob1; + struct object ob1 = OINIT; + struct object opassControl = OINIT; + struct object opassData = OINIT; rob.tag = Snull; if (peer.tag != Sarray) { errorOxmisc2("KoxCreateClient2(): The first argument must be an array [fdStream, portStream, fdControl, portControl]"); @@ -970,18 +1071,29 @@ struct object KoxCreateClient2(struct object peer, if (ipmask.tag != Sinteger) { errorOxmisc2("KoxCreateClient2(): ipmask must be an integer."); } - if (pass.tag != Sdollar) { - errorOxmisc2("KoxCreateClient2(): pass must be a string."); + if (pass.tag == Sdollar) { + opassControl = pass; opassData = pass; + }else if (pass.tag == Sarray) { + if (getoaSize(pass) < 2) errorOxmisc2("KoxCreateClient2: #passArray < 2."); + opassControl = getoa(pass,0); + opassData = getoa(pass,1); + }else{ + errorOxmisc2("KoxCreateClient2(): pass must be a string or an array."); } + if ((opassControl.tag != Sdollar) || (opassData.tag != Sdollar)) { + errorOxmisc2("KoxCreateClient2(): opassControl or opassData must be a string."); + } client = oxCreateClient2(fdStream, portStream, fdControl, portControl, - KopInteger(ipmask), KopString(pass)); + KopInteger(ipmask), + KopString(opassControl),KopString(opassData)); if (client == NULL) { errorOxmisc2("KoxCreateClient2(): Open error."); return(rob); } rob = newObjectArray(N_OF_CLIENT_FIELDS); oxClientToObject(client,rob); + oxClientListUpdate(rob); return(rob); } @@ -991,16 +1103,17 @@ int KgetCmoTagOfObject(struct object obj) { return(k); } -errorOxmisc2(char *s) { +int errorOxmisc2(char *s) { SET_MYERROROUT; fprintf(MyErrorOut,"error in oxmisc2.c: %s\n",s); errorKan1("%s\n"," "); + return 0; } struct object KoxPushCMD(struct object client,struct object cmd) { int ans; static oxclientp cc1 = NULL; - struct object rob; + struct object rob = OINIT; rob.tag = Snull; if (cc1 == NULL) { cc1 = (oxclientp) mymalloc(sizeof(oxclient)); @@ -1031,7 +1144,7 @@ struct object KoxPushCMD(struct object client,struct o struct object KoxPushCMO(struct object client,struct object ob) { int ans; static oxclientp cc1 = NULL; - struct object rob; + struct object rob = OINIT; rob.tag = Snull; if (cc1 == NULL) { cc1 = (oxclientp) mymalloc(sizeof(oxclient)); @@ -1069,11 +1182,11 @@ oxclientp oxCreateControl_RFC_101(int fdstream,int por int ipmask,char *pass); struct object KoxCreateControl_RFC_101(struct object peer,struct object ipmask,struct object pass) { - struct object rob; + struct object rob = OINIT; oxclientp client; int fdStream, portStream; int i; - struct object ob1; + struct object ob1 = OINIT; rob.tag = Snull; if (peer.tag != Sarray) { errorOxmisc2("KoxCreateControl_RFC_101(): The first argument must be an array [fdStream, portStream]"); @@ -1113,7 +1226,6 @@ struct object KoxCreateControl_RFC_101(struct object p oxclientp oxCreateControl_RFC_101(int fdstream,int portStream, int ipmask,char *pass) { - static int clnum = 0; int v = 0; int fdControl = -1; int fdStream = -1; @@ -1149,10 +1261,10 @@ oxclientp oxCreateControl_RFC_101(int fdstream,int por /* Authentication by password. */ m = strlen(pass); s = (char *)mymalloc(sizeof(char)*(m+1)); - read(fdStream,s,m+1); s[m] = '\0'; + {int r; r=read(fdStream,s,m+1);} s[m] = '\0'; if (strcmp(s,pass) != 0) { fprintf(stderr,"oxCreateControl_RFC_101(): password authentication failed for control channel.\n"); - close(fdStream); + {int r; r=close(fdStream);} return(NULL); } @@ -1174,7 +1286,7 @@ oxclientp oxCreateControl_RFC_101(int fdstream,int por client->dataport = portStream; client->controlport = -1; client->controlfd = -1; - client->id = clnum; clnum++; + client->id = oxGetClientID(); client->type = CLIENT_SOCKET; /* socket */ client->engineByteOrder = engineByteOrder; client->controlByteOrder = -1; @@ -1185,11 +1297,11 @@ oxclientp oxCreateEngine_RFC_101(int fdstream,int port int ipmask,char *pass, int engineID); struct object KoxCreateEngine_RFC_101(struct object peer,struct object ipmask,struct object pass, struct object engineID) { - struct object rob; + struct object rob = OINIT; oxclientp client; int fdStream, portStream; int i; - struct object ob1; + struct object ob1 = OINIT; rob.tag = Snull; if (peer.tag != Sarray) { errorOxmisc2("KoxCreateEngine_RFC_101(): The first argument must be an array [fdStream, portStream]"); @@ -1226,6 +1338,7 @@ struct object KoxCreateEngine_RFC_101(struct object pe } rob = newObjectArray(N_OF_CLIENT_FIELDS); oxClientToObject(client,rob); + oxClientListUpdate(rob); return(rob); } @@ -1293,9 +1406,71 @@ oxclientp oxCreateEngine_RFC_101(int fdstream,int port client->dataport = portStream; client->controlport = -1; client->controlfd = -1; - client->id = engineID; + client->id = oxGetClientID(); + client->engineID = engineID; client->type = CLIENT_SOCKET; /* socket */ client->engineByteOrder = engineByteOrder; client->controlByteOrder = -1; return(client); } + +void oxClientListUpdate(struct object ob) { + int id; + extern struct object OxClientList[]; + id = KopInteger(getoa(ob,8)); + /* printf("id=%d\n",id); */ + if ((id = 0)) { + OxClientList[id] = ob; + }else{ + errorOxmisc2("oxClientListUpdate(): the client table is full.\n"); + } +} +void oxClientListRemove(struct object ob) { + int id; + extern struct object OxClientList[]; + id = KopInteger(getoa(ob,8)); + if ((id = 0)) { + (OxClientList[id]).tag = Snull; + }else{ + /* errorOxmisc2("oxClientListRemove(): the client table is full.\n");*/ + } +} +static void KoxCleanClientList() { + extern int OxClientListn; + extern struct object OxClientList[]; + int i,j,n; + struct object ob = OINIT; + n = 0; + for (i=0; i= n) { + j=0; + errorOxmisc2("oxGetClientList(): the client table is broken.\n"); + } + putoa(rob,j,OxClientList[i]); + j++; + } + } + return rob; +} + +