Revert partially the commit 21b1273

[tcpdump] / print-geonet.c

diff --git a/print-geonet.c b/print-geonet.c
index 95bcad00ea294c005b17d20ffe1eca57d9042adf..bd2fa0561c26912dd644c2dbcc20007c1d214b53 100644 (file)
--- a/print-geonet.c
+++ b/print-geonet.c
@@ -57,15 +57,16 @@ static const struct tok msg_type_values[] = {
 
 static void
 print_btp_body(netdissect_options *ndo,
-               const u_char *bp)
+              const u_char *bp)
 {
        u_int version;
        u_int msg_type;
        const char *msg_type_str;
 
        /* Assuming ItsDpuHeader */
-       version = EXTRACT_U_1(bp);
-       msg_type = EXTRACT_U_1(bp + 1);
+       /* 2 bytes ND_TCHECKed in geonet_print() */
+       version = GET_U_1(bp);
+       msg_type = GET_U_1(bp + 1);
        msg_type_str = tok2str(msg_type_values, "unknown (%u)", msg_type);
 
        ND_PRINT("; ItsPduHeader v:%u t:%u-%s", version, msg_type, msg_type_str);
@@ -73,28 +74,25 @@ print_btp_body(netdissect_options *ndo,
 
 static void
 print_btp(netdissect_options *ndo,
-          const u_char *bp)
+         const u_char *bp)
 {
-       uint16_t dest = EXTRACT_BE_U_2(bp + 0);
-       uint16_t src = EXTRACT_BE_U_2(bp + 2);
+       /* 4 bytes ND_TCHECKed in geonet_print() */
+       uint16_t dest = GET_BE_U_2(bp + 0);
+       uint16_t src = GET_BE_U_2(bp + 2);
        ND_PRINT("; BTP Dst:%u Src:%u", dest, src);
 }
 
 static int
 print_long_pos_vector(netdissect_options *ndo,
-                      const u_char *bp)
+                     const u_char *bp)
 {
        uint32_t lat, lon;
 
-       if (!ND_TTEST_LEN(bp, GEONET_ADDR_LEN))
-               return (-1);
-       ND_PRINT("GN_ADDR:%s ", linkaddr_string (ndo, bp, 0, GEONET_ADDR_LEN));
+       ND_PRINT("GN_ADDR:%s ", GET_LINKADDR_STRING(bp, LINKADDR_OTHER, GEONET_ADDR_LEN));
 
-       if (!ND_TTEST_8(bp + 12))
-               return (-1);
-       lat = EXTRACT_BE_U_4(bp + 12);
+       lat = GET_BE_U_4(bp + 12);
        ND_PRINT("lat:%u ", lat);
-       lon = EXTRACT_BE_U_4(bp + 16);
+       lon = GET_BE_U_4(bp + 16);
        ND_PRINT("lon:%u", lon);
        return (0);
 }
@@ -129,12 +127,12 @@ geonet_print(netdissect_options *ndo, const u_char *bp, u_int length,
                goto invalid;
 
        ND_TCHECK_8(bp);
-       version = EXTRACT_U_1(bp) >> 4;
-       next_hdr = EXTRACT_U_1(bp) & 0x0f;
-       hdr_type = EXTRACT_U_1(bp + 1) >> 4;
-       hdr_subtype = EXTRACT_U_1(bp + 1) & 0x0f;
-       payload_length = EXTRACT_BE_U_2(bp + 4);
-       hop_limit = EXTRACT_U_1(bp + 7);
+       version = GET_U_1(bp) >> 4;
+       next_hdr = GET_U_1(bp) & 0x0f;
+       hdr_type = GET_U_1(bp + 1) >> 4;
+       hdr_subtype = GET_U_1(bp + 1) & 0x0f;
+       payload_length = GET_BE_U_2(bp + 4);
+       hop_limit = GET_U_1(bp + 7);
 
        switch (next_hdr) {
                case 0: next_hdr_txt = "Any"; break;
@@ -275,5 +273,5 @@ invalid:
        return;
 
 trunc:
-       ND_PRINT("[|geonet]");
+       nd_print_trunc(ndo);
 }