diff options
| author | Yoshinobu Inoue <shin@FreeBSD.org> | 2000-02-19 16:10:16 +0000 |
|---|---|---|
| committer | Yoshinobu Inoue <shin@FreeBSD.org> | 2000-02-19 16:10:16 +0000 |
| commit | 0ca229d64d13381cb45c8e73c54fd8bd67aa92d8 (patch) | |
| tree | 72f8866991d9743af43e911a9f11186d62ceb921 /lib/libc/net | |
| parent | 6d939e82e0d6b54be01c0c7323db0c4c0121a82b (diff) | |
Notes
Diffstat (limited to 'lib/libc/net')
| -rw-r--r-- | lib/libc/net/getaddrinfo.c | 4 | ||||
| -rw-r--r-- | lib/libc/net/getnameinfo.c | 11 |
2 files changed, 6 insertions, 9 deletions
diff --git a/lib/libc/net/getaddrinfo.c b/lib/libc/net/getaddrinfo.c index 8b6d6b725190..a1f2726a1f86 100644 --- a/lib/libc/net/getaddrinfo.c +++ b/lib/libc/net/getaddrinfo.c @@ -709,7 +709,7 @@ explore_numeric_scope(pai, hostname, servname, res) switch (pai->ai_family) { #ifdef INET6 case AF_INET6: - scope = if_nametoindex(hostname2); + scope = if_nametoindex(cp); if (scope == 0) { error = EAI_SYSTEM; goto free; @@ -718,7 +718,7 @@ explore_numeric_scope(pai, hostname, servname, res) #endif } - error = explore_numeric(pai, cp, servname, res); + error = explore_numeric(pai, hostname2, servname, res); if (error == 0) { for (cur = *res; cur; cur = cur->ai_next) { #ifdef INET6 diff --git a/lib/libc/net/getnameinfo.c b/lib/libc/net/getnameinfo.c index 42f7906ee9f9..5edcffb9498c 100644 --- a/lib/libc/net/getnameinfo.c +++ b/lib/libc/net/getnameinfo.c @@ -199,14 +199,11 @@ getnameinfo(sa, salen, host, hostlen, serv, servlen, flags) + scopelen > hostlen) return ENI_MEMORY; /* - * Shift the host string to allocate - * space for the scope ID part. + * Construct <numeric-addr><delim><scopeid> */ - memmove(host + scopelen + 1, host, numaddrlen); - /* copy the scope ID and the delimiter */ - memcpy(host, ifname, scopelen); - host[scopelen] = SCOPE_DELIMITER; - host[scopelen + 1 + numaddrlen] = '\0'; + memcpy(host + numaddrlen + 1, ifname, scopelen); + host[numaddrlen] = SCOPE_DELIMITER; + host[numaddrlen + 1 + scopelen] = '\0'; } } #endif /* INET6 */ |