Use more the ND_TTEST_1() macro

[tcpdump] / print-zeromq.c

diff --git a/print-zeromq.c b/print-zeromq.c
index 0ef30517bd7cc312faa2e8cda3a8b4810a0feea2..e43d071780064048adb012efbe25a36179f54e97 100644 (file)
--- a/print-zeromq.c
+++ b/print-zeromq.c
@@ -1,7 +1,4 @@
 /*
 /*

- * This file implements decoding of ZeroMQ network protocol(s).
- *
- *

  * Copyright (c) 2013 The TCPDUMP project
  * All rights reserved.
  *
  * Copyright (c) 2013 The TCPDUMP project
  * All rights reserved.
  *


@@ -28,14 +25,15 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
  * POSSIBILITY OF SUCH DAMAGE.
  */
 

-#define NETDISSECT_REWORKED
+/* \summary: ZeroMQ Message Transport Protocol (ZMTP) 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 "extract.h"
 
 static const char tstr[] = " [|zmtp1]";
 #include "extract.h"
 
 static const char tstr[] = " [|zmtp1]";


@@ -76,32 +74,29 @@ static const char tstr[] = " [|zmtp1]";
  */
 
 static const u_char *
  */
 
 static const u_char *

-zmtp1_print_frame(netdissect_options *ndo, const u_char *cp, const u_char *ep) {
+zmtp1_print_frame(netdissect_options *ndo, const u_char *cp, const u_char *ep)
+{

        uint64_t body_len_declared, body_len_captured, header_len;
        uint8_t flags;
 
        ND_PRINT((ndo, "\n\t"));
        uint64_t body_len_declared, body_len_captured, header_len;
        uint8_t flags;
 
        ND_PRINT((ndo, "\n\t"));

-       ND_TCHECK2(*cp, 1); /* length/0xFF */
+       ND_TCHECK_1(cp); /* length/0xFF */

 
 

-       if (cp[0] != 0xFF) {
+       if (EXTRACT_U_1(cp) != 0xFF) {

                header_len = 1; /* length */
                header_len = 1; /* length */

-               body_len_declared = cp[0];
-               if (body_len_declared == 0)
-                       return cp + header_len; /* skip to next frame */
-               ND_PRINT((ndo, " frame flags+body  (8-bit) length %u", cp[0]));
-               ND_TCHECK2(*cp, header_len + 1); /* length, flags */
-               flags = cp[1];
+               body_len_declared = EXTRACT_U_1(cp);
+               ND_PRINT((ndo, " frame flags+body  (8-bit) length %" PRIu64, body_len_declared));

        } else {
                header_len = 1 + 8; /* 0xFF, length */
                ND_PRINT((ndo, " frame flags+body (64-bit) length"));
        } else {
                header_len = 1 + 8; /* 0xFF, length */
                ND_PRINT((ndo, " frame flags+body (64-bit) length"));

-               ND_TCHECK2(*cp, header_len); /* 0xFF, length */
-               body_len_declared = EXTRACT_64BITS(cp + 1);
-               if (body_len_declared == 0)
-                       return cp + header_len; /* skip to next frame */
+               ND_TCHECK_LEN(cp, header_len); /* 0xFF, length */
+               body_len_declared = EXTRACT_BE_U_8(cp + 1);

                ND_PRINT((ndo, " %" PRIu64, body_len_declared));
                ND_PRINT((ndo, " %" PRIu64, body_len_declared));

-               ND_TCHECK2(*cp, header_len + 1); /* 0xFF, length, flags */
-               flags = cp[9];

        }
        }

+       if (body_len_declared == 0)
+               return cp + header_len; /* skip to the next frame */
+       ND_TCHECK_LEN(cp, header_len + 1); /* ..., flags */
+       flags = EXTRACT_U_1(cp + header_len);

 
        body_len_captured = ep - cp - header_len;
        if (body_len_declared > body_len_captured)
 
        body_len_captured = ep - cp - header_len;
        if (body_len_declared > body_len_captured)


@@ -130,8 +125,15 @@ zmtp1_print_frame(netdissect_options *ndo, const u_char *cp, const u_char *ep) {
                }
        }
 
                }
        }
 

-       ND_TCHECK2(*cp, header_len + body_len_declared); /* Next frame within the buffer ? */
-       return cp + header_len + body_len_declared;
+       /*
+        * Do not advance cp by the sum of header_len and body_len_declared
+        * before each offset has successfully passed ND_TCHECK_LEN() as the
+        * sum can roll over (9 + 0xfffffffffffffff7 = 0) and cause an
+        * infinite loop.
+        */
+       cp += header_len;
+       ND_TCHECK_LEN(cp, body_len_declared); /* Next frame within the buffer ? */
+       return cp + body_len_declared;

 
 trunc:
        ND_PRINT((ndo, "%s", tstr));
 
 trunc:
        ND_PRINT((ndo, "%s", tstr));


@@ -139,7 +141,8 @@ trunc:
 }
 
 void
 }
 
 void

-zmtp1_print(netdissect_options *ndo, const u_char *cp, u_int len) {
+zmtp1_print(netdissect_options *ndo, const u_char *cp, u_int len)
+{

        const u_char *ep = min(ndo->ndo_snapend, cp + len);
 
        ND_PRINT((ndo, ": ZMTP/1.0"));
        const u_char *ep = min(ndo->ndo_snapend, cp + len);
 
        ND_PRINT((ndo, ": ZMTP/1.0"));


@@ -164,12 +167,13 @@ zmtp1_print(netdissect_options *ndo, const u_char *cp, u_int len) {
  */
 
 static const u_char *
  */
 
 static const u_char *

-zmtp1_print_intermediate_part(netdissect_options *ndo, const u_char *cp, const u_int len) {
+zmtp1_print_intermediate_part(netdissect_options *ndo, const u_char *cp, const u_int len)
+{

        u_int frame_offset;
        uint64_t remaining_len;
 
        u_int frame_offset;
        uint64_t remaining_len;
 

-       ND_TCHECK2(*cp, 2);
-       frame_offset = EXTRACT_16BITS(cp);
+       ND_TCHECK_2(cp);
+       frame_offset = EXTRACT_BE_U_2(cp);

        ND_PRINT((ndo, "\n\t frame offset 0x%04x", frame_offset));
        cp += 2;
        remaining_len = ndo->ndo_snapend - cp; /* without the frame length */
        ND_PRINT((ndo, "\n\t frame offset 0x%04x", frame_offset));
        cp += 2;
        remaining_len = ndo->ndo_snapend - cp; /* without the frame length */


@@ -206,7 +210,8 @@ trunc:
 }
 
 void
 }
 
 void

-zmtp1_print_datagram(netdissect_options *ndo, const u_char *cp, const u_int len) {
+zmtp1_datagram_print(netdissect_options *ndo, const u_char *cp, const u_int len)
+{

        const u_char *ep = min(ndo->ndo_snapend, cp + len);
 
        cp = zmtp1_print_intermediate_part(ndo, cp, len);
        const u_char *ep = min(ndo->ndo_snapend, cp + len);
 
        cp = zmtp1_print_intermediate_part(ndo, cp, len);