GeoNet: Replace the ND_TTEST_*() calls with ND_TCHECK_*() calls

Moreover:
Add two comments

diff --git a/print-geonet.c b/print-geonet.c
index d15087747e8eaad4e98ff256401b9e1d1acec6a8..af3f1ec9c1712743a1012c5572b005390a60e7c9 100644 (file)
--- a/print-geonet.c
+++ b/print-geonet.c
@@ -64,6 +64,7 @@ print_btp_body(netdissect_options *ndo,
        const char *msg_type_str;
 
        /* Assuming ItsDpuHeader */
+       /* 2 bytes ND_TCHECKed in geonet_print() */
        version = EXTRACT_U_1(bp);
        msg_type = EXTRACT_U_1(bp + 1);
        msg_type_str = tok2str(msg_type_values, "unknown (%u)", msg_type);
@@ -75,6 +76,7 @@ static void
 print_btp(netdissect_options *ndo,
          const u_char *bp)
 {
+       /* 4 bytes ND_TCHECKed in geonet_print() */
        uint16_t dest = EXTRACT_BE_U_2(bp + 0);
        uint16_t src = EXTRACT_BE_U_2(bp + 2);
        ND_PRINT("; BTP Dst:%u Src:%u", dest, src);
@@ -86,17 +88,17 @@ print_long_pos_vector(netdissect_options *ndo,
 {
        uint32_t lat, lon;
 
-       if (!ND_TTEST_LEN(bp, GEONET_ADDR_LEN))
-               return (-1);
+       ND_TCHECK_LEN(bp, GEONET_ADDR_LEN);
        ND_PRINT("GN_ADDR:%s ", linkaddr_string (ndo, bp, 0, GEONET_ADDR_LEN));
 
-       if (!ND_TTEST_8(bp + 12))
-               return (-1);
+       ND_TCHECK_8(bp + 12);
        lat = EXTRACT_BE_U_4(bp + 12);
        ND_PRINT("lat:%u ", lat);
        lon = EXTRACT_BE_U_4(bp + 16);
        ND_PRINT("lon:%u", lon);
        return (0);
+trunc:
+       return -1;
 }