PIM: refresh and use tok2str()

[tcpdump] / print-vqp.c

diff --git a/print-vqp.c b/print-vqp.c
index 3245b33206d022824f3d7ebd57df2d3a02bea4b8..a316b0cd116b26711e8550774ccc388ad079be1f 100644 (file)
--- a/print-vqp.c
+++ b/print-vqp.c
@@ -17,13 +17,14 @@
  * Original code by Carles Kishimoto <[email protected]>
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 
-#include "netdissect.h"
+#include "interface.h"
 #include "extract.h"
 #include "addrtoname.h"
 
@@ -171,19 +172,19 @@ vqp_print(netdissect_options *ndo, register const u_char *pptr, register u_int l
 
         switch(vqp_obj_type) {
        case VQP_OBJ_IP_ADDRESS:
-            ND_PRINT((ndo, "%s (0x%08x)", ipaddr_string(tptr), EXTRACT_32BITS(tptr)));
+            ND_PRINT((ndo, "%s (0x%08x)", ipaddr_string(ndo, tptr), EXTRACT_32BITS(tptr)));
             break;
             /* those objects have similar semantics - fall through */
         case VQP_OBJ_PORT_NAME:
        case VQP_OBJ_VLAN_NAME:
        case VQP_OBJ_VTP_DOMAIN:
        case VQP_OBJ_ETHERNET_PKT:
-            safeputs((const char *)tptr, vqp_obj_len);
+            safeputs(ndo, tptr, vqp_obj_len);
             break;
             /* those objects have similar semantics - fall through */
        case VQP_OBJ_MAC_ADDRESS:
        case VQP_OBJ_MAC_NULL:
-             ND_PRINT((ndo, "%s", etheraddr_string(tptr)));
+             ND_PRINT((ndo, "%s", etheraddr_string(ndo, tptr)));
               break;
         default:
             if (ndo->ndo_vflag <= 1)