X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/1a84a1e1142f2c60dc045c2557ed4d484b576d8b..1a04b92e365f5ed01ca38619b41bcc4fc9cbd63c:/print-geonet.c

diff --git a/print-geonet.c b/print-geonet.c
index edfb7f2d..488969ef 100644
--- a/print-geonet.c
+++ b/print-geonet.c
@@ -15,14 +15,15 @@
  * Original code by Ola Martin Lykkja (ola.lykkja@q-free.com)
  */
 
-#define NETDISSECT_REWORKED
+/* \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 "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 #include "addrtoname.h"
 
@@ -63,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));
@@ -74,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));
 }
 
@@ -85,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);
 }
@@ -102,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;
@@ -114,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 malformed;
-		
-	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];
+		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);
 
 	switch (next_hdr) {
 		case 0: next_hdr_txt = "Any"; break;
@@ -224,8 +231,8 @@ geonet_print(netdissect_options *ndo, const u_char *eth, const u_char *bp, u_int
 	/* Skip Extended headers */
 	if (hdr_size >= 0) {
 		if (length < (u_int)hdr_size)
-			goto malformed;
-		ND_TCHECK2(*bp, hdr_size);
+			goto invalid;
+		ND_TCHECK_LEN(bp, hdr_size);
 		length -= hdr_size;
 		bp += hdr_size;
 		switch (next_hdr) {
@@ -234,8 +241,8 @@ geonet_print(netdissect_options *ndo, const u_char *eth, const u_char *bp, u_int
 			case 1:
 			case 2: /* BTP A/B */
 				if (length < 4)
-					goto malformed;
-				ND_TCHECK2(*bp, 4);
+					goto invalid;
+				ND_TCHECK_4(bp);
 				print_btp(ndo, bp);
 				length -= 4;
 				bp += 4;
@@ -247,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;
@@ -261,7 +268,7 @@ geonet_print(netdissect_options *ndo, const u_char *eth, const u_char *bp, u_int
 		ND_DEFAULTPRINT(bp, length);
 	return;
 
-malformed:
+invalid:
 	ND_PRINT((ndo, " Malformed (small) "));
 	/* XXX - print the remaining data as hex? */
 	return;