=================================================================== RCS file: /home/cvs/OpenXM/src/kan96xx/plugin/oxmisc2.c,v retrieving revision 1.1.1.1 retrieving revision 1.10 diff -u -p -r1.1.1.1 -r1.10 --- OpenXM/src/kan96xx/plugin/oxmisc2.c 1999/10/08 02:12:05 1.1.1.1 +++ OpenXM/src/kan96xx/plugin/oxmisc2.c 2000/12/05 12:03:43 1.10 @@ -1,8 +1,13 @@ +/* $OpenXM: OpenXM/src/kan96xx/plugin/oxmisc2.c,v 1.9 2000/12/05 11:20:26 takayama Exp $ */ #include #include "ox_kan.h" #include "oxmisc2.h" /* This file requires sm1 object description. */ #include "cmo.h" + extern FILE *MyErrorOut; +#define SET_MYERROROUT { if (MyErrorOut == NULL) MyErrorOut=stdout; } +/* It is also defined in oxmisc.c */ + extern int SerialOX; /* defined in SerialOX */ extern int OxVersion; @@ -67,6 +72,7 @@ int oxGet(oxclientp client, struct object *op,int *isO int oxGetFromControl(oxclientp client) { int ans = -1; + AbortIfRFC_101(client); if (client->cstate != -1) { ans = oxGetResultOfControlInt32(client->controlfd); if (ans != -1) { client->cstate = 0; } @@ -78,13 +84,15 @@ int oxGetFromControl(oxclientp client) int oxReq(oxclientp client,int func,struct object ob) { struct object *ob1p; + SET_MYERROROUT; /* request to the control channel */ if (func == SM_control_reset_connection || func == SM_control_kill) { + AbortIfRFC_101(client); switch(func) { case SM_control_reset_connection: oxReqControlResetConnection(client->controlfd); - client->cstate = 1; + client->cstate = 0; client->dstate = DSTATE_FIRST_SYNC; break; case SM_control_kill: @@ -128,13 +136,17 @@ int oxReq(oxclientp client,int func,struct object ob) case SM_setMathCap: /* ob = [(mathcap-obj) [[version num, system name] [sm tags] ob1 smtags - [[ox numbers] [cmo numbers]]] + oxtags [[ox numbers, [cmo numbers]]] 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; int n,i; struct mathCap mathcap; @@ -143,25 +155,40 @@ int oxReq(oxclientp client,int func,struct object ob) client->dstate = DSTATE_ANY; break; } - ob1 = getoa(getoa(ob,1),0); - smtags = getoa(getoa(ob,1),1); - ob2 = getoa(getoa(getoa(ob,1),2),1); - ob3 = getoa(getoa(getoa(ob,1),2),0); - + obm = getoa(ob,1); + ob1 = getoa(obm,0); + smtags = getoa(obm,1); + oxtags = getoa(obm,2); + if (smtags.tag != Sarray || oxtags.tag != Sarray) { + errorOxmisc2("data format error in oxReqSetMathCap"); + } ob1p = (struct object *) sGC_malloc(sizeof(struct object)); *ob1p = ob1; mathcap.infop = ob1p; - n = getoaSize(ob2); - mathcap.n = n; + + n = getoaSize(oxtags); if (n >= MATHCAP_SIZE) errorOxmisc2("Too big mathcap of your peer."); - for (i=0; i= MATHCAP_SIZE) errorOxmisc2("Too big mathcap of your peer."); mathcap.oxSize = n; for (i=0; i= MATHCAP_SIZE) errorOxmisc2("Too big mathcap of your peer."); + for (i=0; itag != Sarray) { fprintf(stderr,"cmoCheckMathCap: the mathcap obj is \n"); printObject(*obp,0,stderr); @@ -725,6 +775,15 @@ int cmoCheckMathCap(struct object obj, struct object * errorOxmisc2("cmoCheckMathCap: format error in the client->mathcapObjp field.\n"); } mathcap = *obp; + /* Example of mathcap + [ $mathcap-object$ , + [ [ 199909080 , $Ox_system=ox_sm1.plain$ , $Version=2.991106$ , + $HOSTTYPE=i386$ ] , + [ 262 , 263 , 264 , 265 , 266 , 268 , 269 , 272 , 273 , 275 , + 276 ] , + [ [ 514 , [ 2130706434 , 1 , 2 , 4 , 5 , 17 , 19 , 20 , 22 , 23 , 24 , 25 , 26 , 30 , 31 , 60 , 61 , 27 , 33 , 40 , 16 , 34 ] ] ] ] ] + */ + n = getoaSize(mathcap); if (n < 2) { fprintf(stderr,"cmoCheckMathCap: the mathcap obj is \n"); @@ -732,33 +791,82 @@ int cmoCheckMathCap(struct object obj, struct object * fprintf(stderr,"\n"); errorOxmisc2("cmoCheckMathCap: length of mathcap is wrong in the client->mathcapObjp field.\n"); } - /* I should check - getoa(getoa(mathcap,2),0) - contains OX_DATA. - It has not yet implemented. - */ - mathcap = getoa(getoa(mathcap,1),2); - n = getoaSize(mathcap); - if (n < 2) { + ob0 = getoa(mathcap,0); + if (ob0.tag != Sdollar) { fprintf(stderr,"cmoCheckMathCap: the mathcap obj is \n"); printObject(*obp,0,stderr); fprintf(stderr,"\n"); - errorOxmisc2("cmoCheckMathCap: length of mathcap is wrong in the client->mathcapObjp field.\n"); + errorOxmisc2("cmoCheckMathCap: The first field must be the string mathcap-object.\n"); } - cmolist = getoa(mathcap,1); - if (cmolist.tag != Sarray) { + if (strcmp(KopString(ob0),"mathcap-object") != 0) { fprintf(stderr,"cmoCheckMathCap: the mathcap obj is \n"); printObject(*obp,0,stderr); fprintf(stderr,"\n"); - errorOxmisc2("cmoCheckMathCap: mathcap[1] must be an array of integers.\n"); + errorOxmisc2("cmoCheckMathCap: The mathcap must be of the form [(mathcap-object) [...]]\n"); } - n = getoaSize(cmolist); - if (n > CMO_CHECK_MATH_CAP_LIST_SIZE) { - errorOxmisc2("cmoCheckMathCap: Too big cmo list.\n"); + + /* I should check + getoa(getoa(mathcap,1),2) + contains OX_DATA. + It has not yet implemented. + */ + mathcapMain = getoa(mathcap,1); + if (mathcapMain.tag != Sarray) { + fprintf(stderr,"cmoCheckMathCap: mathcap[1] is \n"); + printObject(mathcapMain,0,stderr); + fprintf(stderr,"\n"); + errorOxmisc2("cmoCheckMathCap: format error in the (client->mathcapObjp)[1] field. It should be an array.\n"); } - for (i=0; imathcapObjp)[1] field. It should be an array of which length is more than 2.\n"); } + mathcapThird = getoa(mathcapMain,2); + oxsize = getoaSize(mathcapThird); + for (i=0; i 1) { + cmolist = getoa(ox,1); + if (cmolist.tag != Sarray) { + fprintf(stderr,"cmoCheckMathCap: the mathcap obj is \n"); + printObject(*obp,0,stderr); + fprintf(stderr,"\n"); + errorOxmisc2("cmoCheckMathCap: mathcap[1] must be an array of integers.\n"); + } + n = getoaSize(cmolist); + if (n > CMO_CHECK_MATH_CAP_LIST_SIZE) { + errorOxmisc2("cmoCheckMathCap: Too big cmo list.\n"); + } + for (i=0; idatafp2,OX_COMMAND,SerialOX++); + oxSendInt32(cc1->datafp2,KopInteger(cmd)); + /* synchronize cc1 and client. */ + oxClientToObject(cc1,client); + return(cmd); +} + +struct object KoxPushCMO(struct object client,struct object ob) { + int ans; + static oxclientp cc1 = NULL; + struct object rob; + rob.tag = Snull; + if (cc1 == NULL) { + cc1 = (oxclientp) mymalloc(sizeof(oxclient)); + if (cc1 == NULL) { + errorOxmisc2("KoxReq(): no more memory."); + return(rob); + } + oxInitClient(cc1); /* BUG: is it fine? */ + } + + if (oxObjectToClient(client,cc1) == -1) return(rob); + if (cc1 == NULL) { + errorOxmisc2("KoxReq(): the first argument must be a client object."); + return(rob); + } + + /* request to the data channel */ + if (cc1->dstate != DSTATE_ANY) { + errorOxmisc2("oxPushCMO: cc1->dstate != DSTATE_ANY, data channel is not ready to send data.\n"); + return(rob); + } + + if (!cmoCheckMathCap(ob,(struct object *)cc1->mathcapObjp)) { + errorOxmisc2("oxPushCMO: your peer does not understand this cmo.\n"); + return(rob); + } + oxSendOXheader(cc1->datafp2,OX_DATA,SerialOX++); + cmoObjectToStream2(ob,cc1->datafp2); + /* synchronize cc1 and client. */ + oxClientToObject(cc1,client); + return(ob); +} + +/* ------------- TODO ----------------- */ +oxclientp oxCreateControl_RFC_101(int fdstream,int portStream, + int ipmask,char *pass); +struct object KoxCreateControl_RFC_101(struct object peer,struct object ipmask,struct object pass) +{ + struct object rob; + oxclientp client; + int fdStream, portStream; + int i; + struct object ob1; + rob.tag = Snull; + if (peer.tag != Sarray) { + errorOxmisc2("KoxCreateControl_RFC_101(): The first argument must be an array [fdStream, portStream]"); + return(rob); + } + if (getoaSize(peer) != 2 ) { + errorOxmisc2("KoxCreateControl_RFC_101(): The first argument must be an array [fdStream, portStream] of size 2."); + return(rob); + } + for (i=0; idatafp2 = fp2open(fdStream); + if (client->datafp2 == NULL) { + fprintf(stderr,"oxCreateControl_RFC_101(): fp2open(fd) failed.\n"); + return(NULL); + } + client->dataport = portStream; + client->controlport = -1; + client->controlfd = -1; + client->id = clnum; clnum++; + client->type = CLIENT_SOCKET; /* socket */ + client->engineByteOrder = engineByteOrder; + client->controlByteOrder = -1; + return(client); }