svn commit: r282893 - head/usr.bin/whois

[Tony Finch]

Author: fanf
Date: Thu May 14 11:37:36 2015
New Revision: 282893
URL: https://svnweb.freebsd.org/changeset/base/282893

Log:
  whois: add an option to query the PeeringDB

Modified:
  head/usr.bin/whois/whois.1
  head/usr.bin/whois/whois.c

Modified: head/usr.bin/whois/whois.1
==============================================================================
--- head/usr.bin/whois/whois.1	Thu May 14 11:33:31 2015	(r282892)
+++ head/usr.bin/whois/whois.1	Thu May 14 11:37:36 2015	(r282893)
@@ -159,6 +159,10 @@ Connect to the whois server on
 If this option is not specified,
 .Nm
 defaults to port 43.
+.It Fl P
+Use the PeeringDB database of AS numbers.
+It contains details about presence at internet peering points
+for many network operators.
 .It Fl Q
 Do a quick lookup.
 This means that

Modified: head/usr.bin/whois/whois.c
==============================================================================
--- head/usr.bin/whois/whois.c	Thu May 14 11:33:31 2015	(r282892)
+++ head/usr.bin/whois/whois.c	Thu May 14 11:37:36 2015	(r282893)
@@ -71,6 +71,7 @@ __FBSDID("$FreeBSD$");
 #define	LNICHOST	"whois.lacnic.net"
 #define	MNICHOST	"whois.ra.net"
 #define	NICHOST		"whois.crsnic.net"
+#define	PDBHOST		"whois.peeringdb.com"
 #define	PNICHOST	"whois.apnic.net"
 #define	QNICHOST_HEAD	"whois.nic."
 #define	QNICHOST_TAIL	".whois-servers.net"
@@ -122,7 +123,7 @@ main(int argc, char *argv[])
 
 	country = host = qnichost = NULL;
 	flags = use_qnichost = 0;
-	while ((ch = getopt(argc, argv, "aAbc:fgh:iIklmp:Qr")) != -1) {
+	while ((ch = getopt(argc, argv, "aAbc:fgh:iIklmp:PQr")) != -1) {
 		switch (ch) {
 		case 'a':
 			host = ANICHOST;
@@ -163,6 +164,9 @@ main(int argc, char *argv[])
 		case 'p':
 			port = optarg;
 			break;
+		case 'P':
+			host = PDBHOST;
+			break;
 		case 'Q':
 			flags |= WHOIS_QUICK;
 			break;
@@ -511,7 +515,7 @@ static void
 usage(void)
 {
 	fprintf(stderr,
-	    "usage: whois [-aAbfgiIklmQr] [-c country-code | -h hostname] "
+	    "usage: whois [-aAbfgiIklmPQr] [-c country-code | -h hostname] "
 	    "[-p port] name ...\n");
 	exit(EX_USAGE);
 }