===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/plugin/mytcpio.c,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.3
diff -u -p -r1.4.2.1 -r1.4.2.3
--- OpenXM/src/kan96xx/plugin/mytcpio.c	2000/11/10 20:12:08	1.4.2.1
+++ OpenXM/src/kan96xx/plugin/mytcpio.c	2000/11/11 07:01:19	1.4.2.3
@@ -1,4 +1,4 @@
-/*  $OpenXM: OpenXM/src/kan96xx/plugin/mytcpio.c,v 1.4 2000/09/08 16:08:42 takayama Exp $ */
+/*  $OpenXM: OpenXM/src/kan96xx/plugin/mytcpio.c,v 1.4.2.2 2000/11/11 04:44:30 maekawa Exp $ */
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -44,7 +44,7 @@ socketOpen(char *serverName,int portNumber) {
 	hints.ai_socktype = SOCK_STREAM;
 
 	memset(pstr, 0, sizeof(pstr));
-	snprintf(pstr, sizeof(pstr), "%u", portNumber);
+	snprintf(pstr, sizeof(pstr), "%d", portNumber);
 
 	error = getaddrinfo(serverName, pstr, &hints, &res);
 	if (error) {
@@ -147,46 +147,77 @@ socketAccept(int snum) {
   return(news);
 }
 
-socketAcceptLocal(int snum) {
-  int s, news;
-  struct sockaddr_storage ss;
-  int len;
-  int i;
+socketAcceptLocal(int s) {
+	struct sockaddr_storage ss;
+	socklen_t len;
+	int ps, accepted, error;
 
-  SET_TCPIOERROR;
-  s = snum;
-  fprintf(TcpioError,"Trying to accept from localhost... "); fflush(TcpioError);
-  len = sizeof(ss);
-  if ((news = accept(s, (struct sockaddr *)&ss,&len)) < 0) {
-    errorMsg1s("Error in accept.");
-    return(-1);
-  }
+	SET_TCPIOERROR;
 
-  len = sizeof(ss);
-  getpeername(news, (struct sockaddr *)&ss,&len);
-#if 0
-  printf("len= %d\n",len);
-  for (i=0; i<len; i++) {
-    printf(" %x ", peer.sa_data[i]);
-  }
-  printf("\n");
-  if (peer.sa_data[2] == 0x7f && peer.sa_data[3] == 0 &&
-      peer.sa_data[4] == 0    && peer.sa_data[5] == 1) {
-    fprintf(stderr,"Authentication: localhost is allowed to be accepted.\n");
-  }else{
-    errorMsg1s("Authentication: The connection is not from the localhost.");
-    close(s);
-    fprintf(stderr,"The connection is refused.");
-    return(-1);
-  }
-#endif
+	fprintf(TcpioError,"Trying to accept from localhost... ");
+	fflush(TcpioError);
 
-  fprintf(TcpioError,"Accepted.\n"); fflush(TcpioError);
-  if (close(s) < 0) {
-    errorMsg1s("Error in closing the old socket.");
-    return(-1);
-  }
-  return(news);
+	len = sizeof(ss);
+	if ((ps = accept(s, (struct sockaddr *)&ss, &len)) < 0) {
+		errorMsg1s("Error in accept.");
+		close(s);
+		return (-1);
+	}
+
+	len = sizeof(ss);
+	if (getpeername(ps, (struct sockaddr *)&ss, &len) < 0) {
+		close(s);
+		close(ps);
+		errorMsg1s("Error in getpeername.");
+		return (-1);
+	}
+
+	accepted = 0;
+	switch (ss.ss_family) {
+	case AF_INET:
+	{
+#ifndef INADDR_LOOPBACK
+#define	INADDR_LOOPBACK		0x7f000001	/* 127.0.0.1 */
+#endif /* INADDR_LOOPBACK */
+		struct sockaddr_in *sin;
+		sin = (struct sockaddr_in *)&ss;
+		if (sin->sin_addr.s_addr == INADDR_LOOPBACK)
+			accepted = 1;
+		break;
+	}
+	case AF_INET6:
+	{
+		struct sockaddr_in6 *sin6;
+		sin6 = (struct sockaddr_in6 *)&ss;
+		if (IN6_IS_ADDR_LOOPBACK(&sin6->sin6_addr))
+			accepted = 1;
+		break;
+	}
+	default:
+		accepted = 0;
+	}
+
+	if (accepted) {
+		fprintf(stderr, "Authentication: "
+				"localhost is allowed to be accepted.\n");
+	} else {
+		errorMsg1s("Authentication: "
+			   "The connection is not from the localhost.");
+		close(s);
+		close(ps);
+		fprintf(stderr, "The connection is refused.");
+		return (-1);
+	}
+
+	fprintf(TcpioError, "Accepted.\n");
+	fflush(TcpioError);
+	if (close(s) < 0) {
+		errorMsg1s("Error in closing the old socket.");
+		close(ps);
+		return(-1);
+	}
+
+	return(ps);
 }
 
 int oxSocketSelect0(int fd,int t) {
@@ -272,36 +303,59 @@ oxSocketMultiSelect(int sid[],int size,int t,int resul
 
 
 socketConnect(char *serverName,int portNumber) {
-  struct hostent *servhost;
-  struct sockaddr_in server;
-  int socketid;
-  int on;
+	struct addrinfo hints, *res, *ai;
+	char pstr[BUFSIZ], *errstr;
+	int s, error;
 
-  SET_TCPIOERROR;
-  if ((servhost = gethostbyname(serverName)) == NULL) {
-    errorMsg1s("bad server name.\n");
-    return(-1);
-  }
-  bzero((char *)&server,sizeof(server));
-  server.sin_family = AF_INET;
-  server.sin_port = htons(portNumber);
-  bcopy(servhost->h_addr,
-	(char *)&server.sin_addr,servhost->h_length);
+	SET_TCPIOERROR;
 
-  if ((socketid = socket(AF_INET,SOCK_STREAM,0)) <0) {
-    errorMsg1s("socket allocation is failed.\n");
-    return(-1);
-  }
-  /* on=1; setsockopt(socketid,SOL_SOCKET,SO_REUSEADDR,&on,sizeof(on));  */
-  if (!Quiet) {
-    fprintf(TcpioError,"Trying to connect port %d, ip=%x\n",ntohs(server.sin_port),server.sin_addr);
-  }
-  if (connect(socketid,(struct sockaddr *)&server,sizeof(server)) == -1) {
-    errorMsg1s("cannot connect");
-    return(-1);
-  }
-  if (!Quiet) fprintf(TcpioError,"connected.\n");
-  return(socketid);
+	memset(&hints, 0, sizeof(hints));
+	hints.ai_family = PF_UNSPEC;
+	hints.ai_socktype = SOCK_STREAM;
+
+	memset(pstr, 0, sizeof(pstr));
+	snprintf(pstr, sizeof(pstr), "%d", portNumber);
+
+	error = getaddrinfo(serverName, pstr, &hints, &res);
+	if (error) {
+		errorMsg1s("bad server name.\n");
+		return (-1);
+	}
+
+	s = -1;
+	errstr = NULL;
+
+	for (ai = res ; ai != NULL ; ai = ai->ai_next) {
+		s = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
+		if (s < 0) {
+			errstr = "socket";
+			continue;
+		}
+
+		if (!Quiet) {
+			fprintf(TcpioError, "Trying to connect %s, port %d\n",
+					    serverName, portNumber);
+		}
+
+		if (connect(s, ai->ai_addr, ai->ai_addrlen) < 0) {
+			errstr = "connect";
+			close(s);
+			s = -1;
+			continue;
+		}
+	}
+
+	freeaddrinfo(res);
+
+	if (s < 0) {
+		fprintf(stderr, "Error %s\n", errstr);
+		return (-1);
+	}
+
+	if (!Quiet)
+		fprintf(TcpioError,"connected.\n");
+
+	return (s);
 }
 
 socketConnectWithPass(char *servername,int port,char *pass)