aboutsummaryrefslogtreecommitdiff
path: root/inet
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-11-10 04:15:55 +0000
committerUlrich Drepper <drepper@redhat.com>2000-11-10 04:15:55 +0000
commit85599e53cdba552f3b288b9e79c26592da11263b (patch)
tree9f2726a666de57e0d70929a728284dfa5dbf5b6d /inet
parentbb5a22b34a609e2e995ece3c6d5025b950c68f4e (diff)
downloadglibc-85599e53cdba552f3b288b9e79c26592da11263b.zip
glibc-85599e53cdba552f3b288b9e79c26592da11263b.tar.gz
glibc-85599e53cdba552f3b288b9e79c26592da11263b.tar.bz2
Update.
2000-11-06 Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org> * sysdeps/posix/getaddrinfo.c: Clean-up: define family to hold target family. 2000-11-06 Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org> * sysdeps/posix/getaddrinfo.c: Loosen protocol check to ease raw socket creation. 2000-11-06 Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org> * sysdeps/posix/getaddrinfo.c: Ensure to fill ai_socktype and ai_protocol by internal table if service was not given. 2000-11-06 Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org> * sysdeps/posix/getaddrinfo.c: Don't raise an error even if numerical port was specified with protocol without socktype. 2000-11-06 Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org> * sysdeps/posix/getaddrinfo.c: Ensure to check if protocol is ok. 2000-11-06 Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org> * inet/getnameinfo.c: getnameinfo() NI_xxx flag validation. 2000-11-06 Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org> * sysdeps/posix/getaddrinfo.c: Ensure not to fill garbage value in sin6_scope_id field. 2000-11-06 Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org> * inet/getnameinfo.c: Repair getnameinfo() sin6_socpe_id support. 2000-11-06 Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org> * inet/getnameinfo.c: Repair NI_NOFQDN flag support. 2000-11-06 Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org> * inet/getnameinfo.c: Wake-up sin6_scope_id support in getnameinfo(): check for whether sin6_socpe_id exist was wrong. 2000-11-09 Martin Schwidefsky <mschwide@nc.boeblingen.de.ibm.com> * sysdeps/unix/sysv/linux/s390/mmap.S: Use mmap2 if it is present. * sysdeps/unix/sysv/linux/s390/mmap64.S: New file.
Diffstat (limited to 'inet')
-rw-r--r--inet/getnameinfo.c99
1 files changed, 51 insertions, 48 deletions
diff --git a/inet/getnameinfo.c b/inet/getnameinfo.c
index 6beeba0..119def2 100644
--- a/inet/getnameinfo.c
+++ b/inet/getnameinfo.c
@@ -175,25 +175,28 @@ getnameinfo (const struct sockaddr *sa, socklen_t addrlen, char *host,
struct hostent th;
int ok = 0;
+ if (flags & ~(NI_NUMERICHOST|NI_NUMERICSERV|NI_NOFQDN|NI_NAMEREQD|NI_DGRAM))
+ return EAI_BADFLAGS;
+
if (sa == NULL || addrlen < sizeof (sa_family_t))
- return -1;
+ return EAI_FAMILY;
switch (sa->sa_family)
{
case AF_LOCAL:
if (addrlen < (socklen_t) (((struct sockaddr_un *) NULL)->sun_path))
- return -1;
+ return EAI_FAMILY;
break;
case AF_INET:
if (addrlen < sizeof (struct sockaddr_in))
- return -1;
+ return EAI_FAMILY;
break;
case AF_INET6:
if (addrlen < sizeof (struct sockaddr_in6))
- return -1;
+ return EAI_FAMILY;
break;
default:
- return -1;
+ return EAI_FAMILY;
}
if (host != NULL && hostlen > 0)
@@ -224,7 +227,7 @@ getnameinfo (const struct sockaddr *sa, socklen_t addrlen, char *host,
{
__set_h_errno (herrno);
__set_errno (serrno);
- return -1;
+ return EAI_SYSTEM;
}
}
else
@@ -255,26 +258,23 @@ getnameinfo (const struct sockaddr *sa, socklen_t addrlen, char *host,
if (h)
{
- if (flags & NI_NOFQDN)
+ char *c;
+ if ((flags & NI_NOFQDN) == 0
+ && (c = nrl_domainname ())
+ && (c = strstr (h->h_name, c))
+ && (c != h->h_name) && (*(--c) == '.'))
{
- char *c;
- if ((c = nrl_domainname ()) && (c = strstr(h->h_name, c))
- && (c != h->h_name) && (*(--c) == '.'))
- {
- strncpy (host, h->h_name,
- min(hostlen, (size_t) (c - h->h_name)));
- host[min(hostlen - 1, (size_t) (c - h->h_name))]
- = '\0';
- ok = 1;
- }
- else
- {
- strncpy (host, h->h_name, hostlen);
- ok = 1;
- }
+ strncpy (host, h->h_name,
+ min(hostlen, (size_t) (c - h->h_name)));
+ host[min(hostlen - 1, (size_t) (c - h->h_name))]
+ = '\0';
+ ok = 1;
+ }
+ else
+ {
+ strncpy (host, h->h_name, hostlen);
+ ok = 1;
}
- strncpy (host, h->h_name, hostlen);
- ok = 1;
}
}
@@ -283,7 +283,7 @@ getnameinfo (const struct sockaddr *sa, socklen_t addrlen, char *host,
if (flags & NI_NAMEREQD)
{
__set_errno (serrno);
- return -1;
+ return EAI_NONAME;
}
else
{
@@ -295,40 +295,43 @@ getnameinfo (const struct sockaddr *sa, socklen_t addrlen, char *host,
c = inet_ntop (AF_INET6,
(void *) &sin6p->sin6_addr, host, hostlen);
- if (addrlen > sizeof (struct sockaddr_in6)
- && (scopeid = sin6p->sin6_scope_id))
+ scopeid = sin6p->sin6_scope_id;
+ if (scopeid != 0)
{
/* Buffer is >= IFNAMSIZ+1. */
char scopebuf[IFNAMSIZ + 1];
+ char *scopeptr;
int ni_numericscope = 0;
+ size_t real_hostlen = __strnlen (host, hostlen);
+ size_t scopelen = 0;
+
+ scopebuf[0] = SCOPE_DELIMITER;
+ scopebuf[1] = '\0';
+ scopeptr = &scopebuf[1];
if (IN6_IS_ADDR_LINKLOCAL (&sin6p->sin6_addr)
|| IN6_IS_ADDR_MC_LINKLOCAL (&sin6p->sin6_addr))
{
if (if_indextoname (scopeid, scopebuf) == NULL)
++ni_numericscope;
+ else
+ scopelen = strlen (scopebuf);
}
else
++ni_numericscope;
if (ni_numericscope)
- {
- char *scopeptr = &scopebuf[1];
- size_t real_hostlen;
- size_t scopelen;
-
- scopebuf[0] = SCOPE_DELIMITER;
- scopelen = 1 + __snprintf (scopeptr,
- (scopebuf
- + sizeof scopebuf
- - scopeptr),
- "%u", scopeid);
-
- real_hostlen = __strnlen (host, hostlen);
- if (real_hostlen + scopelen + 1 > hostlen)
- return -1;
- memcpy (host + real_hostlen, scopebuf, scopelen);
- }
+ scopelen = 1 + __snprintf (scopeptr,
+ (scopebuf
+ + sizeof scopebuf
+ - scopeptr),
+ "%u", scopeid);
+
+ if (real_hostlen + scopelen + 1 > hostlen)
+ /* XXX We should not fail here. Simply enlarge
+ the buffer or return with out of memory. */
+ return EAI_SYSTEM;
+ memcpy (host + real_hostlen, scopebuf, scopelen + 1);
}
}
else
@@ -338,7 +341,7 @@ getnameinfo (const struct sockaddr *sa, socklen_t addrlen, char *host,
if (c == NULL)
{
__set_errno (serrno);
- return -1;
+ return EAI_SYSTEM;
}
}
ok = 1;
@@ -360,14 +363,14 @@ getnameinfo (const struct sockaddr *sa, socklen_t addrlen, char *host,
if (flags & NI_NAMEREQD)
{
__set_errno (serrno);
- return -1;
+ return EAI_NONAME;
}
strncpy (host, "localhost", hostlen);
break;
default:
- return -1;
+ return EAI_FAMILY;
}
if (serv && (servlen > 0))
@@ -392,7 +395,7 @@ getnameinfo (const struct sockaddr *sa, socklen_t addrlen, char *host,
else
{
__set_errno (serrno);
- return -1;
+ return EAI_SYSTEM;
}
}
else