diff options
author | soren <soren@pkgsrc.org> | 2000-06-17 19:48:44 +0000 |
---|---|---|
committer | soren <soren@pkgsrc.org> | 2000-06-17 19:48:44 +0000 |
commit | 390acad27776d42af5b37cbfe551f61dbcc78cb7 (patch) | |
tree | ff34459e956121d8bcbd73e51746ffb422ad0c07 /net/pchar/patches | |
parent | 8de9504c84e246b019e61052e52228160d85539d (diff) | |
download | pkgsrc-390acad27776d42af5b37cbfe551f61dbcc78cb7.tar.gz |
Patch now integrated.
Diffstat (limited to 'net/pchar/patches')
-rw-r--r-- | net/pchar/patches/patch-aa | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/net/pchar/patches/patch-aa b/net/pchar/patches/patch-aa deleted file mode 100644 index d20fc0e775a..00000000000 --- a/net/pchar/patches/patch-aa +++ /dev/null @@ -1,59 +0,0 @@ -$NetBSD: patch-aa,v 1.3 2000/05/27 08:46:58 itojun Exp $ - -Index: PctestIpv6.cc -=================================================================== -RCS file: /cvsroot/apps/pchar/PctestIpv6.cc,v -retrieving revision 1.1.1.1 -retrieving revision 1.3 -diff -u -r1.1.1.1 -r1.3 ---- PctestIpv6.cc 2000/05/27 08:18:36 1.1.1.1 -+++ PctestIpv6.cc 2000/05/27 08:41:33 1.3 -@@ -210,28 +210,28 @@ - // - char *PctestIpv6::GetName(void *a) - { -- struct addrinfo *host, hints; -- char *h_name; -- int error_num; -+ static char hbuf[NI_MAXHOST]; -+ struct sockaddr_in6 sin6; -+ int niflags; - -- memset(&hints, 0, sizeof(hints)); -- hints.ai_family = PF_INET6; -- getaddrinfo((char *) a, NULL, &hints, &host); -+ memset(&sin6, 0, sizeof(sin6)); -+ sin6.sin6_family = AF_INET6; -+#ifdef HAVE_SOCKADDR_SA_LEN -+ sin6.sin6_len = sizeof(struct sockaddr_in6); -+#endif -+ memcpy(&sin6.sin6_addr, a, sizeof(sin6.sin6_addr)); -+ /* XXX scope */ - -- if (host) { -- -- h_name = host->ai_canonname; -- /* -- * XXX We don't free the addrinfo, since we return the canonname field. -- */ -- -- /* freeaddrinfo(host); */ -- return h_name; -- } -- else { -- return (GetPrintableAddress(a)); -- } -- -+#if 0 -+ niflags = NumericFlag ? NI_NUMERICHOST : 0; -+#else -+ niflags = NI_NUMERICHOST; -+#endif -+ if (getnameinfo((struct sockaddr *)&sin6, sizeof(struct sockaddr_in6), -+ hbuf, sizeof(hbuf), NULL, 0, niflags) == 0) { -+ return hbuf; -+ } else -+ return "(invalid)"; - } - - // |