X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=networking%2Fnslookup.c;h=a1a12d992d709810d9964015f3208d2eb2a7a890;hb=85dd4b3b272793502b513d0d54b546c741ad1a5d;hp=3223b3b63b6f8d01b6d62296872890fce20ce4fa;hpb=5e1189e187f6a7957dadb8eda2c271c4a0777a23;p=oweals%2Fbusybox.git diff --git a/networking/nslookup.c b/networking/nslookup.c index 3223b3b63..a1a12d992 100644 --- a/networking/nslookup.c +++ b/networking/nslookup.c @@ -2,8 +2,8 @@ /* * Mini nslookup implementation for busybox * - * Copyright (C) 2000 by Lineo, inc. - * Written by John Beppu + * Copyright (C) 1999,2000 by Lineo, inc. and John Beppu + * Copyright (C) 1999,2000,2001 by John Beppu * * 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 @@ -21,16 +21,19 @@ * */ -#include "internal.h" #include #include #include #include +#include #include #include #include #include +#include +#include +#include "busybox.h" /* | I'm only implementing non-interactive mode; @@ -38,24 +41,10 @@ | | [ TODO ] | + find out how to use non-default name servers - | + find out how the real nslookup gets the default name server */ -static const char nslookup_usage[] = "nslookup [HOST]\n\nQueries the nameserver for the IP address of the given HOST\n"; - - -/* I have to see how the real nslookup does this. - * I could dig through /etc/resolv.conf, but is there a - * better (programatic) way? - */ -static void server_fprint(FILE * dst) -{ - fprintf(dst, "Server: %s\n", "default"); - fprintf(dst, "Address: %s\n\n", "default"); -} - /* only works for IPv4 */ -static int addr_fprint(char *addr, FILE * dst) +static int addr_fprint(char *addr) { u_int8_t split[4]; u_int32_t ip; @@ -66,59 +55,70 @@ static int addr_fprint(char *addr, FILE * dst) split[1] = (ip & 0x00ff0000) >> 16; split[2] = (ip & 0x0000ff00) >> 8; split[3] = (ip & 0x000000ff); - fprintf(dst, "%d.%d.%d.%d", split[0], split[1], split[2], split[3] - ); + printf("%d.%d.%d.%d", split[0], split[1], split[2], split[3]); return 0; } -/* changes a c-string matching the perl regex \d+\.\d+\.\d+\.\d+ - * into a u_int32_t - */ -static u_int32_t str_to_addr(const char *addr) -{ - u_int32_t split[4]; - u_int32_t ip; - - sscanf(addr, "%d.%d.%d.%d", - &split[0], &split[1], &split[2], &split[3]); - - /* assuming sscanf worked */ - ip = (split[0] << 24) | - (split[1] << 16) | (split[2] << 8) | (split[3]); - - return htonl(ip); -} - /* takes the NULL-terminated array h_addr_list, and * prints its contents appropriately */ -static int addr_list_fprint(char **h_addr_list, FILE * dst) +static int addr_list_fprint(char **h_addr_list) { int i, j; char *addr_string = (h_addr_list[1]) ? "Addresses: " : "Address: "; - fprintf(dst, "%s ", addr_string); + printf("%s ", addr_string); for (i = 0, j = 0; h_addr_list[i]; i++, j++) { - addr_fprint(h_addr_list[i], dst); + addr_fprint(h_addr_list[i]); /* real nslookup does this */ if (j == 4) { if (h_addr_list[i + 1]) { - fprintf(dst, "\n "); + printf("\n "); } j = 0; } else { if (h_addr_list[i + 1]) { - fprintf(dst, ", "); + printf(", "); } } } - fprintf(dst, "\n"); + printf("\n"); return 0; } +/* print the results as nslookup would */ +static struct hostent *hostent_fprint(struct hostent *host) +{ + if (host) { + printf("Name: %s\n", host->h_name); + addr_list_fprint(host->h_addr_list); + } else { + printf("*** Unknown host\n"); + } + return host; +} + +/* changes a c-string matching the perl regex \d+\.\d+\.\d+\.\d+ + * into a u_int32_t + */ +static u_int32_t str_to_addr(const char *addr) +{ + u_int32_t split[4]; + u_int32_t ip; + + sscanf(addr, "%d.%d.%d.%d", + &split[0], &split[1], &split[2], &split[3]); + + /* assuming sscanf worked */ + ip = (split[0] << 24) | + (split[1] << 16) | (split[2] << 8) | (split[3]); + + return htonl(ip); +} + /* gethostbyaddr wrapper */ static struct hostent *gethostbyaddr_wrapper(const char *address) { @@ -128,18 +128,24 @@ static struct hostent *gethostbyaddr_wrapper(const char *address) return gethostbyaddr((char *) &addr, 4, AF_INET); /* IPv4 only for now */ } -/* print the results as nslookup would */ -static struct hostent *hostent_fprint(struct hostent *host, FILE * dst) +#ifdef __UCLIBC__ +#warning FIXME after fixing uClibc to define struct _res +static inline void server_print(void) { - if (host) { - fprintf(dst, "Name: %s\n", host->h_name); - addr_list_fprint(host->h_addr_list, dst); - } else { - fprintf(dst, "*** %s\n", hstrerror(h_errno)); - } - return host; + 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) +{ + struct sockaddr_in def = _res.nsaddr_list[0]; + char *ip = inet_ntoa(def.sin_addr); + hostent_fprint(gethostbyaddr_wrapper(ip)); + printf("\n"); +} +#endif /* naive function to check whether char *s is an ip address */ static int is_ip_address(const char *s) @@ -160,17 +166,18 @@ int nslookup_main(int argc, char **argv) struct hostent *host; if (argc < 2 || *argv[1]=='-') { - usage(nslookup_usage); + show_usage(); } - server_fprint(stdout); + res_init(); + server_print(); if (is_ip_address(argv[1])) { host = gethostbyaddr_wrapper(argv[1]); } else { - host = gethostbyname(argv[1]); + host = xgethostbyname(argv[1]); } - hostent_fprint(host, stdout); - exit( TRUE); + hostent_fprint(host); + return EXIT_SUCCESS; } -/* $Id: nslookup.c,v 1.7 2000/04/15 16:34:54 erik Exp $ */ +/* $Id: nslookup.c,v 1.26 2001/10/24 04:59:56 andersen Exp $ */