Use more the ND_TTEST_1() macro

[tcpdump] / print-geonet.c

diff --git a/print-geonet.c b/print-geonet.c
index 61441a0bf3b484961ec62f1562441cd75f5e9d98..488969ef9703dd0fe97c7a32d37571c8043a3a02 100644 (file)
--- a/print-geonet.c
+++ b/print-geonet.c
@@ -64,8 +64,8 @@ print_btp_body(netdissect_options *ndo,
        const char *msg_type_str;
 
        /* Assuming ItsDpuHeader */
-       version = bp[0];
-       msg_type = bp[1];
+       version = EXTRACT_U_1(bp);
+       msg_type = EXTRACT_U_1(bp + 1);
        msg_type_str = tok2str(msg_type_values, "unknown (%u)", msg_type);
 
        ND_PRINT((ndo, "; ItsPduHeader v:%d t:%d-%s", version, msg_type, msg_type_str));
@@ -75,8 +75,8 @@ static void
 print_btp(netdissect_options *ndo,
           const u_char *bp)
 {
-       uint16_t dest = EXTRACT_16BITS(bp+0);
-       uint16_t src = EXTRACT_16BITS(bp+2);
+       uint16_t dest = EXTRACT_BE_U_2(bp + 0);
+       uint16_t src = EXTRACT_BE_U_2(bp + 2);
        ND_PRINT((ndo, "; BTP Dst:%u Src:%u", dest, src));
 }
 
@@ -86,13 +86,15 @@ print_long_pos_vector(netdissect_options *ndo,
 {
        uint32_t lat, lon;
 
+       if (!ND_TTEST_LEN(bp, GEONET_ADDR_LEN))
+               return (-1);
        ND_PRINT((ndo, "GN_ADDR:%s ", linkaddr_string (ndo, bp, 0, GEONET_ADDR_LEN)));
 
-       if (!ND_TTEST2(*(bp+12), 8))
+       if (!ND_TTEST_8(bp + 12))
                return (-1);
-       lat = EXTRACT_32BITS(bp+12);
+       lat = EXTRACT_BE_U_4(bp + 12);
        ND_PRINT((ndo, "lat:%d ", lat));
-       lon = EXTRACT_32BITS(bp+16);
+       lon = EXTRACT_BE_U_4(bp + 16);
        ND_PRINT((ndo, "lon:%d", lon));
        return (0);
 }
@@ -103,7 +105,8 @@ print_long_pos_vector(netdissect_options *ndo,
  * to the geonet header of the packet.
  */
 void
-geonet_print(netdissect_options *ndo, const u_char *eth, const u_char *bp, u_int length)
+geonet_print(netdissect_options *ndo, const u_char *bp, u_int length,
+            const struct lladdr_info *src)
 {
        int version;
        int next_hdr;
@@ -115,19 +118,22 @@ geonet_print(netdissect_options *ndo, const u_char *eth, const u_char *bp, u_int
        const char *hdr_type_txt = "Unknown";
        int hdr_size = -1;
 
-       ND_PRINT((ndo, "GeoNet src:%s; ", etheraddr_string(ndo, eth+6)));
+       ND_PRINT((ndo, "GeoNet "));
+       if (src != NULL)
+               ND_PRINT((ndo, "src:%s", (src->addr_string)(ndo, src->addr)));
+       ND_PRINT((ndo, "; "));
 
        /* Process Common Header */
        if (length < 36)
                goto invalid;
 
-       ND_TCHECK2(*bp, 7);
-       version = bp[0] >> 4;
-       next_hdr = bp[0] & 0x0f;
-       hdr_type = bp[1] >> 4;
-       hdr_subtype = bp[1] & 0x0f;
-       payload_length = EXTRACT_16BITS(bp+4);
-       hop_limit = bp[7];
+       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);
 
        switch (next_hdr) {
                case 0: next_hdr_txt = "Any"; break;
@@ -226,7 +232,7 @@ geonet_print(netdissect_options *ndo, const u_char *eth, const u_char *bp, u_int
        if (hdr_size >= 0) {
                if (length < (u_int)hdr_size)
                        goto invalid;
-               ND_TCHECK2(*bp, hdr_size);
+               ND_TCHECK_LEN(bp, hdr_size);
                length -= hdr_size;
                bp += hdr_size;
                switch (next_hdr) {
@@ -236,7 +242,7 @@ geonet_print(netdissect_options *ndo, const u_char *eth, const u_char *bp, u_int
                        case 2: /* BTP A/B */
                                if (length < 4)
                                        goto invalid;
-                               ND_TCHECK2(*bp, 4);
+                               ND_TCHECK_4(bp);
                                print_btp(ndo, bp);
                                length -= 4;
                                bp += 4;
@@ -248,7 +254,7 @@ geonet_print(netdissect_options *ndo, const u_char *eth, const u_char *bp, u_int
                                         * or was that just not
                                         * reporting genuine errors?
                                         */
-                                       ND_TCHECK2(*bp, 2);
+                                       ND_TCHECK_2(bp);
                                        print_btp_body(ndo, bp);
                                }
                                break;