Fix printing of Linux cooked captures with monitor-mode packets.

[tcpdump] / print-vqp.c

diff --git a/print-vqp.c b/print-vqp.c
index 21d89fc29603ca36acad6ebe9b041fb7142ccfbb..90cf8ddfef9bf785395447184afafb7054dc9834 100644 (file)
--- a/print-vqp.c
+++ b/print-vqp.c
@@ -12,29 +12,21 @@
  * LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
  * FOR A PARTICULAR PURPOSE.
  *
  * LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
  * FOR A PARTICULAR PURPOSE.
  *

- * support for the Cisco prop. VQP Protocol 
- *

  * Original code by Carles Kishimoto <[email protected]>
  */
 
  * Original code by Carles Kishimoto <[email protected]>
  */
 

-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-vqp.c,v 1.1 2006-03-03 22:31:16 hannes Exp $";
-#endif
+/* \summary: Cisco VLAN Query Protocol (VQP) printer */

 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

-#include <tcpdump-stdinc.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <netdissect-stdinc.h>

 
 

-#include "interface.h"
+#include "netdissect.h"

 #include "extract.h"
 #include "addrtoname.h"
 #include "extract.h"
 #include "addrtoname.h"

+#include "ether.h"

 
 #define VQP_VERSION                            1
 #define VQP_EXTRACT_VERSION(x) ((x)&0xFF)
 
 #define VQP_VERSION                            1
 #define VQP_EXTRACT_VERSION(x) ((x)&0xFF)


@@ -52,23 +44,16 @@ static const char rcsid[] _U_ =
  */
 
 struct vqp_common_header_t {
  */
 
 struct vqp_common_header_t {

-    u_int8_t version;
-    u_int8_t msg_type;
-    u_int8_t error_code;
-    u_int8_t nitems;
-    u_int8_t sequence[4];
-};
-
-struct vqp_tlv_reqjoinport_t {
-    u_int8_t obj_type[4];
-    u_int8_t obj_length[2];
+    uint8_t version;
+    uint8_t msg_type;
+    uint8_t error_code;
+    uint8_t nitems;
+    uint8_t sequence[4];

 };
 
 };
 

-struct vqp_tlv_respvlan_t {
-    u_int8_t obj_type[4];
-    u_int8_t unknown1[8]; /* XXX */
-    u_int8_t obj_length[2];
-    u_int8_t unknown2[4]; /* XXX */
+struct vqp_obj_tlv_t {
+    uint8_t obj_type[4];
+    uint8_t obj_length[2];

 };
 
 #define VQP_OBJ_REQ_JOIN_PORT  0x01
 };
 
 #define VQP_OBJ_REQ_JOIN_PORT  0x01


@@ -112,119 +97,108 @@ static const struct tok vqp_obj_values[] = {
     { 0, NULL}
 };
 
     { 0, NULL}
 };
 

-#define FALSE 0
-#define TRUE  1
-

 void
 void

