mirror of
https://github.com/moparisthebest/curl
synced 2024-12-22 08:08:50 -05:00
Charles Hardin made adig support a regular numerical dotted IP address for the
-s option as well.
This commit is contained in:
parent
5e826c78a7
commit
eb612bfdfc
@ -1,5 +1,9 @@
|
||||
Changelog for the c-ares project
|
||||
|
||||
* Oct 18 2008 (Daniel Stenberg)
|
||||
Charles Hardin made adig support a regular numerical dotted IP address for the
|
||||
-s option as well.
|
||||
|
||||
* Oct 7 2008 (Yang Tse)
|
||||
- Added --enable-optimize configure option to enable and disable compiler
|
||||
optimizations to allow decoupled setting from --enable-debug.
|
||||
|
15
ares/adig.c
15
ares/adig.c
@ -151,6 +151,7 @@ static const char *opcodes[] = {
|
||||
"UPDATEA", "UPDATED", "UPDATEDA", "UPDATEM", "UPDATEMA",
|
||||
"ZONEINIT", "ZONEREF"
|
||||
};
|
||||
struct in_addr inaddr;
|
||||
|
||||
static const char *rcodes[] = {
|
||||
"NOERROR", "FORMERR", "SERVFAIL", "NXDOMAIN", "NOTIMP", "REFUSED",
|
||||
@ -212,11 +213,15 @@ int main(int argc, char **argv)
|
||||
|
||||
case 's':
|
||||
/* Add a server, and specify servers in the option mask. */
|
||||
hostent = gethostbyname(optarg);
|
||||
if (!hostent || hostent->h_addrtype != AF_INET)
|
||||
if (inet_pton(AF_INET, optarg, &inaddr) <= 0)
|
||||
{
|
||||
fprintf(stderr, "adig: server %s not found.\n", optarg);
|
||||
return 1;
|
||||
hostent = gethostbyname(optarg);
|
||||
if (!hostent || hostent->h_addrtype != AF_INET)
|
||||
{
|
||||
fprintf(stderr, "adig: server %s not found.\n", optarg);
|
||||
return 1;
|
||||
}
|
||||
memcpy(&inaddr, hostent->h_addr, sizeof(struct in_addr));
|
||||
}
|
||||
options.servers = realloc(options.servers, (options.nservers + 1)
|
||||
* sizeof(struct in_addr));
|
||||
@ -225,7 +230,7 @@ int main(int argc, char **argv)
|
||||
fprintf(stderr, "Out of memory!\n");
|
||||
return 1;
|
||||
}
|
||||
memcpy(&options.servers[options.nservers], hostent->h_addr,
|
||||
memcpy(&options.servers[options.nservers], &inaddr,
|
||||
sizeof(struct in_addr));
|
||||
options.nservers++;
|
||||
optmask |= ARES_OPT_SERVERS;
|
||||
|
Loading…
Reference in New Issue
Block a user