Makefile.in: don't remove configure and config.h.in in make distclean.

[tcpdump] / print-vsock.c

diff --git a/print-vsock.c b/print-vsock.c
index 6d8a44e1433e7ada1af03d658e777988b9ad1b36..1fd09fce25c16193e6f639a2a07bb4ff6202c29a 100644 (file)
--- a/print-vsock.c
+++ b/print-vsock.c
@@ -24,12 +24,13 @@
 /* \summary: Linux vsock printer */
 
 #ifdef HAVE_CONFIG_H
 /* \summary: Linux vsock printer */
 
 #ifdef HAVE_CONFIG_H

-#include "config.h"
+#include <config.h>

 #endif
 
 #include "netdissect-stdinc.h"
 #include <stddef.h>
 
 #endif
 
 #include "netdissect-stdinc.h"
 #include <stddef.h>
 

+#define ND_LONGJMP_FROM_TCHECK

 #include "netdissect.h"
 #include "extract.h"
 
 #include "netdissect.h"
 #include "extract.h"
 


@@ -127,33 +128,36 @@ vsock_virtio_hdr_print(netdissect_options *ndo, const struct virtio_vsock_hdr *h
        uint16_t u16_v;
        uint32_t u32_v;
 
        uint16_t u16_v;
        uint32_t u32_v;
 

-       u32_v = GET_LE_U_4(&hdr->len);
+       u32_v = GET_LE_U_4(hdr->len);

        ND_PRINT("len %u", u32_v);
 
        ND_PRINT("len %u", u32_v);
 

-       u16_v = GET_LE_U_2(&hdr->type);
+       u16_v = GET_LE_U_2(hdr->type);

        ND_PRINT(", type %s",
                 tok2str(virtio_type, "Invalid type (%hu)", u16_v));
 
        ND_PRINT(", type %s",
                 tok2str(virtio_type, "Invalid type (%hu)", u16_v));
 

-       u16_v = GET_LE_U_2(&hdr->op);
+       u16_v = GET_LE_U_2(hdr->op);

        ND_PRINT(", op %s",
                 tok2str(virtio_op, "Invalid op (%hu)", u16_v));
 
        ND_PRINT(", op %s",
                 tok2str(virtio_op, "Invalid op (%hu)", u16_v));
 

-       u32_v = GET_LE_U_4(&hdr->flags);
+       u32_v = GET_LE_U_4(hdr->flags);

        ND_PRINT(", flags %x", u32_v);
 
        ND_PRINT(", flags %x", u32_v);
 

-       u32_v = GET_LE_U_4(&hdr->buf_alloc);
+       u32_v = GET_LE_U_4(hdr->buf_alloc);

        ND_PRINT(", buf_alloc %u", u32_v);
 
        ND_PRINT(", buf_alloc %u", u32_v);
 

-       u32_v = GET_LE_U_4(&hdr->fwd_cnt);
+       u32_v = GET_LE_U_4(hdr->fwd_cnt);

        ND_PRINT(", fwd_cnt %u", u32_v);
 }
 
        ND_PRINT(", fwd_cnt %u", u32_v);
 }
 

