Use more the ND_TTEST_1() macro

[tcpdump] / print-msnlb.c

diff --git a/print-msnlb.c b/print-msnlb.c
index fcd0006482687850fae573e303beb9604209256a..2352ba38c78b2a26ecb972d8a3ffcab2de5fbe7e 100644 (file)
--- a/print-msnlb.c
+++ b/print-msnlb.c
@@ -26,14 +26,15 @@
  * SUCH DAMAGE.
  */
 
  * SUCH DAMAGE.
  */
 

-#define NETDISSECT_REWORKED
+/* \summary: MS Network Load Balancing's (NLB) heartbeat printer */
+

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>

 
 

-#include "interface.h"
+#include "netdissect.h"

 #include "addrtoname.h"
 #include "extract.h"
 
 #include "addrtoname.h"
 #include "extract.h"
 


@@ -51,11 +52,11 @@ msnlb_print(netdissect_options *ndo, const u_char *bp)
 {
        const struct msnlb_heartbeat_pkt *hb;
 
 {
        const struct msnlb_heartbeat_pkt *hb;
 

-       hb = (struct msnlb_heartbeat_pkt *)bp;
+       hb = (const struct msnlb_heartbeat_pkt *)bp;

        ND_TCHECK(*hb);
 
        ND_PRINT((ndo, "MS NLB heartbeat, host priority: %u,",
        ND_TCHECK(*hb);
 
        ND_PRINT((ndo, "MS NLB heartbeat, host priority: %u,",

-               EXTRACT_LE_32BITS(&(hb->host_prio))));
+               EXTRACT_LE_U_4(&(hb->host_prio))));

        ND_PRINT((ndo, " cluster IP: %s,", ipaddr_string(ndo, &(hb->virtual_ip))));
        ND_PRINT((ndo, " host IP: %s", ipaddr_string(ndo, &(hb->host_ip))));
        return;
        ND_PRINT((ndo, " cluster IP: %s,", ipaddr_string(ndo, &(hb->virtual_ip))));
        ND_PRINT((ndo, " host IP: %s", ipaddr_string(ndo, &(hb->host_ip))));
        return;