Use nd_ types, add EXTRACT_ calls.

[tcpdump] / print-l2tp.c

diff --git a/print-l2tp.c b/print-l2tp.c
index 9852ff50b612be658a265faa83ff0fb6cc723645..d900caa3741183970c28e4aa178b6b8621ed1cf0 100644 (file)
--- a/print-l2tp.c
+++ b/print-l2tp.c
@@ -396,7 +396,7 @@ l2tp_q931_cc_print(netdissect_options *ndo, const u_char *dat, u_int length)
                return;
        }
        print_16bits_val(ndo, (const uint16_t *)dat);
                return;
        }
        print_16bits_val(ndo, (const uint16_t *)dat);

-       ND_PRINT((ndo, ", %02x", dat[2]));
+       ND_PRINT((ndo, ", %02x", EXTRACT_U_1(dat + 2)));

        dat += 3;
        length -= 3;
        if (length != 0) {
        dat += 3;
        length -= 3;
        if (length != 0) {


@@ -605,7 +605,7 @@ l2tp_avp_print(netdissect_options *ndo, const u_char *dat, int length)
 
        ND_PRINT((ndo, " "));
 
 
        ND_PRINT((ndo, " "));
 

-       ND_TCHECK(*ptr);        /* Flags & Length */
+       ND_TCHECK_2(ptr);       /* Flags & Length */

        len = EXTRACT_BE_U_2(ptr) & L2TP_AVP_HDR_LEN_MASK;
 
        /* If it is not long enough to contain the header, we'll give up. */
        len = EXTRACT_BE_U_2(ptr) & L2TP_AVP_HDR_LEN_MASK;
 
        /* If it is not long enough to contain the header, we'll give up. */


@@ -619,7 +619,7 @@ l2tp_avp_print(netdissect_options *ndo, const u_char *dat, int length)
 
        /* If it goes past the end of the remaining length of the captured
           data, we'll give up. */
 
        /* If it goes past the end of the remaining length of the captured
           data, we'll give up. */

-       ND_TCHECK2(*ptr, len);
+       ND_TCHECK_LEN(ptr, len);

 
        /*
         * After this point, we don't need to check whether we go past
 
        /*
         * After this point, we don't need to check whether we go past


@@ -777,7 +777,7 @@ l2tp_print(netdissect_options *ndo, const u_char *dat, u_int length)
 
        flag_t = flag_l = flag_s = flag_o = FALSE;
 
 
        flag_t = flag_l = flag_s = flag_o = FALSE;
 

-       ND_TCHECK2(*ptr, 2);    /* Flags & Version */
+       ND_TCHECK_2(ptr);       /* Flags & Version */

        if ((EXTRACT_BE_U_2(ptr) & L2TP_VERSION_MASK) == L2TP_VERSION_L2TP) {
                ND_PRINT((ndo, " l2tp:"));
        } else if ((EXTRACT_BE_U_2(ptr) & L2TP_VERSION_MASK) == L2TP_VERSION_L2F) {
        if ((EXTRACT_BE_U_2(ptr) & L2TP_VERSION_MASK) == L2TP_VERSION_L2TP) {
                ND_PRINT((ndo, " l2tp:"));
        } else if ((EXTRACT_BE_U_2(ptr) & L2TP_VERSION_MASK) == L2TP_VERSION_L2F) {


@@ -813,7 +813,7 @@ l2tp_print(netdissect_options *ndo, const u_char *dat, u_int length)
        cnt += 2;
 
        if (flag_l) {
        cnt += 2;
 
        if (flag_l) {

-               ND_TCHECK2(*ptr, 2);    /* Length */
+               ND_TCHECK_2(ptr);       /* Length */

                l2tp_len = EXTRACT_BE_U_2(ptr);
                ptr += 2;
                cnt += 2;
                l2tp_len = EXTRACT_BE_U_2(ptr);
                ptr += 2;
                cnt += 2;


@@ -821,28 +821,28 @@ l2tp_print(netdissect_options *ndo, const u_char *dat, u_int length)
                l2tp_len = 0;
        }
 
                l2tp_len = 0;
        }
 

-       ND_TCHECK2(*ptr, 2);            /* Tunnel ID */
+       ND_TCHECK_2(ptr);               /* Tunnel ID */

        ND_PRINT((ndo, "(%u/", EXTRACT_BE_U_2(ptr)));
        ptr += 2;
        cnt += 2;
        ND_PRINT((ndo, "(%u/", EXTRACT_BE_U_2(ptr)));
        ptr += 2;
        cnt += 2;

-       ND_TCHECK2(*ptr, 2);            /* Session ID */
+       ND_TCHECK_2(ptr);               /* Session ID */

        ND_PRINT((ndo, "%u)",  EXTRACT_BE_U_2(ptr)));
        ptr += 2;
        cnt += 2;
 
        if (flag_s) {
        ND_PRINT((ndo, "%u)",  EXTRACT_BE_U_2(ptr)));
        ptr += 2;
        cnt += 2;
 
        if (flag_s) {

-               ND_TCHECK2(*ptr, 2);    /* Ns */
+               ND_TCHECK_2(ptr);       /* Ns */

                ND_PRINT((ndo, "Ns=%u,", EXTRACT_BE_U_2(ptr)));
                ptr += 2;
                cnt += 2;
                ND_PRINT((ndo, "Ns=%u,", EXTRACT_BE_U_2(ptr)));
                ptr += 2;
                cnt += 2;

-               ND_TCHECK2(*ptr, 2);    /* Nr */
+               ND_TCHECK_2(ptr);       /* Nr */

                ND_PRINT((ndo, "Nr=%u",  EXTRACT_BE_U_2(ptr)));
                ptr += 2;
                cnt += 2;
        }
 
        if (flag_o) {
                ND_PRINT((ndo, "Nr=%u",  EXTRACT_BE_U_2(ptr)));
                ptr += 2;
                cnt += 2;
        }
 
        if (flag_o) {

-               ND_TCHECK2(*ptr, 2);    /* Offset Size */
+               ND_TCHECK_2(ptr);       /* Offset Size */

                pad =  EXTRACT_BE_U_2(ptr);
                ptr += (2 + pad);
                cnt += (2 + pad);
                pad =  EXTRACT_BE_U_2(ptr);
                ptr += (2 + pad);
                cnt += (2 + pad);