Merge pull request #916 from stevekay/master

[tcpdump] / print-arp.c

diff --git a/print-arp.c b/print-arp.c
index 7cbe781628a69fd355392ee6c805a14e5222870e..7d3efe74fa02e74b2e9f092338d3111a98cda594 100644 (file)
--- a/print-arp.c
+++ b/print-arp.c
@@ -27,8 +27,6 @@
 
 #include "netdissect-stdinc.h"
 
-#include <string.h>
-
 #define ND_LONGJMP_FROM_TCHECK
 #include "netdissect.h"
 #include "addrtoname.h"
@@ -426,8 +424,16 @@ arp_print(netdissect_options *ndo,
                break;
 
        case ARPOP_REVREQUEST:
-               ND_PRINT("who-is %s tell %s",
-                         GET_LINKADDR_STRING(THA(ap), linkaddr, HRD_LEN(ap)),
+               /*
+                * XXX - GET_LINKADDR_STRING() may return a pointer to
+                * a static buffer, so we only have one call to it per
+                * ND_PRINT() call.
+                *
+                * This should be done in a cleaner fashion.
+                */
+               ND_PRINT("who-is %s",
+                         GET_LINKADDR_STRING(THA(ap), linkaddr, HRD_LEN(ap)));
+               ND_PRINT(" tell %s",
                          GET_LINKADDR_STRING(SHA(ap), linkaddr, HRD_LEN(ap)));
                break;
 
@@ -438,8 +444,16 @@ arp_print(netdissect_options *ndo,
                break;
 
        case ARPOP_INVREQUEST:
-               ND_PRINT("who-is %s tell %s",
-                         GET_LINKADDR_STRING(THA(ap), linkaddr, HRD_LEN(ap)),
+               /*
+                * XXX - GET_LINKADDR_STRING() may return a pointer to
+                * a static buffer, so we only have one call to it per
+                * ND_PRINT() call.
+                *
+                * This should be done in a cleaner fashion.
+                */
+               ND_PRINT("who-is %s",
+                         GET_LINKADDR_STRING(THA(ap), linkaddr, HRD_LEN(ap)));
+               ND_PRINT(" tell %s",
                          GET_LINKADDR_STRING(SHA(ap), linkaddr, HRD_LEN(ap)));
                break;