-vqp_print(register const u_char *pptr, register u_int len) 
+vqp_print(netdissect_options *ndo, register const u_char *pptr, register u_int len)

 {
     const struct vqp_common_header_t *vqp_common_header;
 {
     const struct vqp_common_header_t *vqp_common_header;

-    union {
-        const struct vqp_tlv_reqjoinport_t *reqjoinport;
-        const struct vqp_tlv_respvlan_t *respvlan;
-    } vqp_tlv;
+    const struct vqp_obj_tlv_t *vqp_obj_tlv;

 
     const u_char *tptr;
 
     const u_char *tptr;

-    u_int16_t vqp_obj_len;
-    u_int32_t vqp_obj_type;
-    int tlen, hexdump;
-    u_int8_t nitems;
+    uint16_t vqp_obj_len;
+    uint32_t vqp_obj_type;
+    u_int tlen;
+    uint8_t nitems;

 
     tptr=pptr;
     tlen = len;
     vqp_common_header = (const struct vqp_common_header_t *)pptr;
 
     tptr=pptr;
     tlen = len;
     vqp_common_header = (const struct vqp_common_header_t *)pptr;

-    TCHECK(*vqp_common_header);
+    ND_TCHECK(*vqp_common_header);
+    if (sizeof(struct vqp_common_header_t) > tlen)
+        goto trunc;

 
     /*
      * Sanity checking of the header.
      */
     if (VQP_EXTRACT_VERSION(vqp_common_header->version) != VQP_VERSION) {
 
     /*
      * Sanity checking of the header.
      */
     if (VQP_EXTRACT_VERSION(vqp_common_header->version) != VQP_VERSION) {

-       printf("VQP version %u packet not supported",
-               VQP_EXTRACT_VERSION(vqp_common_header->version));
+       ND_PRINT((ndo, "VQP version %u packet not supported",
+               VQP_EXTRACT_VERSION(vqp_common_header->version)));

        return;
     }
 
     /* in non-verbose mode just lets print the basic Message Type */
        return;
     }
 
     /* in non-verbose mode just lets print the basic Message Type */

-    if (vflag < 1) {
-        printf("VQPv%u %s Message, error-code %s (%u), length %u",
+    if (ndo->ndo_vflag < 1) {
+        ND_PRINT((ndo, "VQPv%u %s Message, error-code %s (%u), length %u",

                VQP_EXTRACT_VERSION(vqp_common_header->version),
                tok2str(vqp_msg_type_values, "unknown (%u)",vqp_common_header->msg_type),
                tok2str(vqp_error_code_values, "unknown (%u)",vqp_common_header->error_code),
               vqp_common_header->error_code,
                VQP_EXTRACT_VERSION(vqp_common_header->version),
                tok2str(vqp_msg_type_values, "unknown (%u)",vqp_common_header->msg_type),
                tok2str(vqp_error_code_values, "unknown (%u)",vqp_common_header->error_code),
               vqp_common_header->error_code,

-               len);
+               len));

         return;
     }
         return;
     }

-    
+

     /* ok they seem to want to know everything - lets fully decode it */
     nitems = vqp_common_header->nitems;
     /* ok they seem to want to know everything - lets fully decode it */
     nitems = vqp_common_header->nitems;

-    printf("\n\tVQPv%u, %s Message, error-code %s (%u), seq 0x%08x, items %u, length %u",
+    ND_PRINT((ndo, "\n\tVQPv%u, %s Message, error-code %s (%u), seq 0x%08x, items %u, length %u",

            VQP_EXTRACT_VERSION(vqp_common_header->version),
           tok2str(vqp_msg_type_values, "unknown (%u)",vqp_common_header->msg_type),
           tok2str(vqp_error_code_values, "unknown (%u)",vqp_common_header->error_code),
           vqp_common_header->error_code,
            EXTRACT_32BITS(&vqp_common_header->sequence),
            nitems,
            VQP_EXTRACT_VERSION(vqp_common_header->version),
           tok2str(vqp_msg_type_values, "unknown (%u)",vqp_common_header->msg_type),
           tok2str(vqp_error_code_values, "unknown (%u)",vqp_common_header->error_code),
           vqp_common_header->error_code,
            EXTRACT_32BITS(&vqp_common_header->sequence),
            nitems,

-           len);
+           len));

 
     /* skip VQP Common header */
     tptr+=sizeof(const struct vqp_common_header_t);
     tlen-=sizeof(const struct vqp_common_header_t);
 
 
     /* skip VQP Common header */
     tptr+=sizeof(const struct vqp_common_header_t);
     tlen-=sizeof(const struct vqp_common_header_t);
 

-    while (nitems > 0) {
+    while (nitems > 0 && tlen > 0) {

 
 

-        switch (vqp_common_header->msg_type) {
-        case VQP_OBJ_REQ_JOIN_PORT:
-            vqp_tlv.reqjoinport = (const struct vqp_tlv_reqjoinport_t *)tptr;
-            vqp_obj_type = EXTRACT_32BITS(vqp_tlv.reqjoinport->obj_type);
-            vqp_obj_len = EXTRACT_16BITS(vqp_tlv.reqjoinport->obj_length);
-            tptr+=sizeof(struct vqp_tlv_reqjoinport_t);
-            tlen-=sizeof(struct vqp_tlv_reqjoinport_t);
-            break;
-        case VQP_OBJ_RESP_VLAN:
-            vqp_tlv.respvlan = (const struct vqp_tlv_respvlan_t *)tptr;
-            vqp_obj_type = EXTRACT_32BITS(vqp_tlv.respvlan->obj_type);
-            vqp_obj_len = EXTRACT_16BITS(vqp_tlv.respvlan->obj_length);
-            tptr+=sizeof(struct vqp_tlv_respvlan_t);
-            tlen-=sizeof(struct vqp_tlv_respvlan_t);
-            break;
-        default:
-            /* bail - don't know the TLV format of the message type */
-            return;
-        }
-
-        /* did we capture enough for fully decoding the object ? */
-        if (!TTEST2(*tptr, vqp_obj_len)) 
+        vqp_obj_tlv = (const struct vqp_obj_tlv_t *)tptr;
+        ND_TCHECK(*vqp_obj_tlv);
+        if (sizeof(struct vqp_obj_tlv_t) > tlen)

             goto trunc;
             goto trunc;

-        hexdump=FALSE;
+        vqp_obj_type = EXTRACT_32BITS(vqp_obj_tlv->obj_type);
+        vqp_obj_len = EXTRACT_16BITS(vqp_obj_tlv->obj_length);
+        tptr+=sizeof(struct vqp_obj_tlv_t);
+        tlen-=sizeof(struct vqp_obj_tlv_t);

 
 

-        printf("\n\t  %s Object (0x%08x), length %u, value: ",
+        ND_PRINT((ndo, "\n\t  %s Object (0x%08x), length %u, value: ",

                tok2str(vqp_obj_values, "Unknown", vqp_obj_type),
                tok2str(vqp_obj_values, "Unknown", vqp_obj_type),

-               vqp_obj_type, vqp_obj_len);
+               vqp_obj_type, vqp_obj_len));

 
         /* basic sanity check */
         if (vqp_obj_type == 0 || vqp_obj_len ==0) {
             return;
         }
 
 
         /* basic sanity check */
         if (vqp_obj_type == 0 || vqp_obj_len ==0) {
             return;
         }
 

+        /* did we capture enough for fully decoding the object ? */
+        ND_TCHECK2(*tptr, vqp_obj_len);
+        if (vqp_obj_len > tlen)
+            goto trunc;
+

         switch(vqp_obj_type) {
        case VQP_OBJ_IP_ADDRESS:
         switch(vqp_obj_type) {
        case VQP_OBJ_IP_ADDRESS:

-            printf("%s (0x%08x)", ipaddr_string(tptr), EXTRACT_32BITS(tptr));
+            if (vqp_obj_len != 4)
+                goto trunc;
+            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:
             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(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:
             break;
             /* those objects have similar semantics - fall through */
        case VQP_OBJ_MAC_ADDRESS:
        case VQP_OBJ_MAC_NULL:

-             printf("%s", etheraddr_string(tptr));
+            if (vqp_obj_len != ETHER_ADDR_LEN)
+                goto trunc;
+             ND_PRINT((ndo, "%s", etheraddr_string(ndo, tptr)));

               break;
         default:
               break;
         default:

-            if (vflag <= 1)
-                print_unknown_data(tptr, "\n\t    ", vqp_obj_len);
+            if (ndo->ndo_vflag <= 1)
+                print_unknown_data(ndo,tptr, "\n\t    ", vqp_obj_len);

             break;
         }
        tptr += vqp_obj_len;
             break;
         }
        tptr += vqp_obj_len;


@@ -233,5 +207,5 @@ vqp_print(register const u_char *pptr, register u_int len)
     }
     return;
 trunc:
     }
     return;
 trunc:

-    printf("\n\t[|VQP]");
+    ND_PRINT((ndo, "\n\t[|VQP]"));

 }
 }