X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/bbf859b4155b079ba0072570d4bba3bd65d11ae4..1ff54606670b48238857a93a8234356f433df093:/print-lisp.c diff --git a/print-lisp.c b/print-lisp.c index 6b5b8151..cccc266e 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,13 +94,12 @@ * +-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ */ - #ifdef HAVE_CONFIG_H #include "config.h" #endif #include -#include +#include "netdissect.h" #include #include @@ -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) @@ -227,7 +229,8 @@ static void lisp_hdr_flag(netdissect_options *, const lisp_map_register_hdr *); static void action_flag(netdissect_options *, uint8_t); static void loc_hdr_flag(netdissect_options *, uint16_t); -void lisp_print(netdissect_options *ndo, const u_char *bp, u_int length) +void +lisp_print(netdissect_options *ndo, const u_char *bp, u_int length) { uint8_t type; uint8_t mask_len; @@ -260,13 +263,13 @@ void lisp_print(netdissect_options *ndo, const u_char *bp, u_int length) xtr_present = is_xtr_data_present(type, lisp_hdr->type_and_flag); /* Extract the number of EID records present */ - auth_data_len = EXTRACT_16BITS(&lisp_hdr->auth_data_len); + auth_data_len = EXTRACT_BE_U_2(&lisp_hdr->auth_data_len); packet_iterator = (const u_char *)(lisp_hdr); packet_offset = MAP_REGISTER_HDR_LEN; record_count = lisp_hdr->record_count; if (ndo->ndo_vflag) { - key_id = EXTRACT_16BITS(&lisp_hdr->key_id); + key_id = EXTRACT_BE_U_2(&lisp_hdr->key_id); ND_PRINT((ndo, "\n %u record(s), ", record_count)); ND_PRINT((ndo, "Authentication %s,", tok2str(auth_type, "unknown-type", key_id))); @@ -278,7 +281,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--)) { @@ -289,11 +292,11 @@ void lisp_print(netdissect_options *ndo, const u_char *bp, u_int length) ((const u_char *)lisp_hdr + packet_offset); packet_offset += MAP_REGISTER_EID_LEN; mask_len = lisp_eid->eid_prefix_mask_length; - eid_afi = EXTRACT_16BITS(&lisp_eid->eid_prefix_afi); + eid_afi = EXTRACT_BE_U_2(&lisp_eid->eid_prefix_afi); loc_count = lisp_eid->locator_count; if (ndo->ndo_vflag) { - ttl = EXTRACT_32BITS(&lisp_eid->ttl); + ttl = EXTRACT_BE_U_4(&lisp_eid->ttl); ND_PRINT((ndo, " Record TTL %u,", ttl)); action_flag(ndo, lisp_eid->act_auth_inc_res); map_version = (((lisp_eid->reserved_version_hi) & 15 ) * 255) + @@ -303,14 +306,14 @@ 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_TCHECK_4(packet_iterator + packet_offset); + 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_TCHECK_16(packet_iterator + packet_offset); + ND_PRINT((ndo, " EID %s/%u,", ip6addr_string(ndo, packet_iterator + packet_offset), mask_len)); packet_offset += 16; break; @@ -329,20 +332,20 @@ void lisp_print(netdissect_options *ndo, const u_char *bp, u_int length) lisp_loc = (const lisp_map_register_loc *) (packet_iterator + packet_offset); loc_ip_pointer = (const u_char *) (lisp_loc + 1); packet_offset += MAP_REGISTER_LOC_LEN; - loc_afi = EXTRACT_16BITS(&lisp_loc->locator_afi); + loc_afi = EXTRACT_BE_U_2(&lisp_loc->locator_afi); if (ndo->ndo_vflag) ND_PRINT((ndo, "\n ")); switch (loc_afi) { case IPv4_AFI: - ND_TCHECK2(*(packet_iterator + packet_offset), 4); - ND_PRINT((ndo, " LOC %s", getname(ndo, loc_ip_pointer))); + ND_TCHECK_4(packet_iterator + packet_offset); + 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_TCHECK_16(packet_iterator + packet_offset); + ND_PRINT((ndo, " LOC %s", ip6addr_string(ndo, loc_ip_pointer))); packet_offset += 16; break; default: @@ -353,22 +356,23 @@ void lisp_print(netdissect_options *ndo, const u_char *bp, u_int length) " Multicast Priority/Weight %u/%u,", lisp_loc->priority, lisp_loc->weight, lisp_loc->m_priority, lisp_loc->m_weight)); - loc_hdr_flag(ndo, EXTRACT_16BITS(&lisp_loc->unused_and_flag)); + loc_hdr_flag(ndo, + EXTRACT_BE_U_2(&lisp_loc->unused_and_flag)); } } } /* - * 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))); + EXTRACT_BE_U_8(packet_iterator + packet_offset + 16))); } else { /* Check if packet isn't over yet */ if (packet_iterator + packet_offset < ndo->ndo_snapend) { @@ -378,14 +382,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; @@ -416,16 +419,15 @@ static void lisp_hdr_flag(netdissect_options *ndo, const lisp_map_register_hdr * if (type == LISP_MAP_REGISTER) { ND_PRINT((ndo, " flags [%s],", bittok2str(map_register_hdr_flag, - "none", EXTRACT_32BITS(lisp_hdr)))); + "none", EXTRACT_BE_U_4(lisp_hdr)))); } else if (type == LISP_MAP_NOTIFY) { ND_PRINT((ndo, " flags [%s],", bittok2str(map_notify_hdr_flag, - "none", EXTRACT_32BITS(lisp_hdr)))); + "none", EXTRACT_BE_U_4(lisp_hdr)))); } return; } - static void action_flag(netdissect_options *ndo, uint8_t act_auth_inc_res) { uint8_t action; @@ -442,7 +444,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)));