security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-03 12:11:33 +01:00
Code Activity

dirmngr: Put brackets around IP addresses in the hosttable.

Browse Source 
* dirmngr/ks-engine-hkp.c (EAI_OVERFLOW): Provide a substitute.
(my_getnameinfo): New.
(map_host): Use it.
This commit is contained in:
Werner Koch 2014-03-11 18:02:29 +01:00
parent a3dee28891
commit 0b2cca807d
1 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
dirmngr/ks-engine-hkp.c
View File

@ -40,6 +40,12 @@
#include "userids.h" #include "userids.h"
#include "ks-engine.h" #include "ks-engine.h"
/* Substitute a missing Mingw macro. */
#ifndef EAI_OVERFLOW
# define EAI_OVERFLOW EAI_FAIL
#endif
/* To match the behaviour of our old gpgkeys helper code we escape /* To match the behaviour of our old gpgkeys helper code we escape
more characters than actually needed. */ more characters than actually needed. */
#define EXTRA_ESCAPE_CHARS "@!\"#$%&'()*+,-./:;<=>?[\\]^_{|}~" #define EXTRA_ESCAPE_CHARS "@!\"#$%&'()*+,-./:;<=>?[\\]^_{|}~"
@ -200,6 +206,35 @@ select_random_host (int *table)
} }
/* Simplified version of getnameinfo which also returns a numeric
hostname inside of brackets. The caller should provide a buffer
for TMPHOST which is 2 bytes larger than the the largest hostname.
returns 0 on success or an EAI error code. */
static int
my_getnameinfo (const struct sockaddr *sa, socklen_t salen,
char *host, size_t hostlen)
{
int ec;
if (hostlen < 5)
return EAI_OVERFLOW;
ec = getnameinfo (sa, salen, host, hostlen, NULL, 0, NI_NAMEREQD);
if (!ec && *host == '[')
ec = EAI_FAIL; /* A name may never start with a bracket. */
else if (ec == EAI_NONAME)
{
*host = '[';
ec = getnameinfo (sa, salen, host + 1, hostlen - 2,
NULL, 0, NI_NUMERICHOST);
if (!ec)
strcat (host, "]");
}
return ec;
}
/* Map the host name NAME to the actual to be used host name. This /* Map the host name NAME to the actual to be used host name. This
allows us to manage round robin DNS names. We use our own strategy allows us to manage round robin DNS names. We use our own strategy
to choose one of the hosts. For example we skip those hosts which to choose one of the hosts. For example we skip those hosts which
@ -256,9 +291,8 @@ map_host (const char *name, int force_reselect)
if (ai->ai_family != AF_INET && ai->ai_family != AF_INET6) if (ai->ai_family != AF_INET && ai->ai_family != AF_INET6)
continue; continue;
if ((ec=getnameinfo (ai->ai_addr, ai->ai_addrlen, if ((ec = my_getnameinfo (ai->ai_addr, ai->ai_addrlen,
tmphost, sizeof tmphost, tmphost, sizeof tmphost)))
NULL, 0, 0)))
{ {
log_info ("getnameinfo failed while checking '%s': %s\n", log_info ("getnameinfo failed while checking '%s': %s\n",
name, gai_strerror (ec)); name, gai_strerror (ec));