2004-11-29 05:08:29 +01:00
|
|
|
--- snmplib/snmpTCPIPv6Domain.c.orig Sat Oct 16 03:52:29 2004
|
|
|
|
|
+++ snmplib/snmpTCPIPv6Domain.c Mon Oct 25 09:22:06 2004
|
|
|
|
|
@@ -95,13 +95,21 @@
|
2002-07-25 13:03:01 +02:00
|
|
|
if (to == NULL) {
|
|
|
|
|
return strdup("TCP/IPv6: unknown");
|
|
|
|
|
} else {
|
2002-10-06 11:35:21 +02:00
|
|
|
- char addr[INET6_ADDRSTRLEN];
|
|
|
|
|
- char tmp[INET6_ADDRSTRLEN + 8];
|
|
|
|
|
+ char tmp[NI_MAXHOST];
|
2002-07-25 13:03:01 +02:00
|
|
|
|
2004-11-29 05:08:29 +01:00
|
|
|
- sprintf(tmp, "TCP/IPv6: [%s]:%hd",
|
2002-07-25 13:03:01 +02:00
|
|
|
- inet_ntop(AF_INET6, (void *) &(to->sin6_addr), addr,
|
|
|
|
|
- INET6_ADDRSTRLEN), ntohs(to->sin6_port));
|
|
|
|
|
- return strdup(tmp);
|
|
|
|
|
+/*
|
|
|
|
|
+ * NI_WITHSCOPEID will be obsoleted. But some implementations require
|
|
|
|
|
+ * this flag to retrieve scoped name.
|
|
|
|
|
+ * (2002-07-25: kuriyama@FreeBSD.org)
|
|
|
|
|
+ */
|
|
|
|
|
+#ifndef NI_WITHSCOPEID
|
|
|
|
|
+#define NI_WITHSCOPEID 0
|
|
|
|
|
+#endif
|
|
|
|
|
+ if (getnameinfo(to, sizeof(struct sockaddr_in6), tmp, sizeof(tmp),
|
|
|
|
|
+ NULL, 0, NI_NUMERICHOST | NI_WITHSCOPEID)) {
|
|
|
|
|
+ return strdup("UDP/IPv6: unknown");
|
|
|
|
|
+ }
|
|
|
|
|
+ return strdup(tmp);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
