[src/trunk]: src/usr.bin/whois IPv6-ready whois client.

[itojun <itojun%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fa70605ec4ce
branches:  trunk
changeset: 476022:fa70605ec4ce
user:      itojun <itojun%NetBSD.org@localhost>
date:      Fri Sep 03 13:51:28 1999 +0000

description:
IPv6-ready whois client.

PR: 8281

diffstat:

 usr.bin/whois/whois.1 |   23 ++++++++-
 usr.bin/whois/whois.c |  125 ++++++++++++++++++++++++++-----------------------
 2 files changed, 87 insertions(+), 61 deletions(-)

diffs (263 lines):

diff -r d113e82e550a -r fa70605ec4ce usr.bin/whois/whois.1
--- a/usr.bin/whois/whois.1     Fri Sep 03 13:40:15 1999 +0000
+++ b/usr.bin/whois/whois.1     Fri Sep 03 13:51:28 1999 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: whois.1,v 1.10 1999/05/18 22:36:36 tron Exp $
+.\"    $NetBSD: whois.1,v 1.11 1999/09/03 13:51:28 itojun Exp $
 .\"
 .\" Copyright (c) 1985, 1990, 1993
 .\"    The Regents of the University of California.  All rights reserved.
@@ -41,7 +41,7 @@
 .Nd TCP/IP Internet directory service, RIPE version
 .Sh SYNOPSIS
 .Nm ""
-.Op Fl aFSrR
+.Op Fl 46aFSrR
 .Op Fl h Ar host
 .Op Fl p Ar port
 .Op Fl i Ar attributes
@@ -133,6 +133,12 @@
 .B \-T types
 types is a comma separated list of object types.
 requests the server to only send back objects that match one of the "types".
+By default, whois connect to whois server both IPv6 and IPv4. If you want
+to connect IPv4 only, you use
+.B \-4
+option, and if you want to connect IPv6 only, you use
+.B \-6
+option.
 .TP 8
 .Lp
 .Sh EXAMPLES
@@ -205,9 +211,22 @@
 to <ncc%ripe.net@localhost>. For more information about the RIPE database please also
 refer to <ncc%ripe.net@localhost>.
 .Lp
+.Sh IPv6 supported
+This whois support the IPv6
+.Pq IP version 6
+whois connections.
+This whois is get the all of host's Information from nameserver, and
+connect order is
+.Pq if exists
+IPv6 addresses of server at first and IPv4 address is later.
+.Lp
 .Sh BUGS
 Most of the extra flags are ONLY supported by the RIPE whois server,
 or copies of the same version of the software. Usage of these flags
 may cause errors on other whois servers.
+.Nm
+depends on
+.Xr getaddrinfo 3
+functions and search order depends on the function.
 .\".Sh SEE ALSO
 .\"RFC 812:  NICNAME/WHOIS
diff -r d113e82e550a -r fa70605ec4ce usr.bin/whois/whois.c
--- a/usr.bin/whois/whois.c     Fri Sep 03 13:40:15 1999 +0000
+++ b/usr.bin/whois/whois.c     Fri Sep 03 13:51:28 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: whois.c,v 1.9 1999/05/18 22:36:36 tron Exp $   */
+/*     $NetBSD: whois.c,v 1.10 1999/09/03 13:51:28 itojun Exp $        */
 
 /*
  * RIPE version marten%ripe.net@localhost
@@ -61,7 +61,7 @@
 #if 0
 static char sccsid[] = "@(#)whois.c    8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: whois.c,v 1.9 1999/05/18 22:36:36 tron Exp $");
+__RCSID("$NetBSD: whois.c,v 1.10 1999/09/03 13:51:28 itojun Exp $");
 #endif
 #endif /* not lint */
 #endif /* not RIPE */
@@ -167,16 +167,18 @@
 {
 #ifdef RIPE
 #ifdef NETWORKUPDATE
-  (void)fprintf(stderr, "\nUsage: networkupdate [-h hostname] [-p port]");
+  (void)fprintf(stderr, "\nUsage: networkupdate [-46] [-h hostname] [-p port]");
 #else
-  (void)fprintf(stderr, "\nUsage: whois [-aFLmMrSvR] [-h hostname] [-s sources] [-T types] [-i attr] keys\n");
+  (void)fprintf(stderr, "\nUsage: whois [-46aFLmMrSvR] [-h hostname] [-s sources] [-T types] [-i attr] keys\n");
   (void)fprintf(stderr, "       whois -t type");
   (void)fprintf(stderr, "       whois -v type");
 #endif
 #else
-  (void)fprintf(stderr, "\nUsage: whois [-h hostname] [-p port] name ...");
+  (void)fprintf(stderr, "\nUsage: whois [-46] [-h hostname] [-p port] name ...");
 #endif
   (void)fprintf(stderr, "\n\nWhere:\n\n");
+  (void)fprintf(stderr, "-4                         Use IPv4 Only\n");
+  (void)fprintf(stderr, "-6                         Use IPv6 Only\n");
 #ifdef RIPE
 #ifndef NETWORKUPDATE
   (void)fprintf(stderr, "-a                         search all databases\n");
@@ -266,13 +268,19 @@
   FILE *sfi;
   FILE *sfo;
   int ch;
-  struct sockaddr_in sin;
-  struct hostent *hp;
-  struct servent *sp;
+  struct addrinfo *dst, hints;
+  int socktype=PF_UNSPEC;
+  int error;
   char *host, *whoishost;
-  int optp=0, optport=0;
+  int optp=0;
+  char *optport="whois";
+#ifdef DEBUG
+  int verb=1;
+#else /*DEBUG */
+  int verb=0;
+#endif
 #ifdef RIPE
-  int verb=0, opthost=0;
+  int opthost=0;
 #ifndef NETWORKUPDATE
   /* normal whois client */
   char *string;
@@ -304,20 +312,26 @@
   
 #ifdef RIPE
 #ifdef NETWORKUPDATE
-    while ((ch = getopt(argc, argv, "h:p:")) != EOF)
+    while ((ch = getopt(argc, argv, "46h:p:")) != EOF)
 #else
-  while ((ch = getopt(argc, argv, "acFg:h:i:LmMp:rs:SRt:T:v:")) != EOF)
+  while ((ch = getopt(argc, argv, "46acFg:h:i:LmMp:rs:SRt:T:v:")) != EOF)
 #endif
 #else
-    while ((ch = getopt(argc, argv, "h:p:")) != EOF)
+    while ((ch = getopt(argc, argv, "46h:p:")) != EOF)
 #endif
       switch((char)ch) {
+      case '4':
+       socktype = PF_INET;
+       break;
+      case '6':
+       socktype = PF_INET6;
+       break;
       case 'h':
        host = optarg;
        opthost = 1;
        break;
       case 'p':
-        optport=htons((u_short)atoi(optarg));
+       optport=optarg;
         optp =1;
         break; 
 #ifdef RIPE
@@ -423,23 +437,32 @@
        if (verb) fprintf(stderr, "Clever guess: %s\n", whoishost);
       }
     }
-    hp = gethostbyname(whoishost);
-    if ((hp == NULL) && (verb)) 
+
+    memset(&hints, 0, sizeof(hints));
+    hints.ai_flags = AI_CANONNAME;
+    hints.ai_family = socktype;
+    hints.ai_socktype = SOCK_STREAM;
+    hints.ai_protocol = 0;
+    error = getaddrinfo(host, optport, &hints, &dst);
+    if ((error) && (verb))
       fprintf(stderr,"No such host: %s\n", whoishost);
-
-    if (hp==NULL) {
+    if (error) {
 #endif
     
       whoishost=NICHOST;
     
       if (verb) fprintf(stderr, "Default host: %s\n\n", whoishost);
-      hp = gethostbyname(whoishost);
-      
-      if (hp == NULL) {
+      memset(&hints, 0, sizeof(hints));
+      hints.ai_flags = AI_CANONNAME;
+      hints.ai_family = socktype;
+      hints.ai_socktype = SOCK_STREAM;
+      hints.ai_protocol = 0;
+      error = getaddrinfo(host, optport , &hints, &dst);
+      if (error) {
        fprintf(stderr,"No such host: %s\n", whoishost);
        if (verb) fprintf(stderr, "Now I give up ...\n");
        perror("Unknown host");
-       exit(1);
+       exit(1);        
       }
 
 #ifdef CLEVER
@@ -448,50 +471,34 @@
   }
   else {
     if (verb) fprintf(stderr, "Trying: %s\n\n", host);
-    hp = gethostbyname(host);
-    if (hp == NULL) {
+    memset(&hints, 0, sizeof(hints));
+    hints.ai_flags = AI_CANONNAME;
+    hints.ai_family = socktype;
+    hints.ai_socktype = SOCK_STREAM;
+    hints.ai_protocol = 0;
+    error = getaddrinfo(host, optport, &hints, &dst);
+    if (error) {
       (void)fprintf(stderr, "whois: %s: ", host);
       perror("Unknown host");
       exit(1);
     }
   }
   
-  host = hp->h_name;
-  s = socket(hp->h_addrtype, SOCK_STREAM, 0);
-  if (s < 0) {
-    perror("whois: socket");
-    exit(1);
-  }
-  bzero((caddr_t)&sin, sizeof (sin));
-  sin.sin_family = hp->h_addrtype;
-  if (bind(s, (struct sockaddr *)&sin, sizeof(sin)) < 0) {
-    perror("whois: bind");
-    exit(1);
-  }
-  bcopy(hp->h_addr, (char *)&sin.sin_addr, hp->h_length);
-  
-  if (optp) {
-     sin.sin_port=optport;
+  while (1) {
+    s = socket(dst->ai_family, dst->ai_socktype, dst->ai_protocol);
+    if (connect(s, dst->ai_addr, dst->ai_addrlen) < 0) {
+      if (verb) (void)fprintf(stderr, "whois: connect miss\n");
+      if (dst->ai_next == NULL) {
+       perror("whois: connect");
+       exit(1);
+      } else {
+       dst = dst->ai_next;
+      }
+      continue;
+    }
+    break;
   }
-  else {
-     
-     sp=getservbyname("whois", "tcp");
-  
-     if (sp == NULL) {
-        (void)fprintf(stderr, "whois: whois/tcp: unknown service\n");
-        exit(1);
-     }
-  
-     sin.sin_port = sp->s_port;
-
-  }
-
-  /* printf("%i\n", sin.sin_port); */
-
-  if (connect(s, (struct sockaddr *)&sin, sizeof(sin)) < 0) {
-    perror("whois: connect");
-    exit(1);
-  }
+  if (verb) (void)fprintf(stderr, "whois: connect success\n");
 
 #ifndef NETWORKUPDATE
   sfi = fdopen(s, "r");