X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/1fe6e66ecec3fb7a7cc729038012cbb264542331..c39d40a767a1ae36171e5bcbf6f157ff3e80fb6c:/print-calm-fast.c

diff --git a/print-calm-fast.c b/print-calm-fast.c
index 351b6b8d..1220d867 100644
--- a/print-calm-fast.c
+++ b/print-calm-fast.c
@@ -15,14 +15,17 @@
  * Original code by Ola Martin Lykkja (ola.lykkja@q-free.com)
  */
 
-#define NETDISSECT_REWORKED
+/* \summary: Communication access for land mobiles (CALM) printer */
+
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <tcpdump-stdinc.h>
+#include "netdissect-stdinc.h"
 
-#include "interface.h"
+#define ND_LONGJMP_FROM_TCHECK
+#include "netdissect.h"
+#include "extract.h"
 #include "addrtoname.h"
 
 /*
@@ -36,25 +39,33 @@
  * to the calm header of the packet.
  */
 void
-calm_fast_print(netdissect_options *ndo, const u_char *eth, const u_char *bp, u_int length)
+calm_fast_print(netdissect_options *ndo, const u_char *bp, u_int length, const struct lladdr_info *src)
 {
-	int srcNwref = bp[0];
-	int dstNwref = bp[1];
-	length -= 2;
-	bp += 2;
+	ndo->ndo_protocol = "calm_fast";
 
-	ND_PRINT((ndo, "CALM FAST src:%s; ", etheraddr_string(eth+6)));
-	ND_PRINT((ndo, "SrcNwref:%d; ", srcNwref));
-	ND_PRINT((ndo, "DstNwref:%d; ", dstNwref));
+	ND_PRINT("CALM FAST");
+	if (src != NULL)
+		ND_PRINT(" src:%s", (src->addr_string)(ndo, src->addr));
+	ND_PRINT("; ");
 
-	if (ndo->ndo_vflag)
-		ndo->ndo_default_print(ndo, bp, length);
-}
+	if (length < 2) {
+		ND_PRINT(" (length %u < 2)", length);
+		goto invalid;
+	}
 
+	ND_PRINT("SrcNwref:%u; ", GET_U_1(bp));
+	length -= 1;
+	bp += 1;
 
-/*
- * Local Variables:
- * c-style: whitesmith
- * c-basic-offset: 8
- * End:
- */
+	ND_PRINT("DstNwref:%u; ", GET_U_1(bp));
+	length -= 1;
+	bp += 1;
+
+	if (ndo->ndo_vflag)
+		ND_DEFAULTPRINT(bp, length);
+	return;
+
+invalid:
+	nd_print_invalid(ndo);
+	ND_TCHECK_LEN(bp, length);
+}