X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/9eda8ebfdebae9a4809f8c24d16ff11a4da5b5e5..d7b497cac78b6e22a66a6bae9bdec60a8044f67a:/print-calm-fast.c

diff --git a/print-calm-fast.c b/print-calm-fast.c
index ba9776ca..16b416a3 100644
--- a/print-calm-fast.c
+++ b/print-calm-fast.c
@@ -15,17 +15,15 @@
  * Original code by Ola Martin Lykkja (ola.lykkja@q-free.com)
  */
 
+/* \summary: Communication access for land mobiles (CALM) printer */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <tcpdump-stdinc.h>
-
-#include <pcap.h>
-#include <stdio.h>
-#include <string.h>
+#include <netdissect-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 #include "addrtoname.h"
 
@@ -40,20 +38,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)
 {
-	printf("CALM FAST src:%s; ", etheraddr_string(eth+6));
+	int srcNwref;
+	int dstNwref;
 
-	int srcNwref = bp[0];
-	int dstNwref = bp[1];
+	ND_TCHECK_2(bp);
+	if (length < 2)
+		goto trunc;
+	srcNwref = bp[0];
+	dstNwref = bp[1];
 	length -= 2;
 	bp += 2;
 
-	printf("SrcNwref:%d; ", srcNwref);
-	printf("DstNwref:%d; ", dstNwref);
+	ND_PRINT((ndo, "CALM FAST"));
+	if (src != NULL)
+		ND_PRINT((ndo, " src:%s", (src->addr_string)(ndo, src->addr)));
+	ND_PRINT((ndo, "; "));
+	ND_PRINT((ndo, "SrcNwref:%d; ", srcNwref));
+	ND_PRINT((ndo, "DstNwref:%d; ", dstNwref));
 
 	if (ndo->ndo_vflag)
-		default_print(bp, length);
+		ND_DEFAULTPRINT(bp, length);
+	return;
+
+trunc:
+	ND_PRINT((ndo, "[|calm fast]"));
+	return;
 }