CHANGES: Add a change backported to 4.99

[tcpdump] / print-ipfc.c

diff --git a/print-ipfc.c b/print-ipfc.c
index c56fc22038fffc9d90b4a1b894065dfdab194429..9aed44852dadada01925ecd8dbaebbf6b2df319a 100644 (file)
--- a/print-ipfc.c
+++ b/print-ipfc.c
@@ -23,50 +23,49 @@
 
 /* specification: RFC 2625 */
 
 
 /* specification: RFC 2625 */
 

-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <config.h>

 
 

-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"

 
 #include <string.h>
 
 
 #include <string.h>
 

+#define ND_LONGJMP_FROM_TCHECK

 #include "netdissect.h"
 #include "addrtoname.h"
 
 #include "netdissect.h"
 #include "addrtoname.h"
 

+

 struct ipfc_header {
 struct ipfc_header {

-       nd_byte ipfc_dhost[2+MAC_ADDR_LEN];
-       nd_byte ipfc_shost[2+MAC_ADDR_LEN];
+       nd_byte ipfc_dhost[2+MAC48_LEN];
+       nd_byte ipfc_shost[2+MAC48_LEN];

 };
 
 #define IPFC_HDRLEN 16
 
 /* Extract src, dst addresses */
 };
 
 #define IPFC_HDRLEN 16
 
 /* Extract src, dst addresses */

-static inline void
+static void

 extract_ipfc_addrs(const struct ipfc_header *ipfcp, char *ipfcsrc,
 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
         * source and destination addresses are MAC addresses.
         */
 {
        /*
         * We assume that, as per RFC 2625, the lower 48 bits of the
         * source and destination addresses are MAC addresses.
         */

-       memcpy(ipfcdst, (const char *)&ipfcp->ipfc_dhost[2], MAC_ADDR_LEN);
-       memcpy(ipfcsrc, (const char *)&ipfcp->ipfc_shost[2], MAC_ADDR_LEN);
+       memcpy(ipfcdst, (const char *)&ipfcp->ipfc_dhost[2], MAC48_LEN);
+       memcpy(ipfcsrc, (const char *)&ipfcp->ipfc_shost[2], MAC48_LEN);

 }
 
 /*
  * Print the Network_Header
  */
 }
 
 /*
  * Print the Network_Header
  */

-static inline void
+static void

 ipfc_hdr_print(netdissect_options *ndo,
 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;
 
 {
        const char *srcname, *dstname;
 

-       srcname = etheraddr_string(ndo, ipfcsrc);
-       dstname = etheraddr_string(ndo, ipfcdst);
+       srcname = mac48_string(ndo, ipfcsrc);
+       dstname = mac48_string(ndo, ipfcdst);

 
        /*
         * XXX - should we show the upper 16 bits of the addresses?
 
        /*
         * XXX - should we show the upper 16 bits of the addresses?


@@ -90,14 +89,12 @@ static u_int
 ipfc_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen)
 {
        const struct ipfc_header *ipfcp = (const struct ipfc_header *)p;
 ipfc_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen)
 {
        const struct ipfc_header *ipfcp = (const struct ipfc_header *)p;

-       nd_mac_addr srcmac, dstmac;
+       nd_mac48 srcmac, dstmac;

        struct lladdr_info src, dst;
        int llc_hdrlen;
 
        struct lladdr_info src, dst;
        int llc_hdrlen;
 

-       if (caplen < IPFC_HDRLEN) {
-               ND_PRINT("[|ipfc]");
-               return (caplen);
-       }
+       ndo->ndo_protocol = "ipfc";
+       ND_TCHECK_LEN(p, IPFC_HDRLEN);

        /*
         * Get the network addresses into a canonical form
         */
        /*
         * Get the network addresses into a canonical form
         */


@@ -107,9 +104,9 @@ ipfc_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen)
                ipfc_hdr_print(ndo, ipfcp, length, srcmac, dstmac);
 
        src.addr = srcmac;
                ipfc_hdr_print(ndo, ipfcp, length, srcmac, dstmac);
 
        src.addr = srcmac;

-       src.addr_string = etheraddr_string;
+       src.addr_string = mac48_string;

        dst.addr = dstmac;
        dst.addr = dstmac;

-       dst.addr_string = etheraddr_string;
+       dst.addr_string = mac48_string;

 
        /* Skip over Network_Header */
        length -= IPFC_HDRLEN;
 
        /* Skip over Network_Header */
        length -= IPFC_HDRLEN;


@@ -136,8 +133,9 @@ ipfc_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen)
  * 'h->len' is the length of the packet off the wire, and 'h->caplen'
  * is the number of bytes actually captured.
  */
  * 'h->len' is the length of the packet off the wire, and 'h->caplen'
  * is the number of bytes actually captured.
  */

-u_int
+void

 ipfc_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p)
 {
 ipfc_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p)
 {

-       return (ipfc_print(ndo, p, h->len, h->caplen));
+       ndo->ndo_protocol = "ipfc";
+       ndo->ndo_ll_hdr_len += ipfc_print(ndo, p, h->len, h->caplen);

 }
 }