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:02:41 +02:00
parent c6f7ae9162
commit 5211801fe0
No known key found for this signature in database
GPG Key ID: CB3EC33AE1DED781
2 changed files with 71 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
data.h
View File

@ -19,6 +19,17 @@ const char *ripe_servers[] = {
NULL
};
struct server_referral_handler {
const char *name;
void (*handler)(char **referral_server, const char *buf);
};
const struct server_referral_handler server_referral_handlers[] = {
{ "whois.6bone.net", find_referral_server_6bone },
{ "whois.arin.net", find_referral_server_arin },
{ NULL, NULL }
};
const char *hide_strings[] = {
"The data in Networksolutions.com's WHOIS database", NULL,
/* Some registrars like .wang copied the first paragraph of this

89
whois.c
View File

@ -40,6 +40,10 @@
#include <idna.h>
#endif
/* prototypes referenced in data.h */
static void find_referral_server_6bone(char **, const char *);
static void find_referral_server_arin(char **, const char *);
/* Application-specific */
#include "version.h"
#include "data.h"
@ -790,19 +794,72 @@ int hide_line(int *hiding, const char *const line)
return 0;
}
static void find_referral_server_6bone(char **referral_server, const char *buf)
{
char nh[256], np[16], nq[1024];
if (*referral_server)
return;
/* 6bone-style referral:
* % referto: whois -h whois.arin.net -p 43 as 1
*/
if (!strneq(buf, "% referto:", 10))
return;
if (sscanf(buf, REFERTO_FORMAT, nh, np, nq) == 3) {
/* XXX we are ignoring the new query string */
*referral_server = malloc(strlen(nh) + 1 + strlen(np) + 1);
sprintf(*referral_server, "%s:%s", nh, np);
}
}
static void find_referral_server_arin(char **referral_server, const char *buf)
{
char *p;
if (*referral_server)
return;
/* ARIN referrals:
* ReferralServer: rwhois://rwhois.fuse.net:4321/
* ReferralServer: whois://whois.ripe.net
* ReferralServer: whois.ripe.net
*/
if (!strneq(buf, "ReferralServer:", 15))
return;
if ((p = strstr(buf, "rwhois://")))
*referral_server = strdup(p + 9);
else if ((p = strstr(buf, "whois://")))
*referral_server = strdup(p + 8);
else
*referral_server = strdup(buf + 17);
if (*referral_server && (p = strpbrk(*referral_server, "/")))
*p = '\0';
}
/* 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 *temp, *p, buf[2000];
FILE *fi;
int hide = hide_discl;
int sock;
int sock, i;
char *referral_server = NULL;
void (*referral_handler)(char **referral_server, const char *buf) = NULL;
temp = malloc(strlen(query) + 2 + 1);
strcpy(temp, query);
strcat(temp, "\r\n");
for (i = 0; server_referral_handlers[i].name; i++) {
if (streq(server_referral_handlers[i].name, server)) {
referral_handler = server_referral_handlers[i].handler;
break;
}
}
sock = openconn(server, port);
fi = fdopen(sock, "r");
if (!fi)
@ -815,34 +872,8 @@ char *query_server(const char *server, const char *port, const char *query)
if ((p = strpbrk(buf, "\r\n"))) /* remove the trailing CR/LF */
*p = '\0';
/* 6bone-style referral:
* % referto: whois -h whois.arin.net -p 43 as 1
*/
if (!referral_server && strneq(buf, "% referto:", 10)) {
char nh[256], np[16], nq[1024];
if (sscanf(buf, REFERTO_FORMAT, nh, np, nq) == 3) {
/* XXX we are ignoring the new query string */
referral_server = malloc(strlen(nh) + 1 + strlen(np) + 1);
sprintf(referral_server, "%s:%s", nh, np);
}
}
/* ARIN referrals:
* ReferralServer: rwhois://rwhois.fuse.net:4321/
* ReferralServer: whois://whois.ripe.net
* ReferralServer: whois.ripe.net
*/
if (!referral_server && strneq(buf, "ReferralServer:", 15)) {
if ((p = strstr(buf, "rwhois://")))
referral_server = strdup(p + 9);
else if ((p = strstr(buf, "whois://")))
referral_server = strdup(p + 8);
else
referral_server = strdup(buf + 17);
if (referral_server && (p = strpbrk(referral_server, "/")))
*p = '\0';
}
if (referral_handler)
referral_handler(&referral_server, buf);
if (hide_line(&hide, buf))
continue;