Add printing support for vsockmon devices.

[tcpdump] / print-ipfc.c

diff --git a/print-ipfc.c b/print-ipfc.c
index 2ba51271876be554b9b3e54588be594baeabb798..7add1b7b0965cbdc358fd8d274dcdef19ea4d11d 100644 (file)
--- a/print-ipfc.c
+++ b/print-ipfc.c
@@ -24,16 +24,17 @@
 /* specification: RFC 2625 */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 
 #include <string.h>
 
 #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,
-          register const struct ipfc_header *ipfcp _U_,
-          register u_int length, register const u_char *ipfcsrc,
-          register 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;
 
@@ -83,7 +83,7 @@ ipfc_hdr_print(netdissect_options *ndo,
         * so, for captures following this specification, the upper 16
         * bits should be 0x1000, followed by a MAC address.
         */
-       ND_PRINT((ndo, "%s > %s, length %u: ", srcname, dstname, length));
+       ND_PRINT("%s > %s, length %u: ", srcname, dstname, length);
 }
 
 static u_int
@@ -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((ndo, "[|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;
 }
 
 /*
@@ -137,7 +140,8 @@ ipfc_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen)
  * is the number of bytes actually captured.
  */
 u_int
-ipfc_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, register const u_char *p)
+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));
 }