X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/bbf859b4155b079ba0072570d4bba3bd65d11ae4..refs/heads/tcpdump-4.9:/print-lisp.c

diff --git a/print-lisp.c b/print-lisp.c
index 6b5b8151..47afe503 100644
--- a/print-lisp.c
+++ b/print-lisp.c
@@ -26,9 +26,10 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+/* \summary: - Locator/Identifier Separation Protocol (LISP) printer */
+
 /*
- * tcpdump filter for LISP - Locator/Identifier Separation Protocol
- * RFC 6830
+ * specification: RFC 6830
  *
  *
  * The Map-Register message format is:
@@ -93,7 +94,6 @@
  *  +-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -109,6 +109,8 @@
 #include "extract.h"
 #include "addrtoname.h"
 
+static const char tstr[] = " [|LISP]";
+
 #define IPv4_AFI			1
 #define IPv6_AFI			2
 #define TYPE_INDEX			4
@@ -186,38 +188,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)
 
@@ -278,7 +280,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--)) {
@@ -304,13 +306,13 @@ void lisp_print(netdissect_options *ndo, const u_char *bp, u_int length)
 		switch (eid_afi) {
 		case IPv4_AFI:
 			ND_TCHECK2(*(packet_iterator + packet_offset), 4);
-			ND_PRINT((ndo, " EID %s/%u,", getname(ndo,
+			ND_PRINT((ndo, " EID %s/%u,", ipaddr_string(ndo,
 				packet_iterator + packet_offset), mask_len));
 			packet_offset += 4;
 			break;
 		case IPv6_AFI:
 			ND_TCHECK2(*(packet_iterator + packet_offset), 16);
-			ND_PRINT((ndo, " EID %s/%u,", getname6(ndo,
+			ND_PRINT((ndo, " EID %s/%u,", ip6addr_string(ndo,
 				packet_iterator + packet_offset), mask_len));
 			packet_offset += 16;
 			break;
@@ -337,12 +339,12 @@ void lisp_print(netdissect_options *ndo, const u_char *bp, u_int length)
 			switch (loc_afi) {
 			case IPv4_AFI:
 				ND_TCHECK2(*(packet_iterator + packet_offset), 4);
-				ND_PRINT((ndo, " LOC %s", getname(ndo, loc_ip_pointer)));
+				ND_PRINT((ndo, " LOC %s", ipaddr_string(ndo, loc_ip_pointer)));
 				packet_offset += 4;
 				break;
 			case IPv6_AFI:
 				ND_TCHECK2(*(packet_iterator + packet_offset), 16);
-				ND_PRINT((ndo, " LOC %s", getname6(ndo, loc_ip_pointer)));
+				ND_PRINT((ndo, " LOC %s", ip6addr_string(ndo, loc_ip_pointer)));
 				packet_offset += 16;
 				break;
 			default:
@@ -359,13 +361,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)));
@@ -378,14 +380,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;
@@ -425,7 +426,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;
@@ -442,7 +442,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)));