X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/823644a72dfde7f127d127a299d4dde30412e21c..d2aa4eec28a011b739a68cc1258a97d880215574:/print-lisp.c

diff --git a/print-lisp.c b/print-lisp.c
index 327e99e2..27cca1a7 100644
--- a/print-lisp.c
+++ b/print-lisp.c
@@ -27,7 +27,7 @@
  */
 
 /*
- * tcpdump filter for LISP - Locator/Identifier Separation Protocol
+ * netdissect printer for LISP - Locator/Identifier Separation Protocol
  * RFC 6830
  *
  *
@@ -93,7 +93,6 @@
  *  +-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -104,14 +103,13 @@
 #include <stdlib.h>
 
 #include "ip.h"
-#ifdef INET6
 #include "ip6.h"
-#endif
 
 #include "extract.h"
-#include "interface.h"
 #include "addrtoname.h"
 
+static const char tstr[] = " [|LISP]";
+
 #define IPv4_AFI			1
 #define IPv6_AFI			2
 #define TYPE_INDEX			4
@@ -189,38 +187,38 @@ static const struct tok lisp_loc_flag[] = {
 };
 
 typedef struct map_register_hdr {
-	uint8_t type_and_flag;
-	uint8_t reserved;
-	uint8_t reserved_and_flag2;
-	uint8_t record_count;
-	uint64_t nonce;
-	uint16_t key_id;
-	uint16_t auth_data_len;
-} UNALIGNED lisp_map_register_hdr;
+	nd_uint8_t type_and_flag;
+	nd_uint8_t reserved;
+	nd_uint8_t reserved_and_flag2;
+	nd_uint8_t record_count;
+	nd_uint64_t nonce;
+	nd_uint16_t key_id;
+	nd_uint16_t auth_data_len;
+} lisp_map_register_hdr;
 
 #define MAP_REGISTER_HDR_LEN sizeof(lisp_map_register_hdr)
 
 typedef struct map_register_eid {
-	uint32_t ttl;
-	uint8_t locator_count;
-	uint8_t eid_prefix_mask_length;
-	uint8_t act_auth_inc_res;
-	uint8_t reserved;
-	uint8_t reserved_version_hi;
-	uint8_t version_low;
-	uint16_t eid_prefix_afi;
-} UNALIGNED lisp_map_register_eid;
+	nd_uint32_t ttl;
+	nd_uint8_t locator_count;
+	nd_uint8_t eid_prefix_mask_length;
+	nd_uint8_t act_auth_inc_res;
+	nd_uint8_t reserved;
+	nd_uint8_t reserved_version_hi;
+	nd_uint8_t version_low;
+	nd_uint16_t eid_prefix_afi;
+} lisp_map_register_eid;
 
 #define MAP_REGISTER_EID_LEN sizeof(lisp_map_register_eid)
 
 typedef struct map_register_loc {
-	uint8_t priority;
-	uint8_t weight;
-	uint8_t m_priority;
-	uint8_t m_weight;
-	uint16_t unused_and_flag;
-	uint16_t locator_afi;
-} UNALIGNED lisp_map_register_loc;
+	nd_uint8_t priority;
+	nd_uint8_t weight;
+	nd_uint8_t m_priority;
+	nd_uint8_t m_weight;
+	nd_uint16_t unused_and_flag;
+	nd_uint16_t locator_afi;
+} lisp_map_register_loc;
 
 #define MAP_REGISTER_LOC_LEN sizeof(lisp_map_register_loc)
 
@@ -281,7 +279,7 @@ void lisp_print(netdissect_options *ndo, const u_char *bp, u_int length)
 	packet_offset += auth_data_len;
 
 	if (record_count == 0)
-		goto malformed;
+		goto invalid;
 
 	/* Print all the EID records */
 	while ((length > packet_offset) && (record_count--)) {
@@ -313,12 +311,8 @@ void lisp_print(netdissect_options *ndo, const u_char *bp, u_int length)
 			break;
 		case IPv6_AFI:
 			ND_TCHECK2(*(packet_iterator + packet_offset), 16);
-			#ifdef INET6
-			ND_PRINT((ndo, " EID %s/%u,", getname6(ndo,
+			ND_PRINT((ndo, " EID %s/%u,", ip6addr_string(ndo,
 				packet_iterator + packet_offset), mask_len));
-			#else
-			ND_PRINT((ndo, " IPv6 EID,"));
-			#endif
 			packet_offset += 16;
 			break;
 		default:
@@ -349,11 +343,7 @@ void lisp_print(netdissect_options *ndo, const u_char *bp, u_int length)
 				break;
 			case IPv6_AFI:
 				ND_TCHECK2(*(packet_iterator + packet_offset), 16);
-				#ifdef INET6
-				ND_PRINT((ndo, " LOC %s", getname6(ndo, loc_ip_pointer)));
-				#else
-				ND_PRINT((ndo, " LOC IPv6"));
-				#endif
+				ND_PRINT((ndo, " LOC %s", ip6addr_string(ndo, loc_ip_pointer)));
 				packet_offset += 16;
 				break;
 			default:
@@ -370,13 +360,13 @@ void lisp_print(netdissect_options *ndo, const u_char *bp, u_int length)
 	}
 
 	/*
-	 * Print xTR and Site ID. Handle the fact that the packet could be malformed.
+	 * Print xTR and Site ID. Handle the fact that the packet could be invalid.
 	 * If the xTR_ID_Present bit is not set, and we still have data to display,
 	 * show it as hex data.
 	 */
 	if (xtr_present) {
 		if (!ND_TTEST2(*(packet_iterator + packet_offset), 24))
-			goto malformed;
+			goto invalid;
 		hex_print_with_offset(ndo, "\n    xTR-ID: ", packet_iterator + packet_offset, 16, 0);
 		ND_PRINT((ndo, "\n    SITE-ID: %" PRIu64,
 			EXTRACT_64BITS(packet_iterator + packet_offset + 16)));
@@ -389,14 +379,13 @@ void lisp_print(netdissect_options *ndo, const u_char *bp, u_int length)
 	}
 	return;
 trunc:
-	ND_PRINT((ndo, "\n    [|LISP]"));
+	ND_PRINT((ndo, "\n   %s", tstr));
 	return;
-malformed:
-	ND_PRINT((ndo, "\n    (malformed-packet)"));
+invalid:
+	ND_PRINT((ndo, "\n   %s", istr));
 	return;
 }
 
-
 static inline uint8_t extract_lisp_type(uint8_t lisp_hdr_flags)
 {
 	return (lisp_hdr_flags) >> TYPE_INDEX;
@@ -404,7 +393,7 @@ static inline uint8_t extract_lisp_type(uint8_t lisp_hdr_flags)
 
 static inline uint8_t is_xtr_data_present(uint8_t type, uint8_t lisp_hdr_flags)
 {
-	uint8_t xtr_present;
+	uint8_t xtr_present = 0;
 
 	if (type == LISP_MAP_REGISTER)
 		xtr_present = (lisp_hdr_flags) & LISP_MAP_REGISTER_IBIT_MASK;
@@ -436,7 +425,6 @@ static void lisp_hdr_flag(netdissect_options *ndo, const lisp_map_register_hdr *
 	return;
 }
 
-
 static void action_flag(netdissect_options *ndo, uint8_t act_auth_inc_res)
 {
 	uint8_t action;
@@ -453,7 +441,6 @@ static void action_flag(netdissect_options *ndo, uint8_t act_auth_inc_res)
 	ND_PRINT((ndo, " %s,", tok2str(lisp_eid_action, "unknown", action)));
 }
 
-
 static void loc_hdr_flag(netdissect_options *ndo, uint16_t flag)
 {
 	ND_PRINT((ndo, " flags [%s],", bittok2str(lisp_loc_flag, "none", flag)));