Fixed some warnings, added print-zep.c to CMakeLists

[tcpdump] / print-msnlb.c

diff --git a/print-msnlb.c b/print-msnlb.c
index 2721246d2a8f126dae2c17a86c09abde5889c9f8..7a86ff0652be7830c68cf3b5144488f4974c34df 100644 (file)
--- a/print-msnlb.c
+++ b/print-msnlb.c
@@ -26,22 +26,24 @@
  * SUCH DAMAGE.
  */
 
  * SUCH DAMAGE.
  */
 

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

 #ifdef HAVE_CONFIG_H
 #ifdef HAVE_CONFIG_H

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

 #endif
 
 #endif
 

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

 
 

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

 #include "addrtoname.h"
 #include "extract.h"
 
 struct msnlb_heartbeat_pkt {
 #include "addrtoname.h"
 #include "extract.h"
 
 struct msnlb_heartbeat_pkt {

-       uint32_t unknown1;
-       uint32_t unknown2;
-       uint32_t host_prio;     /* little-endian */
-       uint32_t virtual_ip;
-       uint32_t host_ip;
+       nd_byte     unknown1[4];
+       nd_byte     unknown2[4];
+       nd_uint32_t host_prio;  /* little-endian */
+       nd_ipv4     virtual_ip;
+       nd_ipv4     host_ip;

        /* the protocol is undocumented so we ignore the rest */
 };
 
        /* the protocol is undocumented so we ignore the rest */
 };
 


@@ -50,14 +52,15 @@ msnlb_print(netdissect_options *ndo, const u_char *bp)
 {
        const struct msnlb_heartbeat_pkt *hb;
 
 {
        const struct msnlb_heartbeat_pkt *hb;
 

+       ndo->ndo_protocol = "msnlb";

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

-       ND_TCHECK(*hb);
+       ND_TCHECK_SIZE(hb);

 
 

-       ND_PRINT((ndo, "MS NLB heartbeat, host priority: %u,",
-               EXTRACT_LE_32BITS(&(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))));
+       ND_PRINT("MS NLB heartbeat, host priority: %u,",
+               EXTRACT_LE_U_4((hb->host_prio)));
+       ND_PRINT(" cluster IP: %s,", ipaddr_string(ndo, hb->virtual_ip));
+       ND_PRINT(" host IP: %s", ipaddr_string(ndo, hb->host_ip));

        return;
 trunc:
        return;
 trunc:

-       ND_PRINT((ndo, "[|MS NLB]"));
+       nd_print_trunc(ndo);

 }
 }