-static size_t
+/*
+ * This size had better fit in a u_int.
+ */
+static u_int

 vsock_transport_hdr_size(uint16_t transport)
 {
        switch (transport) {
                case AF_VSOCK_TRANSPORT_VIRTIO:
 vsock_transport_hdr_size(uint16_t transport)
 {
        switch (transport) {
                case AF_VSOCK_TRANSPORT_VIRTIO:

-                       return sizeof(struct virtio_vsock_hdr);
+                       return (u_int)sizeof(struct virtio_vsock_hdr);

                default:
                        return 0;
        }
                default:
                        return 0;
        }


@@ -162,12 +166,12 @@ vsock_transport_hdr_size(uint16_t transport)
 /* Returns 0 on success, -1 on truncation */
 static int
 vsock_transport_hdr_print(netdissect_options *ndo, uint16_t transport,
 /* Returns 0 on success, -1 on truncation */
 static int
 vsock_transport_hdr_print(netdissect_options *ndo, uint16_t transport,

-                          const u_char *p, const u_int len)
+                          const u_char *p, const u_int caplen)

 {
 {

-       size_t transport_size = vsock_transport_hdr_size(transport);
+       u_int transport_size = vsock_transport_hdr_size(transport);

        const void *hdr;
 
        const void *hdr;
 

-       if (len < sizeof(struct af_vsockmon_hdr) + transport_size) {
+       if (caplen < sizeof(struct af_vsockmon_hdr) + transport_size) {

                return -1;
        }
 
                return -1;
        }
 


@@ -185,52 +189,53 @@ vsock_transport_hdr_print(netdissect_options *ndo, uint16_t transport,
 }
 
 static void
 }
 
 static void

-vsock_hdr_print(netdissect_options *ndo, const u_char *p, const u_int len)
+vsock_hdr_print(netdissect_options *ndo, const u_char *p, const u_int caplen)

 {
        const struct af_vsockmon_hdr *hdr = (const struct af_vsockmon_hdr *)p;
        uint16_t hdr_transport, hdr_op;
        uint32_t hdr_src_port, hdr_dst_port;
        uint64_t hdr_src_cid, hdr_dst_cid;
 {
        const struct af_vsockmon_hdr *hdr = (const struct af_vsockmon_hdr *)p;
        uint16_t hdr_transport, hdr_op;
        uint32_t hdr_src_port, hdr_dst_port;
        uint64_t hdr_src_cid, hdr_dst_cid;

-       size_t total_hdr_size;
+       u_int total_hdr_size;

        int ret = 0;
 
        int ret = 0;
 

-       hdr_transport = GET_LE_U_2(&hdr->transport);
+       hdr_transport = GET_LE_U_2(hdr->transport);

        ND_PRINT("%s",
                 tok2str(vsock_transport, "Invalid transport (%u)",
                          hdr_transport));
 
        /* If verbose level is more than 0 print transport details */
        if (ndo->ndo_vflag) {
        ND_PRINT("%s",
                 tok2str(vsock_transport, "Invalid transport (%u)",
                          hdr_transport));
 
        /* If verbose level is more than 0 print transport details */
        if (ndo->ndo_vflag) {

-               ret = vsock_transport_hdr_print(ndo, hdr_transport, p, len);
+               ret = vsock_transport_hdr_print(ndo, hdr_transport, p, caplen);

                if (ret == 0)
                        ND_PRINT("\n\t");
        } else
                ND_PRINT(" ");
 
                if (ret == 0)
                        ND_PRINT("\n\t");
        } else
                ND_PRINT(" ");
 

-       hdr_src_cid = GET_LE_U_8(&hdr->src_cid);
-       hdr_dst_cid = GET_LE_U_8(&hdr->dst_cid);
-       hdr_src_port = GET_LE_U_4(&hdr->src_port);
-       hdr_dst_port = GET_LE_U_4(&hdr->dst_port);
-       hdr_op = GET_LE_U_2(&hdr->op);
+       hdr_src_cid = GET_LE_U_8(hdr->src_cid);
+       hdr_dst_cid = GET_LE_U_8(hdr->dst_cid);
+       hdr_src_port = GET_LE_U_4(hdr->src_port);
+       hdr_dst_port = GET_LE_U_4(hdr->dst_port);
+       hdr_op = GET_LE_U_2(hdr->op);

        ND_PRINT("%" PRIu64 ".%u > %" PRIu64 ".%u %s, length %u",
                 hdr_src_cid, hdr_src_port,
                 hdr_dst_cid, hdr_dst_port,
                 tok2str(vsock_op, " invalid op (%u)", hdr_op),
        ND_PRINT("%" PRIu64 ".%u > %" PRIu64 ".%u %s, length %u",
                 hdr_src_cid, hdr_src_port,
                 hdr_dst_cid, hdr_dst_port,
                 tok2str(vsock_op, " invalid op (%u)", hdr_op),

-                len);
+                caplen);

 
        if (ret < 0)
                goto trunc;
 
        /* If debug level is more than 1 print payload contents */
 
        if (ret < 0)
                goto trunc;
 
        /* If debug level is more than 1 print payload contents */

-       total_hdr_size = sizeof(struct af_vsockmon_hdr) +
+       /* This size had better fit in a u_int */
+       total_hdr_size = (u_int)sizeof(struct af_vsockmon_hdr) +

                         vsock_transport_hdr_size(hdr_transport);
        if (ndo->ndo_vflag > 1 && hdr_op == AF_VSOCK_OP_PAYLOAD) {
                         vsock_transport_hdr_size(hdr_transport);
        if (ndo->ndo_vflag > 1 && hdr_op == AF_VSOCK_OP_PAYLOAD) {

-               if (len > total_hdr_size) {
+               if (caplen > total_hdr_size) {

                        const u_char *payload = p + total_hdr_size;
 
                        ND_PRINT("\n");
                        print_unknown_data(ndo, payload, "\t",
                        const u_char *payload = p + total_hdr_size;
 
                        ND_PRINT("\n");
                        print_unknown_data(ndo, payload, "\t",

-                                          len - total_hdr_size);
+                                          caplen - total_hdr_size);

                } else
                        goto trunc;
        }
                } else
                        goto trunc;
        }


@@ -240,18 +245,13 @@ trunc:
        nd_print_trunc(ndo);
 }
 
        nd_print_trunc(ndo);
 }
 

-u_int
+void

 vsock_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
               const u_char *cp)
 {
 vsock_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
               const u_char *cp)
 {

-       u_int len = h->caplen;
-

        ndo->ndo_protocol = "vsock";
 
        ndo->ndo_protocol = "vsock";
 

-       if (len < sizeof(struct af_vsockmon_hdr))
-               nd_print_trunc(ndo);
-       else
-               vsock_hdr_print(ndo, cp, len);
-
-       return len;
+       ND_TCHECK_LEN(cp, sizeof(struct af_vsockmon_hdr));
+       ndo->ndo_ll_hdr_len += sizeof(struct af_vsockmon_hdr);
+       vsock_hdr_print(ndo, cp, h->caplen);

 }
 }