Revert partially the commit 21b1273

[tcpdump] / print-calm-fast.c

diff --git a/print-calm-fast.c b/print-calm-fast.c
index ba9776ca4f46f5cfd200adabf8920dc7e545e085..6331a9c985e32a2da2eb86e35637ddca4207b9ff 100644 (file)
--- a/print-calm-fast.c
+++ b/print-calm-fast.c
@@ -15,17 +15,15 @@
  * Original code by Ola Martin Lykkja ([email protected])
  */
 
  * Original code by Ola Martin Lykkja ([email protected])
  */
 

+/* \summary: Communication access for land mobiles (CALM) printer */
+

 #ifdef HAVE_CONFIG_H
 #ifdef HAVE_CONFIG_H

-#include "config.h"
+#include <config.h>

 #endif
 
 #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"
 
 #include "extract.h"
 #include "addrtoname.h"
 


@@ -40,26 +38,32 @@
  * to the calm header of the packet.
  */
 void
  * 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));
+       u_int srcNwref;
+       u_int dstNwref;

 
 

-       int srcNwref = bp[0];
-       int dstNwref = bp[1];
+       ndo->ndo_protocol = "calm_fast";
+       ND_TCHECK_2(bp);
+       if (length < 2)
+               goto trunc;
+       srcNwref = GET_U_1(bp);
+       dstNwref = GET_U_1(bp + 1);

        length -= 2;
        bp += 2;
 
        length -= 2;
        bp += 2;
 

-       printf("SrcNwref:%d; ", srcNwref);
-       printf("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)
 
        if (ndo->ndo_vflag)

-               default_print(bp, length);
-}
-
+               ND_DEFAULTPRINT(bp, length);
+       return;

 
 

-/*
- * Local Variables:
- * c-style: whitesmith
- * c-basic-offset: 8
- * End:
- */
+trunc:
+       nd_print_trunc(ndo);
+       return;
+}