Use more the EXTRACT_U_1() macro (40/n)

[tcpdump] / print-calm-fast.c

diff --git a/print-calm-fast.c b/print-calm-fast.c
index 351b6b8dd2bd686e34d602da9a1b2abc92749440..16b416a3f9a516b122db8fb67ed6349e2c237255 100644 (file)
--- a/print-calm-fast.c
+++ b/print-calm-fast.c
@@ -15,14 +15,16 @@
  * Original code by Ola Martin Lykkja ([email protected])
  */
 
-#define NETDISSECT_REWORKED
+/* \summary: Communication access for land mobiles (CALM) printer */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
+#include "extract.h"
 #include "addrtoname.h"
 
 /*
@@ -36,19 +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)
 {
-       int srcNwref = bp[0];
-       int dstNwref = bp[1];
+       int srcNwref;
+       int dstNwref;
+
+       ND_TCHECK_2(bp);
+       if (length < 2)
+               goto trunc;
+       srcNwref = bp[0];
+       dstNwref = bp[1];
        length -= 2;
        bp += 2;
 
-       ND_PRINT((ndo, "CALM FAST src:%s; ", etheraddr_string(eth+6)));
+       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)
-               ndo->ndo_default_print(ndo, bp, length);
+               ND_DEFAULTPRINT(bp, length);
+       return;
+
+trunc:
+       ND_PRINT((ndo, "[|calm fast]"));
+       return;
 }