* For license terms, see the file COPYING in this directory.
*/
#include "config.h"
-#ifdef HAVE_GETHOSTBYNAME
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include "i18n.h"
#include "mx.h"
#include "fetchmail.h"
+#include "getaddrinfo.h"
#define MX_RETRIES 3
typedef unsigned char address_t[sizeof (struct in_addr)];
-typedef struct _address_e
+#ifdef HAVE_RES_SEARCH
+static int getaddresses(struct addrinfo **result, const char *name)
{
- struct _address_e *next;
- address_t address;
-} address_e;
+ struct addrinfo hints;
-static void free_addrlst(address_e *lst)
+ memset(&hints, 0, sizeof(hints));
+ hints.ai_socktype=SOCK_STREAM;
+ hints.ai_protocol=PF_UNSPEC;
+ hints.ai_family=AF_UNSPEC;
+ return fm_getaddrinfo(name, NULL, &hints, result);
+}
+
+/* XXX FIXME: doesn't detect if an IPv6-mapped IPv4 address
+ * matches a real IPv4 address */
+static int compareaddr(const struct addrinfo *a1, const struct addrinfo *a2)
{
- address_e *i;
- while(lst) {
- i = lst->next;
- free(lst);
- lst = i;
- }
+ if (a1->ai_family != a2->ai_family) return FALSE;
+ if (a1->ai_addrlen != a2->ai_addrlen) return FALSE;
+ return (!memcmp(a1->ai_addr, a2->ai_addr, a1->ai_addrlen));
}
-/* XXX FIXME: This junk isn't IPv6 aware */
static int is_ip_alias(const char *name1,const char *name2)
/*
* Given two hostnames as arguments, returns TRUE if they
* the calling function does them.
*/
{
- address_e *host_a_addr=0, *host_b_addr=0;
- address_e *dummy_addr, *ii, *ij;
-
int rc = FALSE;
- struct hostent *hp;
- char **p;
-
- hp = gethostbyname((char*)name1);
-
- dummy_addr = (address_e *)NULL;
-
- if (hp)
- for (p = hp->h_addr_list; *p != 0; p++) {
- struct in_addr in;
-
- host_a_addr = xmalloc(sizeof (address_e));
- memset (host_a_addr,0, sizeof (address_e));
- host_a_addr->next = dummy_addr;
- (void) memcpy(&host_a_addr->address, *p, sizeof (in.s_addr));
- dummy_addr = host_a_addr;
- }
-
- hp = gethostbyname((char*)name2);
- dummy_addr = (address_e *)NULL;
+ struct addrinfo *res1 = NULL, *res2 = NULL, *ii, *ij;
- if (hp)
- for (p = hp->h_addr_list; *p != 0; p++) {
- struct in_addr in;
+ if (getaddresses(&res1, name1))
+ goto found;
- host_b_addr = xmalloc(sizeof (address_e));
- memset (host_b_addr,0, sizeof (address_e));
- host_b_addr->next = dummy_addr;
- (void) memcpy(&host_b_addr->address, *p, sizeof (in.s_addr));
- dummy_addr = host_b_addr;
- }
+ if (getaddresses(&res2, name2))
+ goto found;
- for (ii = host_a_addr ; ii ; ii = ii -> next) {
- for (ij = host_b_addr ; ij ; ij = ij -> next) {
- if (!memcmp(ii->address, ij->address, sizeof (address_t))) {
+ for (ii = res1 ; ii ; ii = ii -> ai_next) {
+ for (ij = res2 ; ij ; ij = ij -> ai_next) {
+ if (compareaddr(ii, ij)) {
rc = TRUE;
goto found;
}
}
found:
- free_addrlst(host_b_addr);
- free_addrlst(host_a_addr);
+ if (res2)
+ fm_freeaddrinfo(res2);
+ if (res1)
+ fm_freeaddrinfo(res1);
return rc;
}
+#endif
-int is_host_alias(const char *name, struct query *ctl)
+int is_host_alias(const char *name, struct query *ctl, struct addrinfo **res)
/* determine whether name is a DNS alias of the mailserver for this query */
{
- struct hostent *he,*he_st;
+#ifdef HAVE_RES_SEARCH
struct mxentry *mxp, *mxrecords;
+ int e;
+ struct addrinfo hints, *res_st;
+#endif
struct idlist *idl;
- int namelen;
+ size_t namelen;
struct hostdata *lead_server =
ctl->server.lead_server ? ctl->server.lead_server : &ctl->server;
namelen = strlen(name);
for (idl = lead_server->akalist; idl; idl = idl->next)
{
- char *ep;
+ const char *ep;
/*
* Test is >= here because str_in_list() should have caught the
*/
if (strlen(idl->id) >= namelen)
continue;
- ep = (char *)name + (namelen - strlen(idl->id));
+ ep = name + (namelen - strlen(idl->id));
/* a suffix led by . must match */
if (ep[-1] == '.' && !strcasecmp(ep, idl->id))
return(TRUE);
if (!ctl->server.dns)
return(FALSE);
#ifndef HAVE_RES_SEARCH
+ (void)res;
return(FALSE);
#else
/*
* delivering the current message or anything else from the
* current server until it's back up.
*/
- if ((he = gethostbyname((char*)name)) != (struct hostent *)NULL)
+ memset(&hints, 0, sizeof hints);
+ hints.ai_family=AF_UNSPEC;
+ hints.ai_protocol=PF_UNSPEC;
+ hints.ai_socktype=SOCK_STREAM;
+ hints.ai_flags=AI_CANONNAME;
+
+ e = fm_getaddrinfo(name, NULL, &hints, res);
+ if (e == 0)
{
- if (strcasecmp(ctl->server.truename, he->h_name) == 0)
+ int rr = (strcasecmp(ctl->server.truename, (*res)->ai_canonname) == 0);
+ fm_freeaddrinfo(*res); *res = NULL;
+ if (rr)
goto match;
- else if (((he_st = gethostbyname(ctl->server.truename)) != (struct hostent *)NULL) && ctl->server.checkalias)
+ else if (ctl->server.checkalias && 0 == fm_getaddrinfo(ctl->server.truename, NULL, &hints, &res_st))
{
+ fm_freeaddrinfo(res_st);
if (outlevel >= O_DEBUG)
report(stdout, GT_("Checking if %s is really the same node as %s\n"),ctl->server.truename,name);
if (is_ip_alias(ctl->server.truename,name) == TRUE)
if (outlevel >= O_DEBUG)
report(stdout, GT_("No, their IP addresses don't match\n"));
return(FALSE);
- }
- else
+ } else {
return(FALSE);
+ }
}
else
- switch (h_errno)
+ switch (e)
{
- case HOST_NOT_FOUND: /* specified host is unknown */
-#ifndef __BEOS__
- case NO_ADDRESS: /* valid, but does not have an IP address */
- break;
+ case EAI_NONAME: /* specified host is unknown */
+#ifdef EAI_NODATA
+ /* EAI_NODATA was in the older RFC-2553, but that got
+ * obsoleted by RFC-3493 - there, EAI_NODATA is no longer
+ * valid, and modern operating systems no longer issue this
+ * error code. libesmtp/getaddrinfo.?, however, still does.
+ * (This was reported to Brian Stafford 2013-02-03.)
+ */
+ case EAI_NODATA: /* specified host is unknown */
#endif
- case NO_RECOVERY: /* non-recoverable name server error */
- case TRY_AGAIN: /* temporary error on authoritative server */
- default:
- if (outlevel != O_SILENT)
- report_complete(stdout, "\n"); /* terminate the progress message */
- report(stderr,
- GT_("nameserver failure while looking for `%s' during poll of %s.\n"),
- name, ctl->server.pollname);
- ctl->errcount++;
- break;
+ break;
+
+ default:
+ if (outlevel != O_SILENT)
+ report_complete(stdout, "\n"); /* terminate the progress message */
+ report(stderr,
+ GT_("nameserver failure while looking for '%s' during poll of %s: %s\n"),
+ name, ctl->server.pollname, gai_strerror(e));
+ ctl->errcount++;
+ break;
}
/*
switch (h_errno)
{
case HOST_NOT_FOUND: /* specified host is unknown */
-#ifndef __BEOS__
+#ifdef NO_ADDRESS
case NO_ADDRESS: /* valid, but does not have an IP address */
return(FALSE);
#endif
ctl->errcount++;
break;
}
- }
- else
- {
+ } else {
for (mxp = mxrecords; mxp->name; mxp++)
if (strcasecmp(ctl->server.truename, mxp->name) == 0
|| is_ip_alias(ctl->server.truename, mxp->name) == TRUE)
return(TRUE);
#endif /* HAVE_RES_SEARCH */
}
-#endif /* HAVE_GETHOSTBYNAME */
/* checkalias.c ends here */
projects / ~andy / fetchmail / blobdiff