|
 |
c504094 |
diff -up tcpdump-4.5.0/addrtoname.c.gethostby tcpdump-4.5.0/addrtoname.c
|
|
|
4d79e32 |
--- tcpdump-4.5.0/addrtoname.c.gethostby 2013-11-08 09:03:52.166752012 +0100
|
|
|
4d79e32 |
+++ tcpdump-4.5.0/addrtoname.c 2013-11-08 09:04:57.792747210 +0100
|
|
|
c504094 |
@@ -224,7 +224,6 @@ static u_int32_t f_localnet;
|
|
 |
0b97fc6 |
const char *
|
|
|
0b97fc6 |
getname(const u_char *ap)
|
|
|
0b97fc6 |
{
|
|
|
0b97fc6 |
- register struct hostent *hp;
|
|
|
0b97fc6 |
u_int32_t addr;
|
|
|
0b97fc6 |
static struct hnamemem *p; /* static for longjmp() */
|
|
|
0b97fc6 |
|
|
|
c504094 |
@@ -246,6 +245,28 @@ getname(const u_char *ap)
|
|
|
0b97fc6 |
*/
|
|
|
0b97fc6 |
if (!nflag &&
|
|
|
0b97fc6 |
(addr & f_netmask) == f_localnet) {
|
|
|
0b97fc6 |
+#ifdef HAVE_GETNAMEINFO
|
|
|
0b97fc6 |
+ struct sockaddr_in sa;
|
|
|
0b97fc6 |
+ char hbuf[NI_MAXHOST];
|
|
|
0b97fc6 |
+
|
|
|
0b97fc6 |
+ memset(&sa, 0, sizeof (sa));
|
|
|
0b97fc6 |
+ sa.sin_family = AF_INET;
|
|
|
0b97fc6 |
+ sa.sin_addr.s_addr = addr;
|
|
|
0b97fc6 |
+ if (!getnameinfo((struct sockaddr *)&sa, sizeof (sa),
|
|
|
0b97fc6 |
+ hbuf, sizeof (hbuf), NULL, 0, 0)) {
|
|
|
0b97fc6 |
+ if (Nflag) {
|
|
|
0b97fc6 |
+ char *dotp;
|
|
|
0b97fc6 |
+
|
|
|
0b97fc6 |
+ /* Remove domain qualifications */
|
|
|
0b97fc6 |
+ dotp = strchr(hbuf, '.');
|
|
|
0b97fc6 |
+ if (dotp)
|
|
|
0b97fc6 |
+ *dotp = '\0';
|
|
|
0b97fc6 |
+ }
|
|
|
0b97fc6 |
+ p->name = strdup(hbuf);
|
|
|
0b97fc6 |
+ return p->name;
|
|
|
0b97fc6 |
+ }
|
|
|
0b97fc6 |
+#else
|
|
|
0b97fc6 |
+ register struct hostent *hp;
|
|
|
0b97fc6 |
hp = gethostbyaddr((char *)&addr, 4, AF_INET);
|
|
|
0b97fc6 |
if (hp) {
|
|
|
0b97fc6 |
char *dotp;
|
|
|
c504094 |
@@ -259,6 +280,7 @@ getname(const u_char *ap)
|
|
|
0b97fc6 |
}
|
|
|
0b97fc6 |
return (p->name);
|
|
|
0b97fc6 |
}
|
|
|
0b97fc6 |
+#endif
|
|
|
0b97fc6 |
}
|
|
|
0b97fc6 |
p->name = strdup(intoa(addr));
|
|
|
0b97fc6 |
return (p->name);
|
|
|
c504094 |
@@ -272,7 +294,6 @@ getname(const u_char *ap)
|
|
|
0b97fc6 |
const char *
|
|
|
0b97fc6 |
getname6(const u_char *ap)
|
|
|
0b97fc6 |
{
|
|
|
0b97fc6 |
- register struct hostent *hp;
|
|
|
c504094 |
union {
|
|
|
c504094 |
struct in6_addr addr;
|
|
|
c504094 |
struct for_hash_addr {
|
|
|
c504094 |
@@ -297,6 +318,28 @@ getname6(const u_char *ap)
|
|
|
0b97fc6 |
* Do not print names if -n was given.
|
|
|
0b97fc6 |
*/
|
|
|
0b97fc6 |
if (!nflag) {
|
|
|
0b97fc6 |
+#ifdef HAVE_GETNAMEINFO
|
|
|
0b97fc6 |
+ struct sockaddr_in6 sa;
|
|
|
0b97fc6 |
+ char hbuf[NI_MAXHOST];
|
|
|
0b97fc6 |
+
|
|
|
0b97fc6 |
+ memset(&sa, 0, sizeof (sa));
|
|
|
0b97fc6 |
+ sa.sin6_family = AF_INET6;
|
|
|
4d79e32 |
+ sa.sin6_addr = addr.addr;
|
|
|
0b97fc6 |
+ if (!getnameinfo((struct sockaddr *)&sa, sizeof (sa),
|
|
|
0b97fc6 |
+ hbuf, sizeof (hbuf), NULL, 0, 0)) {
|
|
|
0b97fc6 |
+ if (Nflag) {
|
|
|
0b97fc6 |
+ char *dotp;
|
|
|
0b97fc6 |
+
|
|
|
0b97fc6 |
+ /* Remove domain qualifications */
|
|
|
0b97fc6 |
+ dotp = strchr(hbuf, '.');
|
|
|
0b97fc6 |
+ if (dotp)
|
|
|
0b97fc6 |
+ *dotp = '\0';
|
|
|
0b97fc6 |
+ }
|
|
|
0b97fc6 |
+ p->name = strdup(hbuf);
|
|
|
0b97fc6 |
+ return p->name;
|
|
|
0b97fc6 |
+ }
|
|
|
0b97fc6 |
+#else
|
|
|
0b97fc6 |
+ register struct hostent *hp;
|
|
|
0b97fc6 |
hp = gethostbyaddr((char *)&addr, sizeof(addr), AF_INET6);
|
|
|
0b97fc6 |
if (hp) {
|
|
|
0b97fc6 |
char *dotp;
|
|
|
c504094 |
@@ -310,6 +353,7 @@ getname6(const u_char *ap)
|
|
|
0b97fc6 |
}
|
|
|
0b97fc6 |
return (p->name);
|
|
|
0b97fc6 |
}
|
|
|
0b97fc6 |
+#endif
|
|
|
0b97fc6 |
}
|
|
|
0b97fc6 |
cp = inet_ntop(AF_INET6, &addr, ntop_buf, sizeof(ntop_buf));
|
|
|
0b97fc6 |
p->name = strdup(cp);
|