Use ND_TCHECK_32BITS() before EXTRACT_32BITS().

It makes it a bit clearer what's being done.

diff --git a/print-udp.c b/print-udp.c
index ada3c21d2f06f4b62c6bf7ee0fe0d7e9ef9f7d01..5a74ff2fc69c706d43002f6d770955c63c59ea95 100644 (file)
--- a/print-udp.c
+++ b/print-udp.c
@@ -185,7 +185,7 @@ rtp_print(netdissect_options *ndo, const void *hdr, u_int len,
                if (hasopt) {
                        u_int i2, optlen;
                        do {
                if (hasopt) {
                        u_int i2, optlen;
                        do {

-                               ND_TCHECK2(*ip, 4);
+                               ND_TCHECK_32BITS(ip);

                                i2 = EXTRACT_32BITS(ip);
                                optlen = (i2 >> 16) & 0xff;
                                if (optlen == 0 || optlen > len) {
                                i2 = EXTRACT_32BITS(ip);
                                optlen = (i2 >> 16) & 0xff;
                                if (optlen == 0 || optlen > len) {


@@ -198,7 +198,7 @@ rtp_print(netdissect_options *ndo, const void *hdr, u_int len,
                }
                if (hasext) {
                        u_int i2, extlen;
                }
                if (hasext) {
                        u_int i2, extlen;

-                       ND_TCHECK2(*ip, 4);
+                       ND_TCHECK_32BITS(ip);

                        i2 = EXTRACT_32BITS(ip);
                        extlen = (i2 & 0xffff) + 1;
                        if (extlen > len) {
                        i2 = EXTRACT_32BITS(ip);
                        extlen = (i2 & 0xffff) + 1;
                        if (extlen > len) {


@@ -207,7 +207,7 @@ rtp_print(netdissect_options *ndo, const void *hdr, u_int len,
                        }
                        ip += extlen;
                }
                        }
                        ip += extlen;
                }

-               ND_TCHECK(*ip);
+               ND_TCHECK_32BITS(ip);

                if (contype == 0x1f) /*XXX H.261 */
                        ND_PRINT((ndo, " 0x%04x", EXTRACT_32BITS(ip) >> 16));
        }
                if (contype == 0x1f) /*XXX H.261 */
                        ND_PRINT((ndo, " 0x%04x", EXTRACT_32BITS(ip) >> 16));
        }