You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
+#include "getaddrinfo.h"
+
+#if HAVE_NETINET_IN_H
+# include <netinet/in.h>
+#endif
+
/* Get calloc. */
#include <stdlib.h>
/* Get memcpy. */
#include <string.h>
-/* Get struct hostent. */
-#include <netdb.h>
-
#include <stdbool.h>
#include "gettext.h"
#define _(String) gettext (String)
#define N_(String) String
-#include "getaddrinfo.h"
+#include "strdup.h"
static inline bool
validate_family (int family)
struct addrinfo **restrict res)
{
struct addrinfo *tmp;
- struct servent *se;
+ struct servent *se = NULL;
struct hostent *he;
- size_t sinlen;
+ void *storage;
+ size_t size;
+#if HAVE_IPV6
+ struct v6_pair {
+ struct addrinfo addrinfo;
+ struct sockaddr_in6 sockaddr_in6;
+ };
+#endif
+#if HAVE_IPV4
+ struct v4_pair {
+ struct addrinfo addrinfo;
+ struct sockaddr_in sockaddr_in;
+ };
+#endif
- if (hints && hints->ai_flags)
+ if (hints && (hints->ai_flags & ~AI_CANONNAME))
/* FIXME: Support more flags. */
return EAI_BADFLAGS;
{
#if HAVE_IPV6
case PF_INET6:
- sinlen = sizeof (struct sockaddr_in6);
+ size = sizeof (struct v6_pair);
break;
#endif
#if HAVE_IPV4
case PF_INET:
- sinlen = sizeof (struct sockaddr_in);
+ size = sizeof (struct v4_pair);
break;
#endif
return EAI_NODATA;
}
- tmp = calloc (1, sizeof (*tmp) + sinlen);
- if (!tmp)
+ storage = calloc (1, size);
+ if (!storage)
return EAI_MEMORY;
switch (he->h_addrtype)
#if HAVE_IPV6
case PF_INET6:
{
- struct sockaddr_in6 *sinp = (void *) tmp + sizeof (*tmp);
+ struct v6_pair *p = storage;
+ struct sockaddr_in6 *sinp = &p->sockaddr_in6;
+ tmp = &p->addrinfo;
if (se)
sinp->sin6_port = se->s_port;
if (he->h_length != sizeof (sinp->sin6_addr))
- return EAI_SYSTEM; /* FIXME: Better return code? Set errno? */
+ {
+ free (storage);
+ return EAI_SYSTEM; /* FIXME: Better return code? Set errno? */
+ }
- memcpy (&sinp->sin6_addr, he->h_addr_list[0], he->h_length);
+ memcpy (&sinp->sin6_addr, he->h_addr_list[0], sizeof sinp->sin6_addr);
tmp->ai_addr = (struct sockaddr *) sinp;
- tmp->ai_addrlen = sinlen;
+ tmp->ai_addrlen = sizeof *sinp;
}
break;
#endif
#if HAVE_IPV4
case PF_INET:
{
- struct sockaddr_in *sinp = (void *) tmp + sizeof (*tmp);
+ struct v4_pair *p = storage;
+ struct sockaddr_in *sinp = &p->sockaddr_in;
+ tmp = &p->addrinfo;
if (se)
sinp->sin_port = se->s_port;
if (he->h_length != sizeof (sinp->sin_addr))
- return EAI_SYSTEM; /* FIXME: Better return code? Set errno? */
+ {
+ free (storage);
+ return EAI_SYSTEM; /* FIXME: Better return code? Set errno? */
+ }
- memcpy (&sinp->sin_addr, he->h_addr_list[0], he->h_length);
+ memcpy (&sinp->sin_addr, he->h_addr_list[0], sizeof sinp->sin_addr);
tmp->ai_addr = (struct sockaddr *) sinp;
- tmp->ai_addrlen = sinlen;
+ tmp->ai_addrlen = sizeof *sinp;
}
break;
#endif
default:
- free (tmp);
+ free (storage);
return EAI_NODATA;
}
+ if (hints && hints->ai_flags & AI_CANONNAME)
+ {
+ const char *cn;
+ if (he->h_name)
+ cn = he->h_name;
+ else
+ cn = nodename;
+
+ tmp->ai_canonname = strdup (cn);
+ if (!tmp->ai_canonname)
+ {
+ free (storage);
+ return EAI_MEMORY;
+ }
+ }
+
tmp->ai_protocol = (hints) ? hints->ai_protocol : 0;
tmp->ai_socktype = (hints) ? hints->ai_socktype : 0;
tmp->ai_addr->sa_family = he->h_addrtype;
cur = ai;
ai = ai->ai_next;
+
+ if (cur->ai_canonname) free (cur->ai_canonname);
free (cur);
}
}