===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/plugin/oxmisc2.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- OpenXM/src/kan96xx/plugin/oxmisc2.c	2000/12/05 12:03:43	1.10
+++ OpenXM/src/kan96xx/plugin/oxmisc2.c	2000/12/06 00:29:52	1.11
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM/src/kan96xx/plugin/oxmisc2.c,v 1.9 2000/12/05 11:20:26 takayama Exp $ */
+/* $OpenXM: OpenXM/src/kan96xx/plugin/oxmisc2.c,v 1.10 2000/12/05 12:03:43 takayama Exp $ */
 #include <stdio.h>
 #include "ox_kan.h"
 #include "oxmisc2.h"   /* This file requires sm1 object description. */
@@ -1065,7 +1065,6 @@ struct object KoxPushCMO(struct object client,struct o
   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) 
@@ -1172,6 +1171,121 @@ oxclientp oxCreateControl_RFC_101(int fdstream,int por
   client->controlport = -1;
   client->controlfd = -1;
   client->id = clnum; clnum++;
+  client->type = CLIENT_SOCKET; /* socket */
+  client->engineByteOrder = engineByteOrder;
+  client->controlByteOrder = -1;
+  return(client);
+}
+
+oxclientp oxCreateEngine_RFC_101(int fdstream,int portStream,
+			                      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;
+  oxclientp client;
+  int fdStream, portStream;
+  int i;
+  struct object ob1;
+  rob.tag = Snull;
+  if (peer.tag != Sarray) {
+    errorOxmisc2("KoxCreateEngine_RFC_101(): The first argument must be an array [fdStream, portStream]");
+    return(rob);
+  }
+  if (getoaSize(peer) != 2 ) {
+    errorOxmisc2("KoxCreateEngine_RFC_101(): The first argument must be an array [fdStream, portStream] of size 2.");
+    return(rob);
+  }
+  for (i=0; i<getoaSize(peer); i++) {
+    ob1 = getoa(peer,i);
+    if (ob1.tag != Sinteger) {
+      errorOxmisc2("KoxCreateEngine_RFC_101(): The element of the first argument must be an integer.");
+    }
+  }
+  fdStream = KopInteger(getoa(peer,0));
+  portStream = KopInteger(getoa(peer,1));
+
+  if (ipmask.tag != Sinteger) {
+    errorOxmisc2("KoxCreateEngine_RFC_101(): ipmask must be an integer.");
+  }
+  if (pass.tag != Sdollar) {
+    errorOxmisc2("KoxCreateEngine_RFC_101(): pass must be a string.");
+  }
+  if (engineID.tag != Sinteger) {
+    errorOxmisc2("KoxCreateEngine_RFC_101(): engineID must be an integer.");
+  }
+
+  client = oxCreateEngine_RFC_101(fdStream, portStream,
+			   KopInteger(ipmask), KopString(pass),KopInteger(engineID));
+  if (client == NULL) {
+    errorOxmisc2("KoxCreateEngine_RFC_101(): Open error.");
+    return(rob);
+  }
+  rob = newObjectArray(N_OF_CLIENT_FIELDS);
+  oxClientToObject(client,rob);
+  return(rob);
+}
+
+oxclientp oxCreateEngine_RFC_101(int fdstream,int portStream,
+			                      int ipmask,char *pass,int engineID)
+{
+  int v = 0;
+  int fdControl = -1;
+  int fdStream = -1;
+  int m;
+
+  char *s;
+  oxclientp client;
+  extern jmp_buf MyEnv_oxmisc ;
+  int engineByteOrder;
+  extern int Quiet;
+
+  v = !Quiet;
+  
+  switch(ipmask) {
+  case 0:/* only local */
+    fdStream  = socketAcceptLocal(fdstream);
+    break;
+  default:/* any */
+    fdStream  = socketAccept(fdstream);
+    break;
+  }
+  if (v) fprintf(stderr,"\nEngine port %d : Connected.\n",portStream);
+
+  if (fdStream == -1 ) {
+    fprintf(stderr,"\nOpen error in oxCreateEngine_RFC_101.\n");
+    return(NULL);
+  }
+
+  /* Authentication by password. */
+  /*  skip password check for now. BUG. 
+  m = strlen(pass);
+  s = (char *)mymalloc(sizeof(char)*(m+1));
+  read(fdStream,s,m+1); s[m] = '\0';
+  if (strcmp(s,pass) != 0) {
+    fprintf(stderr,"oxCreateEngine_RFC_101(): password authentication failed for control channel.\n");
+    close(fdStream);
+    return(NULL);
+  }
+  */
+
+  engineByteOrder = oxSetByteOrder(fdStream);
+  if (v) fprintf(stderr,"Byte order for engine stackmacine is %s.\n",
+		 (engineByteOrder == 0? "network byte order":
+		  (engineByteOrder == 1? "little indican":
+		   "big indian")));
+  
+
+  client = (oxclientp) mymalloc(sizeof(oxclient));
+  oxInitClient(client);
+  client->datafp2 = fp2open(fdStream);
+  if (client->datafp2 == NULL) {
+    fprintf(stderr,"oxCreateEngine_RFC_101(): fp2open(fd) failed.\n");
+    return(NULL);
+  }
+  client->dataport = portStream;
+  client->controlport = -1;
+  client->controlfd = -1;
+  client->id = engineID;
   client->type = CLIENT_SOCKET; /* socket */
   client->engineByteOrder = engineByteOrder;
   client->controlByteOrder = -1;