* +-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
*/
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
#include "netdissect-stdinc.h"
+
+#define ND_LONGJMP_FROM_TCHECK
#include "netdissect.h"
-#include <string.h>
-#include <stdlib.h>
#include "ip.h"
#include "ip6.h"
#include "extract.h"
#include "addrtoname.h"
-
#define IPv4_AFI 1
#define IPv6_AFI 2
#define TYPE_INDEX 4
};
static const struct tok lisp_type [] = {
- { 0, "LISP-Reserved" },
- { 1, "LISP-Map-Request" },
- { 2, "LISP-Map-Reply" },
- { 3, "LISP-Map-Register" },
- { 4, "LISP-Map-Notify" },
- { 8, "LISP-Encapsulated-Contol-Message" },
+ { 0, "LISP-Reserved" },
+ { 1, "LISP-Map-Request" },
+ { 2, "LISP-Map-Reply" },
+ { 3, "LISP-Map-Register" },
+ { 4, "LISP-Map-Notify" },
+ { 8, "LISP-Encapsulated-Control-Message" },
{ 0, NULL }
};
uint16_t packet_offset;
uint16_t auth_data_len;
uint32_t ttl;
- const u_char *packet_iterator;
- const u_char *loc_ip_pointer;
const lisp_map_register_hdr *lisp_hdr;
const lisp_map_register_eid *lisp_eid;
const lisp_map_register_loc *lisp_loc;
ndo->ndo_protocol = "lisp";
- /* Check if enough bytes for header are available */
- ND_TCHECK_LEN(bp, MAP_REGISTER_HDR_LEN);
lisp_hdr = (const lisp_map_register_hdr *) bp;
lisp_hdr_flag(ndo, lisp_hdr);
/* Supporting only MAP NOTIFY and MAP REGISTER LISP packets */
type_and_flag = GET_U_1(lisp_hdr->type_and_flag);
type = extract_lisp_type(type_and_flag);
- if ((type != LISP_MAP_REGISTER) && (type != LISP_MAP_NOTIFY))
+ if ((type != LISP_MAP_REGISTER) && (type != LISP_MAP_NOTIFY)) {
+ ND_TCHECK_LEN(bp, MAP_REGISTER_HDR_LEN);
return;
+ }
/* Find if the packet contains xTR and Site-ID data */
xtr_present = is_xtr_data_present(type, type_and_flag);
/* Extract the number of EID records present */
auth_data_len = GET_BE_U_2(lisp_hdr->auth_data_len);
- packet_iterator = (const u_char *)(lisp_hdr);
packet_offset = MAP_REGISTER_HDR_LEN;
record_count = GET_U_1(lisp_hdr->record_count);
key_id = GET_BE_U_2(lisp_hdr->key_id);
ND_PRINT("\n %u record(s), ", record_count);
ND_PRINT("Authentication %s,",
- tok2str(auth_type, "unknown-type", key_id));
- hex_print(ndo, "\n Authentication-Data: ", packet_iterator +
- packet_offset, auth_data_len);
+ tok2str(auth_type, "unknown-type", key_id));
+ ND_ICHECKMSG_ZU("authentication data length", auth_data_len, >,
+ length - MAP_REGISTER_HDR_LEN);
+ hex_print(ndo, "\n Authentication-Data: ",
+ bp + packet_offset, auth_data_len);
} else {
ND_PRINT(" %u record(s),", record_count);
+ ND_ICHECKMSG_ZU("authentication data length", auth_data_len, >,
+ length - MAP_REGISTER_HDR_LEN);
}
packet_offset += auth_data_len;
- if (record_count == 0)
- goto invalid;
+ ND_ICHECKMSG_U("record count", record_count, ==, 0);
/* Print all the EID records */
- while ((length > packet_offset) && (record_count--)) {
-
- ND_TCHECK_LEN(packet_iterator + packet_offset,
- MAP_REGISTER_EID_LEN);
+ while ((length > packet_offset) && (record_count != 0)) {
+ record_count--;
+ ND_TCHECK_LEN(bp + packet_offset, MAP_REGISTER_EID_LEN);
ND_PRINT("\n");
- lisp_eid = (const lisp_map_register_eid *)
- ((const u_char *)lisp_hdr + packet_offset);
+ lisp_eid = (const lisp_map_register_eid *) (bp + packet_offset);
packet_offset += MAP_REGISTER_EID_LEN;
mask_len = GET_U_1(lisp_eid->eid_prefix_mask_length);
eid_afi = GET_BE_U_2(lisp_eid->eid_prefix_afi);
switch (eid_afi) {
case IPv4_AFI:
- ND_TCHECK_4(packet_iterator + packet_offset);
ND_PRINT(" EID %s/%u,",
- GET_IPADDR_STRING(packet_iterator + packet_offset),
- mask_len);
+ GET_IPADDR_STRING(bp + packet_offset),
+ mask_len);
packet_offset += 4;
break;
case IPv6_AFI:
- ND_TCHECK_16(packet_iterator + packet_offset);
ND_PRINT(" EID %s/%u,",
- GET_IP6ADDR_STRING(packet_iterator + packet_offset),
- mask_len);
+ GET_IP6ADDR_STRING(bp + packet_offset),
+ mask_len);
packet_offset += 16;
break;
default:
+ ND_PRINT(" [unsuported address family identifier %u]",
+ eid_afi);
/*
* No support for LCAF right now.
*/
return;
- break;
}
ND_PRINT(" %u locator(s)", loc_count);
- while (loc_count--) {
- ND_TCHECK_LEN(packet_iterator + packet_offset,
- MAP_REGISTER_LOC_LEN);
- lisp_loc = (const lisp_map_register_loc *) (packet_iterator + packet_offset);
- loc_ip_pointer = (const u_char *) (lisp_loc + 1);
+ while (loc_count != 0) {
+ loc_count--;
+ ND_TCHECK_LEN(bp + packet_offset, MAP_REGISTER_LOC_LEN);
+ lisp_loc = (const lisp_map_register_loc *) (bp + packet_offset);
packet_offset += MAP_REGISTER_LOC_LEN;
loc_afi = GET_BE_U_2(lisp_loc->locator_afi);
switch (loc_afi) {
case IPv4_AFI:
- ND_TCHECK_4(packet_iterator + packet_offset);
- ND_PRINT(" LOC %s", GET_IPADDR_STRING(loc_ip_pointer));
+ ND_PRINT(" LOC %s",
+ GET_IPADDR_STRING(bp + packet_offset));
packet_offset += 4;
break;
case IPv6_AFI:
- ND_TCHECK_16(packet_iterator + packet_offset);
- ND_PRINT(" LOC %s", GET_IP6ADDR_STRING(loc_ip_pointer));
+ ND_PRINT(" LOC %s",
+ GET_IP6ADDR_STRING(bp + packet_offset));
packet_offset += 16;
break;
default:
}
/*
- * 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.
+ * Print xTR and Site ID.
+ * 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_TTEST_LEN(packet_iterator + packet_offset, 24))
- goto invalid;
- hex_print(ndo, "\n xTR-ID: ", packet_iterator + packet_offset, 16);
+ hex_print(ndo, "\n xTR-ID: ", bp + packet_offset, 16);
ND_PRINT("\n SITE-ID: %" PRIu64,
- GET_BE_U_8(packet_iterator + packet_offset + 16));
+ GET_BE_U_8(bp + packet_offset + 16));
} else {
- /* Check if packet isn't over yet */
- if (packet_iterator + packet_offset < ndo->ndo_snapend) {
- hex_print(ndo, "\n Data: ", packet_iterator + packet_offset,
- ND_BYTES_AVAILABLE_AFTER(packet_iterator + packet_offset));
+ /* If there's at least one byte to print */
+ if (ND_TTEST_LEN(bp + packet_offset, 1)) {
+ hex_print(ndo, "\n Data: ", bp + packet_offset,
+ ND_BYTES_AVAILABLE_AFTER(bp + packet_offset));
}
}
return;
-trunc:
- nd_print_trunc(ndo);
- return;
+
invalid:
nd_print_invalid(ndo);
- return;
}
static uint8_t
{
uint8_t type = extract_lisp_type(GET_U_1(lisp_hdr->type_and_flag));
- if (!ndo->ndo_vflag) {
- ND_PRINT("%s,", tok2str(lisp_type, "unknown-type-%u", type));
+ ND_PRINT("%s,", tok2str(lisp_type, "unknown-type-%u", type));
+ if (!ndo->ndo_vflag)
return;
- } else {
- ND_PRINT("%s,", tok2str(lisp_type, "unknown-type-%u", type));
- }
if (type == LISP_MAP_REGISTER) {
ND_PRINT(" flags [%s],", bittok2str(map_register_hdr_flag,
ND_PRINT(" flags [%s],", bittok2str(map_notify_hdr_flag,
"none", GET_BE_U_4(lisp_hdr)));
}
-
- return;
}
static void action_flag(netdissect_options *ndo, uint8_t act_auth_inc_res)
{
ND_PRINT(" flags [%s],", bittok2str(lisp_loc_flag, "none", flag));
}
-
projects / tcpdump / blobdiff