X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/546558eabd81cfc36a81a4df728fdfea0d83b41a..refs/heads/master:/print-geonet.c

diff --git a/print-geonet.c b/print-geonet.c
index 6558eacd..3f8ee075 100644
--- a/print-geonet.c
+++ b/print-geonet.c
@@ -17,12 +17,11 @@
 
 /* \summary: ISO CALM FAST and ETSI GeoNetworking printer */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "netdissect-stdinc.h"
 
+#define ND_LONGJMP_FROM_TCHECK
 #include "netdissect.h"
 #include "extract.h"
 #include "addrtoname.h"
@@ -57,46 +56,34 @@ 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);
-	msg_type_str = tok2str(msg_type_values, "unknown (%u)", msg_type);
+	/* Assuming ItsPduHeader */
+	ND_PRINT("; ItsPduHeader v:%u", GET_U_1(bp));
 
-	ND_PRINT("; ItsPduHeader v:%u t:%u-%s", version, msg_type, msg_type_str);
+	msg_type = GET_U_1(bp + 1);
+	ND_PRINT(" t:%u-%s", msg_type,
+	         tok2str(msg_type_values, "unknown (%u)", msg_type));
 }
 
+/* EN 302 636-5-1 V2.2.1 Section 7.2: BTP-A header */
 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);
-	ND_PRINT("; BTP Dst:%u Src:%u", dest, src);
+	ND_PRINT("; BTP Dst:%u", GET_BE_U_2(bp + 0));
+	ND_PRINT(" Src:%u", GET_BE_U_2(bp + 2));
 }
 
-static int
+static void
 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));
-
-	if (!ND_TTEST_8(bp + 12))
-		return (-1);
-	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);
+	ND_PRINT("GN_ADDR:%s ", GET_LINKADDR_STRING(bp, LINKADDR_OTHER, GEONET_ADDR_LEN));
+	ND_PRINT("lat:%u ", GET_BE_U_4(bp + 12));
+	ND_PRINT("lon:%u", GET_BE_U_4(bp + 16));
 }
 
 
@@ -125,16 +112,17 @@ geonet_print(netdissect_options *ndo, const u_char *bp, u_int length,
 	ND_PRINT("; ");
 
 	/* Process Common Header */
-	if (length < 36)
+	if (length < 36) {
+		ND_PRINT(" (common header length %u < 36)", 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;
@@ -176,10 +164,10 @@ geonet_print(netdissect_options *ndo, const u_char *bp, u_int length,
 	ND_PRINT("HT:%u-%u-%s ", hdr_type, hdr_subtype, hdr_type_txt);
 	ND_PRINT("HopLim:%u ", hop_limit);
 	ND_PRINT("Payload:%u ", payload_length);
-	if (print_long_pos_vector(ndo, bp + 8) == -1)
-		goto trunc;
+	print_long_pos_vector(ndo, bp + 8);
 
 	/* Skip Common Header */
+	ND_TCHECK_LEN(bp, 36);
 	length -= 36;
 	bp += 36;
 
@@ -231,8 +219,10 @@ geonet_print(netdissect_options *ndo, const u_char *bp, u_int length,
 
 	/* Skip Extended headers */
 	if (hdr_size >= 0) {
-		if (length < (u_int)hdr_size)
+		if (length < (u_int)hdr_size) {
+			ND_PRINT(" (header size %d > %u)", hdr_size, length);
 			goto invalid;
+		}
 		ND_TCHECK_LEN(bp, hdr_size);
 		length -= hdr_size;
 		bp += hdr_size;
@@ -241,9 +231,10 @@ geonet_print(netdissect_options *ndo, const u_char *bp, u_int length,
 				break;
 			case 1:
 			case 2: /* BTP A/B */
-				if (length < 4)
+				if (length < 4) {
+					ND_PRINT(" (BTP length %u < 4)", length);
 					goto invalid;
-				ND_TCHECK_4(bp);
+				}
 				print_btp(ndo, bp);
 				length -= 4;
 				bp += 4;
@@ -255,7 +246,6 @@ geonet_print(netdissect_options *ndo, const u_char *bp, u_int length,
 					 * or was that just not
 					 * reporting genuine errors?
 					 */
-					ND_TCHECK_2(bp);
 					print_btp_body(ndo, bp);
 				}
 				break;
@@ -270,18 +260,6 @@ geonet_print(netdissect_options *ndo, const u_char *bp, u_int length,
 	return;
 
 invalid:
-	ND_PRINT(" Malformed (small) ");
+	nd_print_invalid(ndo);
 	/* XXX - print the remaining data as hex? */
-	return;
-
-trunc:
-	ND_PRINT("[|geonet]");
 }
-
-
-/*
- * Local Variables:
- * c-style: whitesmith
- * c-basic-offset: 8
- * End:
- */