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

Refactoring

Browse Source
This commit is contained in:
Marco d'Itri 2025-05-04 17:44:34 +02:00
parent b903b3679b
commit 8f5ef792d8
No known key found for this signature in database
GPG Key ID: CB3EC33AE1DED781
3 changed files with 34 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data.h
View File

@ -28,6 +28,7 @@ const struct server_referral_handler server_referral_handlers[] = {
{ "whois.6bone.net", find_referral_server_6bone },
{ "whois.arin.net", find_referral_server_arin },
{ "whois.iana.org", find_referral_server_iana },
{ "\x08", find_referral_server_recursive },
{ NULL, NULL }
};

91
whois.c
View File

@ -44,6 +44,7 @@
static void find_referral_server_6bone(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_recursive(char **, const char *);
/* Application-specific */
#include "version.h"
@ -358,9 +359,9 @@ int handle_query(const char *hserver, const char *hport,
case 8:
if (verb)
printf(_("Using server %s.\n"), server + 1);
sockfd = openconn(server + 1, NULL);
free(server);
server = query_afilias(sockfd, query);
char *old_server = server;
server = query_server(server, NULL, query);
free(old_server);
if (no_recursion && server)
server[0] = '\0';
break;
@ -857,6 +858,26 @@ static void find_referral_server_iana(char **referral_server, const char *buf)
*referral_server = strdup(p);
}
static void find_referral_server_recursive(char **referral_server, const char *buf)
{
static int state = 0;
const char *p;
if (*referral_server)
return;
if (state == 0 && strneq(buf, "Domain Name:", 12))
state = 1;
else if (state == 1 && strneq(buf, "Domain Name:", 12))
state = 2;
else if (state == 1 && strneq(buf, "Registrar WHOIS Server:", 23)) {
p = buf + 23; /* 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 */
char *query_server(const char *server, const char *port, const char *query)
{
@ -872,7 +893,15 @@ char *query_server(const char *server, const char *port, const char *query)
strcat(temp, "\r\n");
for (i = 0; server_referral_handlers[i].name; i++) {
if (streq(server_referral_handlers[i].name, server)) {
/* If the first character is not printable then it represents
* a general category of servers in the list.
*/
if (server[0] < ' ' &&
strneq(server_referral_handlers[i].name, server, 1)) {
server++;
referral_handler = server_referral_handlers[i].handler;
break;
} else if (streq(server_referral_handlers[i].name, server)) {
referral_handler = server_referral_handlers[i].handler;
break;
}
@ -975,60 +1004,6 @@ char *query_crsnic(const int sock, const char *query)
return referral_server;
}
char *query_afilias(const int sock, const char *query)
{
char *temp, *p, buf[2000];
FILE *fi;
int hide = hide_discl;
char *referral_server = NULL;
int state = 0;
temp = malloc(strlen(query) + 2 + 1);
strcpy(temp, query);
strcat(temp, "\r\n");
fi = fdopen(sock, "r");
if (!fi)
err_sys("fdopen");
if (write(sock, temp, strlen(temp)) < 0)
err_sys("write");
free(temp);
while (fgets(buf, sizeof(buf), fi)) {
if ((p = strpbrk(buf, "\r\n"))) /* remove the trailing CR/LF */
*p = '\0';
/* If multiple attributes are returned then use the first result.
This is not supposed to happen. */
if (state == 0 && strneq(buf, "Domain Name:", 12))
state = 1;
if (state == 1 && strneq(buf, "Registrar WHOIS Server:", 23)) {
p = buf + 23; /* 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);
if (hide > HIDE_NOT_STARTED && hide != HIDE_TO_THE_END)
err_quit(_("Catastrophic error: disclaimer text has been changed.\n"
"Please upgrade this program.\n"));
return referral_server;
}
int openconn(const char *server, const char *port)
{
int fd = -1;

1
whois.h
View File

@ -17,7 +17,6 @@ char *queryformat(const char *, const char *, const char *);
int hide_line(int *hiding, const char *const line);
char *query_server(const char *, const char *, const char *);
char *query_crsnic(const int, const char *);
char *query_afilias(const int, const char *);
int openconn(const char *, const char *);
int connect_with_timeout(int, const struct sockaddr *, socklen_t, int);
void NORETURN usage(int error);