Fix spaces

[tcpdump] / print-calm-fast.c

diff --git a/print-calm-fast.c b/print-calm-fast.c
index 3d58fe0d7b3a8f227cbf8fdcc0780794f4c7be88..45bb5cc781828a775e46651113b161ce3a6a7d8b 100644 (file)
--- a/print-calm-fast.c
+++ b/print-calm-fast.c
@@ -15,13 +15,16 @@
  * Original code by Ola Martin Lykkja ([email protected])
  */
 
+/* \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 "netdissect.h"
+#include "extract.h"
 #include "addrtoname.h"
 
 /*
@@ -35,25 +38,32 @@
  * 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];
+       u_int srcNwref;
+       u_int dstNwref;
+
+       ndo->ndo_protocol = "calm_fast";
+       ND_TCHECK_2(bp);
+       if (length < 2)
+               goto trunc;
+       srcNwref = EXTRACT_U_1(bp);
+       dstNwref = EXTRACT_U_1(bp + 1);
        length -= 2;
        bp += 2;
 
-       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("; ");
+       ND_PRINT("SrcNwref:%u; ", srcNwref);
+       ND_PRINT("DstNwref:%u; ", dstNwref);
 
        if (ndo->ndo_vflag)
-               ndo->ndo_default_print(ndo, bp, length);
-}
-
+               ND_DEFAULTPRINT(bp, length);
+       return;
 
-/*
- * Local Variables:
- * c-style: whitesmith
- * c-basic-offset: 8
- * End:
- */
+trunc:
+       nd_print_trunc(ndo);
+       return;
+}