Add printing support for vsockmon devices.

[tcpdump] / print-ipfc.c

diff --git a/print-ipfc.c b/print-ipfc.c
index 8205c978f8a732d6330a91f16130d349a73e732a..7add1b7b0965cbdc358fd8d274dcdef19ea4d11d 100644 (file)
--- a/print-ipfc.c
+++ b/print-ipfc.c
@@ -34,6 +34,7 @@
 #include "netdissect.h"
 #include "addrtoname.h"
 
+
 struct ipfc_header {
        nd_byte ipfc_dhost[2+MAC_ADDR_LEN];
        nd_byte ipfc_shost[2+MAC_ADDR_LEN];
@@ -42,9 +43,9 @@ struct ipfc_header {
 #define IPFC_HDRLEN 16
 
 /* Extract src, dst addresses */
-static inline void
+static void
 extract_ipfc_addrs(const struct ipfc_header *ipfcp, char *ipfcsrc,
-    char *ipfcdst)
+                  char *ipfcdst)
 {
        /*
         * We assume that, as per RFC 2625, the lower 48 bits of the
@@ -57,11 +58,10 @@ extract_ipfc_addrs(const struct ipfc_header *ipfcp, char *ipfcsrc,
 /*
  * Print the Network_Header
  */
-static inline void
+static void
 ipfc_hdr_print(netdissect_options *ndo,
-          const struct ipfc_header *ipfcp _U_,
-          u_int length, const u_char *ipfcsrc,
-          const u_char *ipfcdst)
+              const struct ipfc_header *ipfcp _U_, u_int length,
+              const u_char *ipfcsrc, const u_char *ipfcdst)
 {
        const char *srcname, *dstname;
 
@@ -94,13 +94,13 @@ ipfc_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen)
        struct lladdr_info src, dst;
        int llc_hdrlen;
 
-       if (caplen < IPFC_HDRLEN) {
-               ND_PRINT("[|ipfc]");
-               return (caplen);
-       }
+       ndo->ndo_protocol = "ipfc";
+       if (caplen < IPFC_HDRLEN)
+               goto trunc;
        /*
         * Get the network addresses into a canonical form
         */
+       ND_TCHECK_SIZE(ipfcp);
        extract_ipfc_addrs(ipfcp, (char *)srcmac, (char *)dstmac);
 
        if (ndo->ndo_eflag)
@@ -128,6 +128,9 @@ ipfc_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen)
                llc_hdrlen = -llc_hdrlen;
        }
        return (IPFC_HDRLEN + llc_hdrlen);
+trunc:
+       nd_print_trunc(ndo);
+       return caplen;
 }
 
 /*
@@ -139,5 +142,6 @@ ipfc_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen)
 u_int
 ipfc_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p)
 {
+       ndo->ndo_protocol = "ipfc_if";
        return (ipfc_print(ndo, p, h->len, h->caplen));
 }