nik/whois
1
0
Fork 0
mirror of https://github.com/rfc1036/whois.git synced 2026-05-03 06:51:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring

Browse Source
This commit is contained in:
Marco d'Itri 2025-05-05 02:07:00 +02:00
parent e19e5d9f4f
commit b36474fc77
No known key found for this signature in database
GPG Key ID: CB3EC33AE1DED781
2 changed files with 28 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data.h
View File

@ -29,6 +29,7 @@ const struct server_referral_handler server_referral_handlers[] = {
{ "whois.apnic.net", find_referral_server_apnic }, { "whois.apnic.net", find_referral_server_apnic },
{ "whois.arin.net", find_referral_server_arin }, { "whois.arin.net", find_referral_server_arin },
{ "whois.iana.org", find_referral_server_iana }, { "whois.iana.org", find_referral_server_iana },
{ "\x04", find_referral_server_verisign },
{ "\x08", find_referral_server_recursive }, { "\x08", find_referral_server_recursive },
{ NULL, NULL } { NULL, NULL }
}; };

72
whois.c
View File

@ -46,6 +46,7 @@ static void find_referral_server_apnic(char **, const char *);
static void find_referral_server_arin(char **, const char *); static void find_referral_server_arin(char **, const char *);
static void find_referral_server_iana(char **, const char *); static void find_referral_server_iana(char **, const char *);
static void find_referral_server_recursive(char **, const char *); static void find_referral_server_recursive(char **, const char *);
static void find_referral_server_verisign(char **, const char *);
/* Application-specific */ /* Application-specific */
#include "version.h" #include "version.h"
@ -352,7 +353,7 @@ int handle_query(const char *hserver, const char *hport,
if (verb) if (verb)
printf(_("Using server %s.\n"), server + 1); printf(_("Using server %s.\n"), server + 1);
old_server = server; old_server = server;
server = query_verisign(server + 1, NULL, query); server = query_verisign(server, NULL, query);
free(old_server); free(old_server);
if (no_recursion && server) if (no_recursion && server)
server[0] = '\0'; server[0] = '\0';
@ -950,6 +951,29 @@ static void find_referral_server_recursive(char **referral_server, const char *b
} }
} }
static void find_referral_server_verisign(char **referral_server, const char *buf)
{
static int state = 0;
const char *p;
if (*referral_server)
return;
/* If there are multiple matches only the server of the first record
* is queried */
if (state == 0 && strneq(buf, " Domain Name:", 15)) {
state = 1;
} else if (state == 0 && strneq(buf, " Server Name:", 15)) {
*referral_server = strdup("");
state = 2;
} else if (state == 1 && strneq(buf, " Registrar WHOIS Server:", 26)) {
p = buf + 26; /* skip until the colon */
for (; *p && *p == ' '; p++); /* skip the spaces */
*referral_server = strdup(p);
state = 2;
}
}
/* returns a string which should be freed by the caller, or NULL */ /* returns a string which should be freed by the caller, or NULL */
char *query_server(const char *server, const char *port, const char *query) char *query_server(const char *server, const char *port, const char *query)
{ {
@ -1014,12 +1038,9 @@ char *query_server(const char *server, const char *port, const char *query)
char *query_verisign(const char *server, const char *port, const char *query) char *query_verisign(const char *server, const char *port, const char *query)
{ {
char *temp, *p, buf[2000]; char *temp, *p;
FILE *fi;
int hide = hide_discl;
int sock; int sock;
char *referral_server = NULL; char *referral_server = NULL;
int state = 0;
int dotscount = 0; int dotscount = 0;
temp = malloc(strlen("domain ") + strlen(query) + 2 + 1); temp = malloc(strlen("domain ") + strlen(query) + 2 + 1);
@ -1033,48 +1054,9 @@ char *query_verisign(const char *server, const char *port, const char *query)
if (dotscount == 1 && !strpbrk(query, "=~ ")) if (dotscount == 1 && !strpbrk(query, "=~ "))
strcpy(temp, "domain "); strcpy(temp, "domain ");
strcat(temp, query); strcat(temp, query);
strcat(temp, "\r\n");
sock = openconn(server, port); referral_server = query_server(server, port, temp);
fi = fdopen(sock, "r");
if (!fi)
err_sys("fdopen");
if (write(sock, temp, strlen(temp)) < 0)
err_sys("write");
free(temp); free(temp);
while (fgets(buf, sizeof(buf), fi)) {
if ((p = strpbrk(buf, "\r\n"))) /* remove the trailing CR/LF */
*p = '\0';
/* If there are multiple matches only the server of the first record
is queried */
if (state == 0 && strneq(buf, " Domain Name:", 15))
state = 1;
if (state == 0 && strneq(buf, " Server Name:", 15)) {
referral_server = strdup("");
state = 2;
}
if (state == 1 && strneq(buf, " Registrar WHOIS Server:", 26)) {
p = buf + 26; /* skip until the colon */
for (; *p == ' '; p++); /* skip the spaces */
referral_server = strdup(p);
state = 2;
}
/* the output must not be hidden or no data will be shown for
host records and not-existing domains */
if (hide_line(&hide, buf))
continue;
recode_fputs(buf, stdout);
fputc('\n', stdout);
}
if (ferror(fi))
err_sys("fgets");
fclose(fi);
return referral_server; return referral_server;
} }