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

diff --git a/print-lisp.c b/print-lisp.c
index 327e99e2..325f9840 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
  *
  *
@@ -104,12 +104,9 @@
 #include <stdlib.h>
 
 #include "ip.h"
-#ifdef INET6
 #include "ip6.h"
-#endif
 
 #include "extract.h"
-#include "interface.h"
 #include "addrtoname.h"
 
 #define IPv4_AFI			1
@@ -189,38 +186,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)
 
@@ -313,12 +310,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,
 				packet_iterator + packet_offset), mask_len));
-			#else
-			ND_PRINT((ndo, " IPv6 EID,"));
-			#endif
 			packet_offset += 16;
 			break;
 		default:
@@ -349,11 +342,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
 				packet_offset += 16;
 				break;
 			default:
@@ -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;