===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/plugin/sm1Socket.c,v
retrieving revision 1.12
retrieving revision 1.22
diff -u -p -r1.12 -r1.22
--- OpenXM/src/kan96xx/plugin/sm1Socket.c	2002/10/24 01:29:00	1.12
+++ OpenXM/src/kan96xx/plugin/sm1Socket.c	2020/10/06 11:33:47	1.22
@@ -1,19 +1,23 @@
-/* $OpenXM: OpenXM/src/kan96xx/plugin/sm1Socket.c,v 1.11 2002/10/24 01:05:05 takayama Exp $ */
+/* $OpenXM: OpenXM/src/kan96xx/plugin/sm1Socket.c,v 1.21 2015/10/10 11:29:46 takayama Exp $ */
 /* msg0s.c */
 #include <stdio.h>
+#include <string.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <netinet/in.h>
 #include <netdb.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <unistd.h>
 
-
 #include "datatype.h"
 #include "stackm.h"
 #include "extern.h"
 #include "sm1Socket.h"
 
 extern int Quiet;
+static int Post_debug=0;
 static void errorMsg1s(char *s);
 static int getContentLength(char *s);
 static int getReceivedContentLength(char *s);
@@ -29,8 +33,12 @@ struct object KsocketOpen(struct object obj) {
   int s_waiting;
   int on;
   int tt;
-  extern int errno;
+  extern int Post_debug;
 
+  if ((char *)getenv("OXWEB_DEBUG") != NULL) {
+	Post_debug = 1;
+  }
+
   if (obj.tag != Sarray) {
     errorMsg1s("KsocketOpen([optional integer,optional string name])");
   }
@@ -55,7 +63,7 @@ struct object KsocketOpen(struct object obj) {
 
   /* fprintf(stderr,"Hello from open.\n"); */
   if ((myhost = gethostbyname(serverName)) == NULL) {
-    errorMsg1s("Bad server name.");
+    perror("gethostbyname"); errorMsg1s("Bad server name.");
   }
   bzero((char *)&me,sizeof(me));
   me.sin_family = AF_INET;
@@ -64,25 +72,25 @@ struct object KsocketOpen(struct object obj) {
         &me.sin_addr,myhost->h_length);
 
   if ((s_waiting = socket(AF_INET,SOCK_STREAM,0)) < 0) {
-    errorMsg1s("Socket allocation is failed.");
+    perror("socket"); errorMsg1s("Socket allocation is failed.");
   }
 
   on=1; setsockopt(s_waiting,SOL_SOCKET,SO_REUSEADDR,&on,sizeof(on)); 
   /* important */
   if (bind(s_waiting,(struct sockaddr *) &me,sizeof(me)) == -1) {
     fprintf(stderr,"Bind error. Error no is %d. See /usr/include/sys/errno.h.\n",errno);
-    errorMsg1s("cannot bind");
+    perror("bind"); errorMsg1s("cannot bind");
   }
 
   tt = sizeof(me);
   if (getsockname(s_waiting,(struct sockaddr *)&me,&tt) < 0) {
     fprintf(stderr,"getsockname error. Error no is %d. See /usr/include/sys/errno.h.\n",errno);
-    errorMsg1s("cannot getsockname");
+    perror("getsockname"); errorMsg1s("cannot getsockname");
   }
 
   
   if (listen(s_waiting,MAX_LISTEN_QUEUE) < 0) {
-    errorMsg1s("Listen failed");
+    perror("listen"); errorMsg1s("Listen failed");
   }
   /*  
       fprintf(stderr,"Done the initialization. port =%d\n",ntohs(me.sin_port));
@@ -129,7 +137,7 @@ struct object KsocketConnect(struct object obj) {
 
 
   if ((servhost = gethostbyname(serverName)) == NULL) {
-    errorMsg1s("bad server name.\n");
+    perror("gethostbyname"); errorMsg1s("bad server name.\n");
   }
   bzero((char *)&server,sizeof(server));
   server.sin_family = AF_INET;
@@ -138,13 +146,13 @@ struct object KsocketConnect(struct object obj) {
         (char *)&server.sin_addr,servhost->h_length);
 
   if ((socketid = socket(AF_INET,SOCK_STREAM,0)) <0) {
-    errorMsg1s("socket allocation is failed.\n");
+    perror("socket"); errorMsg1s("socket allocation is failed.\n");
   }
   if (!Quiet) {
-    fprintf(stderr,"Trying to connect port %d, ip=%x\n",ntohs(server.sin_port),server.sin_addr);
+    fprintf(stderr,"Trying to connect port %d, ip=%lx\n",ntohs(server.sin_port),(long) server.sin_addr.s_addr);
   }
   if (connect(socketid,(struct sockaddr *)&server,sizeof(server)) == -1) {
-    errorMsg1s("cannot connect");
+    perror("connect"); errorMsg1s("cannot connect");
   }
   /* fprintf(stderr,"connected.\n"); */
   robj = newObjectArray(2);
@@ -156,9 +164,9 @@ struct object KsocketConnect(struct object obj) {
 /* [ integer socketid ]
    [ integer newsocketid ] */
 struct object KsocketAccept(struct object obj) {
-  struct object obj1;
-  struct object obj2;
-  struct object robj;
+  struct object obj1 = OINIT;
+  struct object obj2 = OINIT;
+  struct object robj = OINIT;
   int s, news;
     
   if (obj.tag != Sarray) {
@@ -173,20 +181,63 @@ struct object KsocketAccept(struct object obj) {
   }
   s = KopInteger(obj1);
   if ((news = accept(s,NULL,NULL)) < 0) {
-    errorMsg1s("Error in accept.");
+    fprintf(stderr,"Error in accept. Retrying (KsocketAccept).\n");
+    /* Code added for strange behavior on cygwin. */
+    if ((news = accept(s,NULL,NULL)) < 0) {
+      perror("accept"); errorMsg1s("Error in accept. Retry failed.");
+    }
   }
   if (close(s) < 0) {
-    errorMsg1s("Error in closing the old socket.");
+    perror("close"); errorMsg1s("Error in closing the old socket.");
   }
   robj = newObjectArray(1);
   putoa(robj,0,KpoInteger(news));
   return(robj);
 }
 
+/* [ integer socketid ]
+   [ integer newsocketid ] */
+/* It does not close the listening socket. You can call it as
+   ls = open.
+   fd=accept2(ls).  close(fd).
+   fd=accept2(ls).  close(fd).
+   ....
+   */
+struct object KsocketAccept2(struct object obj) {
+  struct object obj1 = OINIT;
+  struct object obj2 = OINIT;
+  struct object robj = OINIT;
+  int s, news;
+    
+  if (obj.tag != Sarray) {
+    errorMsg1s("KsocketAccept([integer socketid])");
+  }
+  if (getoaSize(obj) < 1) {
+    errorMsg1s("KsocketAccept([integer socketid])");
+  }
+  obj1 = getoa(obj,0);
+  if (obj1.tag != Sinteger ) {
+    errorMsg1s("KsocketAccept([integer socketid]), argument must be integer.");
+  }
+  s = KopInteger(obj1);
+  if ((news = accept(s,NULL,NULL)) < 0) {
+    fprintf(stderr,"Error in accept. Retrying (KsocketAccept2).\n");
+    /* Code added for strange behavior on cygwin. */
+    if ((news = accept(s,NULL,NULL)) < 0) {
+      perror("accept"); errorMsg1s("Error in accept. Retry failed.");
+    }
+  }
+  if (close(s) < 0) {
+    perror("close"); errorMsg1s("Error in closing the old socket.");
+  }
+  robj = newObjectArray(1);
+  putoa(robj,0,KpoInteger(news));
+  return(robj);
+}
+
 int KsocketSelect0(int fd,int t) {
   fd_set readfds;
   struct timeval timeout;
-  extern int errno;
   FD_ZERO(&readfds);
   FD_SET(fd,&readfds);
   timeout.tv_sec = 0;
@@ -195,12 +246,12 @@ int KsocketSelect0(int fd,int t) {
     if (select(fd+1,&readfds,(fd_set *)NULL,(fd_set *)NULL,&timeout)<0) {
       /* It must be fd+1 !,  Not fd. */
       fprintf(stderr,"Select error. Error no is %d. See /usr/include/sys/errno.h.\n",errno);
-      errorMsg1s("KsocketSelect0() : select failed.");
+      perror("select"); errorMsg1s("KsocketSelect0() : select failed.");
       return(0);
     }
   }else{ /* block */
     if (select(fd+1,&readfds,(fd_set *)NULL,(fd_set *)NULL,(struct timeval *)NULL)<0) {
-      errorMsg1s("KsocketSelect0() : select failed.");
+      perror("select"); errorMsg1s("KsocketSelect0() : select failed.");
       fprintf(stderr,"Select error. Error no is %d. See /usr/include/sys/errno.h.\n",errno);
       return(0);
     }
@@ -213,9 +264,9 @@ int KsocketSelect0(int fd,int t) {
    integer true or false
 */
 struct object KsocketSelect(struct object obj) {
-  struct object robj;
-  struct object ob1;
-  struct object ob2;
+  struct object robj = OINIT;
+  struct object ob1 = OINIT;
+  struct object ob2 = OINIT;
   if (obj.tag != Sarray) {
     errorMsg1s("KsocketSelect([ integer socketid optional integer timeout default 0]");
   }
@@ -245,14 +296,13 @@ struct object KsocketSelectMulti(struct object obj) 
    [ result1, result2, ....]
 */
 {
-  struct object robj;
-  struct object ob1;
-  struct object ob2;
-  struct object ob3;
+  struct object robj = OINIT;
+  struct object ob1 = OINIT;
+  struct object ob2 = OINIT;
+  struct object ob3 = OINIT;
   int size,i,fd,p,t;
   fd_set readfds;
   struct timeval timeout;
-  extern errno;
   if (obj.tag != Sarray) {
     errorMsg1s("KsocketSelectMulti([[sid1, sid2,...] optional integer timeout default 0]");
   }
@@ -297,12 +347,12 @@ struct object KsocketSelectMulti(struct object obj) 
     if (select(fd+1,&readfds,(fd_set *)NULL,(fd_set *)NULL,&timeout)<0) {
       /* It must be fd+1 !,  Not fd. */
       fprintf(stderr,"Select error. Error no is %d. See /usr/include/sys/errno.h.\n",errno);
-      errorMsg1s("KsocketSelectMulti() : select failed.");
+      perror("select"); errorMsg1s("KsocketSelectMulti() : select failed.");
     }
   }else{ /* block */
     if (select(fd+1,&readfds,(fd_set *)NULL,(fd_set *)NULL,(struct timeval *)NULL)<0) {
       fprintf(stderr,"Select error. Error no is %d. See /usr/include/sys/errno.h.\n",errno);
-      errorMsg1s("KsocketSelectMulti() : (block) select failed.");
+      perror("select"); errorMsg1s("KsocketSelectMulti() : (block) select failed.");
     }
   }
   robj = newObjectArray(size);
@@ -325,7 +375,7 @@ static char Data00[1024];
    string data 
 */
 struct object KsocketRead(struct object obj) {
-  struct object ob1;
+  struct object ob1 = OINIT;
   struct object robj = NullObject;
   static int datasize = 1024;
   static char *data = Data00;
@@ -353,6 +403,7 @@ struct object KsocketRead(struct object obj) {
     if (datasize - totalsize > 0) {
       n = read(socketid,data+totalsize,datasize-totalsize);
       if (n < 0) {
+		perror("read");
         errorMsg1s("Read error.");
       }
       if (n < datasize-totalsize) {
@@ -363,8 +414,8 @@ struct object KsocketRead(struct object obj) {
         errorMsg1s("Select returns 1, but there is no data to read.");
       }
     }else { /* increase the datasize */
-      tmp = (char *)GC_malloc(sizeof(char)*2*datasize);
-      /*I should use GC_malloc_atomic and free after finishing this function?*/
+      tmp = (char *)sGC_malloc(sizeof(char)*2*datasize);
+      /*I should use sGC_malloc_atomic and free after finishing this function?*/
       if (tmp == (char *)NULL) errorMsg1s("Out of Memory.");
       bcopy(data,tmp,totalsize);
       data = tmp;
@@ -372,7 +423,7 @@ struct object KsocketRead(struct object obj) {
     }
   }
 
-  r = (char *)GC_malloc(sizeof(char)*(totalsize+1));
+  r = (char *)sGC_malloc(sizeof(char)*(totalsize+1));
   if (r == (char *)NULL) errorMsg1s("Out of Memory.");
   bcopy(data,r,totalsize);
   r[totalsize] = 0;
@@ -386,10 +437,12 @@ struct object KsocketRead(struct object obj) {
 /* [ integer socketid, string data ]
    integer  */
 struct object KsocketWrite(struct object obj) {
-  struct object ob1;
-  struct object ob2;
+  struct object ob1 = OINIT;
+  struct object ob2 = OINIT;
   int socketid;
   int r;
+  int k,k0;
+  char *s;
   if (obj.tag != Sarray) {
     errorMsg1s("KsocketWrite([integer socketid, string data])");
   }
@@ -405,13 +458,23 @@ struct object KsocketWrite(struct object obj) {
   if (ob2.tag != Sdollar) {
     errorMsg1s("KsocketWrite([integer socketid, string data]) : the second argument must be a string.");
   }
-  r = write(socketid,KopString(ob2), strlen(KopString(ob2)));
-  return(KpoInteger(r));
+  s = KopString(ob2);
+  k0 = k = strlen(s);
+  while (1) {
+    r = write(socketid,s,k);
+    if (r < 0) {
+      perror("write"); errorMsg1s("KsocketWrite: write failed.");
+    }
+    if (r >= k) break;
+    k -= r;
+    s = &(s[r]);
+  }
+  return(KpoInteger(k0));
 
 }
 struct object KsocketClose(struct object obj) {
   int socketid;
-  struct object ob1;
+  struct object ob1 = OINIT;
   if (obj.tag != Sarray) {
     errorMsg1s("KsocketClose([ integer socketid ])");
   }
@@ -438,7 +501,7 @@ struct object KsocketReadByte(struct object obj);
 struct object KsocketWriteByte(struct object obj);
 
 struct object KsocketReadByte(struct object obj) {
-  struct object ob1;
+  struct object ob1 = OINIT;
   struct object robj = NullObject;
   char data[2];
   char *tmp;
@@ -462,6 +525,7 @@ struct object KsocketReadByte(struct object obj) {
   
   n = read(socketid,data,1);
   if (n < 0) {
+	perror("read");
     errorMsg1s("Read error.");
     robj = KpoInteger(-1);
     return(robj);
@@ -478,8 +542,8 @@ struct object KsocketReadByte(struct object obj) {
 /* [ integer socketid, int ]
    integer  */
 struct object KsocketWriteByte(struct object obj) {
-  struct object ob1;
-  struct object ob2;
+  struct object ob1 = OINIT;
+  struct object ob2 = OINIT;
   int socketid;
   int r,i,n,kk,r0;
 #define DATA_SIZE 1024
@@ -502,28 +566,33 @@ struct object KsocketWriteByte(struct object obj) {
   if (ob2.tag == Sinteger) {
     data[0] = KopInteger(ob2);
     r = write(socketid,data, 1);
+    if (r < 0) {
+	  perror("write"); errorMsg1s("KsocketWriteByte: write error");
+    }
   }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.");
+        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));
-	}
+        r0 = write(socketid,data,kk);
+        if (r0 < 0) { perror("write"); errorMsg1s("write failed."); }
+        if (r0 != kk) {
+          fprintf(stderr,"Warning: Could not write to the socket.\n");
+          return(KpoInteger(r+r0));  /* bug: we should retry. */
+        }
         r += r0;
-	kk = 0;
+        kk = 0;
       }
     }
     if (kk > 0) {
       r0 = write(socketid,data,kk);
+      if (r0 < 0) { perror("write"); errorMsg1s("write failed."); }
       if (r0 != kk) {
-	fprintf(stderr,"Warning: Could not write to the socket.\n");
-	return(KpoInteger(r+r0));
+        fprintf(stderr,"Warning: Could not write to the socket.\n");
+        return(KpoInteger(r+r0));
       }
       r += r0;
     }
@@ -533,7 +602,9 @@ struct object KsocketWriteByte(struct object obj) {
 
 struct object KsocketReadHTTP(struct object socketObj) {
   /* Read until two empty line appears. */
-  struct object ob;
+  struct object ob = OINIT;
+  struct object ob1 = OINIT;
+  struct object nob = OINIT;
   char *s;
   char *sss;
   char *tmp;
@@ -543,6 +614,25 @@ struct object KsocketReadHTTP(struct object socketObj)
   int datasize;
   int last;
   int contentLength=-1;
+  int socketid;
+  extern int Post_debug;
+  nob = NullObject;
+
+  if (socketObj.tag != Sarray) {
+    errorMsg1s("KsocketReadHTTP([integer socketid])");
+  }
+  if (getoaSize(socketObj) < 1) {
+    errorMsg1s("KsocketReadHTTP([integer socketid])");
+  }
+  ob1 = getoa(socketObj,0);
+  if (ob1.tag != Sinteger) {
+    errorMsg1s("KsocketReadHTTP([integer socketid]) : the argument must be integer.");
+  }
+  socketid = KopInteger(ob1);
+
+  if (KsocketSelect0(socketid,-1) != 1) {
+	return(nob);
+  }
   ob = KsocketRead(socketObj);
   s = KopString(ob);
   if (strncmp(s,"POST",4) == 0) flagmax=2; /* for IE */
@@ -574,22 +664,31 @@ struct object KsocketReadHTTP(struct object socketObj)
 		break;
 	  }
 	}
-	fprintf(stderr,"Waiting in socketReadBlock (spin lock to wait an empty line). flagmax(0d,0a)=%d, content-length=%d, received content-length=%d\n",flagmax,contentLength,getReceivedContentLength(sss));
-	if (strlen(s) == 0) {fprintf(stderr,"but I'm not receiving data. Expecting a bug.\n");
+	if (Post_debug) {
+	  fprintf(stderr,"Waiting in socketReadBlock. flagmax(0d,0a)=%d, content-length=%d, received content-length=%d\n",flagmax,contentLength,getReceivedContentLength(sss));
+	}
+	if (strlen(s) == 0) {
+	  fprintf(stderr,"No data. Perhaps connection is closed by foreign host.\n");
+	  return nob;
 	}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");
-		}
+	  if (Post_debug) {
+		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");
 	  }
-	  fprintf(stderr,"\n");
 	}
-	sleep(2);
+
+    if (KsocketSelect0(socketid,-1) != 1) {
+	  return nob;
+	}
 	ob = KsocketRead(socketObj);
 	s = KopString(ob);
 	for (i=strlen(s)-1; i>=0; i--) {
@@ -604,7 +703,7 @@ struct object KsocketReadHTTP(struct object socketObj)
 	  }
 	}
 	if (datasize-1 <= strlen(sss)+strlen(s)) {
-      tmp = (char *)GC_malloc(sizeof(char)*2*(datasize+strlen(s))+1);
+      tmp = (char *)sGC_malloc(sizeof(char)*2*(datasize+strlen(s))+1);
       if (tmp == (char *)NULL) errorMsg1s("Out of Memory.");
 	  strcpy(tmp,sss);
 	  strcat(tmp,s);
@@ -633,6 +732,8 @@ struct object Kplugin_sm1Socket(char *key,struct objec
     robj = KsocketConnect(obj);
   }else if (strcmp(key,"accept") == 0) {
     robj = KsocketAccept(obj);
+  }else if (strcmp(key,"accept2") == 0) {
+    robj = KsocketAccept2(obj);
   }else if (strcmp(key,"select") == 0) {
     robj = KsocketSelect(obj);
   }else if (strcmp(key,"mselect") == 0) {
@@ -706,7 +807,7 @@ struct object KsocketGetHostName(void) {
   if (gethostname(name,1023) != 0) {
     return rob;	
   }
-  s = (char *)GC_malloc(sizeof(char)*(strlen(name)+2));
+  s = (char *)sGC_malloc(sizeof(char)*(strlen(name)+2));
   if (s == (char *)NULL) errorMsg1s("Out of Memory.");
   strcpy(s,name);
   return(KpoString(s));