===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/sio.c,v
retrieving revision 1.7
retrieving revision 1.16
diff -u -p -r1.7 -r1.16
--- OpenXM_contrib2/asir2000/io/sio.c	2000/09/23 00:57:43	1.7
+++ OpenXM_contrib2/asir2000/io/sio.c	2002/10/03 01:12:46	1.16
@@ -44,14 +44,14 @@
  * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
- * $OpenXM: OpenXM_contrib2/asir2000/io/sio.c,v 1.6 2000/08/22 05:04:18 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/io/sio.c,v 1.15 2001/12/27 04:07:15 noro Exp $ 
 */
-#if INET
 #include "ca.h"
-#include "setjmp.h"
+#include <setjmp.h>
 #include "ox.h"
 #if defined(VISUAL)
-#include <winsock.h>
+#include <winsock2.h>
+#include <io.h>
 #else
 #include <sys/time.h>
 #include <sys/uio.h>
@@ -65,6 +65,7 @@
 
 extern int little_endian;
 
+int I_am_server;
 struct IOFP iofp[MAXIOFP];
 
 #if !defined(_PA_RISC1_1)
@@ -75,15 +76,12 @@ struct IOFP iofp[MAXIOFP];
 
 void init_socket(void);
 
-int getremotesocket(s)
-int s;
+int getremotesocket(int s)
 {
 	return iofp[s].s;
 }
 
-void getremotename(s,name)
-int s;
-char *name;
+void getremotename(int s,char *name)
 {
 	struct sockaddr_in peer;
 	struct hostent *hp;
@@ -98,29 +96,28 @@ char *name;
 		strcpy(name,(char *)inet_ntoa(peer.sin_addr));
 }
 
-int generate_port(use_unix,port_str)
-int use_unix;
-char *port_str;
+void generate_port(int use_unix,char *port_str)
 {
 	double get_current_time();
 	unsigned long mt_genrand();
 	unsigned int port;
 	static int count=0;
 
+#if !defined(VISUAL)
 	if ( use_unix ) {
 		sprintf(port_str,"/tmp/ox%02x.XXXXXX",count);
 		count++;
 		mktemp(port_str);
-	} else {
+	} else 
+#endif
+	{
 		port = ((unsigned int)mt_genrand()+(unsigned int)get_current_time())
 			%(65536-1024)+1024;
 		sprintf(port_str,"%d",port);
 	}
 }
 
-int try_bind_listen(use_unix,port_str)
-int use_unix;
-char *port_str;
+int try_bind_listen(int use_unix,char *port_str)
 {
 	struct sockaddr_in sin;
 	struct sockaddr *saddr;
@@ -153,7 +150,7 @@ char *port_str;
 			return -1;
 		}
 		sin.sin_family = AF_INET; sin.sin_addr.s_addr = INADDR_ANY;
-		sin.sin_port = htons(atoi(port_str));
+		sin.sin_port = htons((unsigned short)atoi(port_str));
 		len = sizeof(sin);
 		saddr = (struct sockaddr *)&sin;
 	}
@@ -189,8 +186,7 @@ char *port_str;
   the original socket is always closed.
 */
 
-int try_accept(af_unix,s)
-int af_unix,s;
+int try_accept(int af_unix,int s)
 {
 	int len,c,i;
 	struct sockaddr_in sin;
@@ -215,9 +211,7 @@ int af_unix,s;
 	return c;
 }
 
-int try_connect(use_unix,host,port_str)
-int use_unix;
-char *host,*port_str;
+int try_connect(int use_unix,char *host,char *port_str)
 {
 	struct sockaddr_in sin;
 	struct sockaddr *saddr;
@@ -247,12 +241,14 @@ char *host,*port_str;
 		} else 
 #endif /* VISUAL */
 		{
+			if ( !host )
+				host = "127.0.0.1";
 			if ( (s = socket(AF_INET,SOCK_STREAM,0)) < 0 ) {
 				perror("socket");
 				return -1;
 			}
 			bzero(&sin,sizeof(sin));
-			sin.sin_port = htons(atoi(port_str));
+			sin.sin_port = htons((unsigned short)atoi(port_str));
 			sin.sin_addr.s_addr = inet_addr(host);
 			if ( sin.sin_addr.s_addr != -1 ) {
 				sin.sin_family = AF_INET;
@@ -282,7 +278,8 @@ char *host,*port_str;
 		return s;
 }
 
-close_allconnections()
+#if 0
+void close_allconnections()
 {
 	int s;
 
@@ -293,8 +290,7 @@ close_allconnections()
 		close_connection(s);
 }
 
-close_connection(s)
-int s;
+void close_connection(int s)
 {
 	struct IOFP *r;
 
@@ -305,26 +301,32 @@ int s;
 		free_iofp(s);
 	}
 }
+#else
+void close_allconnections()
+{
+	shutdown_all();
+}
+#endif
 
-free_iofp(s)
-int s;
+void free_iofp(int s)
 {
 	struct IOFP *r;
 
 	r = &iofp[s];
-	r->in = r->out = 0; r->s = 0;
 #if !defined(VISUAL)
+	if ( r->in )
+		fclose(r->in);
+	if ( r->out )
+		fclose(r->out);
 	if ( r->socket )
 		unlink(r->socket);
+	r->in = r->out = 0; r->s = 0;
 #endif
 }
 
 #define LBUFSIZ BUFSIZ*10
 
-int get_iofp(s1,af_sock,is_server)
-int s1;
-char *af_sock;
-int is_server;
+int get_iofp(int s1,char *af_sock,int is_server)
 {
 	int i;
 	unsigned char c,rc;
@@ -354,24 +356,26 @@ int is_server;
 #else
 	iofp[i].in = fdopen(s1,"r");
 	iofp[i].out = fdopen(s1,"w");
+#if !defined(__CYGWIN__)
 	setbuffer(iofp[i].in,(char *)malloc(LBUFSIZ),LBUFSIZ);
 	setbuffer(iofp[i].out,(char *)malloc(LBUFSIZ),LBUFSIZ);
 #endif
+#endif
 	if ( little_endian )
 		c = 1;
 	else
 		c = 0xff;
 	if ( is_server ) {
 		/* server : write -> read */
-		write_char(iofp[i].out,&c); ox_flush_stream_force(i);
-		read_char(iofp[i].in,&rc);
+		write_char((FILE *)iofp[i].out,&c); ox_flush_stream_force(i);
+		read_char((FILE *)iofp[i].in,&rc);
 	} else {
 		/* client : read -> write */
-		read_char(iofp[i].in,&rc);
+		read_char((FILE *)iofp[i].in,&rc);
 		/* special care for a failure of spawing a server */
 		if ( rc !=0 && rc != 1 && rc != 0xff )
 			return -1;	
-		write_char(iofp[i].out,&c); ox_flush_stream_force(i);
+		write_char((FILE *)iofp[i].out,&c); ox_flush_stream_force(i);
 	}
 	iofp[i].conv = c == rc ? 0 : 1;
 	if ( af_sock && af_sock[0] ) {
@@ -400,14 +404,12 @@ void init_socket()
 }
 #endif
 
-get_fd(index)
-int index;
+int get_fd(int index)
 {
 	return iofp[index].s;
 }
 
-get_index(fd)
-int fd;
+int get_index(int fd)
 {
 	int i;
 
@@ -416,4 +418,4 @@ int fd;
 			return i;
 	return -1;
 }
-#endif /* INET */
+