===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/plugin/sm1Socket.c,v
retrieving revision 1.3
retrieving revision 1.8
diff -u -p -r1.3 -r1.8
--- OpenXM/src/kan96xx/plugin/sm1Socket.c	2001/05/04 01:06:30	1.3
+++ OpenXM/src/kan96xx/plugin/sm1Socket.c	2002/10/21 01:11:44	1.8
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM/src/kan96xx/plugin/sm1Socket.c,v 1.2 2000/01/16 07:55:48 takayama Exp $ */
+/* $OpenXM: OpenXM/src/kan96xx/plugin/sm1Socket.c,v 1.7 2002/10/21 00:37:00 takayama Exp $ */
 /* msg0s.c */
 #include <stdio.h>
 #include <sys/types.h>
@@ -15,6 +15,9 @@
 
 extern int Quiet;
 static void errorMsg1s(char *s);
+static int getContentLength(char *s);
+static int getReceivedContentLength(char *s);
+#define MAX_LISTEN_QUEUE 3
 
 /* [(sm1.socket) (open) [optional integer port, optional string name] ] extension ; */
 struct object KsocketOpen(struct object obj) {
@@ -78,7 +81,7 @@ struct object KsocketOpen(struct object obj) {
   }
 
   
-  if (listen(s_waiting,1) < 0) {
+  if (listen(s_waiting,MAX_LISTEN_QUEUE) < 0) {
     errorMsg1s("Listen failed");
   }
   /*  
@@ -369,10 +372,12 @@ struct object KsocketRead(struct object obj) {
     }
   }
 
-  r = (char *)GC_malloc(sizeof(char)*(n+1));
+  r = (char *)GC_malloc(sizeof(char)*(totalsize+1));
   if (r == (char *)NULL) errorMsg1s("Out of Memory.");
   bcopy(data,r,totalsize);
-  robj = KpoString(r);
+  r[totalsize] = 0;
+  robj = KpoString(r);  /* BUG: it works only for reading string from TCP/IP
+   					            stream. */
 
   return(robj);
     
@@ -476,28 +481,150 @@ struct object KsocketWriteByte(struct object obj) {
   struct object ob1;
   struct object ob2;
   int socketid;
-  int r;
-  char data[2];
+  int r,i,n,kk,r0;
+#define DATA_SIZE 1024
+  char data[DATA_SIZE];
   if (obj.tag != Sarray) {
-    errorMsg1s("KsocketWriteByte([integer socketid, int])");
+    errorMsg1s("KsocketWriteByte([integer socketid, int | array of int])");
   }
   if (getoaSize(obj) < 2) {
-    errorMsg1s("KsocketWriteByte([integer socketid, int])");
+    errorMsg1s("KsocketWriteByte([integer socketid, int | array of int])");
   }
   ob1 = getoa(obj,0);
   ob2 = getoa(obj,1);
   if (ob1.tag != Sinteger) {
-    errorMsg1s("KsocketWriteByte([integer socketid, int]) : the first argument must be an integer.");
+    errorMsg1s("KsocketWriteByte([integer socketid, int | array of int]) : the first argument must be an integer.");
   }
   socketid = KopInteger(ob1);
-  if (ob2.tag != Sinteger) {
-    errorMsg1s("KsocketWriteByte([integer socketid, int]) : the second argument must be a string.");
+  if (ob2.tag != Sinteger && ob2.tag != Sarray) {
+    errorMsg1s("KsocketWriteByte([integer socketid, int | array of int]) : the second argument must be an integer or an array of integers.");
   }
-  data[0] = KopInteger(ob2);
-  r = write(socketid,data, 1);
+  if (ob2.tag == Sinteger) {
+    data[0] = KopInteger(ob2);
+    r = write(socketid,data, 1);
+  }else{
+    n = getoaSize(ob2); kk = 0; r = 0;
+    for (i=0; i<n; i++) {
+      if (getoa(ob2,i).tag != Sinteger)
+	    errorMsg1s("KsocketWriteByte([integer socketid, int | array of int]) : elements of the second argument must be integers.");
+      data[kk] = KopInteger(getoa(ob2,i));
+      kk++;
+      if (kk >= DATA_SIZE) {
+	r0 = write(socketid,data,kk);
+	if (r0 != kk) {
+	  fprintf(stderr,"Warning: Could not write to the socket.\n");
+	  return(KpoInteger(r+r0));
+	}
+        r += r0;
+	kk = 0;
+      }
+    }
+    if (kk > 0) {
+      r0 = write(socketid,data,kk);
+      if (r0 != kk) {
+	fprintf(stderr,"Warning: Could not write to the socket.\n");
+	return(KpoInteger(r+r0));
+      }
+      r += r0;
+    }
+  }
   return(KpoInteger(r));
 }
 
+struct object KsocketReadHTTP(struct object socketObj) {
+  /* Read until two empty line appears. */
+  struct object ob;
+  char *s;
+  char *sss;
+  char *tmp;
+  int i;
+  int flag;
+  int flagmax = 1;
+  int datasize;
+  int last;
+  int contentLength=-1;
+  ob = KsocketRead(socketObj);
+  s = KopString(ob);
+  if (strncmp(s,"POST",4) == 0) flagmax=2; /* for IE */
+  else flagmax=1;
+  flag = 0;
+  for (i=strlen(s)-1; i>=0; i--) {
+	if ((s[i] == '\n') && (i==0)) {
+	  ++flag;
+	}else if ((s[i] == '\n') && (s[i-1] == '\n')) {
+	  ++flag;
+	}else if ((s[i] == 0xd) && (s[i+1] == 0xa) && (i == 0)) {
+	  ++flag;
+	}else if ((s[i] == 0xa) && (s[i-1] == 0xd) && (s[i+1] == 0xd) && (s[i+2] == 0xa)) {
+	  ++flag;
+	}
+  }
+  if (flag >= flagmax) return ob;
+  datasize = strlen(s);
+  sss = s;
+  if ((s[strlen(s)-1] == '\n') ||
+      (s[strlen(s)-2] == 0xd) && (s[strlen(s)-1] == 0xa)) {
+	last = 1;
+  }else last = 0;
+
+  while (flag < flagmax) {
+	contentLength = getContentLength(sss);
+	if (contentLength != -1) {
+	  if (contentLength <= getReceivedContentLength(sss)) {
+		break;
+	  }
+	}
+	fprintf(stderr,"Waiting in socketReadBlock (spin lock to wait an empty line). flagmax(0d,0a)=%d, contentLength\n",flagmax,contentLength);
+	if (strlen(s) == 0) {fprintf(stderr,"but I'm not receiving data. Expecting a bug.\n");
+	}else{
+	  /* for debugging. */
+	  for (i=0; i<strlen(sss); i++) {
+		if ((sss[i] >= ' ') && (sss[i] < 0x7f)) {
+		  fprintf(stderr,"%c",sss[i]);
+		}else{
+          fprintf(stderr,"%3x",sss[i]);
+		  if (sss[i] == 0xa) fprintf(stderr,"\n");
+		}
+
+	  }
+	  fprintf(stderr,"\n");
+	}
+	sleep(2);
+	ob = KsocketRead(socketObj);
+	s = KopString(ob);
+	for (i=strlen(s)-1; i>=0; i--) {
+	  if ((s[i] == '\n') && (i==0) && last) {
+		++flag;
+	  }else if ((s[i] == '\n') && (s[i-1] == '\n')) {
+		++flag;
+	  }else if ((s[i] == 0xd) && (s[i+1] == 0xa) && (i==0) && last) {
+		++flag;
+	  }else if ((s[i] == 0xa) && (s[i-1] == 0xd) && (s[i+1] == 0xd) && (s[i+2] == 0xa)) {
+		++flag;
+	  }
+	}
+	if (datasize-1 <= strlen(sss)+strlen(s)) {
+      tmp = (char *)GC_malloc(sizeof(char)*2*(datasize+strlen(s))+1);
+      if (tmp == (char *)NULL) errorMsg1s("Out of Memory.");
+	  strcpy(tmp,sss);
+	  strcat(tmp,s);
+      datasize = 2*(datasize+strlen(s));
+	  sss = tmp;
+	}else{
+	  strcat(sss,s);
+	}
+
+	if ((s[strlen(s)-1] == '\n') ||
+		(s[strlen(s)-2] == 0xd) && (s[strlen(s)-1] == 0xa)) {
+	  last = 1;
+	}else last = 0;
+
+  }
+
+  return KpoString(sss);
+
+}
+
 struct object Kplugin_sm1Socket(char *key,struct object obj) {
   struct object robj = NullObject;
   if (strcmp(key,"open") == 0) {
@@ -512,6 +639,8 @@ struct object Kplugin_sm1Socket(char *key,struct objec
     robj = KsocketSelectMulti(obj);
   }else if (strcmp(key,"read") == 0) {
     robj = KsocketRead(obj);
+  }else if (strcmp(key,"readHTTP") == 0) {
+    robj = KsocketReadHTTP(obj);
   }else if (strcmp(key,"write") == 0) {
     robj = KsocketWrite(obj);
   }else if (strcmp(key,"read") == 0) {
@@ -529,6 +658,38 @@ struct object Kplugin_sm1Socket(char *key,struct objec
 }
 
 
+static int getContentLength(char *s) {
+  int n;
+  int i;
+  int len = -1;
+  char *s1 = "Content-length:";
+  char *s2 = "CONTENT-LENGTH:";
+  n = strlen(s);
+  for (i=0; i<n; i++) {
+	if ((strncmp(&(s[i]),s1,strlen(s1)) == 0) ||
+		(strncmp(&(s[i]),s2,strlen(s2)) == 0)) {
+	  sscanf(&(s[i+strlen(s1)]),"%d",&len);
+	  break;
+	}
+  }
+  return len;
+}
+static int getReceivedContentLength(char *s) {
+  int n;
+  int i;
+  int start;
+  start = -1;
+  n = strlen(s);
+  for (i=0; i<n; i++) {
+	if ((s[i] == '\n') && (s[i+1] == '\n')) {
+	  start = i+2; break;
+	}else if ((s[i] == 0xd) && (s[i+1] == 0xa) && (s[i+2] == 0xd) && (s[i+3] == 0xa)) {
+	  start = i+4;
+	}
+  }
+  if (start == -1) return 0;
+  return (n-start);
+}