X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=networking%2Fnslookup.c;h=936fa33cb5b970eea25ec670059969dd76eff2b8;hb=999af20d3e025741197b8aebea9aeb4e435c9ebf;hp=81b57cccfd100606f2854e7327b8599bd70359bf;hpb=cd8c436d811a5a077a0b61a6616c900173e2dcfb;p=oweals%2Fbusybox.git

diff --git a/networking/nslookup.c b/networking/nslookup.c
index 81b57cccf..936fa33cb 100644
--- a/networking/nslookup.c
+++ b/networking/nslookup.c
@@ -5,6 +5,9 @@
  * Copyright (C) 1999,2000 by Lineo, inc. and John Beppu
  * Copyright (C) 1999,2000,2001 by John Beppu <beppu@codepoet.org>
  *
+ * Correct default name server display and explicit name server option
+ * added by Ben Zeckel <bzeckel@hmc.edu> June 2001
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -27,6 +30,7 @@
 #include <string.h>
 #include <stdlib.h>
 
+#include <stdint.h>
 #include <netdb.h>
 #include <sys/socket.h>
 #include <sys/types.h>
@@ -38,17 +42,14 @@
 /*
  |  I'm only implementing non-interactive mode;
  |  I totally forgot nslookup even had an interactive mode.
- |
- |  [ TODO ]
- |  + find out how to use non-default name servers
  */
 
 /* only works for IPv4 */
 static int addr_fprint(char *addr)
 {
-	u_int8_t split[4];
-	u_int32_t ip;
-	u_int32_t *x = (u_int32_t *) addr;
+	uint8_t split[4];
+	uint32_t ip;
+	uint32_t *x = (uint32_t *) addr;
 
 	ip = ntohl(*x);
 	split[0] = (ip & 0xff000000) >> 24;
@@ -102,12 +103,12 @@ static struct hostent *hostent_fprint(struct hostent *host, const char *server_h
 }
 
 /* changes a c-string matching the perl regex \d+\.\d+\.\d+\.\d+
- * into a u_int32_t
+ * into a uint32_t
  */
-static u_int32_t str_to_addr(const char *addr)
+static uint32_t str_to_addr(const char *addr)
 {
-	u_int32_t split[4];
-	u_int32_t ip;
+	uint32_t split[4];
+	uint32_t ip;
 
 	sscanf(addr, "%d.%d.%d.%d",
 		   &split[0], &split[1], &split[2], &split[3]);
@@ -128,14 +129,6 @@ static struct hostent *gethostbyaddr_wrapper(const char *address)
 	return gethostbyaddr((char *) &addr, 4, AF_INET);	/* IPv4 only for now */
 }
 
-#ifdef __UCLIBC__
-#warning FIXME after fixing uClibc to define struct _res 
-static inline void server_print(void)
-{
-       printf("Server:     %s\n", "default");
-       printf("Address:    %s\n\n", "default");
-}
-#else
 /* lookup the default nameserver and display it */
 static inline void server_print(void)
 {
@@ -145,7 +138,19 @@ static inline void server_print(void)
 	hostent_fprint(gethostbyaddr_wrapper(ip), "Server:");
 	printf("\n");
 }
-#endif	
+
+/* alter the global _res nameserver structure to use
+   an explicit dns server instead of what is in /etc/resolv.h */
+static inline void set_default_dns(char *server)
+{
+	struct in_addr server_in_addr;
+
+	if(inet_aton(server,&server_in_addr))
+	{
+		_res.nscount = 1;
+		_res.nsaddr_list[0].sin_addr = server_in_addr;
+	}
+}
 
 /* naive function to check whether char *s is an ip address */
 static int is_ip_address(const char *s)
@@ -165,11 +170,26 @@ int nslookup_main(int argc, char **argv)
 {
 	struct hostent *host;
 
-	if (argc < 2 || *argv[1]=='-') {
-		show_usage();
-	}
+	/*
+	* initialize DNS structure _res used in printing the default
+	* name server and in the explicit name server option feature.
+	*/
 
 	res_init();
+
+	/*
+	* We allow 1 or 2 arguments.
+	* The first is the name to be looked up and the second is an
+	* optional DNS server with which to do the lookup.
+	* More than 3 arguments is an error to follow the pattern of the
+	* standard nslookup
+	*/
+
+	if (argc < 2 || *argv[1]=='-' || argc > 3)
+		bb_show_usage();
+	else if(argc == 3)
+		set_default_dns(argv[2]);
+
 	server_print();
 	if (is_ip_address(argv[1])) {
 		host = gethostbyaddr_wrapper(argv[1]);
@@ -177,7 +197,10 @@ int nslookup_main(int argc, char **argv)
 		host = xgethostbyname(argv[1]);
 	}
 	hostent_fprint(host, "Name:  ");
-	return EXIT_SUCCESS;
+	if (host) {
+		return EXIT_SUCCESS;
+	}
+	return EXIT_FAILURE;
 }
 
-/* $Id: nslookup.c,v 1.27 2001/11/10 11:22:43 andersen Exp $ */
+/* $Id: nslookup.c,v 1.33 2004/10/13 07:25:01 andersen Exp $ */