X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fgetaddrinfo.c;h=b52f6c536cfc188fe096cc9e94eb9228723744a6;hb=d5ffc2f6e667c1d849bf7579add8435664e678c5;hp=c400e07d34109edbaa9dedc75c0f8f63cf70bd89;hpb=dbcf2c3410ed74d919efdc62ffbd00e716284d8e;p=pazpar2-moved-to-github.git diff --git a/src/getaddrinfo.c b/src/getaddrinfo.c index c400e07..b52f6c5 100644 --- a/src/getaddrinfo.c +++ b/src/getaddrinfo.c @@ -1,4 +1,4 @@ -/* $Id: getaddrinfo.c,v 1.5 2007-04-23 21:05:23 adam Exp $ +/* $Id: getaddrinfo.c,v 1.8 2007-07-25 13:20:46 adam Exp $ Copyright (c) 2006-2007, Index Data. This file is part of Pazpar2. @@ -54,14 +54,19 @@ void perform_getaddrinfo(struct work *w) { int res = 0; char *port; +#if HAVE_GETADDRINFO struct addrinfo *addrinfo, hints; +#else + struct hostent *hp; +#endif char *hostport = xstrdup(w->hostport); if ((port = strchr(hostport, ':'))) *(port++) = '\0'; else port = "210"; - + +#if HAVE_GETADDRINFO hints.ai_flags = 0; hints.ai_family = PF_INET; hints.ai_socktype = SOCK_STREAM; @@ -90,6 +95,24 @@ void perform_getaddrinfo(struct work *w) w->ipport = xstrdup(ipport); yaz_log(log_level, "Resolved %s -> %s", hostport, ipport); } +#else + hp = gethostbyname(hostport); + if (!hp) + { + yaz_log(YLOG_WARN|YLOG_ERRNO, "Failed to resolve %s", hostport); + } + else + { + char ipport[128]; + unsigned char addrbuf[4]; + + memcpy(addrbuf, *hp->h_addr_list, 4 * sizeof(unsigned char)); + sprintf(ipport, "%u.%u.%u.%u:%s", + addrbuf[0], addrbuf[1], addrbuf[2], addrbuf[3], port); + w->ipport = xstrdup(ipport); + yaz_log(log_level, "Resolved %s -> %s", hostport, ipport); + } +#endif xfree(hostport); }