=================================================================== RCS file: /home/cvs/OpenXM/src/kan96xx/plugin/oxmisc2.c,v retrieving revision 1.23 retrieving revision 1.27 diff -u -p -r1.23 -r1.27 --- OpenXM/src/kan96xx/plugin/oxmisc2.c 2004/09/17 07:27:28 1.23 +++ OpenXM/src/kan96xx/plugin/oxmisc2.c 2013/11/06 06:23:24 1.27 @@ -1,5 +1,6 @@ -/* $OpenXM: OpenXM/src/kan96xx/plugin/oxmisc2.c,v 1.22 2004/03/08 08:24:42 takayama Exp $ */ +/* $OpenXM: OpenXM/src/kan96xx/plugin/oxmisc2.c,v 1.26 2005/07/03 11:08:54 ohara Exp $ */ #include +#include #include "ox_kan.h" #include "oxmisc2.h" /* This file requires sm1 object description. */ #include "cmo.h" @@ -23,7 +24,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 +141,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; @@ -277,10 +278,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."); @@ -306,7 +310,25 @@ 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); @@ -345,7 +367,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; @@ -361,8 +383,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."); @@ -400,7 +422,7 @@ int oxClientToObject(oxclientp client,struct object ro 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"); @@ -465,7 +487,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)); @@ -496,7 +518,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)); @@ -527,7 +549,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)); @@ -557,12 +579,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]; @@ -627,7 +649,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) { @@ -636,7 +658,7 @@ struct object KoxWatch(struct object client,struct obj }else{ WatchStream = 0; } - return; + return rob; } if (cc1 == NULL) { cc1 = (oxclientp) mymalloc(sizeof(oxclient)); @@ -664,7 +686,7 @@ struct object KoxLog(struct object client,struct objec { 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)); @@ -699,7 +721,7 @@ struct object KoxLog(struct object client,struct objec struct object KoxLogStop(struct object client) { static oxclientp cc1 = NULL; - struct object rob; + struct object rob = OINIT; rob.tag = Snull; if (cc1 == NULL) { cc1 = (oxclientp) mymalloc(sizeof(oxclient)); @@ -721,7 +743,7 @@ struct object KoxLogStop(struct object client) { 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); @@ -830,13 +852,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; @@ -948,7 +970,7 @@ int cmoCheckMathCap(struct object obj, struct object * struct object KoxGenPortFile(void) { - struct object ob; + struct object ob = OINIT; ob = KpoString(oxGenPortFile()); return(ob); } @@ -958,20 +980,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; @@ -995,7 +1017,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; @@ -1018,12 +1040,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 opassControl, opassData; + 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]"); @@ -1088,7 +1111,7 @@ errorOxmisc2(char *s) { 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)); @@ -1119,7 +1142,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)); @@ -1157,11 +1180,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]"); @@ -1272,11 +1295,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]"); @@ -1414,7 +1437,7 @@ static void KoxCleanClientList() { extern int OxClientListn; extern struct object OxClientList[]; int i,j,n; - struct object ob; + struct object ob = OINIT; n = 0; for (i=0; i