Upgrade tcpdump to tcpdump-4.99.1
Test: make
Change-Id: I052ed8f5279c806e4d2ff925f581b71db3ac03c0
diff --git a/print-ipfc.c b/print-ipfc.c
index b8a08e9..ab5a813 100644
--- a/print-ipfc.c
+++ b/print-ipfc.c
@@ -24,46 +24,45 @@
/* 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>
+#define ND_LONGJMP_FROM_TCHECK
#include "netdissect.h"
#include "addrtoname.h"
-#include "ether.h"
struct ipfc_header {
- u_char ipfc_dhost[8];
- u_char ipfc_shost[8];
+ nd_byte ipfc_dhost[2+MAC_ADDR_LEN];
+ nd_byte ipfc_shost[2+MAC_ADDR_LEN];
};
#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
* source and destination addresses are MAC addresses.
*/
- memcpy(ipfcdst, (const char *)&ipfcp->ipfc_dhost[2], 6);
- memcpy(ipfcsrc, (const char *)&ipfcp->ipfc_shost[2], 6);
+ memcpy(ipfcdst, (const char *)&ipfcp->ipfc_dhost[2], MAC_ADDR_LEN);
+ memcpy(ipfcsrc, (const char *)&ipfcp->ipfc_shost[2], MAC_ADDR_LEN);
}
/*
* 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;
@@ -85,32 +84,30 @@
* 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
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;
- struct ether_header ehdr;
+ nd_mac_addr srcmac, dstmac;
struct lladdr_info src, dst;
int llc_hdrlen;
- if (caplen < IPFC_HDRLEN) {
- ND_PRINT((ndo, "[|ipfc]"));
- return (caplen);
- }
+ ndo->ndo_protocol = "ipfc";
+ ND_TCHECK_LEN(p, IPFC_HDRLEN);
/*
* Get the network addresses into a canonical form
*/
- extract_ipfc_addrs(ipfcp, (char *)ESRC(&ehdr), (char *)EDST(&ehdr));
+ extract_ipfc_addrs(ipfcp, (char *)srcmac, (char *)dstmac);
if (ndo->ndo_eflag)
- ipfc_hdr_print(ndo, ipfcp, length, ESRC(&ehdr), EDST(&ehdr));
+ ipfc_hdr_print(ndo, ipfcp, length, srcmac, dstmac);
- src.addr = ESRC(&ehdr);
+ src.addr = srcmac;
src.addr_string = etheraddr_string;
- dst.addr = EDST(&ehdr);
+ dst.addr = dstmac;
dst.addr_string = etheraddr_string;
/* Skip over Network_Header */
@@ -138,8 +135,9 @@
* 'h->len' is the length of the packet off the wire, and 'h->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)
+void
+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);
}