Use more the EXTRACT_U_1() macro (40/n)

[tcpdump] / print-geonet.c

diff --git a/print-geonet.c b/print-geonet.c
index 9b61ef202b7b891a5fdb3564164dfed82bc6b913..e40c65112b3a8b86210ad52277b781fe9b374ad5 100644 (file)
--- a/print-geonet.c
+++ b/print-geonet.c
@@ -15,11 +15,13 @@
  * Original code by Ola Martin Lykkja ([email protected])
  */
 
+/* \summary: ISO CALM FAST and ETSI GeoNetworking printer */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
 
 #include "netdissect.h"
 #include "extract.h"
@@ -73,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));
 }
 
@@ -84,13 +86,15 @@ print_long_pos_vector(netdissect_options *ndo,
 {
        uint32_t lat, lon;
 
+       if (!ND_TTEST2(*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);
 }
@@ -101,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;
@@ -113,18 +118,21 @@ 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);
+       ND_TCHECK_8(bp);
        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);
+       payload_length = EXTRACT_BE_U_2(bp + 4);
        hop_limit = bp[7];
 
        switch (next_hdr) {
@@ -234,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;
@@ -246,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;