aboutsummaryrefslogtreecommitdiff
path: root/print-lspping.c
diff options
context:
space:
mode:
Diffstat (limited to 'print-lspping.c')
-rw-r--r--print-lspping.c546
1 files changed, 269 insertions, 277 deletions
diff --git a/print-lspping.c b/print-lspping.c
index 274cc68b7630..f3183cb29299 100644
--- a/print-lspping.c
+++ b/print-lspping.c
@@ -15,20 +15,23 @@
/* \summary: MPLS LSP PING printer */
+/* specification: RFC 4379 */
+
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
#endif
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
+#define ND_LONGJMP_FROM_TCHECK
#include "netdissect.h"
#include "extract.h"
#include "addrtoname.h"
+#include "ntp.h"
#include "l2vpn.h"
#include "oui.h"
-/* RFC 4349 */
/*
* LSPPING common header
@@ -59,18 +62,16 @@
*/
struct lspping_common_header {
- uint8_t version[2];
- uint8_t global_flags[2];
- uint8_t msg_type;
- uint8_t reply_mode;
- uint8_t return_code;
- uint8_t return_subcode;
- uint8_t sender_handle[4];
- uint8_t seq_number[4];
- uint8_t ts_sent_sec[4];
- uint8_t ts_sent_usec[4];
- uint8_t ts_rcvd_sec[4];
- uint8_t ts_rcvd_usec[4];
+ nd_uint16_t version;
+ nd_uint16_t global_flags;
+ nd_uint8_t msg_type;
+ nd_uint8_t reply_mode;
+ nd_uint8_t return_code;
+ nd_uint8_t return_subcode;
+ nd_uint32_t sender_handle;
+ nd_uint32_t seq_number;
+ struct l_fixedpt ts_sent;
+ struct l_fixedpt ts_rcvd;
};
#define LSPPING_VERSION 1
@@ -124,8 +125,8 @@ static const struct tok lspping_return_code_values[] = {
*/
struct lspping_tlv_header {
- uint8_t type[2];
- uint8_t length[2];
+ nd_uint16_t type;
+ nd_uint16_t length;
};
#define LSPPING_TLV_TARGET_FEC_STACK 1
@@ -199,8 +200,8 @@ static const struct tok lspping_tlvtargetfec_subtlv_values[] = {
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
*/
struct lspping_tlv_targetfec_subtlv_ldp_ipv4_t {
- uint8_t prefix [4];
- uint8_t prefix_len;
+ nd_ipv4 prefix;
+ nd_uint8_t prefix_len;
};
/*
@@ -216,8 +217,8 @@ struct lspping_tlv_targetfec_subtlv_ldp_ipv4_t {
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
*/
struct lspping_tlv_targetfec_subtlv_ldp_ipv6_t {
- uint8_t prefix [16];
- uint8_t prefix_len;
+ nd_ipv6 prefix;
+ nd_uint8_t prefix_len;
};
/*
@@ -236,13 +237,13 @@ struct lspping_tlv_targetfec_subtlv_ldp_ipv6_t {
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
*/
struct lspping_tlv_targetfec_subtlv_rsvp_ipv4_t {
- uint8_t tunnel_endpoint [4];
- uint8_t res[2];
- uint8_t tunnel_id[2];
- uint8_t extended_tunnel_id[4];
- uint8_t tunnel_sender [4];
- uint8_t res2[2];
- uint8_t lsp_id [2];
+ nd_ipv4 tunnel_endpoint;
+ nd_byte res[2];
+ nd_uint16_t tunnel_id;
+ nd_ipv4 extended_tunnel_id;
+ nd_ipv4 tunnel_sender;
+ nd_byte res2[2];
+ nd_uint16_t lsp_id;
};
/*
@@ -270,13 +271,13 @@ struct lspping_tlv_targetfec_subtlv_rsvp_ipv4_t {
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
*/
struct lspping_tlv_targetfec_subtlv_rsvp_ipv6_t {
- uint8_t tunnel_endpoint [16];
- uint8_t res[2];
- uint8_t tunnel_id[2];
- uint8_t extended_tunnel_id[16];
- uint8_t tunnel_sender [16];
- uint8_t res2[2];
- uint8_t lsp_id [2];
+ nd_ipv6 tunnel_endpoint;
+ nd_byte res[2];
+ nd_uint16_t tunnel_id;
+ nd_ipv6 extended_tunnel_id;
+ nd_ipv6 tunnel_sender;
+ nd_byte res2[2];
+ nd_uint16_t lsp_id;
};
/*
@@ -292,9 +293,9 @@ struct lspping_tlv_targetfec_subtlv_rsvp_ipv6_t {
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
*/
struct lspping_tlv_targetfec_subtlv_l3vpn_ipv4_t {
- uint8_t rd [8];
- uint8_t prefix [4];
- uint8_t prefix_len;
+ nd_byte rd[8];
+ nd_ipv4 prefix;
+ nd_uint8_t prefix_len;
};
/*
@@ -313,9 +314,9 @@ struct lspping_tlv_targetfec_subtlv_l3vpn_ipv4_t {
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
*/
struct lspping_tlv_targetfec_subtlv_l3vpn_ipv6_t {
- uint8_t rd [8];
- uint8_t prefix [16];
- uint8_t prefix_len;
+ nd_byte rd[8];
+ nd_ipv6 prefix;
+ nd_uint8_t prefix_len;
};
/*
@@ -332,10 +333,10 @@ struct lspping_tlv_targetfec_subtlv_l3vpn_ipv6_t {
* 0 1 2 3
*/
struct lspping_tlv_targetfec_subtlv_l2vpn_endpt_t {
- uint8_t rd [8];
- uint8_t sender_ve_id [2];
- uint8_t receiver_ve_id [2];
- uint8_t encapsulation[2];
+ nd_byte rd[8];
+ nd_uint16_t sender_ve_id;
+ nd_uint16_t receiver_ve_id;
+ nd_uint16_t encapsulation;
};
/*
@@ -349,9 +350,9 @@ struct lspping_tlv_targetfec_subtlv_l2vpn_endpt_t {
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
*/
struct lspping_tlv_targetfec_subtlv_fec_128_pw_old {
- uint8_t remote_pe_address [4];
- uint8_t pw_id [4];
- uint8_t pw_type[2];
+ nd_ipv4 remote_pe_address;
+ nd_uint32_t pw_id;
+ nd_uint16_t pw_type;
};
/*
@@ -367,10 +368,10 @@ struct lspping_tlv_targetfec_subtlv_fec_128_pw_old {
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
*/
struct lspping_tlv_targetfec_subtlv_fec_128_pw {
- uint8_t sender_pe_address [4];
- uint8_t remote_pe_address [4];
- uint8_t pw_id [4];
- uint8_t pw_type[2];
+ nd_ipv4 sender_pe_address;
+ nd_ipv4 remote_pe_address;
+ nd_uint32_t pw_id;
+ nd_uint16_t pw_type;
};
/*
@@ -382,8 +383,8 @@ struct lspping_tlv_targetfec_subtlv_fec_128_pw {
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
*/
struct lspping_tlv_targetfec_subtlv_bgp_ipv4_t {
- uint8_t prefix [4];
- uint8_t prefix_len;
+ nd_ipv4 prefix;
+ nd_uint8_t prefix_len;
};
/*
@@ -398,8 +399,8 @@ struct lspping_tlv_targetfec_subtlv_bgp_ipv4_t {
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
*/
struct lspping_tlv_targetfec_subtlv_bgp_ipv6_t {
- uint8_t prefix [16];
- uint8_t prefix_len;
+ nd_ipv6 prefix;
+ nd_uint8_t prefix_len;
};
/*
@@ -429,47 +430,47 @@ struct lspping_tlv_targetfec_subtlv_bgp_ipv6_t {
*/
/* Enough to get the address type */
struct lspping_tlv_downstream_map_t {
- uint8_t mtu [2];
- uint8_t address_type;
- uint8_t ds_flags;
+ nd_uint16_t mtu;
+ nd_uint8_t address_type;
+ nd_uint8_t ds_flags;
};
struct lspping_tlv_downstream_map_ipv4_t {
- uint8_t mtu [2];
- uint8_t address_type;
- uint8_t ds_flags;
- uint8_t downstream_ip[4];
- uint8_t downstream_interface[4];
+ nd_uint16_t mtu;
+ nd_uint8_t address_type;
+ nd_uint8_t ds_flags;
+ nd_ipv4 downstream_ip;
+ nd_ipv4 downstream_interface;
};
struct lspping_tlv_downstream_map_ipv4_unmb_t {
- uint8_t mtu [2];
- uint8_t address_type;
- uint8_t ds_flags;
- uint8_t downstream_ip[4];
- uint8_t downstream_interface[4];
+ nd_uint16_t mtu;
+ nd_uint8_t address_type;
+ nd_uint8_t ds_flags;
+ nd_ipv4 downstream_ip;
+ nd_uint32_t downstream_interface;
};
struct lspping_tlv_downstream_map_ipv6_t {
- uint8_t mtu [2];
- uint8_t address_type;
- uint8_t ds_flags;
- uint8_t downstream_ip[16];
- uint8_t downstream_interface[16];
+ nd_uint16_t mtu;
+ nd_uint8_t address_type;
+ nd_uint8_t ds_flags;
+ nd_ipv6 downstream_ip;
+ nd_ipv6 downstream_interface;
};
struct lspping_tlv_downstream_map_ipv6_unmb_t {
- uint8_t mtu [2];
- uint8_t address_type;
- uint8_t ds_flags;
- uint8_t downstream_ip[16];
- uint8_t downstream_interface[4];
+ nd_uint16_t mtu;
+ nd_uint8_t address_type;
+ nd_uint8_t ds_flags;
+ nd_ipv6 downstream_ip;
+ nd_uint32_t downstream_interface;
};
struct lspping_tlv_downstream_map_info_t {
- uint8_t multipath_type;
- uint8_t depth_limit;
- uint8_t multipath_length [2];
+ nd_uint8_t multipath_type;
+ nd_uint8_t depth_limit;
+ nd_uint16_t multipath_length;
};
#define LSPPING_AFI_IPV4 1
@@ -487,16 +488,18 @@ static const struct tok lspping_tlv_downstream_addr_values[] = {
void
lspping_print(netdissect_options *ndo,
- register const u_char *pptr, register u_int len)
+ const u_char *pptr, u_int len)
{
const struct lspping_common_header *lspping_com_header;
const struct lspping_tlv_header *lspping_tlv_header;
const struct lspping_tlv_header *lspping_subtlv_header;
const u_char *tptr,*tlv_tptr,*subtlv_tptr;
+ u_int return_code, return_subcode;
u_int tlen,lspping_tlv_len,lspping_tlv_type,tlv_tlen;
int tlv_hexdump,subtlv_hexdump;
u_int lspping_subtlv_len,lspping_subtlv_type;
- struct timeval timestamp;
+ uint32_t int_part, fraction;
+ u_int address_type;
union {
const struct lspping_tlv_downstream_map_t *lspping_tlv_downstream_map;
@@ -521,28 +524,29 @@ lspping_print(netdissect_options *ndo,
const struct lspping_tlv_targetfec_subtlv_bgp_ipv6_t *lspping_tlv_targetfec_subtlv_bgp_ipv6;
} subtlv_ptr;
+ ndo->ndo_protocol = "lspping";
tptr=pptr;
lspping_com_header = (const struct lspping_common_header *)pptr;
- if (len < sizeof(const struct lspping_common_header))
+ if (len < sizeof(struct lspping_common_header))
goto tooshort;
- ND_TCHECK(*lspping_com_header);
+ ND_TCHECK_SIZE(lspping_com_header);
/*
* Sanity checking of the header.
*/
- if (EXTRACT_16BITS(&lspping_com_header->version[0]) != LSPPING_VERSION) {
- ND_PRINT((ndo, "LSP-PING version %u packet not supported",
- EXTRACT_16BITS(&lspping_com_header->version[0])));
+ if (GET_BE_U_2(lspping_com_header->version) != LSPPING_VERSION) {
+ ND_PRINT("LSP-PING version %u packet not supported",
+ GET_BE_U_2(lspping_com_header->version));
return;
}
/* in non-verbose mode just lets print the basic Message Type*/
if (ndo->ndo_vflag < 1) {
- ND_PRINT((ndo, "LSP-PINGv%u, %s, seq %u, length: %u",
- EXTRACT_16BITS(&lspping_com_header->version[0]),
- tok2str(lspping_msg_type_values, "unknown (%u)",lspping_com_header->msg_type),
- EXTRACT_32BITS(lspping_com_header->seq_number),
- len));
+ ND_PRINT("LSP-PINGv%u, %s, seq %u, length: %u",
+ GET_BE_U_2(lspping_com_header->version),
+ tok2str(lspping_msg_type_values, "unknown (%u)",GET_U_1(lspping_com_header->msg_type)),
+ GET_BE_U_4(lspping_com_header->seq_number),
+ len);
return;
}
@@ -550,73 +554,71 @@ lspping_print(netdissect_options *ndo,
tlen=len;
- ND_PRINT((ndo, "\n\tLSP-PINGv%u, msg-type: %s (%u), length: %u\n\t reply-mode: %s (%u)",
- EXTRACT_16BITS(&lspping_com_header->version[0]),
- tok2str(lspping_msg_type_values, "unknown",lspping_com_header->msg_type),
- lspping_com_header->msg_type,
+ ND_PRINT("\n\tLSP-PINGv%u, msg-type: %s (%u), length: %u\n\t reply-mode: %s (%u)",
+ GET_BE_U_2(lspping_com_header->version),
+ tok2str(lspping_msg_type_values, "unknown",GET_U_1(lspping_com_header->msg_type)),
+ GET_U_1(lspping_com_header->msg_type),
len,
- tok2str(lspping_reply_mode_values, "unknown",lspping_com_header->reply_mode),
- lspping_com_header->reply_mode));
+ tok2str(lspping_reply_mode_values, "unknown",GET_U_1(lspping_com_header->reply_mode)),
+ GET_U_1(lspping_com_header->reply_mode));
/*
* the following return codes require that the subcode is attached
* at the end of the translated token output
*/
- if (lspping_com_header->return_code == 3 ||
- lspping_com_header->return_code == 4 ||
- lspping_com_header->return_code == 8 ||
- lspping_com_header->return_code == 10 ||
- lspping_com_header->return_code == 11 ||
- lspping_com_header->return_code == 12 )
- ND_PRINT((ndo, "\n\t Return Code: %s %u (%u)\n\t Return Subcode: (%u)",
- tok2str(lspping_return_code_values, "unknown",lspping_com_header->return_code),
- lspping_com_header->return_subcode,
- lspping_com_header->return_code,
- lspping_com_header->return_subcode));
+ return_code = GET_U_1(lspping_com_header->return_code);
+ return_subcode = GET_U_1(lspping_com_header->return_subcode);
+ if (return_code == 3 ||
+ return_code == 4 ||
+ return_code == 8 ||
+ return_code == 10 ||
+ return_code == 11 ||
+ return_code == 12 )
+ ND_PRINT("\n\t Return Code: %s %u (%u)\n\t Return Subcode: (%u)",
+ tok2str(lspping_return_code_values, "unknown",return_code),
+ return_subcode,
+ return_code,
+ return_subcode);
else
- ND_PRINT((ndo, "\n\t Return Code: %s (%u)\n\t Return Subcode: (%u)",
- tok2str(lspping_return_code_values, "unknown",lspping_com_header->return_code),
- lspping_com_header->return_code,
- lspping_com_header->return_subcode));
-
- ND_PRINT((ndo, "\n\t Sender Handle: 0x%08x, Sequence: %u",
- EXTRACT_32BITS(lspping_com_header->sender_handle),
- EXTRACT_32BITS(lspping_com_header->seq_number)));
-
- timestamp.tv_sec=EXTRACT_32BITS(lspping_com_header->ts_sent_sec);
- timestamp.tv_usec=EXTRACT_32BITS(lspping_com_header->ts_sent_usec);
- ND_PRINT((ndo, "\n\t Sender Timestamp: "));
- ts_print(ndo, &timestamp);
-
- timestamp.tv_sec=EXTRACT_32BITS(lspping_com_header->ts_rcvd_sec);
- timestamp.tv_usec=EXTRACT_32BITS(lspping_com_header->ts_rcvd_usec);
- ND_PRINT((ndo, "Receiver Timestamp: "));
- if ((timestamp.tv_sec != 0) && (timestamp.tv_usec != 0))
- ts_print(ndo, &timestamp);
+ ND_PRINT("\n\t Return Code: %s (%u)\n\t Return Subcode: (%u)",
+ tok2str(lspping_return_code_values, "unknown",return_code),
+ return_code,
+ return_subcode);
+
+ ND_PRINT("\n\t Sender Handle: 0x%08x, Sequence: %u",
+ GET_BE_U_4(lspping_com_header->sender_handle),
+ GET_BE_U_4(lspping_com_header->seq_number));
+
+ ND_PRINT("\n\t Sender Timestamp: ");
+ p_ntp_time(ndo, &lspping_com_header->ts_sent);
+ ND_PRINT(" ");
+
+ int_part=GET_BE_U_4(lspping_com_header->ts_rcvd.int_part);
+ fraction=GET_BE_U_4(lspping_com_header->ts_rcvd.fraction);
+ ND_PRINT("Receiver Timestamp: ");
+ if (! (int_part == 0 && fraction == 0))
+ p_ntp_time(ndo, &lspping_com_header->ts_rcvd);
else
- ND_PRINT((ndo, "no timestamp"));
+ ND_PRINT("no timestamp");
- tptr+=sizeof(const struct lspping_common_header);
- tlen-=sizeof(const struct lspping_common_header);
+ tptr+=sizeof(struct lspping_common_header);
+ tlen-=sizeof(struct lspping_common_header);
while (tlen != 0) {
/* Does the TLV go past the end of the packet? */
if (tlen < sizeof(struct lspping_tlv_header))
goto tooshort;
- /* did we capture enough for fully decoding the tlv header ? */
- ND_TCHECK2(*tptr, sizeof(struct lspping_tlv_header));
-
lspping_tlv_header = (const struct lspping_tlv_header *)tptr;
- lspping_tlv_type=EXTRACT_16BITS(lspping_tlv_header->type);
- lspping_tlv_len=EXTRACT_16BITS(lspping_tlv_header->length);
+ lspping_tlv_type=GET_BE_U_2(lspping_tlv_header->type);
+ lspping_tlv_len=GET_BE_U_2(lspping_tlv_header->length);
- ND_PRINT((ndo, "\n\t %s TLV (%u), length: %u",
+ ND_PRINT("\n\t %s TLV (%u), length: %u",
tok2str(lspping_tlv_values,
"Unknown",
lspping_tlv_type),
lspping_tlv_type,
- lspping_tlv_len));
+ lspping_tlv_len);
/* some little sanity checking */
if (lspping_tlv_len == 0) {
@@ -632,7 +634,7 @@ lspping_print(netdissect_options *ndo,
if (tlen < lspping_tlv_len+sizeof(struct lspping_tlv_header))
goto tooshort;
/* did we capture enough for fully decoding the tlv ? */
- ND_TCHECK2(*tlv_tptr, lspping_tlv_len);
+ ND_TCHECK_LEN(tlv_tptr, lspping_tlv_len);
tlv_hexdump=FALSE;
switch(lspping_tlv_type) {
@@ -640,177 +642,175 @@ lspping_print(netdissect_options *ndo,
while (tlv_tlen != 0) {
/* Does the subTLV header go past the end of the TLV? */
if (tlv_tlen < sizeof(struct lspping_tlv_header)) {
- ND_PRINT((ndo, "\n\t TLV is too short"));
+ ND_PRINT("\n\t TLV is too short");
tlv_hexdump = TRUE;
goto tlv_tooshort;
}
- /* did we capture enough for fully decoding the subtlv header ? */
- ND_TCHECK2(*tlv_tptr, sizeof(struct lspping_tlv_header));
subtlv_hexdump=FALSE;
lspping_subtlv_header = (const struct lspping_tlv_header *)tlv_tptr;
- lspping_subtlv_type=EXTRACT_16BITS(lspping_subtlv_header->type);
- lspping_subtlv_len=EXTRACT_16BITS(lspping_subtlv_header->length);
+ lspping_subtlv_type=GET_BE_U_2(lspping_subtlv_header->type);
+ lspping_subtlv_len=GET_BE_U_2(lspping_subtlv_header->length);
subtlv_tptr=tlv_tptr+sizeof(struct lspping_tlv_header);
/* Does the subTLV go past the end of the TLV? */
if (tlv_tlen < lspping_subtlv_len+sizeof(struct lspping_tlv_header)) {
- ND_PRINT((ndo, "\n\t TLV is too short"));
+ ND_PRINT("\n\t TLV is too short");
tlv_hexdump = TRUE;
goto tlv_tooshort;
}
/* Did we capture enough for fully decoding the subTLV? */
- ND_TCHECK2(*subtlv_tptr, lspping_subtlv_len);
+ ND_TCHECK_LEN(subtlv_tptr, lspping_subtlv_len);
- ND_PRINT((ndo, "\n\t %s subTLV (%u), length: %u",
+ ND_PRINT("\n\t %s subTLV (%u), length: %u",
tok2str(lspping_tlvtargetfec_subtlv_values,
"Unknown",
lspping_subtlv_type),
lspping_subtlv_type,
- lspping_subtlv_len));
+ lspping_subtlv_len);
switch(lspping_subtlv_type) {
case LSPPING_TLV_TARGETFEC_SUBTLV_LDP_IPV4:
/* Is the subTLV length correct? */
if (lspping_subtlv_len != 5) {
- ND_PRINT((ndo, "\n\t invalid subTLV length, should be 5"));
+ ND_PRINT("\n\t invalid subTLV length, should be 5");
subtlv_hexdump=TRUE; /* unknown subTLV just hexdump it */
} else {
- subtlv_ptr.lspping_tlv_targetfec_subtlv_ldp_ipv4 = \
+ subtlv_ptr.lspping_tlv_targetfec_subtlv_ldp_ipv4 =
(const struct lspping_tlv_targetfec_subtlv_ldp_ipv4_t *)subtlv_tptr;
- ND_PRINT((ndo, "\n\t %s/%u",
- ipaddr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_ldp_ipv4->prefix),
- subtlv_ptr.lspping_tlv_targetfec_subtlv_ldp_ipv4->prefix_len));
+ ND_PRINT("\n\t %s/%u",
+ GET_IPADDR_STRING(subtlv_ptr.lspping_tlv_targetfec_subtlv_ldp_ipv4->prefix),
+ GET_U_1(subtlv_ptr.lspping_tlv_targetfec_subtlv_ldp_ipv4->prefix_len));
}
break;
case LSPPING_TLV_TARGETFEC_SUBTLV_LDP_IPV6:
/* Is the subTLV length correct? */
if (lspping_subtlv_len != 17) {
- ND_PRINT((ndo, "\n\t invalid subTLV length, should be 17"));
+ ND_PRINT("\n\t invalid subTLV length, should be 17");
subtlv_hexdump=TRUE; /* unknown subTLV just hexdump it */
} else {
- subtlv_ptr.lspping_tlv_targetfec_subtlv_ldp_ipv6 = \
+ subtlv_ptr.lspping_tlv_targetfec_subtlv_ldp_ipv6 =
(const struct lspping_tlv_targetfec_subtlv_ldp_ipv6_t *)subtlv_tptr;
- ND_PRINT((ndo, "\n\t %s/%u",
- ip6addr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_ldp_ipv6->prefix),
- subtlv_ptr.lspping_tlv_targetfec_subtlv_ldp_ipv6->prefix_len));
+ ND_PRINT("\n\t %s/%u",
+ GET_IP6ADDR_STRING(subtlv_ptr.lspping_tlv_targetfec_subtlv_ldp_ipv6->prefix),
+ GET_U_1(subtlv_ptr.lspping_tlv_targetfec_subtlv_ldp_ipv6->prefix_len));
}
break;
case LSPPING_TLV_TARGETFEC_SUBTLV_BGP_IPV4:
/* Is the subTLV length correct? */
if (lspping_subtlv_len != 5) {
- ND_PRINT((ndo, "\n\t invalid subTLV length, should be 5"));
+ ND_PRINT("\n\t invalid subTLV length, should be 5");
subtlv_hexdump=TRUE; /* unknown subTLV just hexdump it */
} else {
- subtlv_ptr.lspping_tlv_targetfec_subtlv_bgp_ipv4 = \
+ subtlv_ptr.lspping_tlv_targetfec_subtlv_bgp_ipv4 =
(const struct lspping_tlv_targetfec_subtlv_bgp_ipv4_t *)subtlv_tptr;
- ND_PRINT((ndo, "\n\t %s/%u",
- ipaddr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_bgp_ipv4->prefix),
- subtlv_ptr.lspping_tlv_targetfec_subtlv_bgp_ipv4->prefix_len));
+ ND_PRINT("\n\t %s/%u",
+ GET_IPADDR_STRING(subtlv_ptr.lspping_tlv_targetfec_subtlv_bgp_ipv4->prefix),
+ GET_U_1(subtlv_ptr.lspping_tlv_targetfec_subtlv_bgp_ipv4->prefix_len));
}
break;
case LSPPING_TLV_TARGETFEC_SUBTLV_BGP_IPV6:
/* Is the subTLV length correct? */
if (lspping_subtlv_len != 17) {
- ND_PRINT((ndo, "\n\t invalid subTLV length, should be 17"));
+ ND_PRINT("\n\t invalid subTLV length, should be 17");
subtlv_hexdump=TRUE; /* unknown subTLV just hexdump it */
} else {
- subtlv_ptr.lspping_tlv_targetfec_subtlv_bgp_ipv6 = \
+ subtlv_ptr.lspping_tlv_targetfec_subtlv_bgp_ipv6 =
(const struct lspping_tlv_targetfec_subtlv_bgp_ipv6_t *)subtlv_tptr;
- ND_PRINT((ndo, "\n\t %s/%u",
- ip6addr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_bgp_ipv6->prefix),
- subtlv_ptr.lspping_tlv_targetfec_subtlv_bgp_ipv6->prefix_len));
+ ND_PRINT("\n\t %s/%u",
+ GET_IP6ADDR_STRING(subtlv_ptr.lspping_tlv_targetfec_subtlv_bgp_ipv6->prefix),
+ GET_U_1(subtlv_ptr.lspping_tlv_targetfec_subtlv_bgp_ipv6->prefix_len));
}
break;
case LSPPING_TLV_TARGETFEC_SUBTLV_RSVP_IPV4:
/* Is the subTLV length correct? */
if (lspping_subtlv_len != 20) {
- ND_PRINT((ndo, "\n\t invalid subTLV length, should be 20"));
+ ND_PRINT("\n\t invalid subTLV length, should be 20");
subtlv_hexdump=TRUE; /* unknown subTLV just hexdump it */
} else {
- subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv4 = \
+ subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv4 =
(const struct lspping_tlv_targetfec_subtlv_rsvp_ipv4_t *)subtlv_tptr;
- ND_PRINT((ndo, "\n\t tunnel end-point %s, tunnel sender %s, lsp-id 0x%04x" \
+ ND_PRINT("\n\t tunnel end-point %s, tunnel sender %s, lsp-id 0x%04x"
"\n\t tunnel-id 0x%04x, extended tunnel-id %s",
- ipaddr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv4->tunnel_endpoint),
- ipaddr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv4->tunnel_sender),
- EXTRACT_16BITS(subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv4->lsp_id),
- EXTRACT_16BITS(subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv4->tunnel_id),
- ipaddr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv4->extended_tunnel_id)));
+ GET_IPADDR_STRING(subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv4->tunnel_endpoint),
+ GET_IPADDR_STRING(subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv4->tunnel_sender),
+ GET_BE_U_2(subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv4->lsp_id),
+ GET_BE_U_2(subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv4->tunnel_id),
+ GET_IPADDR_STRING(subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv4->extended_tunnel_id));
}
break;
case LSPPING_TLV_TARGETFEC_SUBTLV_RSVP_IPV6:
/* Is the subTLV length correct? */
if (lspping_subtlv_len != 56) {
- ND_PRINT((ndo, "\n\t invalid subTLV length, should be 56"));
+ ND_PRINT("\n\t invalid subTLV length, should be 56");
subtlv_hexdump=TRUE; /* unknown subTLV just hexdump it */
} else {
- subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv6 = \
+ subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv6 =
(const struct lspping_tlv_targetfec_subtlv_rsvp_ipv6_t *)subtlv_tptr;
- ND_PRINT((ndo, "\n\t tunnel end-point %s, tunnel sender %s, lsp-id 0x%04x" \
+ ND_PRINT("\n\t tunnel end-point %s, tunnel sender %s, lsp-id 0x%04x"
"\n\t tunnel-id 0x%04x, extended tunnel-id %s",
- ip6addr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv6->tunnel_endpoint),
- ip6addr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv6->tunnel_sender),
- EXTRACT_16BITS(subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv6->lsp_id),
- EXTRACT_16BITS(subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv6->tunnel_id),
- ip6addr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv6->extended_tunnel_id)));
+ GET_IP6ADDR_STRING(subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv6->tunnel_endpoint),
+ GET_IP6ADDR_STRING(subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv6->tunnel_sender),
+ GET_BE_U_2(subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv6->lsp_id),
+ GET_BE_U_2(subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv6->tunnel_id),
+ GET_IP6ADDR_STRING(subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv6->extended_tunnel_id));
}
break;
case LSPPING_TLV_TARGETFEC_SUBTLV_L3VPN_IPV4:
/* Is the subTLV length correct? */
if (lspping_subtlv_len != 13) {
- ND_PRINT((ndo, "\n\t invalid subTLV length, should be 13"));
+ ND_PRINT("\n\t invalid subTLV length, should be 13");
subtlv_hexdump=TRUE; /* unknown subTLV just hexdump it */
} else {
- subtlv_ptr.lspping_tlv_targetfec_subtlv_l3vpn_ipv4 = \
+ subtlv_ptr.lspping_tlv_targetfec_subtlv_l3vpn_ipv4 =
(const struct lspping_tlv_targetfec_subtlv_l3vpn_ipv4_t *)subtlv_tptr;
- ND_PRINT((ndo, "\n\t RD: %s, %s/%u",
+ ND_PRINT("\n\t RD: %s, %s/%u",
bgp_vpn_rd_print(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_l3vpn_ipv4->rd),
- ipaddr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_l3vpn_ipv4->prefix),
- subtlv_ptr.lspping_tlv_targetfec_subtlv_l3vpn_ipv4->prefix_len));
+ GET_IPADDR_STRING(subtlv_ptr.lspping_tlv_targetfec_subtlv_l3vpn_ipv4->prefix),
+ GET_U_1(subtlv_ptr.lspping_tlv_targetfec_subtlv_l3vpn_ipv4->prefix_len));
}
break;
case LSPPING_TLV_TARGETFEC_SUBTLV_L3VPN_IPV6:
/* Is the subTLV length correct? */
if (lspping_subtlv_len != 25) {
- ND_PRINT((ndo, "\n\t invalid subTLV length, should be 25"));
+ ND_PRINT("\n\t invalid subTLV length, should be 25");
subtlv_hexdump=TRUE; /* unknown subTLV just hexdump it */
} else {
- subtlv_ptr.lspping_tlv_targetfec_subtlv_l3vpn_ipv6 = \
+ subtlv_ptr.lspping_tlv_targetfec_subtlv_l3vpn_ipv6 =
(const struct lspping_tlv_targetfec_subtlv_l3vpn_ipv6_t *)subtlv_tptr;
- ND_PRINT((ndo, "\n\t RD: %s, %s/%u",
+ ND_PRINT("\n\t RD: %s, %s/%u",
bgp_vpn_rd_print(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_l3vpn_ipv6->rd),
- ip6addr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_l3vpn_ipv6->prefix),
- subtlv_ptr.lspping_tlv_targetfec_subtlv_l3vpn_ipv6->prefix_len));
+ GET_IP6ADDR_STRING(subtlv_ptr.lspping_tlv_targetfec_subtlv_l3vpn_ipv6->prefix),
+ GET_U_1(subtlv_ptr.lspping_tlv_targetfec_subtlv_l3vpn_ipv6->prefix_len));
}
break;
case LSPPING_TLV_TARGETFEC_SUBTLV_L2VPN_ENDPT:
/* Is the subTLV length correct? */
if (lspping_subtlv_len != 14) {
- ND_PRINT((ndo, "\n\t invalid subTLV length, should be 14"));
+ ND_PRINT("\n\t invalid subTLV length, should be 14");
subtlv_hexdump=TRUE; /* unknown subTLV just hexdump it */
} else {
- subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_endpt = \
+ subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_endpt =
(const struct lspping_tlv_targetfec_subtlv_l2vpn_endpt_t *)subtlv_tptr;
- ND_PRINT((ndo, "\n\t RD: %s, Sender VE ID: %u, Receiver VE ID: %u" \
+ ND_PRINT("\n\t RD: %s, Sender VE ID: %u, Receiver VE ID: %u"
"\n\t Encapsulation Type: %s (%u)",
bgp_vpn_rd_print(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_endpt->rd),
- EXTRACT_16BITS(subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_endpt->sender_ve_id),
- EXTRACT_16BITS(subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_endpt->receiver_ve_id),
+ GET_BE_U_2(subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_endpt->sender_ve_id),
+ GET_BE_U_2(subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_endpt->receiver_ve_id),
tok2str(mpls_pw_types_values,
"unknown",
- EXTRACT_16BITS(subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_endpt->encapsulation)),
- EXTRACT_16BITS(subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_endpt->encapsulation)));
+ GET_BE_U_2(subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_endpt->encapsulation)),
+ GET_BE_U_2(subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_endpt->encapsulation));
}
break;
@@ -818,39 +818,39 @@ lspping_print(netdissect_options *ndo,
case LSPPING_TLV_TARGETFEC_SUBTLV_FEC_128_PW_OLD:
/* Is the subTLV length correct? */
if (lspping_subtlv_len != 10) {
- ND_PRINT((ndo, "\n\t invalid subTLV length, should be 10"));
+ ND_PRINT("\n\t invalid subTLV length, should be 10");
subtlv_hexdump=TRUE; /* unknown subTLV just hexdump it */
} else {
- subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid_old = \
+ subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid_old =
(const struct lspping_tlv_targetfec_subtlv_fec_128_pw_old *)subtlv_tptr;
- ND_PRINT((ndo, "\n\t Remote PE: %s" \
+ ND_PRINT("\n\t Remote PE: %s"
"\n\t PW ID: 0x%08x, PW Type: %s (%u)",
- ipaddr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid_old->remote_pe_address),
- EXTRACT_32BITS(subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid_old->pw_id),
+ GET_IPADDR_STRING(subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid_old->remote_pe_address),
+ GET_BE_U_4(subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid_old->pw_id),
tok2str(mpls_pw_types_values,
"unknown",
- EXTRACT_16BITS(subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid_old->pw_type)),
- EXTRACT_16BITS(subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid_old->pw_type)));
+ GET_BE_U_2(subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid_old->pw_type)),
+ GET_BE_U_2(subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid_old->pw_type));
}
break;
case LSPPING_TLV_TARGETFEC_SUBTLV_FEC_128_PW:
/* Is the subTLV length correct? */
if (lspping_subtlv_len != 14) {
- ND_PRINT((ndo, "\n\t invalid subTLV length, should be 14"));
+ ND_PRINT("\n\t invalid subTLV length, should be 14");
subtlv_hexdump=TRUE; /* unknown subTLV just hexdump it */
} else {
- subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid = \
+ subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid =
(const struct lspping_tlv_targetfec_subtlv_fec_128_pw *)subtlv_tptr;
- ND_PRINT((ndo, "\n\t Sender PE: %s, Remote PE: %s" \
+ ND_PRINT("\n\t Sender PE: %s, Remote PE: %s"
"\n\t PW ID: 0x%08x, PW Type: %s (%u)",
- ipaddr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid->sender_pe_address),
- ipaddr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid->remote_pe_address),
- EXTRACT_32BITS(subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid->pw_id),
+ GET_IPADDR_STRING(subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid->sender_pe_address),
+ GET_IPADDR_STRING(subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid->remote_pe_address),
+ GET_BE_U_4(subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid->pw_id),
tok2str(mpls_pw_types_values,
"unknown",
- EXTRACT_16BITS(subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid->pw_type)),
- EXTRACT_16BITS(subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid->pw_type)));
+ GET_BE_U_2(subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid->pw_type)),
+ GET_BE_U_2(subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid->pw_type));
}
break;
@@ -860,7 +860,7 @@ lspping_print(netdissect_options *ndo,
}
/* do we want to see an additionally subtlv hexdump ? */
if (ndo->ndo_vflag > 1 || subtlv_hexdump==TRUE)
- print_unknown_data(ndo, tlv_tptr+sizeof(struct lspping_tlv_header), \
+ print_unknown_data(ndo, tlv_tptr+sizeof(struct lspping_tlv_header),
"\n\t ",
lspping_subtlv_len);
@@ -869,7 +869,7 @@ lspping_print(netdissect_options *ndo,
lspping_subtlv_len += 4 - (lspping_subtlv_len % 4);
/* Does the subTLV, including padding, go past the end of the TLV? */
if (tlv_tlen < lspping_subtlv_len+sizeof(struct lspping_tlv_header)) {
- ND_PRINT((ndo, "\n\t\t TLV is too short"));
+ ND_PRINT("\n\t\t TLV is too short");
return;
}
}
@@ -881,102 +881,108 @@ lspping_print(netdissect_options *ndo,
case LSPPING_TLV_DOWNSTREAM_MAPPING:
/* Does the header go past the end of the TLV? */
if (tlv_tlen < sizeof(struct lspping_tlv_downstream_map_t)) {
- ND_PRINT((ndo, "\n\t TLV is too short"));
+ ND_PRINT("\n\t TLV is too short");
tlv_hexdump = TRUE;
goto tlv_tooshort;
}
/* Did we capture enough to get the address family? */
- ND_TCHECK2(*tlv_tptr, sizeof(struct lspping_tlv_downstream_map_t));
+ ND_TCHECK_LEN(tlv_tptr,
+ sizeof(struct lspping_tlv_downstream_map_t));
- tlv_ptr.lspping_tlv_downstream_map= \
+ tlv_ptr.lspping_tlv_downstream_map=
(const struct lspping_tlv_downstream_map_t *)tlv_tptr;
/* that strange thing with the downstream map TLV is that until now
* we do not know if its IPv4 or IPv6 or is unnumbered; after
* we find the address-type, we recast the tlv_tptr and move on. */
- ND_PRINT((ndo, "\n\t MTU: %u, Address-Type: %s (%u)",
- EXTRACT_16BITS(tlv_ptr.lspping_tlv_downstream_map->mtu),
+ address_type = GET_U_1(tlv_ptr.lspping_tlv_downstream_map->address_type);
+ ND_PRINT("\n\t MTU: %u, Address-Type: %s (%u)",
+ GET_BE_U_2(tlv_ptr.lspping_tlv_downstream_map->mtu),
tok2str(lspping_tlv_downstream_addr_values,
"unknown",
- tlv_ptr.lspping_tlv_downstream_map->address_type),
- tlv_ptr.lspping_tlv_downstream_map->address_type));
+ address_type),
+ address_type);
- switch(tlv_ptr.lspping_tlv_downstream_map->address_type) {
+ switch(address_type) {
case LSPPING_AFI_IPV4:
/* Does the data go past the end of the TLV? */
if (tlv_tlen < sizeof(struct lspping_tlv_downstream_map_ipv4_t)) {
- ND_PRINT((ndo, "\n\t TLV is too short"));
+ ND_PRINT("\n\t TLV is too short");
tlv_hexdump = TRUE;
goto tlv_tooshort;
}
/* Did we capture enough for this part of the TLV? */
- ND_TCHECK2(*tlv_tptr, sizeof(struct lspping_tlv_downstream_map_ipv4_t));
+ ND_TCHECK_LEN(tlv_tptr,
+ sizeof(struct lspping_tlv_downstream_map_ipv4_t));
- tlv_ptr.lspping_tlv_downstream_map_ipv4= \
+ tlv_ptr.lspping_tlv_downstream_map_ipv4=
(const struct lspping_tlv_downstream_map_ipv4_t *)tlv_tptr;
- ND_PRINT((ndo, "\n\t Downstream IP: %s" \
+ ND_PRINT("\n\t Downstream IP: %s"
"\n\t Downstream Interface IP: %s",
- ipaddr_string(ndo, tlv_ptr.lspping_tlv_downstream_map_ipv4->downstream_ip),
- ipaddr_string(ndo, tlv_ptr.lspping_tlv_downstream_map_ipv4->downstream_interface)));
+ GET_IPADDR_STRING(tlv_ptr.lspping_tlv_downstream_map_ipv4->downstream_ip),
+ GET_IPADDR_STRING(tlv_ptr.lspping_tlv_downstream_map_ipv4->downstream_interface));
tlv_tptr+=sizeof(struct lspping_tlv_downstream_map_ipv4_t);
tlv_tlen-=sizeof(struct lspping_tlv_downstream_map_ipv4_t);
break;
case LSPPING_AFI_IPV4_UNMB:
/* Does the data go past the end of the TLV? */
if (tlv_tlen < sizeof(struct lspping_tlv_downstream_map_ipv4_unmb_t)) {
- ND_PRINT((ndo, "\n\t TLV is too short"));
+ ND_PRINT("\n\t TLV is too short");
tlv_hexdump = TRUE;
goto tlv_tooshort;
}
/* Did we capture enough for this part of the TLV? */
- ND_TCHECK2(*tlv_tptr, sizeof(struct lspping_tlv_downstream_map_ipv4_unmb_t));
+ ND_TCHECK_LEN(tlv_tptr,
+ sizeof(struct lspping_tlv_downstream_map_ipv4_unmb_t));
- tlv_ptr.lspping_tlv_downstream_map_ipv4_unmb= \
+ tlv_ptr.lspping_tlv_downstream_map_ipv4_unmb=
(const struct lspping_tlv_downstream_map_ipv4_unmb_t *)tlv_tptr;
- ND_PRINT((ndo, "\n\t Downstream IP: %s" \
+ ND_PRINT("\n\t Downstream IP: %s"
"\n\t Downstream Interface Index: 0x%08x",
- ipaddr_string(ndo, tlv_ptr.lspping_tlv_downstream_map_ipv4_unmb->downstream_ip),
- EXTRACT_32BITS(tlv_ptr.lspping_tlv_downstream_map_ipv4_unmb->downstream_interface)));
+ GET_IPADDR_STRING(tlv_ptr.lspping_tlv_downstream_map_ipv4_unmb->downstream_ip),
+ GET_BE_U_4(tlv_ptr.lspping_tlv_downstream_map_ipv4_unmb->downstream_interface));
tlv_tptr+=sizeof(struct lspping_tlv_downstream_map_ipv4_unmb_t);
tlv_tlen-=sizeof(struct lspping_tlv_downstream_map_ipv4_unmb_t);
break;
case LSPPING_AFI_IPV6:
/* Does the data go past the end of the TLV? */
if (tlv_tlen < sizeof(struct lspping_tlv_downstream_map_ipv6_t)) {
- ND_PRINT((ndo, "\n\t TLV is too short"));
+ ND_PRINT("\n\t TLV is too short");
tlv_hexdump = TRUE;
goto tlv_tooshort;
}
/* Did we capture enough for this part of the TLV? */
- ND_TCHECK2(*tlv_tptr, sizeof(struct lspping_tlv_downstream_map_ipv6_t));
+ ND_TCHECK_LEN(tlv_tptr,
+ sizeof(struct lspping_tlv_downstream_map_ipv6_t));
- tlv_ptr.lspping_tlv_downstream_map_ipv6= \
+ tlv_ptr.lspping_tlv_downstream_map_ipv6=
(const struct lspping_tlv_downstream_map_ipv6_t *)tlv_tptr;
- ND_PRINT((ndo, "\n\t Downstream IP: %s" \
+ ND_PRINT("\n\t Downstream IP: %s"
"\n\t Downstream Interface IP: %s",
- ip6addr_string(ndo, tlv_ptr.lspping_tlv_downstream_map_ipv6->downstream_ip),
- ip6addr_string(ndo, tlv_ptr.lspping_tlv_downstream_map_ipv6->downstream_interface)));
+ GET_IP6ADDR_STRING(tlv_ptr.lspping_tlv_downstream_map_ipv6->downstream_ip),
+ GET_IP6ADDR_STRING(tlv_ptr.lspping_tlv_downstream_map_ipv6->downstream_interface));
tlv_tptr+=sizeof(struct lspping_tlv_downstream_map_ipv6_t);
tlv_tlen-=sizeof(struct lspping_tlv_downstream_map_ipv6_t);
break;
case LSPPING_AFI_IPV6_UNMB:
/* Does the data go past the end of the TLV? */
if (tlv_tlen < sizeof(struct lspping_tlv_downstream_map_ipv6_unmb_t)) {
- ND_PRINT((ndo, "\n\t TLV is too short"));
+ ND_PRINT("\n\t TLV is too short");
tlv_hexdump = TRUE;
goto tlv_tooshort;
}
/* Did we capture enough for this part of the TLV? */
- ND_TCHECK2(*tlv_tptr, sizeof(struct lspping_tlv_downstream_map_ipv6_unmb_t));
+ ND_TCHECK_LEN(tlv_tptr,
+ sizeof(struct lspping_tlv_downstream_map_ipv6_unmb_t));
- tlv_ptr.lspping_tlv_downstream_map_ipv6_unmb= \
+ tlv_ptr.lspping_tlv_downstream_map_ipv6_unmb=
(const struct lspping_tlv_downstream_map_ipv6_unmb_t *)tlv_tptr;
- ND_PRINT((ndo, "\n\t Downstream IP: %s" \
+ ND_PRINT("\n\t Downstream IP: %s"
"\n\t Downstream Interface Index: 0x%08x",
- ip6addr_string(ndo, tlv_ptr.lspping_tlv_downstream_map_ipv6_unmb->downstream_ip),
- EXTRACT_32BITS(tlv_ptr.lspping_tlv_downstream_map_ipv6_unmb->downstream_interface)));
+ GET_IP6ADDR_STRING(tlv_ptr.lspping_tlv_downstream_map_ipv6_unmb->downstream_ip),
+ GET_BE_U_4(tlv_ptr.lspping_tlv_downstream_map_ipv6_unmb->downstream_interface));
tlv_tptr+=sizeof(struct lspping_tlv_downstream_map_ipv6_unmb_t);
tlv_tlen-=sizeof(struct lspping_tlv_downstream_map_ipv6_unmb_t);
break;
@@ -988,21 +994,19 @@ lspping_print(netdissect_options *ndo,
/* Does the data go past the end of the TLV? */
if (tlv_tlen < sizeof(struct lspping_tlv_downstream_map_info_t)) {
- ND_PRINT((ndo, "\n\t TLV is too short"));
+ ND_PRINT("\n\t TLV is too short");
tlv_hexdump = TRUE;
goto tlv_tooshort;
}
/* Did we capture enough for this part of the TLV? */
- ND_TCHECK2(*tlv_tptr, sizeof(struct lspping_tlv_downstream_map_info_t));
+ ND_TCHECK_LEN(tlv_tptr,
+ sizeof(struct lspping_tlv_downstream_map_info_t));
- tlv_ptr.lspping_tlv_downstream_map_info= \
+ tlv_ptr.lspping_tlv_downstream_map_info=
(const struct lspping_tlv_downstream_map_info_t *)tlv_tptr;
/* FIXME add hash-key type, depth limit, multipath processing */
- tlv_tptr+=sizeof(struct lspping_tlv_downstream_map_info_t);
- tlv_tlen-=sizeof(struct lspping_tlv_downstream_map_info_t);
-
/* FIXME print downstream labels */
tlv_hexdump=TRUE; /* dump the TLV until code complete */
@@ -1011,12 +1015,11 @@ lspping_print(netdissect_options *ndo,
case LSPPING_TLV_BFD_DISCRIMINATOR:
if (tlv_tlen < LSPPING_TLV_BFD_DISCRIMINATOR_LEN) {
- ND_PRINT((ndo, "\n\t TLV is too short"));
+ ND_PRINT("\n\t TLV is too short");
tlv_hexdump = TRUE;
goto tlv_tooshort;
} else {
- ND_TCHECK2(*tptr, LSPPING_TLV_BFD_DISCRIMINATOR_LEN);
- ND_PRINT((ndo, "\n\t BFD Discriminator 0x%08x", EXTRACT_32BITS(tptr)));
+ ND_PRINT("\n\t BFD Discriminator 0x%08x", GET_BE_U_4(tlv_tptr));
}
break;
@@ -1025,15 +1028,14 @@ lspping_print(netdissect_options *ndo,
uint32_t vendor_id;
if (tlv_tlen < LSPPING_TLV_VENDOR_ENTERPRISE_LEN) {
- ND_PRINT((ndo, "\n\t TLV is too short"));
+ ND_PRINT("\n\t TLV is too short");
tlv_hexdump = TRUE;
goto tlv_tooshort;
} else {
- ND_TCHECK2(*tptr, LSPPING_TLV_VENDOR_ENTERPRISE_LEN);
- vendor_id = EXTRACT_32BITS(tlv_tptr);
- ND_PRINT((ndo, "\n\t Vendor: %s (0x%04x)",
+ vendor_id = GET_BE_U_4(tlv_tptr);
+ ND_PRINT("\n\t Vendor: %s (0x%04x)",
tok2str(smi_values, "Unknown", vendor_id),
- vendor_id));
+ vendor_id);
}
}
break;
@@ -1071,15 +1073,5 @@ lspping_print(netdissect_options *ndo,
}
return;
tooshort:
- ND_PRINT((ndo, "\n\t\t packet is too short"));
- return;
-trunc:
- ND_PRINT((ndo, "\n\t\t packet exceeded snapshot"));
- return;
+ ND_PRINT("\n\t\t packet is too short");
}
-/*
- * Local Variables:
- * c-style: whitesmith
- * c-basic-offset: 8
- * End:
- */
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-09 18:56:08 +0000