#define bgp_attr_lenlen(flags, p) \
(((flags) & 0x10) ? 2U : 1U)
#define bgp_attr_len(flags, p) \
- (((flags) & 0x10) ? EXTRACT_BE_U_2(p) : EXTRACT_U_1(p))
+ (((flags) & 0x10) ? GET_BE_U_2(p) : GET_U_1(p))
#define BGPTYPE_ORIGIN 1
#define BGPTYPE_AS_PATH 2
#define BGP_CAPCODE_ORF 3 /* RFC5291 */
#define BGP_CAPCODE_MR 4 /* RFC3107 */
#define BGP_CAPCODE_EXT_NH 5 /* RFC5549 */
+#define BGP_CAPCODE_ML 8 /* RFC8277 */
#define BGP_CAPCODE_RESTART 64 /* RFC4724 */
#define BGP_CAPCODE_AS_NEW 65 /* RFC6793 */
#define BGP_CAPCODE_DYN_CAP 67 /* draft-ietf-idr-dynamic-cap */
#define BGP_CAPCODE_MULTISESS 68 /* draft-ietf-idr-bgp-multisession */
#define BGP_CAPCODE_ADD_PATH 69 /* RFC7911 */
#define BGP_CAPCODE_ENH_RR 70 /* draft-keyur-bgp-enhanced-route-refresh */
+#define BGP_CAPCODE_LLGR 71 /* draft-uttaro-idr-bgp-persistence-05 */
#define BGP_CAPCODE_RR_CISCO 128
static const struct tok bgp_capcode_values[] = {
{ BGP_CAPCODE_ORF, "Cooperative Route Filtering"},
{ BGP_CAPCODE_MR, "Multiple Routes to a Destination"},
{ BGP_CAPCODE_EXT_NH, "Extended Next Hop Encoding"},
+ { BGP_CAPCODE_ML, "Multiple Labels"},
{ BGP_CAPCODE_RESTART, "Graceful Restart"},
{ BGP_CAPCODE_AS_NEW, "32-Bit AS Number"},
{ BGP_CAPCODE_DYN_CAP, "Dynamic Capability"},
{ BGP_CAPCODE_MULTISESS, "Multisession BGP"},
{ BGP_CAPCODE_ADD_PATH, "Multiple Paths"},
{ BGP_CAPCODE_ENH_RR, "Enhanced Route Refresh"},
+ { BGP_CAPCODE_LLGR, "Long-lived Graceful Restart"},
{ BGP_CAPCODE_RR_CISCO, "Route Refresh (Cisco)"},
{ 0, NULL}
};
#define SAFNUM_VPLS 65
/* RFC6037 */
#define SAFNUM_MDT 66
+/* RFC7432 */
+#define SAFNUM_EVPN 70
/* RFC4364 */
#define SAFNUM_VPNUNICAST 128
/* RFC6513 */
{ SAFNUM_TUNNEL, "Tunnel"},
{ SAFNUM_VPLS, "VPLS"},
{ SAFNUM_MDT, "MDT"},
+ { SAFNUM_EVPN, "EVPN"},
{ SAFNUM_VPNUNICAST, "labeled VPN Unicast"},
{ SAFNUM_VPNMULTICAST, "labeled VPN Multicast"},
{ SAFNUM_VPNUNIMULTICAST, "labeled VPN Unicast+Multicast"},
#define BGP_EXT_COM_OSPF_RTYPE 0x0306 /* OSPF Route Type,Format Area(4B):RouteType(1B):Options(1B) */
#define BGP_EXT_COM_OSPF_RTYPE2 0x8000 /* duplicate - keep for backwards compatibility */
+#define BGP_EXT_COM_ENCAP 0x030c /* rfc5512 */
#define BGP_EXT_COM_OSPF_RID 0x0107 /* OSPF Router ID,Format RouterID(4B):Unused(2B) */
#define BGP_EXT_COM_OSPF_RID2 0x8001 /* duplicate - keep for backwards compatibility */
#define BGP_EXT_COM_L2VPN_RT_0 0x000a /* L2VPN Identifier,Format AS(2bytes):AN(4bytes) */
#define BGP_EXT_COM_L2VPN_RT_1 0xF10a /* L2VPN Identifier,Format IP address:AN(2bytes) */
-/* http://www.cisco.com/en/US/tech/tk436/tk428/technologies_tech_note09186a00801eb09a.shtml */
+/* https://www.cisco.com/en/US/tech/tk436/tk428/technologies_tech_note09186a00801eb09a.shtml */
#define BGP_EXT_COM_EIGRP_GEN 0x8800
#define BGP_EXT_COM_EIGRP_METRIC_AS_DELAY 0x8801
#define BGP_EXT_COM_EIGRP_METRIC_REL_NH_BW 0x8802
{ BGP_EXT_COM_VPN_ORIGIN4, "ospf-domain"},
{ BGP_EXT_COM_OSPF_RTYPE, "ospf-route-type"},
{ BGP_EXT_COM_OSPF_RTYPE2, "ospf-route-type"},
+ { BGP_EXT_COM_ENCAP, "encapsulation"},
{ BGP_EXT_COM_OSPF_RID, "ospf-router-id"},
{ BGP_EXT_COM_OSPF_RID2, "ospf-router-id"},
{ BGP_EXT_COM_L2INFO, "layer2-info"},
{ 0, NULL},
};
+/* RFC RFC5512 BGP Tunnel Encapsulation Attribute Tunnel Types */
+#define BGP_ENCAP_TUNNEL_L2TPV3_IP 1
+#define BGP_ENCAP_TUNNEL_GRE 2
+#define BGP_ENCAP_TUNNEL_TRANSMIT 3
+#define BGP_ENCAP_TUNNEL_IPSEC 4
+#define BGP_ENCAP_TUNNEL_IP_IPSEC 5
+#define BGP_ENCAP_TUNNEL_MPLS_IP 6
+#define BGP_ENCAP_TUNNEL_IP_IP 7
+#define BGP_ENCAP_TUNNEL_VXLAN 8
+#define BGP_ENCAP_TUNNEL_NVGRE 9
+#define BGP_ENCAP_TUNNEL_MPLS 10
+#define BGP_ENCAP_TUNNEL_MPLS_GRE 11
+#define BGP_ENCAP_TUNNEL_VXLAN_GPE 12
+#define BGP_ENCAP_TUNNEL_MPLS_UDP 13
+#define BGP_ENCAP_TUNNEL_IPV6 14
+#define BGP_ENCAP_TUNNEL_SR_TE 15
+#define BGP_ENCAP_TUNNEL_BARE 16
+#define BGP_ENCAP_TUNNEL_SR 17
+
+static const struct tok bgp_extd_comm_encap_tunnel_values[] = {
+ { BGP_ENCAP_TUNNEL_L2TPV3_IP, "L2TPv3 over IP"},
+ { BGP_ENCAP_TUNNEL_GRE, "GRE"},
+ { BGP_ENCAP_TUNNEL_TRANSMIT, "Transmit Tunnel"},
+ { BGP_ENCAP_TUNNEL_IPSEC, "IPsec"},
+ { BGP_ENCAP_TUNNEL_IP_IPSEC, "IP in IP with IPsec"},
+ { BGP_ENCAP_TUNNEL_MPLS_IP, "MPLS in IP with IPsec"},
+ { BGP_ENCAP_TUNNEL_IP_IP, "IP in IP"},
+ { BGP_ENCAP_TUNNEL_VXLAN, "VXLAN"},
+ { BGP_ENCAP_TUNNEL_NVGRE, "NVGRE"},
+ { BGP_ENCAP_TUNNEL_MPLS, "MPLS"},
+ { BGP_ENCAP_TUNNEL_MPLS_GRE, "MPLS in GRE"},
+ { BGP_ENCAP_TUNNEL_VXLAN_GPE, "VXLAN GPE"},
+ { BGP_ENCAP_TUNNEL_MPLS_UDP, "MPLS in UDP"},
+ { BGP_ENCAP_TUNNEL_IPV6, "IPv6"},
+ { BGP_ENCAP_TUNNEL_SR_TE, "SR TE"},
+ { BGP_ENCAP_TUNNEL_BARE, "Bare"},
+ { BGP_ENCAP_TUNNEL_SR, "SR"},
+ { 0, NULL},
+};
+
/* OSPF codes for BGP_EXT_COM_OSPF_RTYPE draft-rosen-vpns-ospf-bgp-mpls */
#define BGP_OSPF_RTYPE_RTR 1 /* OSPF Router LSA */
#define BGP_OSPF_RTYPE_NET 2 /* OSPF Network LSA */
{ 0, NULL },
};
-static char astostr[20];
+/* allocate space for the largest possible string */
+static char astostr[sizeof("xxxxx.xxxxx")];
/*
* as_printf
char *str, size_t size, u_int asnum)
{
if (!ndo->ndo_bflag || asnum <= 0xFFFF) {
- nd_snprintf(str, size, "%u", asnum);
+ snprintf(str, size, "%u", asnum);
} else {
- nd_snprintf(str, size, "%u.%u", asnum >> 16, asnum & 0xFFFF);
+ snprintf(str, size, "%u.%u", asnum >> 16, asnum & 0xFFFF);
}
return str;
}
int
decode_prefix4(netdissect_options *ndo,
- const u_char *pptr, u_int itemlen, char *buf, u_int buflen)
+ const u_char *pptr, u_int itemlen, char *buf, size_t buflen)
{
- struct in_addr addr;
+ nd_ipv4 addr;
u_int plen, plenbytes;
- ND_TCHECK_1(pptr);
ITEMCHECK(1);
- plen = EXTRACT_U_1(pptr);
+ plen = GET_U_1(pptr);
if (32 < plen)
return -1;
itemlen -= 1;
memset(&addr, 0, sizeof(addr));
plenbytes = (plen + 7) / 8;
- ND_TCHECK_LEN(pptr + 1, plenbytes);
ITEMCHECK(plenbytes);
- memcpy(&addr, pptr + 1, plenbytes);
+ GET_CPY_BYTES(&addr, pptr + 1, plenbytes);
if (plen % 8) {
((u_char *)&addr)[plenbytes - 1] &= ((0xff00 >> (plen % 8)) & 0xff);
}
- nd_snprintf(buf, buflen, "%s/%u", ipaddr_string(ndo, (const u_char *)&addr), plen);
+ snprintf(buf, buflen, "%s/%u", ipaddr_string(ndo, (const u_char *)&addr), plen);
return 1 + plenbytes;
-trunc:
- return -2;
-
badtlv:
- return -3;
+ return -2;
}
static int
decode_labeled_prefix4(netdissect_options *ndo,
- const u_char *pptr, u_int itemlen, char *buf, u_int buflen)
+ const u_char *pptr, u_int itemlen, char *buf,
+ size_t buflen)
{
- struct in_addr addr;
+ nd_ipv4 addr;
u_int plen, plenbytes;
/* prefix length and label = 4 bytes */
ND_TCHECK_4(pptr);
ITEMCHECK(4);
- plen = EXTRACT_U_1(pptr); /* get prefix length */
+ plen = GET_U_1(pptr); /* get prefix length */
/* this is one of the weirdnesses of rfc3107
the label length (actually the label + COS bits)
memset(&addr, 0, sizeof(addr));
plenbytes = (plen + 7) / 8;
- ND_TCHECK_LEN(pptr + 4, plenbytes);
ITEMCHECK(plenbytes);
- memcpy(&addr, pptr + 4, plenbytes);
+ GET_CPY_BYTES(&addr, pptr + 4, plenbytes);
if (plen % 8) {
((u_char *)&addr)[plenbytes - 1] &= ((0xff00 >> (plen % 8)) & 0xff);
}
/* the label may get offsetted by 4 bits so lets shift it right */
- nd_snprintf(buf, buflen, "%s/%u, label:%u %s",
+ snprintf(buf, buflen, "%s/%u, label:%u %s",
ipaddr_string(ndo, (const u_char *)&addr),
plen,
- EXTRACT_BE_U_3(pptr + 1)>>4,
- ((EXTRACT_U_1(pptr + 3) & 1) == 0) ? "(BOGUS: Bottom of Stack NOT set!)" : "(bottom)" );
+ GET_BE_U_3(pptr + 1)>>4,
+ ((GET_U_1(pptr + 3) & 1) == 0) ? "(BOGUS: Bottom of Stack NOT set!)" : "(bottom)" );
return 4 + plenbytes;
/*
* bgp_vpn_ip_print
*
- * print an ipv4 or ipv6 address into a buffer dependend on address length.
+ * print an ipv4 or ipv6 address into a buffer dependent on address length.
*/
static char *
bgp_vpn_ip_print(netdissect_options *ndo,
switch(addr_length) {
case (sizeof(nd_ipv4) << 3): /* 32 */
- ND_TCHECK_LEN(pptr, sizeof(nd_ipv4));
- nd_snprintf(pos, sizeof(addr), "%s", ipaddr_string(ndo, pptr));
+ snprintf(pos, sizeof(addr), "%s", GET_IPADDR_STRING(pptr));
break;
case (sizeof(nd_ipv6) << 3): /* 128 */
- ND_TCHECK_LEN(pptr, sizeof(nd_ipv6));
- nd_snprintf(pos, sizeof(addr), "%s", ip6addr_string(ndo, pptr));
+ snprintf(pos, sizeof(addr), "%s", GET_IP6ADDR_STRING(pptr));
break;
default:
- nd_snprintf(pos, sizeof(addr), "bogus address length %u", addr_length);
+ snprintf(pos, sizeof(addr), "bogus address length %u", addr_length);
break;
}
pos += strlen(pos);
-trunc:
*(pos) = '\0';
return (addr);
}
*/
static u_int
bgp_vpn_sg_print(netdissect_options *ndo,
- const u_char *pptr, char *buf, u_int buflen)
+ const u_char *pptr, char *buf, size_t buflen)
{
uint8_t addr_length;
u_int total_length, offset;
total_length = 0;
/* Source address length, encoded in bits */
- ND_TCHECK_1(pptr);
- addr_length = EXTRACT_U_1(pptr);
+ addr_length = GET_U_1(pptr);
pptr++;
/* Source address */
ND_TCHECK_LEN(pptr, (addr_length >> 3));
total_length += (addr_length >> 3) + 1;
- offset = strlen(buf);
+ offset = (u_int)strlen(buf);
if (addr_length) {
- nd_snprintf(buf + offset, buflen - offset, ", Source %s",
+ snprintf(buf + offset, buflen - offset, ", Source %s",
bgp_vpn_ip_print(ndo, pptr, addr_length));
pptr += (addr_length >> 3);
}
/* Group address length, encoded in bits */
- ND_TCHECK_1(pptr);
- addr_length = EXTRACT_U_1(pptr);
+ addr_length = GET_U_1(pptr);
pptr++;
/* Group address */
ND_TCHECK_LEN(pptr, (addr_length >> 3));
total_length += (addr_length >> 3) + 1;
- offset = strlen(buf);
+ offset = (u_int)strlen(buf);
if (addr_length) {
- nd_snprintf(buf + offset, buflen - offset, ", Group %s",
+ snprintf(buf + offset, buflen - offset, ", Group %s",
bgp_vpn_ip_print(ndo, pptr, addr_length));
pptr += (addr_length >> 3);
}
const u_char *pptr)
{
/* allocate space for the largest possible string */
- static char rd[sizeof("xxxxxxxxxx:xxxxx (xxx.xxx.xxx.xxx:xxxxx)")];
+ static char rd[sizeof("xxxxx.xxxxx:xxxxx (xxx.xxx.xxx.xxx:xxxxx)")];
char *pos = rd;
/* ok lets load the RD format */
- switch (EXTRACT_BE_U_2(pptr)) {
+ switch (GET_BE_U_2(pptr)) {
case 0:
/* 2-byte-AS:number fmt */
- nd_snprintf(pos, sizeof(rd) - (pos - rd), "%u:%u (= %u.%u.%u.%u)",
- EXTRACT_BE_U_2(pptr + 2),
- EXTRACT_BE_U_4(pptr + 4),
- EXTRACT_U_1(pptr + 4), EXTRACT_U_1(pptr + 5),
- EXTRACT_U_1(pptr + 6), EXTRACT_U_1(pptr + 7));
+ snprintf(pos, sizeof(rd) - (pos - rd), "%u:%u (= %u.%u.%u.%u)",
+ GET_BE_U_2(pptr + 2),
+ GET_BE_U_4(pptr + 4),
+ GET_U_1(pptr + 4), GET_U_1(pptr + 5),
+ GET_U_1(pptr + 6), GET_U_1(pptr + 7));
break;
case 1:
/* IP-address:AS fmt */
- nd_snprintf(pos, sizeof(rd) - (pos - rd), "%u.%u.%u.%u:%u",
- EXTRACT_U_1(pptr + 2), EXTRACT_U_1(pptr + 3),
- EXTRACT_U_1(pptr + 4), EXTRACT_U_1(pptr + 5),
- EXTRACT_BE_U_2(pptr + 6));
+ snprintf(pos, sizeof(rd) - (pos - rd), "%u.%u.%u.%u:%u",
+ GET_U_1(pptr + 2), GET_U_1(pptr + 3),
+ GET_U_1(pptr + 4), GET_U_1(pptr + 5),
+ GET_BE_U_2(pptr + 6));
break;
case 2:
/* 4-byte-AS:number fmt */
- nd_snprintf(pos, sizeof(rd) - (pos - rd), "%s:%u (%u.%u.%u.%u:%u)",
- as_printf(ndo, astostr, sizeof(astostr), EXTRACT_BE_U_4(pptr + 2)),
- EXTRACT_BE_U_2(pptr + 6), EXTRACT_U_1(pptr + 2),
- EXTRACT_U_1(pptr + 3), EXTRACT_U_1(pptr + 4),
- EXTRACT_U_1(pptr + 5), EXTRACT_BE_U_2(pptr + 6));
+ snprintf(pos, sizeof(rd) - (pos - rd), "%s:%u (%u.%u.%u.%u:%u)",
+ as_printf(ndo, astostr, sizeof(astostr), GET_BE_U_4(pptr + 2)),
+ GET_BE_U_2(pptr + 6), GET_U_1(pptr + 2),
+ GET_U_1(pptr + 3), GET_U_1(pptr + 4),
+ GET_U_1(pptr + 5), GET_BE_U_2(pptr + 6));
break;
default:
- nd_snprintf(pos, sizeof(rd) - (pos - rd), "unknown RD format");
+ snprintf(pos, sizeof(rd) - (pos - rd), "unknown RD format");
break;
}
pos += strlen(pos);
uint32_t i;
} bw;
- switch (EXTRACT_BE_U_2(pptr)) {
+ switch (GET_BE_U_2(pptr)) {
case BGP_EXT_COM_RT_0:
case BGP_EXT_COM_RO_0:
case BGP_EXT_COM_L2VPN_RT_0:
ND_PRINT("%u:%u (= %s)",
- EXTRACT_BE_U_2(pptr + 2),
- EXTRACT_BE_U_4(pptr + 4),
- ipaddr_string(ndo, pptr+4));
+ GET_BE_U_2(pptr + 2),
+ GET_BE_U_4(pptr + 4),
+ GET_IPADDR_STRING(pptr+4));
break;
case BGP_EXT_COM_RT_1:
case BGP_EXT_COM_L2VPN_RT_1:
case BGP_EXT_COM_VRF_RT_IMP:
ND_PRINT("%s:%u",
- ipaddr_string(ndo, pptr+2),
- EXTRACT_BE_U_2(pptr + 6));
+ GET_IPADDR_STRING(pptr+2),
+ GET_BE_U_2(pptr + 6));
break;
case BGP_EXT_COM_RT_2:
case BGP_EXT_COM_RO_2:
ND_PRINT("%s:%u",
as_printf(ndo, astostr, sizeof(astostr),
- EXTRACT_BE_U_4(pptr + 2)), EXTRACT_BE_U_2(pptr + 6));
+ GET_BE_U_4(pptr + 2)), GET_BE_U_2(pptr + 6));
break;
case BGP_EXT_COM_LINKBAND:
- bw.i = EXTRACT_BE_U_4(pptr + 2);
+ bw.i = GET_BE_U_4(pptr + 2);
ND_PRINT("bandwidth: %.3f Mbps",
bw.f*8/1000000);
break;
case BGP_EXT_COM_VPN_ORIGIN4:
case BGP_EXT_COM_OSPF_RID:
case BGP_EXT_COM_OSPF_RID2:
- ND_PRINT("%s", ipaddr_string(ndo, pptr+2));
+ ND_PRINT("%s", GET_IPADDR_STRING(pptr+2));
break;
case BGP_EXT_COM_OSPF_RTYPE:
case BGP_EXT_COM_OSPF_RTYPE2:
ND_PRINT("area:%s, router-type:%s, metric-type:%s%s",
- ipaddr_string(ndo, pptr+2),
+ GET_IPADDR_STRING(pptr+2),
tok2str(bgp_extd_comm_ospf_rtype_values,
"unknown (0x%02x)",
- EXTRACT_U_1((pptr + 6))),
- (EXTRACT_U_1(pptr + 7) & BGP_OSPF_RTYPE_METRIC_TYPE) ? "E2" : "",
- ((EXTRACT_U_1(pptr + 6) == BGP_OSPF_RTYPE_EXT) || (EXTRACT_U_1(pptr + 6) == BGP_OSPF_RTYPE_NSSA)) ? "E1" : "");
+ GET_U_1((pptr + 6))),
+ (GET_U_1(pptr + 7) & BGP_OSPF_RTYPE_METRIC_TYPE) ? "E2" : "",
+ ((GET_U_1(pptr + 6) == BGP_OSPF_RTYPE_EXT) || (GET_U_1(pptr + 6) == BGP_OSPF_RTYPE_NSSA)) ? "E1" : "");
break;
case BGP_EXT_COM_L2INFO:
ND_PRINT("%s Control Flags [0x%02x]:MTU %u",
tok2str(l2vpn_encaps_values,
"unknown encaps",
- EXTRACT_U_1((pptr + 2))),
- EXTRACT_U_1((pptr + 3)),
- EXTRACT_BE_U_2(pptr + 4));
+ GET_U_1((pptr + 2))),
+ GET_U_1((pptr + 3)),
+ GET_BE_U_2(pptr + 4));
break;
case BGP_EXT_COM_SOURCE_AS:
- ND_PRINT("AS %u", EXTRACT_BE_U_2(pptr + 2));
+ ND_PRINT("AS %u", GET_BE_U_2(pptr + 2));
+ break;
+
+ case BGP_EXT_COM_ENCAP:
+ ND_PRINT("Tunnel type: %s", tok2str(bgp_extd_comm_encap_tunnel_values,
+ "unknown encaps",
+ GET_BE_U_2(pptr + 6)));
break;
default:
ND_PRINT("%02x%02x%02x%02x%02x%02x",
- EXTRACT_U_1(pptr + 2),
- EXTRACT_U_1(pptr + 3),
- EXTRACT_U_1(pptr + 4),
- EXTRACT_U_1(pptr + 5),
- EXTRACT_U_1(pptr + 6),
- EXTRACT_U_1(pptr + 7));
+ GET_U_1(pptr + 2),
+ GET_U_1(pptr + 3),
+ GET_U_1(pptr + 4),
+ GET_U_1(pptr + 5),
+ GET_U_1(pptr + 6),
+ GET_U_1(pptr + 7));
+ break;
+ }
+}
+
+/*
+ * RFC4684 (Section 4)/RFC2858 (Section 4).
+ * RTC membership prefix is structured as follows
+ * [prefix-len] [origin-as] [route-target]
+ * The route-target is encoded as RT ext-comms.
+ * Prefix-len may be 0, 32..96
+ *
+ * Note that pptr is not packet data - it is
+ * a buffer owned by our caller - therefore GET_*
+ * macros can not be used.
+ */
+static char *
+bgp_rt_prefix_print(netdissect_options *ndo,
+ const u_char *pptr,
+ u_int plen)
+{
+ /* allocate space for the largest possible string */
+ char rtc_prefix_in_hex[20] = "";
+ u_int rtc_prefix_in_hex_len = 0;
+ static char output[61]; /* max response string */
+ uint16_t ec_type = 0;
+ u_int octet_count;
+ u_int i;
+
+ if (plen == 0) {
+ snprintf(output, sizeof(output), "route-target: 0:0/0");
+ return (output);
+ }
+
+ /* hex representation of the prefix */
+ octet_count = (plen+7)/8;
+ for (i=0; i<octet_count; i++) {
+ rtc_prefix_in_hex_len += snprintf(rtc_prefix_in_hex+rtc_prefix_in_hex_len,
+ sizeof(rtc_prefix_in_hex)-rtc_prefix_in_hex_len,
+ "%02x%s", *(pptr+i),
+ ((i%2 == 1) && (i<octet_count-1)) ? " " : "");
+ }
+
+ if (plen < 16) {
+ /*
+ * The prefix is too short to include the full ext-comm type,
+ * so we have no way to parse it further.
+ */
+ snprintf(output, sizeof(output), "route-target: partial-type: (%s/%d)",
+ rtc_prefix_in_hex, plen);
+ return (output);
+ }
+
+ /*
+ * get the ext-comm type
+ * Note: pptr references a static 8 octet buffer with unused bits set to 0,
+ * hense EXTRACT_*() macros are safe.
+ */
+ ec_type = EXTRACT_BE_U_2(pptr);
+ switch (ec_type) {
+ case BGP_EXT_COM_RT_0:
+ /* 2-byte-AS:number fmt */
+ snprintf(output, sizeof(output), "route-target: %u:%u/%d (%s)",
+ EXTRACT_BE_U_2(pptr+2),
+ EXTRACT_BE_U_4(pptr+4),
+ plen, rtc_prefix_in_hex);
+ break;
+
+ case BGP_EXT_COM_RT_1:
+ /* IP-address:AS fmt */
+ snprintf(output, sizeof(output), "route-target: %u.%u.%u.%u:%u/%d (%s)",
+ *(pptr+2), *(pptr+3), *(pptr+4), *(pptr+5),
+ EXTRACT_BE_U_2(pptr+6), plen, rtc_prefix_in_hex);
+ break;
+
+ case BGP_EXT_COM_RT_2:
+ /* 4-byte-AS:number fmt */
+ snprintf(output, sizeof(output), "route-target: %s:%u/%d (%s)",
+ as_printf(ndo, astostr, sizeof(astostr), EXTRACT_BE_U_4(pptr+2)),
+ EXTRACT_BE_U_2(pptr+6), plen, rtc_prefix_in_hex);
+ break;
+
+ default:
+ snprintf(output, sizeof(output), "route target: unknown-type(%04x) (%s/%d)",
+ ec_type,
+ rtc_prefix_in_hex, plen);
break;
}
+ return (output);
}
/* RFC 4684 */
decode_rt_routing_info(netdissect_options *ndo,
const u_char *pptr)
{
+ uint8_t route_target[8];
u_int plen;
char asbuf[sizeof(astostr)]; /* bgp_vpn_rd_print() overwrites astostr */
+ u_int num_octets;
/* NLRI "prefix length" from RFC 2858 Section 4. */
- ND_TCHECK_1(pptr);
- plen = EXTRACT_U_1(pptr); /* get prefix length */
+ plen = GET_U_1(pptr); /* get prefix length */
/* NLRI "prefix" (ibid), valid lengths are { 0, 32, 33, ..., 96 } bits.
* RFC 4684 Section 4 defines the layout of "origin AS" and "route
}
/* With at least "origin AS", possibly with "route target". */
- ND_TCHECK_4(pptr + 1);
- as_printf(ndo, asbuf, sizeof(asbuf), EXTRACT_BE_U_4(pptr + 1));
+ as_printf(ndo, asbuf, sizeof(asbuf), GET_BE_U_4(pptr + 1));
plen -= 32; /* adjust prefix length */
- /* An extended community is 8 octets, so the remaining prefix
- * length must be 64.
- */
- if (64 != plen) {
- ND_PRINT("\n\t (illegal prefix length)");
+ if (64 < plen) {
+ ND_PRINT("\n\t (illegal prefix length)");
return -1;
}
- ND_TCHECK_LEN(pptr + 5, 8);
- ND_PRINT("\n\t origin AS: %s, route target ", asbuf);
- bgp_extended_community_print(ndo, pptr + 5);
- return 5 + 8;
+ /* From now on (plen + 7) / 8 evaluates to { 0, 1, 2, ..., 8 }
+ * and gives the number of octets in the variable-length "route
+ * target" field inside this NLRI "prefix". Look for it.
+ */
+ memset(&route_target, 0, sizeof(route_target));
+ num_octets = (plen + 7) / 8;
+ GET_CPY_BYTES(&route_target, pptr + 5, num_octets);
+ /* If mask-len is not on octet boundary, ensure all extra bits are 0 */
+ if (plen % 8) {
+ ((u_char *)&route_target)[num_octets - 1] &=
+ ((0xff00 >> (plen % 8)) & 0xff);
+ }
+ ND_PRINT("\n\t origin AS: %s, %s",
+ asbuf,
+ bgp_rt_prefix_print(ndo, (u_char *)&route_target, plen));
-trunc:
- return -2;
+ return 5 + num_octets;
}
static int
decode_labeled_vpn_prefix4(netdissect_options *ndo,
- const u_char *pptr, char *buf, u_int buflen)
+ const u_char *pptr, char *buf, size_t buflen)
{
- struct in_addr addr;
+ nd_ipv4 addr;
u_int plen;
- ND_TCHECK_1(pptr);
- plen = EXTRACT_U_1(pptr); /* get prefix length */
+ plen = GET_U_1(pptr); /* get prefix length */
if ((24+64) > plen)
return -1;
return -1;
memset(&addr, 0, sizeof(addr));
- ND_TCHECK_LEN(pptr + 12, (plen + 7) / 8);
- memcpy(&addr, pptr + 12, (plen + 7) / 8);
+ GET_CPY_BYTES(&addr, pptr + 12, (plen + 7) / 8);
if (plen % 8) {
((u_char *)&addr)[(plen + 7) / 8 - 1] &=
((0xff00 >> (plen % 8)) & 0xff);
}
/* the label may get offsetted by 4 bits so lets shift it right */
- nd_snprintf(buf, buflen, "RD: %s, %s/%u, label:%u %s",
+ snprintf(buf, buflen, "RD: %s, %s/%u, label:%u %s",
bgp_vpn_rd_print(ndo, pptr+4),
ipaddr_string(ndo, (const u_char *)&addr),
plen,
- EXTRACT_BE_U_3(pptr + 1)>>4,
- ((EXTRACT_U_1(pptr + 3) & 1) == 0) ? "(BOGUS: Bottom of Stack NOT set!)" : "(bottom)" );
+ GET_BE_U_3(pptr + 1)>>4,
+ ((GET_U_1(pptr + 3) & 1) == 0) ? "(BOGUS: Bottom of Stack NOT set!)" : "(bottom)" );
return 12 + (plen + 7) / 8;
-
-trunc:
- return -2;
}
/*
static int
decode_mdt_vpn_nlri(netdissect_options *ndo,
- const u_char *pptr, char *buf, u_int buflen)
+ const u_char *pptr, char *buf, size_t buflen)
{
const u_char *rd;
const u_char *vpn_ip;
- ND_TCHECK_1(pptr);
-
/* if the NLRI is not predefined length, quit.*/
- if (EXTRACT_U_1(pptr) != MDT_VPN_NLRI_LEN * 8)
+ if (GET_U_1(pptr) != MDT_VPN_NLRI_LEN * 8)
return -1;
pptr++;
pptr += 8;
/* IPv4 address */
- ND_TCHECK_LEN(pptr, sizeof(nd_ipv4));
vpn_ip = pptr;
pptr += sizeof(nd_ipv4);
/* MDT Group Address */
- ND_TCHECK_LEN(pptr, sizeof(nd_ipv4));
-
- nd_snprintf(buf, buflen, "RD: %s, VPN IP Address: %s, MC Group Address: %s",
- bgp_vpn_rd_print(ndo, rd), ipaddr_string(ndo, vpn_ip), ipaddr_string(ndo, pptr));
+ snprintf(buf, buflen, "RD: %s, VPN IP Address: %s, MC Group Address: %s",
+ bgp_vpn_rd_print(ndo, rd), GET_IPADDR_STRING(vpn_ip), GET_IPADDR_STRING(pptr));
return MDT_VPN_NLRI_LEN + 1;
decode_multicast_vpn(netdissect_options *ndo,
const u_char *pptr, char *buf, size_t buflen)
{
- uint8_t route_type, route_length, addr_length;
- u_int sg_length;
+ uint8_t route_type, route_length;
+ u_int addr_length, sg_length;
u_int offset;
- ND_TCHECK_2(pptr);
- route_type = EXTRACT_U_1(pptr);
+ route_type = GET_U_1(pptr);
pptr++;
- route_length = EXTRACT_U_1(pptr);
+ route_length = GET_U_1(pptr);
pptr++;
- nd_snprintf(buf, buflen, "Route-Type: %s (%u), length: %u",
+ snprintf(buf, buflen, "Route-Type: %s (%u), length: %u",
tok2str(bgp_multicast_vpn_route_type_values,
"Unknown", route_type),
route_type, route_length);
switch(route_type) {
case BGP_MULTICAST_VPN_ROUTE_TYPE_INTRA_AS_I_PMSI:
ND_TCHECK_LEN(pptr, BGP_VPN_RD_LEN);
- offset = strlen(buf);
- nd_snprintf(buf + offset, buflen - offset, ", RD: %s, Originator %s",
+ offset = (u_int)strlen(buf);
+ snprintf(buf + offset, buflen - offset, ", RD: %s, Originator %s",
bgp_vpn_rd_print(ndo, pptr),
bgp_vpn_ip_print(ndo, pptr + BGP_VPN_RD_LEN,
(route_length - BGP_VPN_RD_LEN) << 3));
break;
case BGP_MULTICAST_VPN_ROUTE_TYPE_INTER_AS_I_PMSI:
ND_TCHECK_LEN(pptr, BGP_VPN_RD_LEN + 4);
- offset = strlen(buf);
- nd_snprintf(buf + offset, buflen - offset, ", RD: %s, Source-AS %s",
+ offset = (u_int)strlen(buf);
+ snprintf(buf + offset, buflen - offset, ", RD: %s, Source-AS %s",
bgp_vpn_rd_print(ndo, pptr),
as_printf(ndo, astostr, sizeof(astostr),
- EXTRACT_BE_U_4(pptr + BGP_VPN_RD_LEN)));
+ GET_BE_U_4(pptr + BGP_VPN_RD_LEN)));
break;
case BGP_MULTICAST_VPN_ROUTE_TYPE_S_PMSI:
ND_TCHECK_LEN(pptr, BGP_VPN_RD_LEN);
- offset = strlen(buf);
- nd_snprintf(buf + offset, buflen - offset, ", RD: %s",
+ offset = (u_int)strlen(buf);
+ snprintf(buf + offset, buflen - offset, ", RD: %s",
bgp_vpn_rd_print(ndo, pptr));
pptr += BGP_VPN_RD_LEN;
addr_length = route_length - sg_length;
ND_TCHECK_LEN(pptr, addr_length);
- offset = strlen(buf);
- nd_snprintf(buf + offset, buflen - offset, ", Originator %s",
+ offset = (u_int)strlen(buf);
+ snprintf(buf + offset, buflen - offset, ", Originator %s",
bgp_vpn_ip_print(ndo, pptr, addr_length << 3));
break;
case BGP_MULTICAST_VPN_ROUTE_TYPE_SOURCE_ACTIVE:
ND_TCHECK_LEN(pptr, BGP_VPN_RD_LEN);
- offset = strlen(buf);
- nd_snprintf(buf + offset, buflen - offset, ", RD: %s",
+ offset = (u_int)strlen(buf);
+ snprintf(buf + offset, buflen - offset, ", RD: %s",
bgp_vpn_rd_print(ndo, pptr));
pptr += BGP_VPN_RD_LEN;
case BGP_MULTICAST_VPN_ROUTE_TYPE_SHARED_TREE_JOIN: /* fall through */
case BGP_MULTICAST_VPN_ROUTE_TYPE_SOURCE_TREE_JOIN:
ND_TCHECK_LEN(pptr, BGP_VPN_RD_LEN + 4);
- offset = strlen(buf);
- nd_snprintf(buf + offset, buflen - offset, ", RD: %s, Source-AS %s",
+ offset = (u_int)strlen(buf);
+ snprintf(buf + offset, buflen - offset, ", RD: %s, Source-AS %s",
bgp_vpn_rd_print(ndo, pptr),
as_printf(ndo, astostr, sizeof(astostr),
- EXTRACT_BE_U_4(pptr + BGP_VPN_RD_LEN)));
+ GET_BE_U_4(pptr + BGP_VPN_RD_LEN)));
pptr += BGP_VPN_RD_LEN + 4;
bgp_vpn_sg_print(ndo, pptr, buf, buflen);
static int
decode_labeled_vpn_l2(netdissect_options *ndo,
- const u_char *pptr, char *buf, u_int buflen)
+ const u_char *pptr, char *buf, size_t buflen)
{
u_int plen, tlen, tlv_type, tlv_len, ttlv_len;
int stringlen;
- ND_TCHECK_2(pptr);
- plen = EXTRACT_BE_U_2(pptr);
+ plen = GET_BE_U_2(pptr);
tlen = plen;
pptr += 2;
/* Old and new L2VPN NLRI share AFI/SAFI
/* assume AD-only with RD, BGPNH */
ND_TCHECK_LEN(pptr, 12);
buf[0] = '\0';
- stringlen = nd_snprintf(buf, buflen, "RD: %s, BGPNH: %s",
+ stringlen = snprintf(buf, buflen, "RD: %s, BGPNH: %s",
bgp_vpn_rd_print(ndo, pptr),
- ipaddr_string(ndo, pptr+8));
+ GET_IPADDR_STRING(pptr+8));
UPDATE_BUF_BUFLEN(buf, buflen, stringlen);
pptr += 12;
tlen -= 12;
ND_TCHECK_LEN(pptr, 15);
buf[0] = '\0';
- stringlen = nd_snprintf(buf, buflen, "RD: %s, CE-ID: %u, Label-Block Offset: %u, Label Base %u",
+ stringlen = snprintf(buf, buflen, "RD: %s, CE-ID: %u, Label-Block Offset: %u, Label Base %u",
bgp_vpn_rd_print(ndo, pptr),
- EXTRACT_BE_U_2(pptr + 8),
- EXTRACT_BE_U_2(pptr + 10),
- EXTRACT_BE_U_3(pptr + 12)>>4); /* the label is offsetted by 4 bits so lets shift it right */
+ GET_BE_U_2(pptr + 8),
+ GET_BE_U_2(pptr + 10),
+ GET_BE_U_3(pptr + 12)>>4); /* the label is offsetted by 4 bits so lets shift it right */
UPDATE_BUF_BUFLEN(buf, buflen, stringlen);
pptr += 15;
tlen -= 15;
while (tlen != 0) {
if (tlen < 3) {
if (buflen != 0) {
- stringlen=nd_snprintf(buf,buflen, "\n\t\tran past the end");
+ stringlen=snprintf(buf,buflen, "\n\t\tran past the end");
UPDATE_BUF_BUFLEN(buf, buflen, stringlen);
}
return plen + 2;
}
- ND_TCHECK_3(pptr);
- tlv_type = EXTRACT_U_1(pptr);
+ tlv_type = GET_U_1(pptr);
pptr++;
- tlv_len = EXTRACT_BE_U_2(pptr); /* length, in *bits* */
+ tlv_len = GET_BE_U_2(pptr); /* length, in *bits* */
ttlv_len = (tlv_len + 7)/8; /* length, in *bytes* */
pptr += 2;
switch(tlv_type) {
case 1:
if (buflen != 0) {
- stringlen=nd_snprintf(buf,buflen, "\n\t\tcircuit status vector (%u) length: %u: 0x",
+ stringlen=snprintf(buf,buflen, "\n\t\tcircuit status vector (%u) length: %u: 0x",
tlv_type,
tlv_len);
UPDATE_BUF_BUFLEN(buf, buflen, stringlen);
while (ttlv_len != 0) {
if (tlen < 1) {
if (buflen != 0) {
- stringlen=nd_snprintf(buf,buflen, " (ran past the end)");
+ stringlen=snprintf(buf,buflen, " (ran past the end)");
UPDATE_BUF_BUFLEN(buf, buflen, stringlen);
}
return plen + 2;
}
ND_TCHECK_1(pptr);
if (buflen != 0) {
- stringlen=nd_snprintf(buf,buflen, "%02x",
- EXTRACT_U_1(pptr));
+ stringlen=snprintf(buf,buflen, "%02x",
+ GET_U_1(pptr));
pptr++;
UPDATE_BUF_BUFLEN(buf, buflen, stringlen);
}
break;
default:
if (buflen != 0) {
- stringlen=nd_snprintf(buf,buflen, "\n\t\tunknown TLV #%u, length: %u",
+ stringlen=snprintf(buf,buflen, "\n\t\tunknown TLV #%u, length: %u",
tlv_type,
tlv_len);
UPDATE_BUF_BUFLEN(buf, buflen, stringlen);
}
if (tlen < ttlv_len) {
if (buflen != 0) {
- stringlen=nd_snprintf(buf,buflen, " (ran past the end)");
+ stringlen=snprintf(buf,buflen, " (ran past the end)");
UPDATE_BUF_BUFLEN(buf, buflen, stringlen);
}
return plen + 2;
int
decode_prefix6(netdissect_options *ndo,
- const u_char *pd, u_int itemlen, char *buf, u_int buflen)
+ const u_char *pd, u_int itemlen, char *buf, size_t buflen)
{
- struct in6_addr addr;
+ nd_ipv6 addr;
u_int plen, plenbytes;
- ND_TCHECK_1(pd);
ITEMCHECK(1);
- plen = EXTRACT_U_1(pd);
+ plen = GET_U_1(pd);
if (128 < plen)
return -1;
itemlen -= 1;
memset(&addr, 0, sizeof(addr));
plenbytes = (plen + 7) / 8;
- ND_TCHECK_LEN(pd + 1, plenbytes);
ITEMCHECK(plenbytes);
- memcpy(&addr, pd + 1, plenbytes);
+ GET_CPY_BYTES(&addr, pd + 1, plenbytes);
if (plen % 8) {
- addr.s6_addr[plenbytes - 1] &=
+ addr[plenbytes - 1] &=
((0xff00 >> (plen % 8)) & 0xff);
}
- nd_snprintf(buf, buflen, "%s/%u", ip6addr_string(ndo, (const u_char *)&addr), plen);
+ snprintf(buf, buflen, "%s/%u", ip6addr_string(ndo, (const u_char *)&addr), plen);
return 1 + plenbytes;
-trunc:
- return -2;
-
badtlv:
- return -3;
+ return -2;
}
static int
decode_labeled_prefix6(netdissect_options *ndo,
- const u_char *pptr, u_int itemlen, char *buf, u_int buflen)
+ const u_char *pptr, u_int itemlen, char *buf, size_t buflen)
{
- struct in6_addr addr;
+ nd_ipv6 addr;
u_int plen, plenbytes;
/* prefix length and label = 4 bytes */
ND_TCHECK_4(pptr);
ITEMCHECK(4);
- plen = EXTRACT_U_1(pptr); /* get prefix length */
+ plen = GET_U_1(pptr); /* get prefix length */
if (24 > plen)
return -1;
memset(&addr, 0, sizeof(addr));
plenbytes = (plen + 7) / 8;
- ND_TCHECK_LEN(pptr + 4, plenbytes);
- memcpy(&addr, pptr + 4, plenbytes);
+ GET_CPY_BYTES(&addr, pptr + 4, plenbytes);
if (plen % 8) {
- addr.s6_addr[plenbytes - 1] &=
+ addr[plenbytes - 1] &=
((0xff00 >> (plen % 8)) & 0xff);
}
/* the label may get offsetted by 4 bits so lets shift it right */
- nd_snprintf(buf, buflen, "%s/%u, label:%u %s",
+ snprintf(buf, buflen, "%s/%u, label:%u %s",
ip6addr_string(ndo, (const u_char *)&addr),
plen,
- EXTRACT_BE_U_3(pptr + 1)>>4,
- ((EXTRACT_U_1(pptr + 3) & 1) == 0) ? "(BOGUS: Bottom of Stack NOT set!)" : "(bottom)" );
+ GET_BE_U_3(pptr + 1)>>4,
+ ((GET_U_1(pptr + 3) & 1) == 0) ? "(BOGUS: Bottom of Stack NOT set!)" : "(bottom)" );
return 4 + plenbytes;
static int
decode_labeled_vpn_prefix6(netdissect_options *ndo,
- const u_char *pptr, char *buf, u_int buflen)
+ const u_char *pptr, char *buf, size_t buflen)
{
- struct in6_addr addr;
+ nd_ipv6 addr;
u_int plen;
- ND_TCHECK_1(pptr);
- plen = EXTRACT_U_1(pptr); /* get prefix length */
+ plen = GET_U_1(pptr); /* get prefix length */
if ((24+64) > plen)
return -1;
return -1;
memset(&addr, 0, sizeof(addr));
- ND_TCHECK_LEN(pptr + 12, (plen + 7) / 8);
- memcpy(&addr, pptr + 12, (plen + 7) / 8);
+ GET_CPY_BYTES(&addr, pptr + 12, (plen + 7) / 8);
if (plen % 8) {
- addr.s6_addr[(plen + 7) / 8 - 1] &=
+ addr[(plen + 7) / 8 - 1] &=
((0xff00 >> (plen % 8)) & 0xff);
}
/* the label may get offsetted by 4 bits so lets shift it right */
- nd_snprintf(buf, buflen, "RD: %s, %s/%u, label:%u %s",
+ snprintf(buf, buflen, "RD: %s, %s/%u, label:%u %s",
bgp_vpn_rd_print(ndo, pptr+4),
ip6addr_string(ndo, (const u_char *)&addr),
plen,
- EXTRACT_BE_U_3(pptr + 1)>>4,
- ((EXTRACT_U_1(pptr + 3) & 1) == 0) ? "(BOGUS: Bottom of Stack NOT set!)" : "(bottom)" );
+ GET_BE_U_3(pptr + 1)>>4,
+ ((GET_U_1(pptr + 3) & 1) == 0) ? "(BOGUS: Bottom of Stack NOT set!)" : "(bottom)" );
return 12 + (plen + 7) / 8;
-
-trunc:
- return -2;
}
static int
decode_clnp_prefix(netdissect_options *ndo,
- const u_char *pptr, char *buf, u_int buflen)
+ const u_char *pptr, char *buf, size_t buflen)
{
uint8_t addr[19];
u_int plen;
- ND_TCHECK_1(pptr);
- plen = EXTRACT_U_1(pptr); /* get prefix length */
+ plen = GET_U_1(pptr); /* get prefix length */
if (152 < plen)
return -1;
memset(&addr, 0, sizeof(addr));
- ND_TCHECK_LEN(pptr + 4, (plen + 7) / 8);
- memcpy(&addr, pptr + 4, (plen + 7) / 8);
+ GET_CPY_BYTES(&addr, pptr + 4, (plen + 7) / 8);
if (plen % 8) {
addr[(plen + 7) / 8 - 1] &=
((0xff00 >> (plen % 8)) & 0xff);
}
- nd_snprintf(buf, buflen, "%s/%u",
+ /* Cannot use GET_ISONSAP_STRING (not packet buffer pointer) */
+ snprintf(buf, buflen, "%s/%u",
isonsap_string(ndo, addr,(plen + 7) / 8),
plen);
return 1 + (plen + 7) / 8;
-
-trunc:
- return -2;
}
static int
decode_labeled_vpn_clnp_prefix(netdissect_options *ndo,
- const u_char *pptr, char *buf, u_int buflen)
+ const u_char *pptr, char *buf, size_t buflen)
{
uint8_t addr[19];
u_int plen;
- ND_TCHECK_1(pptr);
- plen = EXTRACT_U_1(pptr); /* get prefix length */
+ plen = GET_U_1(pptr); /* get prefix length */
if ((24+64) > plen)
return -1;
return -1;
memset(&addr, 0, sizeof(addr));
- ND_TCHECK_LEN(pptr + 12, (plen + 7) / 8);
- memcpy(&addr, pptr + 12, (plen + 7) / 8);
+ GET_CPY_BYTES(&addr, pptr + 12, (plen + 7) / 8);
if (plen % 8) {
addr[(plen + 7) / 8 - 1] &= ((0xff00 >> (plen % 8)) & 0xff);
}
/* the label may get offsetted by 4 bits so lets shift it right */
- nd_snprintf(buf, buflen, "RD: %s, %s/%u, label:%u %s",
+ /* Cannot use GET_ISONSAP_STRING (not packet buffer pointer) */
+ snprintf(buf, buflen, "RD: %s, %s/%u, label:%u %s",
bgp_vpn_rd_print(ndo, pptr+4),
isonsap_string(ndo, addr,(plen + 7) / 8),
plen,
- EXTRACT_BE_U_3(pptr + 1)>>4,
- ((EXTRACT_U_1(pptr + 3) & 1) == 0) ? "(BOGUS: Bottom of Stack NOT set!)" : "(bottom)" );
+ GET_BE_U_3(pptr + 1)>>4,
+ ((GET_U_1(pptr + 3) & 1) == 0) ? "(BOGUS: Bottom of Stack NOT set!)" : "(bottom)" );
return 12 + (plen + 7) / 8;
-
-trunc:
- return -2;
}
/*
* each.
*/
while (tptr < pptr + len) {
- ND_TCHECK_1(tptr);
-
/*
* If we do not find a valid segment type, our guess might be wrong.
*/
- if (EXTRACT_U_1(tptr) < BGP_AS_SEG_TYPE_MIN || EXTRACT_U_1(tptr) > BGP_AS_SEG_TYPE_MAX) {
+ if (GET_U_1(tptr) < BGP_AS_SEG_TYPE_MIN || GET_U_1(tptr) > BGP_AS_SEG_TYPE_MAX) {
goto trunc;
}
- ND_TCHECK_1(tptr + 1);
- tptr += 2 + EXTRACT_U_1(tptr + 1) * 2;
+ tptr += 2 + GET_U_1(tptr + 1) * 2;
}
/*
/* We ran out of captured data; quit scanning. */
break;
}
- prefix_length = EXTRACT_U_1(pptr + offset);
+ prefix_length = GET_U_1(pptr + offset);
/*
* Add 4 to cover the path id
* and check the prefix length isn't greater than 32/128.
/* We ran out of captured data; quit scanning. */
break;
}
- prefix_length = EXTRACT_U_1(pptr + offset);
+ prefix_length = GET_U_1(pptr + offset);
/*
* If the prefix_length is zero (0.0.0.0/0)
* and since it's not the only address (length >= 5)
return 0;
}
+static int
+bgp_mp_af_print(netdissect_options *ndo,
+ const u_char *tptr, u_int tlen,
+ uint16_t *afp, uint8_t *safip)
+{
+ uint16_t af;
+ uint8_t safi;
+
+ af = GET_BE_U_2(tptr);
+ *afp = af;
+ safi = GET_U_1(tptr + 2);
+ *safip = safi;
+
+ ND_PRINT("\n\t AFI: %s (%u), %sSAFI: %s (%u)",
+ tok2str(af_values, "Unknown AFI", af),
+ af,
+ (safi>128) ? "vendor specific " : "", /* 128 is meanwhile wellknown */
+ tok2str(bgp_safi_values, "Unknown SAFI", safi),
+ safi);
+
+ switch(af<<8 | safi) {
+ case (AFNUM_INET<<8 | SAFNUM_UNICAST):
+ case (AFNUM_INET<<8 | SAFNUM_MULTICAST):
+ case (AFNUM_INET<<8 | SAFNUM_UNIMULTICAST):
+ case (AFNUM_INET<<8 | SAFNUM_LABUNICAST):
+ case (AFNUM_INET<<8 | SAFNUM_RT_ROUTING_INFO):
+ case (AFNUM_INET<<8 | SAFNUM_VPNUNICAST):
+ case (AFNUM_INET<<8 | SAFNUM_VPNMULTICAST):
+ case (AFNUM_INET<<8 | SAFNUM_VPNUNIMULTICAST):
+ case (AFNUM_INET<<8 | SAFNUM_MULTICAST_VPN):
+ case (AFNUM_INET<<8 | SAFNUM_MDT):
+ case (AFNUM_INET6<<8 | SAFNUM_UNICAST):
+ case (AFNUM_INET6<<8 | SAFNUM_MULTICAST):
+ case (AFNUM_INET6<<8 | SAFNUM_UNIMULTICAST):
+ case (AFNUM_INET6<<8 | SAFNUM_LABUNICAST):
+ case (AFNUM_INET6<<8 | SAFNUM_VPNUNICAST):
+ case (AFNUM_INET6<<8 | SAFNUM_VPNMULTICAST):
+ case (AFNUM_INET6<<8 | SAFNUM_VPNUNIMULTICAST):
+ case (AFNUM_NSAP<<8 | SAFNUM_UNICAST):
+ case (AFNUM_NSAP<<8 | SAFNUM_MULTICAST):
+ case (AFNUM_NSAP<<8 | SAFNUM_UNIMULTICAST):
+ case (AFNUM_NSAP<<8 | SAFNUM_VPNUNICAST):
+ case (AFNUM_NSAP<<8 | SAFNUM_VPNMULTICAST):
+ case (AFNUM_NSAP<<8 | SAFNUM_VPNUNIMULTICAST):
+ case (AFNUM_L2VPN<<8 | SAFNUM_VPNUNICAST):
+ case (AFNUM_L2VPN<<8 | SAFNUM_VPNMULTICAST):
+ case (AFNUM_L2VPN<<8 | SAFNUM_VPNUNIMULTICAST):
+ case (AFNUM_VPLS<<8 | SAFNUM_VPLS):
+ break;
+ default:
+ ND_TCHECK_LEN(tptr, tlen);
+ ND_PRINT("\n\t no AFI %u / SAFI %u decoder", af, safi);
+ if (ndo->ndo_vflag <= 1)
+ print_unknown_data(ndo, tptr, "\n\t ", tlen);
+ return -1;
+ }
+ return 0;
+trunc:
+ return -2;
+}
+
+static int
+bgp_nlri_print(netdissect_options *ndo, uint16_t af, uint8_t safi,
+ const u_char *tptr, u_int len,
+ char *buf, size_t buflen,
+ int add_path4, int add_path6)
+{
+ int advance;
+ u_int path_id = 0;
+
+ switch (af<<8 | safi) {
+ case (AFNUM_INET<<8 | SAFNUM_UNICAST):
+ case (AFNUM_INET<<8 | SAFNUM_MULTICAST):
+ case (AFNUM_INET<<8 | SAFNUM_UNIMULTICAST):
+ if (add_path4) {
+ path_id = GET_BE_U_4(tptr);
+ tptr += 4;
+ }
+ advance = decode_prefix4(ndo, tptr, len, buf, buflen);
+ if (advance == -1)
+ ND_PRINT("\n\t (illegal prefix length)");
+ else if (advance == -2)
+ break; /* bytes left, but not enough */
+ else
+ ND_PRINT("\n\t %s", buf);
+ if (add_path4) {
+ ND_PRINT(" Path Id: %u", path_id);
+ advance += 4;
+ }
+ break;
+ case (AFNUM_INET<<8 | SAFNUM_LABUNICAST):
+ advance = decode_labeled_prefix4(ndo, tptr, len, buf, buflen);
+ if (advance == -1)
+ ND_PRINT("\n\t (illegal prefix length)");
+ else if (advance == -2)
+ goto trunc;
+ else if (advance == -3)
+ break; /* bytes left, but not enough */
+ else
+ ND_PRINT("\n\t %s", buf);
+ break;
+ case (AFNUM_INET<<8 | SAFNUM_VPNUNICAST):
+ case (AFNUM_INET<<8 | SAFNUM_VPNMULTICAST):
+ case (AFNUM_INET<<8 | SAFNUM_VPNUNIMULTICAST):
+ advance = decode_labeled_vpn_prefix4(ndo, tptr, buf, buflen);
+ if (advance == -1)
+ ND_PRINT("\n\t (illegal prefix length)");
+ else
+ ND_PRINT("\n\t %s", buf);
+ break;
+ case (AFNUM_INET<<8 | SAFNUM_RT_ROUTING_INFO):
+ advance = decode_rt_routing_info(ndo, tptr);
+ break;
+ case (AFNUM_INET<<8 | SAFNUM_MULTICAST_VPN): /* fall through */
+ case (AFNUM_INET6<<8 | SAFNUM_MULTICAST_VPN):
+ advance = decode_multicast_vpn(ndo, tptr, buf, buflen);
+ if (advance == -1)
+ ND_PRINT("\n\t (illegal prefix length)");
+ else if (advance == -2)
+ goto trunc;
+ else
+ ND_PRINT("\n\t %s", buf);
+ break;
+
+ case (AFNUM_INET<<8 | SAFNUM_MDT):
+ advance = decode_mdt_vpn_nlri(ndo, tptr, buf, buflen);
+ if (advance == -1)
+ ND_PRINT("\n\t (illegal prefix length)");
+ else if (advance == -2)
+ goto trunc;
+ else
+ ND_PRINT("\n\t %s", buf);
+ break;
+ case (AFNUM_INET6<<8 | SAFNUM_UNICAST):
+ case (AFNUM_INET6<<8 | SAFNUM_MULTICAST):
+ case (AFNUM_INET6<<8 | SAFNUM_UNIMULTICAST):
+ if (add_path6) {
+ path_id = GET_BE_U_4(tptr);
+ tptr += 4;
+ }
+ advance = decode_prefix6(ndo, tptr, len, buf, buflen);
+ if (advance == -1)
+ ND_PRINT("\n\t (illegal prefix length)");
+ else if (advance == -2)
+ break; /* bytes left, but not enough */
+ else
+ ND_PRINT("\n\t %s", buf);
+ if (add_path6) {
+ ND_PRINT(" Path Id: %u", path_id);
+ advance += 4;
+ }
+ break;
+ case (AFNUM_INET6<<8 | SAFNUM_LABUNICAST):
+ advance = decode_labeled_prefix6(ndo, tptr, len, buf, buflen);
+ if (advance == -1)
+ ND_PRINT("\n\t (illegal prefix length)");
+ else if (advance == -2)
+ goto trunc;
+ else if (advance == -3)
+ break; /* bytes left, but not enough */
+ else
+ ND_PRINT("\n\t %s", buf);
+ break;
+ case (AFNUM_INET6<<8 | SAFNUM_VPNUNICAST):
+ case (AFNUM_INET6<<8 | SAFNUM_VPNMULTICAST):
+ case (AFNUM_INET6<<8 | SAFNUM_VPNUNIMULTICAST):
+ advance = decode_labeled_vpn_prefix6(ndo, tptr, buf, buflen);
+ if (advance == -1)
+ ND_PRINT("\n\t (illegal prefix length)");
+ else
+ ND_PRINT("\n\t %s", buf);
+ break;
+ case (AFNUM_VPLS<<8 | SAFNUM_VPLS):
+ case (AFNUM_L2VPN<<8 | SAFNUM_VPNUNICAST):
+ case (AFNUM_L2VPN<<8 | SAFNUM_VPNMULTICAST):
+ case (AFNUM_L2VPN<<8 | SAFNUM_VPNUNIMULTICAST):
+ advance = decode_labeled_vpn_l2(ndo, tptr, buf, buflen);
+ if (advance == -1)
+ ND_PRINT("\n\t (illegal length)");
+ else if (advance == -2)
+ goto trunc;
+ else
+ ND_PRINT("\n\t %s", buf);
+ break;
+ case (AFNUM_NSAP<<8 | SAFNUM_UNICAST):
+ case (AFNUM_NSAP<<8 | SAFNUM_MULTICAST):
+ case (AFNUM_NSAP<<8 | SAFNUM_UNIMULTICAST):
+ advance = decode_clnp_prefix(ndo, tptr, buf, buflen);
+ if (advance == -1)
+ ND_PRINT("\n\t (illegal prefix length)");
+ else
+ ND_PRINT("\n\t %s", buf);
+ break;
+ case (AFNUM_NSAP<<8 | SAFNUM_VPNUNICAST):
+ case (AFNUM_NSAP<<8 | SAFNUM_VPNMULTICAST):
+ case (AFNUM_NSAP<<8 | SAFNUM_VPNUNIMULTICAST):
+ advance = decode_labeled_vpn_clnp_prefix(ndo, tptr, buf, buflen);
+ if (advance == -1)
+ ND_PRINT("\n\t (illegal prefix length)");
+ else
+ ND_PRINT("\n\t %s", buf);
+ break;
+ default:
+ /*
+ * This should not happen, we should have been protected
+ * by bgp_mp_af_print()'s return value.
+ */
+ ND_PRINT("\n\t ERROR: no AFI %u / SAFI %u decoder", af, safi);
+ advance = -4;
+ break;
+ }
+ return advance;
+trunc: /* we rely on the caller to recognize -2 return value */
+ return -2;
+}
+
static int
bgp_attr_print(netdissect_options *ndo,
- u_int atype, const u_char *pptr, u_int len)
+ uint8_t atype, const u_char *pptr, u_int len,
+ const unsigned attr_set_level)
{
u_int i;
uint16_t af;
char buf[MAXHOSTNAMELEN + 100];
u_int as_size;
int add_path4, add_path6;
- u_int path_id = 0;
+ int ret;
tptr = pptr;
tlen = len;
if (len != 1)
ND_PRINT("invalid len");
else {
- ND_TCHECK_1(tptr);
ND_PRINT("%s", tok2str(bgp_origin_values,
"Unknown Origin Typecode",
- EXTRACT_U_1(tptr)));
+ GET_U_1(tptr)));
}
break;
as_size = bgp_attr_get_as_size(ndo, atype, pptr, len);
while (tptr < pptr + len) {
- ND_TCHECK_1(tptr);
ND_PRINT("%s", tok2str(bgp_as_path_segment_open_values,
- "?", EXTRACT_U_1(tptr)));
- ND_TCHECK_1(tptr + 1);
- for (i = 0; i < EXTRACT_U_1(tptr + 1) * as_size; i += as_size) {
+ "?", GET_U_1(tptr)));
+ for (i = 0; i < GET_U_1(tptr + 1) * as_size; i += as_size) {
ND_TCHECK_LEN(tptr + 2 + i, as_size);
ND_PRINT("%s ",
as_printf(ndo, astostr, sizeof(astostr),
as_size == 2 ?
- EXTRACT_BE_U_2(tptr + i + 2) :
- EXTRACT_BE_U_4(tptr + i + 2)));
+ GET_BE_U_2(tptr + i + 2) :
+ GET_BE_U_4(tptr + i + 2)));
}
- ND_TCHECK_1(tptr);
ND_PRINT("%s", tok2str(bgp_as_path_segment_close_values,
- "?", EXTRACT_U_1(tptr)));
- ND_TCHECK_1(tptr + 1);
- tptr += 2 + EXTRACT_U_1(tptr + 1) * as_size;
+ "?", GET_U_1(tptr)));
+ tptr += 2 + GET_U_1(tptr + 1) * as_size;
}
break;
case BGPTYPE_NEXT_HOP:
if (len != 4)
ND_PRINT("invalid len");
else {
- ND_TCHECK_4(tptr);
- ND_PRINT("%s", ipaddr_string(ndo, tptr));
+ ND_PRINT("%s", GET_IPADDR_STRING(tptr));
}
break;
case BGPTYPE_MULTI_EXIT_DISC:
if (len != 4)
ND_PRINT("invalid len");
else {
- ND_TCHECK_4(tptr);
- ND_PRINT("%u", EXTRACT_BE_U_4(tptr));
+ ND_PRINT("%u", GET_BE_U_4(tptr));
}
break;
case BGPTYPE_ATOMIC_AGGREGATE:
ND_TCHECK_LEN(tptr, len);
if (len == 6) {
ND_PRINT(" AS #%s, origin %s",
- as_printf(ndo, astostr, sizeof(astostr), EXTRACT_BE_U_2(tptr)),
- ipaddr_string(ndo, tptr + 2));
+ as_printf(ndo, astostr, sizeof(astostr), GET_BE_U_2(tptr)),
+ GET_IPADDR_STRING(tptr + 2));
} else {
ND_PRINT(" AS #%s, origin %s",
as_printf(ndo, astostr, sizeof(astostr),
- EXTRACT_BE_U_4(tptr)), ipaddr_string(ndo, tptr + 4));
+ GET_BE_U_4(tptr)), GET_IPADDR_STRING(tptr + 4));
}
break;
case BGPTYPE_AGGREGATOR4:
ND_PRINT("invalid len");
break;
}
- ND_TCHECK_8(tptr);
ND_PRINT(" AS #%s, origin %s",
- as_printf(ndo, astostr, sizeof(astostr), EXTRACT_BE_U_4(tptr)),
- ipaddr_string(ndo, tptr + 4));
+ as_printf(ndo, astostr, sizeof(astostr), GET_BE_U_4(tptr)),
+ GET_IPADDR_STRING(tptr + 4));
break;
case BGPTYPE_COMMUNITIES:
if (len % 4) {
ND_TCHECK_4(tptr);
if (tlen < 4)
goto trunc;
- comm = EXTRACT_BE_U_4(tptr);
+ comm = GET_BE_U_4(tptr);
switch (comm) {
case BGP_COMMUNITY_NO_EXPORT:
ND_PRINT(" NO_EXPORT");
ND_PRINT("invalid len");
break;
}
- ND_TCHECK_4(tptr);
- ND_PRINT("%s",ipaddr_string(ndo, tptr));
+ ND_PRINT("%s",GET_IPADDR_STRING(tptr));
break;
case BGPTYPE_CLUSTER_LIST:
if (len % 4) {
break;
}
while (tlen != 0) {
- ND_TCHECK_4(tptr);
if (tlen < 4)
goto trunc;
ND_PRINT("%s%s",
- ipaddr_string(ndo, tptr),
+ GET_IPADDR_STRING(tptr),
(tlen>4) ? ", " : "");
tlen -=4;
tptr +=4;
ND_TCHECK_3(tptr);
if (tlen < 3)
goto trunc;
- af = EXTRACT_BE_U_2(tptr);
- safi = EXTRACT_U_1(tptr + 2);
+ ret = bgp_mp_af_print(ndo, tptr, tlen, &af, &safi);
+ if (ret == -2)
+ goto trunc;
+ if (ret < 0)
+ break;
- ND_PRINT("\n\t AFI: %s (%u), %sSAFI: %s (%u)",
- tok2str(af_values, "Unknown AFI", af),
- af,
- (safi>128) ? "vendor specific " : "", /* 128 is meanwhile wellknown */
- tok2str(bgp_safi_values, "Unknown SAFI", safi),
- safi);
-
- switch(af<<8 | safi) {
- case (AFNUM_INET<<8 | SAFNUM_UNICAST):
- case (AFNUM_INET<<8 | SAFNUM_MULTICAST):
- case (AFNUM_INET<<8 | SAFNUM_UNIMULTICAST):
- case (AFNUM_INET<<8 | SAFNUM_LABUNICAST):
- case (AFNUM_INET<<8 | SAFNUM_RT_ROUTING_INFO):
- case (AFNUM_INET<<8 | SAFNUM_VPNUNICAST):
- case (AFNUM_INET<<8 | SAFNUM_VPNMULTICAST):
- case (AFNUM_INET<<8 | SAFNUM_VPNUNIMULTICAST):
- case (AFNUM_INET<<8 | SAFNUM_MULTICAST_VPN):
- case (AFNUM_INET<<8 | SAFNUM_MDT):
- case (AFNUM_INET6<<8 | SAFNUM_UNICAST):
- case (AFNUM_INET6<<8 | SAFNUM_MULTICAST):
- case (AFNUM_INET6<<8 | SAFNUM_UNIMULTICAST):
- case (AFNUM_INET6<<8 | SAFNUM_LABUNICAST):
- case (AFNUM_INET6<<8 | SAFNUM_VPNUNICAST):
- case (AFNUM_INET6<<8 | SAFNUM_VPNMULTICAST):
- case (AFNUM_INET6<<8 | SAFNUM_VPNUNIMULTICAST):
- case (AFNUM_NSAP<<8 | SAFNUM_UNICAST):
- case (AFNUM_NSAP<<8 | SAFNUM_MULTICAST):
- case (AFNUM_NSAP<<8 | SAFNUM_UNIMULTICAST):
- case (AFNUM_NSAP<<8 | SAFNUM_VPNUNICAST):
- case (AFNUM_NSAP<<8 | SAFNUM_VPNMULTICAST):
- case (AFNUM_NSAP<<8 | SAFNUM_VPNUNIMULTICAST):
- case (AFNUM_L2VPN<<8 | SAFNUM_VPNUNICAST):
- case (AFNUM_L2VPN<<8 | SAFNUM_VPNMULTICAST):
- case (AFNUM_L2VPN<<8 | SAFNUM_VPNUNIMULTICAST):
- case (AFNUM_VPLS<<8 | SAFNUM_VPLS):
- break;
- default:
- ND_TCHECK_LEN(tptr, tlen);
- ND_PRINT("\n\t no AFI %u / SAFI %u decoder", af, safi);
- if (ndo->ndo_vflag <= 1)
- print_unknown_data(ndo, tptr, "\n\t ", tlen);
- goto done;
- break;
- }
-
- tptr +=3;
+ tptr += 3;
+ tlen -= 3;
ND_TCHECK_1(tptr);
- nhlen = EXTRACT_U_1(tptr);
- tlen = nhlen;
+ if (tlen < 1)
+ goto trunc;
+ nhlen = GET_U_1(tptr);
tptr++;
+ tlen--;
- if (tlen) {
+ if (nhlen) {
u_int nnh = 0;
+ uint8_t tnhlen = nhlen;
+ if (tlen < tnhlen)
+ goto trunc;
ND_PRINT("\n\t nexthop: ");
- while (tlen != 0) {
+ while (tnhlen != 0) {
if (nnh++ > 0) {
ND_PRINT(", " );
}
case (AFNUM_INET<<8 | SAFNUM_RT_ROUTING_INFO):
case (AFNUM_INET<<8 | SAFNUM_MULTICAST_VPN):
case (AFNUM_INET<<8 | SAFNUM_MDT):
- if (tlen < sizeof(nd_ipv4)) {
+ if (tnhlen < sizeof(nd_ipv4)) {
ND_PRINT("invalid len");
- tlen = 0;
+ tptr += tnhlen;
+ tlen -= tnhlen;
+ tnhlen = 0;
} else {
- ND_TCHECK_LEN(tptr, sizeof(nd_ipv4));
- ND_PRINT("%s",ipaddr_string(ndo, tptr));
- tlen -= sizeof(nd_ipv4);
+ ND_PRINT("%s",GET_IPADDR_STRING(tptr));
tptr += sizeof(nd_ipv4);
+ tnhlen -= sizeof(nd_ipv4);
+ tlen -= sizeof(nd_ipv4);
}
break;
case (AFNUM_INET<<8 | SAFNUM_VPNUNICAST):
case (AFNUM_INET<<8 | SAFNUM_VPNMULTICAST):
case (AFNUM_INET<<8 | SAFNUM_VPNUNIMULTICAST):
- if (tlen < sizeof(nd_ipv4)+BGP_VPN_RD_LEN) {
+ if (tnhlen < sizeof(nd_ipv4)+BGP_VPN_RD_LEN) {
ND_PRINT("invalid len");
- tlen = 0;
+ tptr += tnhlen;
+ tlen -= tnhlen;
+ tnhlen = 0;
} else {
- ND_TCHECK_LEN(tptr,
- sizeof(nd_ipv4) + BGP_VPN_RD_LEN);
ND_PRINT("RD: %s, %s",
bgp_vpn_rd_print(ndo, tptr),
- ipaddr_string(ndo, tptr+BGP_VPN_RD_LEN));
- tlen -= (sizeof(nd_ipv4)+BGP_VPN_RD_LEN);
+ GET_IPADDR_STRING(tptr+BGP_VPN_RD_LEN));
tptr += (sizeof(nd_ipv4)+BGP_VPN_RD_LEN);
+ tlen -= (sizeof(nd_ipv4)+BGP_VPN_RD_LEN);
+ tnhlen -= (sizeof(nd_ipv4)+BGP_VPN_RD_LEN);
}
break;
case (AFNUM_INET6<<8 | SAFNUM_UNICAST):
case (AFNUM_INET6<<8 | SAFNUM_MULTICAST):
case (AFNUM_INET6<<8 | SAFNUM_UNIMULTICAST):
case (AFNUM_INET6<<8 | SAFNUM_LABUNICAST):
- if (tlen < sizeof(nd_ipv6)) {
+ if (tnhlen < sizeof(nd_ipv6)) {
ND_PRINT("invalid len");
- tlen = 0;
+ tptr += tnhlen;
+ tlen -= tnhlen;
+ tnhlen = 0;
} else {
- ND_TCHECK_LEN(tptr, sizeof(nd_ipv6));
- ND_PRINT("%s", ip6addr_string(ndo, tptr));
- tlen -= sizeof(nd_ipv6);
+ ND_PRINT("%s", GET_IP6ADDR_STRING(tptr));
tptr += sizeof(nd_ipv6);
+ tlen -= sizeof(nd_ipv6);
+ tnhlen -= sizeof(nd_ipv6);
}
break;
case (AFNUM_INET6<<8 | SAFNUM_VPNUNICAST):
case (AFNUM_INET6<<8 | SAFNUM_VPNMULTICAST):
case (AFNUM_INET6<<8 | SAFNUM_VPNUNIMULTICAST):
- if (tlen < sizeof(nd_ipv6)+BGP_VPN_RD_LEN) {
+ if (tnhlen < sizeof(nd_ipv6)+BGP_VPN_RD_LEN) {
ND_PRINT("invalid len");
- tlen = 0;
+ tptr += tnhlen;
+ tlen -= tnhlen;
+ tnhlen = 0;
} else {
- ND_TCHECK_LEN(tptr,
- sizeof(nd_ipv6) + BGP_VPN_RD_LEN);
ND_PRINT("RD: %s, %s",
bgp_vpn_rd_print(ndo, tptr),
- ip6addr_string(ndo, tptr+BGP_VPN_RD_LEN));
- tlen -= (sizeof(nd_ipv6)+BGP_VPN_RD_LEN);
+ GET_IP6ADDR_STRING(tptr+BGP_VPN_RD_LEN));
tptr += (sizeof(nd_ipv6)+BGP_VPN_RD_LEN);
+ tlen -= (sizeof(nd_ipv6)+BGP_VPN_RD_LEN);
+ tnhlen -= (sizeof(nd_ipv6)+BGP_VPN_RD_LEN);
}
break;
case (AFNUM_VPLS<<8 | SAFNUM_VPLS):
case (AFNUM_L2VPN<<8 | SAFNUM_VPNUNICAST):
case (AFNUM_L2VPN<<8 | SAFNUM_VPNMULTICAST):
case (AFNUM_L2VPN<<8 | SAFNUM_VPNUNIMULTICAST):
- if (tlen < sizeof(nd_ipv4)) {
+ if (tnhlen < sizeof(nd_ipv4)) {
ND_PRINT("invalid len");
- tlen = 0;
+ tptr += tnhlen;
+ tlen -= tnhlen;
+ tnhlen = 0;
} else {
- ND_TCHECK_LEN(tptr, sizeof(nd_ipv4));
- ND_PRINT("%s", ipaddr_string(ndo, tptr));
- tlen -= (sizeof(nd_ipv4));
+ ND_PRINT("%s", GET_IPADDR_STRING(tptr));
tptr += (sizeof(nd_ipv4));
+ tlen -= (sizeof(nd_ipv4));
+ tnhlen -= (sizeof(nd_ipv4));
}
break;
case (AFNUM_NSAP<<8 | SAFNUM_UNICAST):
case (AFNUM_NSAP<<8 | SAFNUM_MULTICAST):
case (AFNUM_NSAP<<8 | SAFNUM_UNIMULTICAST):
- ND_TCHECK_LEN(tptr, tlen);
- ND_PRINT("%s", isonsap_string(ndo, tptr, tlen));
- tptr += tlen;
- tlen = 0;
+ ND_PRINT("%s", GET_ISONSAP_STRING(tptr, tnhlen));
+ tptr += tnhlen;
+ tlen -= tnhlen;
+ tnhlen = 0;
break;
case (AFNUM_NSAP<<8 | SAFNUM_VPNUNICAST):
case (AFNUM_NSAP<<8 | SAFNUM_VPNMULTICAST):
case (AFNUM_NSAP<<8 | SAFNUM_VPNUNIMULTICAST):
- if (tlen < BGP_VPN_RD_LEN+1) {
+ if (tnhlen < BGP_VPN_RD_LEN+1) {
ND_PRINT("invalid len");
- tlen = 0;
+ tptr += tnhlen;
+ tlen -= tnhlen;
+ tnhlen = 0;
} else {
- ND_TCHECK_LEN(tptr, tlen);
+ ND_TCHECK_LEN(tptr, tnhlen);
ND_PRINT("RD: %s, %s",
bgp_vpn_rd_print(ndo, tptr),
- isonsap_string(ndo, tptr+BGP_VPN_RD_LEN,tlen-BGP_VPN_RD_LEN));
+ GET_ISONSAP_STRING(tptr+BGP_VPN_RD_LEN,tnhlen-BGP_VPN_RD_LEN));
/* rfc986 mapped IPv4 address ? */
- if (EXTRACT_BE_U_4(tptr + BGP_VPN_RD_LEN) == 0x47000601)
- ND_PRINT(" = %s", ipaddr_string(ndo, tptr+BGP_VPN_RD_LEN+4));
+ if (GET_BE_U_4(tptr + BGP_VPN_RD_LEN) == 0x47000601)
+ ND_PRINT(" = %s", GET_IPADDR_STRING(tptr+BGP_VPN_RD_LEN+4));
/* rfc1888 mapped IPv6 address ? */
- else if (EXTRACT_BE_U_3(tptr + BGP_VPN_RD_LEN) == 0x350000)
- ND_PRINT(" = %s", ip6addr_string(ndo, tptr+BGP_VPN_RD_LEN+3));
- tptr += tlen;
- tlen = 0;
+ else if (GET_BE_U_3(tptr + BGP_VPN_RD_LEN) == 0x350000)
+ ND_PRINT(" = %s", GET_IP6ADDR_STRING(tptr+BGP_VPN_RD_LEN+3));
+ tptr += tnhlen;
+ tlen -= tnhlen;
+ tnhlen = 0;
}
break;
default:
- ND_TCHECK_LEN(tptr, tlen);
- ND_PRINT("no AFI %u/SAFI %u decoder", af, safi);
- if (ndo->ndo_vflag <= 1)
- print_unknown_data(ndo, tptr, "\n\t ", tlen);
- tptr += tlen;
- tlen = 0;
+ /*
+ * bgp_mp_af_print() should have saved us from
+ * an unsupported AFI/SAFI.
+ */
+ ND_PRINT("ERROR: no AFI %u/SAFI %u nexthop decoder", af, safi);
+ tptr += tnhlen;
+ tlen -= tnhlen;
+ tnhlen = 0;
goto done;
break;
}
}
}
ND_PRINT(", nh-length: %u", nhlen);
- tptr += tlen;
- ND_TCHECK_1(tptr);
- snpa = EXTRACT_U_1(tptr);
+ /* As per RFC 2858; this is reserved in RFC 4760 */
+ if (tlen < 1)
+ goto trunc;
+ snpa = GET_U_1(tptr);
tptr++;
+ tlen--;
if (snpa) {
ND_PRINT("\n\t %u SNPA", snpa);
for (/*nothing*/; snpa != 0; snpa--) {
- ND_TCHECK_1(tptr);
- ND_PRINT("\n\t %u bytes", EXTRACT_U_1(tptr));
- tptr += EXTRACT_U_1(tptr) + 1;
+ uint8_t snpalen;
+ if (tlen < 1)
+ goto trunc;
+ snpalen = GET_U_1(tptr);
+ ND_PRINT("\n\t %u bytes", snpalen);
+ tptr++;
+ tlen--;
+ if (tlen < snpalen)
+ goto trunc;
+ ND_TCHECK_LEN(tptr, snpalen);
+ tptr += snpalen;
+ tlen -= snpalen;
}
} else {
ND_PRINT(", no SNPA");
}
- add_path4 = check_add_path(ndo, tptr, (len-(tptr - pptr)), 32);
- add_path6 = check_add_path(ndo, tptr, (len-(tptr - pptr)), 128);
+ add_path4 = check_add_path(ndo, tptr, (len-ND_BYTES_BETWEEN(tptr, pptr)), 32);
+ add_path6 = check_add_path(ndo, tptr, (len-ND_BYTES_BETWEEN(tptr, pptr)), 128);
while (tptr < pptr + len) {
- switch (af<<8 | safi) {
- case (AFNUM_INET<<8 | SAFNUM_UNICAST):
- case (AFNUM_INET<<8 | SAFNUM_MULTICAST):
- case (AFNUM_INET<<8 | SAFNUM_UNIMULTICAST):
- if (add_path4) {
- path_id = EXTRACT_BE_U_4(tptr);
- tptr += 4;
- }
- advance = decode_prefix4(ndo, tptr, len, buf, sizeof(buf));
- if (advance == -1)
- ND_PRINT("\n\t (illegal prefix length)");
- else if (advance == -2)
- goto trunc;
- else if (advance == -3)
- break; /* bytes left, but not enough */
- else
- ND_PRINT("\n\t %s", buf);
- if (add_path4) {
- ND_PRINT(" Path Id: %u", path_id);
- }
- break;
- case (AFNUM_INET<<8 | SAFNUM_LABUNICAST):
- advance = decode_labeled_prefix4(ndo, tptr, len, buf, sizeof(buf));
- if (advance == -1)
- ND_PRINT("\n\t (illegal prefix length)");
- else if (advance == -2)
- goto trunc;
- else if (advance == -3)
- break; /* bytes left, but not enough */
- else
- ND_PRINT("\n\t %s", buf);
- break;
- case (AFNUM_INET<<8 | SAFNUM_VPNUNICAST):
- case (AFNUM_INET<<8 | SAFNUM_VPNMULTICAST):
- case (AFNUM_INET<<8 | SAFNUM_VPNUNIMULTICAST):
- advance = decode_labeled_vpn_prefix4(ndo, tptr, buf, sizeof(buf));
- if (advance == -1)
- ND_PRINT("\n\t (illegal prefix length)");
- else if (advance == -2)
- goto trunc;
- else
- ND_PRINT("\n\t %s", buf);
- break;
- case (AFNUM_INET<<8 | SAFNUM_RT_ROUTING_INFO):
- advance = decode_rt_routing_info(ndo, tptr);
- if (advance == -2)
- goto trunc;
- break;
- case (AFNUM_INET<<8 | SAFNUM_MULTICAST_VPN): /* fall through */
- case (AFNUM_INET6<<8 | SAFNUM_MULTICAST_VPN):
- advance = decode_multicast_vpn(ndo, tptr, buf, sizeof(buf));
- if (advance == -1)
- ND_PRINT("\n\t (illegal prefix length)");
- else if (advance == -2)
- goto trunc;
- else
- ND_PRINT("\n\t %s", buf);
- break;
-
- case (AFNUM_INET<<8 | SAFNUM_MDT):
- advance = decode_mdt_vpn_nlri(ndo, tptr, buf, sizeof(buf));
- if (advance == -1)
- ND_PRINT("\n\t (illegal prefix length)");
- else if (advance == -2)
- goto trunc;
- else
- ND_PRINT("\n\t %s", buf);
- break;
- case (AFNUM_INET6<<8 | SAFNUM_UNICAST):
- case (AFNUM_INET6<<8 | SAFNUM_MULTICAST):
- case (AFNUM_INET6<<8 | SAFNUM_UNIMULTICAST):
- if (add_path6) {
- path_id = EXTRACT_BE_U_4(tptr);
- tptr += 4;
- }
- advance = decode_prefix6(ndo, tptr, len, buf, sizeof(buf));
- if (advance == -1)
- ND_PRINT("\n\t (illegal prefix length)");
- else if (advance == -2)
- goto trunc;
- else if (advance == -3)
- break; /* bytes left, but not enough */
- else
- ND_PRINT("\n\t %s", buf);
- if (add_path6) {
- ND_PRINT(" Path Id: %u", path_id);
- }
- break;
- case (AFNUM_INET6<<8 | SAFNUM_LABUNICAST):
- advance = decode_labeled_prefix6(ndo, tptr, len, buf, sizeof(buf));
- if (advance == -1)
- ND_PRINT("\n\t (illegal prefix length)");
- else if (advance == -2)
- goto trunc;
- else if (advance == -3)
- break; /* bytes left, but not enough */
- else
- ND_PRINT("\n\t %s", buf);
- break;
- case (AFNUM_INET6<<8 | SAFNUM_VPNUNICAST):
- case (AFNUM_INET6<<8 | SAFNUM_VPNMULTICAST):
- case (AFNUM_INET6<<8 | SAFNUM_VPNUNIMULTICAST):
- advance = decode_labeled_vpn_prefix6(ndo, tptr, buf, sizeof(buf));
- if (advance == -1)
- ND_PRINT("\n\t (illegal prefix length)");
- else if (advance == -2)
- goto trunc;
- else
- ND_PRINT("\n\t %s", buf);
- break;
- case (AFNUM_VPLS<<8 | SAFNUM_VPLS):
- case (AFNUM_L2VPN<<8 | SAFNUM_VPNUNICAST):
- case (AFNUM_L2VPN<<8 | SAFNUM_VPNMULTICAST):
- case (AFNUM_L2VPN<<8 | SAFNUM_VPNUNIMULTICAST):
- advance = decode_labeled_vpn_l2(ndo, tptr, buf, sizeof(buf));
- if (advance == -1)
- ND_PRINT("\n\t (illegal length)");
- else if (advance == -2)
- goto trunc;
- else
- ND_PRINT("\n\t %s", buf);
- break;
- case (AFNUM_NSAP<<8 | SAFNUM_UNICAST):
- case (AFNUM_NSAP<<8 | SAFNUM_MULTICAST):
- case (AFNUM_NSAP<<8 | SAFNUM_UNIMULTICAST):
- advance = decode_clnp_prefix(ndo, tptr, buf, sizeof(buf));
- if (advance == -1)
- ND_PRINT("\n\t (illegal prefix length)");
- else if (advance == -2)
- goto trunc;
- else
- ND_PRINT("\n\t %s", buf);
- break;
- case (AFNUM_NSAP<<8 | SAFNUM_VPNUNICAST):
- case (AFNUM_NSAP<<8 | SAFNUM_VPNMULTICAST):
- case (AFNUM_NSAP<<8 | SAFNUM_VPNUNIMULTICAST):
- advance = decode_labeled_vpn_clnp_prefix(ndo, tptr, buf, sizeof(buf));
- if (advance == -1)
- ND_PRINT("\n\t (illegal prefix length)");
- else if (advance == -2)
- goto trunc;
- else
- ND_PRINT("\n\t %s", buf);
- break;
- default:
- ND_TCHECK_LEN(tptr, tlen);
- ND_PRINT("\n\t no AFI %u / SAFI %u decoder", af, safi);
- if (ndo->ndo_vflag <= 1)
- print_unknown_data(ndo, tptr, "\n\t ", tlen);
- advance = 0;
- tptr = pptr + len;
- break;
- }
+ advance = bgp_nlri_print(ndo, af, safi, tptr, len, buf, sizeof(buf),
+ add_path4, add_path6);
+ if (advance == -2)
+ goto trunc;
if (advance < 0)
break;
tptr += advance;
}
- done:
break;
case BGPTYPE_MP_UNREACH_NLRI:
ND_TCHECK_LEN(tptr, BGP_MP_NLRI_MINSIZE);
- af = EXTRACT_BE_U_2(tptr);
- safi = EXTRACT_U_1(tptr + 2);
-
- ND_PRINT("\n\t AFI: %s (%u), %sSAFI: %s (%u)",
- tok2str(af_values, "Unknown AFI", af),
- af,
- (safi>128) ? "vendor specific " : "", /* 128 is meanwhile wellknown */
- tok2str(bgp_safi_values, "Unknown SAFI", safi),
- safi);
+ ret = bgp_mp_af_print(ndo, tptr, tlen, &af, &safi);
+ if (ret == -2)
+ goto trunc;
+ if (ret < 0)
+ break;
if (len == BGP_MP_NLRI_MINSIZE)
ND_PRINT("\n\t End-of-Rib Marker (empty NLRI)");
tptr += 3;
- add_path4 = check_add_path(ndo, tptr, (len-(tptr - pptr)), 32);
- add_path6 = check_add_path(ndo, tptr, (len-(tptr - pptr)), 128);
+ add_path4 = check_add_path(ndo, tptr, (len-ND_BYTES_BETWEEN(tptr, pptr)), 32);
+ add_path6 = check_add_path(ndo, tptr, (len-ND_BYTES_BETWEEN(tptr, pptr)), 128);
while (tptr < pptr + len) {
- switch (af<<8 | safi) {
- case (AFNUM_INET<<8 | SAFNUM_UNICAST):
- case (AFNUM_INET<<8 | SAFNUM_MULTICAST):
- case (AFNUM_INET<<8 | SAFNUM_UNIMULTICAST):
- if (add_path4) {
- path_id = EXTRACT_BE_U_4(tptr);
- tptr += 4;
- }
- advance = decode_prefix4(ndo, tptr, len, buf, sizeof(buf));
- if (advance == -1)
- ND_PRINT("\n\t (illegal prefix length)");
- else if (advance == -2)
- goto trunc;
- else if (advance == -3)
- break; /* bytes left, but not enough */
- else
- ND_PRINT("\n\t %s", buf);
- if (add_path4) {
- ND_PRINT(" Path Id: %u", path_id);
- }
- break;
- case (AFNUM_INET<<8 | SAFNUM_LABUNICAST):
- advance = decode_labeled_prefix4(ndo, tptr, len, buf, sizeof(buf));
- if (advance == -1)
- ND_PRINT("\n\t (illegal prefix length)");
- else if (advance == -2)
- goto trunc;
- else if (advance == -3)
- break; /* bytes left, but not enough */
- else
- ND_PRINT("\n\t %s", buf);
- break;
- case (AFNUM_INET<<8 | SAFNUM_VPNUNICAST):
- case (AFNUM_INET<<8 | SAFNUM_VPNMULTICAST):
- case (AFNUM_INET<<8 | SAFNUM_VPNUNIMULTICAST):
- advance = decode_labeled_vpn_prefix4(ndo, tptr, buf, sizeof(buf));
- if (advance == -1)
- ND_PRINT("\n\t (illegal prefix length)");
- else if (advance == -2)
- goto trunc;
- else
- ND_PRINT("\n\t %s", buf);
- break;
- case (AFNUM_INET6<<8 | SAFNUM_UNICAST):
- case (AFNUM_INET6<<8 | SAFNUM_MULTICAST):
- case (AFNUM_INET6<<8 | SAFNUM_UNIMULTICAST):
- if (add_path6) {
- path_id = EXTRACT_BE_U_4(tptr);
- tptr += 4;
- }
- advance = decode_prefix6(ndo, tptr, len, buf, sizeof(buf));
- if (advance == -1)
- ND_PRINT("\n\t (illegal prefix length)");
- else if (advance == -2)
- goto trunc;
- else if (advance == -3)
- break; /* bytes left, but not enough */
- else
- ND_PRINT("\n\t %s", buf);
- if (add_path6) {
- ND_PRINT(" Path Id: %u", path_id);
- }
- break;
- case (AFNUM_INET6<<8 | SAFNUM_LABUNICAST):
- advance = decode_labeled_prefix6(ndo, tptr, len, buf, sizeof(buf));
- if (advance == -1)
- ND_PRINT("\n\t (illegal prefix length)");
- else if (advance == -2)
- goto trunc;
- else if (advance == -3)
- break; /* bytes left, but not enough */
- else
- ND_PRINT("\n\t %s", buf);
- break;
- case (AFNUM_INET6<<8 | SAFNUM_VPNUNICAST):
- case (AFNUM_INET6<<8 | SAFNUM_VPNMULTICAST):
- case (AFNUM_INET6<<8 | SAFNUM_VPNUNIMULTICAST):
- advance = decode_labeled_vpn_prefix6(ndo, tptr, buf, sizeof(buf));
- if (advance == -1)
- ND_PRINT("\n\t (illegal prefix length)");
- else if (advance == -2)
- goto trunc;
- else
- ND_PRINT("\n\t %s", buf);
- break;
- case (AFNUM_VPLS<<8 | SAFNUM_VPLS):
- case (AFNUM_L2VPN<<8 | SAFNUM_VPNUNICAST):
- case (AFNUM_L2VPN<<8 | SAFNUM_VPNMULTICAST):
- case (AFNUM_L2VPN<<8 | SAFNUM_VPNUNIMULTICAST):
- advance = decode_labeled_vpn_l2(ndo, tptr, buf, sizeof(buf));
- if (advance == -1)
- ND_PRINT("\n\t (illegal length)");
- else if (advance == -2)
- goto trunc;
- else
- ND_PRINT("\n\t %s", buf);
- break;
- case (AFNUM_NSAP<<8 | SAFNUM_UNICAST):
- case (AFNUM_NSAP<<8 | SAFNUM_MULTICAST):
- case (AFNUM_NSAP<<8 | SAFNUM_UNIMULTICAST):
- advance = decode_clnp_prefix(ndo, tptr, buf, sizeof(buf));
- if (advance == -1)
- ND_PRINT("\n\t (illegal prefix length)");
- else if (advance == -2)
- goto trunc;
- else
- ND_PRINT("\n\t %s", buf);
- break;
- case (AFNUM_NSAP<<8 | SAFNUM_VPNUNICAST):
- case (AFNUM_NSAP<<8 | SAFNUM_VPNMULTICAST):
- case (AFNUM_NSAP<<8 | SAFNUM_VPNUNIMULTICAST):
- advance = decode_labeled_vpn_clnp_prefix(ndo, tptr, buf, sizeof(buf));
- if (advance == -1)
- ND_PRINT("\n\t (illegal prefix length)");
- else if (advance == -2)
- goto trunc;
- else
- ND_PRINT("\n\t %s", buf);
- break;
- case (AFNUM_INET<<8 | SAFNUM_MDT):
- advance = decode_mdt_vpn_nlri(ndo, tptr, buf, sizeof(buf));
- if (advance == -1)
- ND_PRINT("\n\t (illegal prefix length)");
- else if (advance == -2)
- goto trunc;
- else
- ND_PRINT("\n\t %s", buf);
- break;
- case (AFNUM_INET<<8 | SAFNUM_MULTICAST_VPN): /* fall through */
- case (AFNUM_INET6<<8 | SAFNUM_MULTICAST_VPN):
- advance = decode_multicast_vpn(ndo, tptr, buf, sizeof(buf));
- if (advance == -1)
- ND_PRINT("\n\t (illegal prefix length)");
- else if (advance == -2)
- goto trunc;
- else
- ND_PRINT("\n\t %s", buf);
- break;
- default:
- ND_TCHECK_LEN(tptr - 3, tlen);
- ND_PRINT("no AFI %u / SAFI %u decoder", af, safi);
- if (ndo->ndo_vflag <= 1)
- print_unknown_data(ndo, tptr-3, "\n\t ", tlen);
- advance = 0;
- tptr = pptr + len;
- break;
- }
+ advance = bgp_nlri_print(ndo, af, safi, tptr, len, buf, sizeof(buf),
+ add_path4, add_path6);
+ if (advance == -2)
+ goto trunc;
if (advance < 0)
break;
tptr += advance;
ND_TCHECK_2(tptr);
if (tlen < 2)
goto trunc;
- extd_comm=EXTRACT_BE_U_2(tptr);
+ extd_comm=GET_BE_U_2(tptr);
ND_PRINT("\n\t %s (0x%04x), Flags [%s]",
tok2str(bgp_extd_comm_subtype_values,
ND_TCHECK_5(tptr);
if (tlen < 5)
goto trunc;
- flags = EXTRACT_U_1(tptr);
- tunnel_type = EXTRACT_U_1(tptr + 1);
- tlen = len;
+ flags = GET_U_1(tptr);
+ tunnel_type = GET_U_1(tptr + 1);
ND_PRINT("\n\t Tunnel-type %s (%u), Flags [%s], MPLS Label %u",
tok2str(bgp_pmsi_tunnel_values, "Unknown", tunnel_type),
tunnel_type,
bittok2str(bgp_pmsi_flag_values, "none", flags),
- EXTRACT_BE_U_3(tptr + 2)>>4);
+ GET_BE_U_3(tptr + 2)>>4);
tptr +=5;
tlen -= 5;
switch (tunnel_type) {
case BGP_PMSI_TUNNEL_PIM_SM: /* fall through */
case BGP_PMSI_TUNNEL_PIM_BIDIR:
- ND_TCHECK_8(tptr);
ND_PRINT("\n\t Sender %s, P-Group %s",
- ipaddr_string(ndo, tptr),
- ipaddr_string(ndo, tptr+4));
+ GET_IPADDR_STRING(tptr),
+ GET_IPADDR_STRING(tptr+4));
break;
case BGP_PMSI_TUNNEL_PIM_SSM:
- ND_TCHECK_8(tptr);
ND_PRINT("\n\t Root-Node %s, P-Group %s",
- ipaddr_string(ndo, tptr),
- ipaddr_string(ndo, tptr+4));
+ GET_IPADDR_STRING(tptr),
+ GET_IPADDR_STRING(tptr+4));
break;
case BGP_PMSI_TUNNEL_INGRESS:
- ND_TCHECK_4(tptr);
ND_PRINT("\n\t Tunnel-Endpoint %s",
- ipaddr_string(ndo, tptr));
+ GET_IPADDR_STRING(tptr));
break;
case BGP_PMSI_TUNNEL_LDP_P2MP: /* fall through */
case BGP_PMSI_TUNNEL_LDP_MP2MP:
- ND_TCHECK_8(tptr);
ND_PRINT("\n\t Root-Node %s, LSP-ID 0x%08x",
- ipaddr_string(ndo, tptr),
- EXTRACT_BE_U_4(tptr + 4));
+ GET_IPADDR_STRING(tptr),
+ GET_BE_U_4(tptr + 4));
break;
case BGP_PMSI_TUNNEL_RSVP_P2MP:
- ND_TCHECK_8(tptr);
ND_PRINT("\n\t Extended-Tunnel-ID %s, P2MP-ID 0x%08x",
- ipaddr_string(ndo, tptr),
- EXTRACT_BE_U_4(tptr + 4));
+ GET_IPADDR_STRING(tptr),
+ GET_BE_U_4(tptr + 4));
break;
default:
if (ndo->ndo_vflag <= 1) {
uint8_t type;
uint16_t length;
- tlen = len;
-
while (tlen >= 3) {
-
- ND_TCHECK_3(tptr);
-
- type = EXTRACT_U_1(tptr);
- length = EXTRACT_BE_U_2(tptr + 1);
+ type = GET_U_1(tptr);
+ length = GET_BE_U_2(tptr + 1);
tptr += 3;
tlen -= 3;
if (length < 8)
goto trunc;
ND_PRINT(", metric %" PRIu64,
- EXTRACT_BE_U_8(tptr));
+ GET_BE_U_8(tptr));
break;
default:
if (len < 4)
goto trunc;
ND_PRINT("\n\t Origin AS: %s",
- as_printf(ndo, astostr, sizeof(astostr), EXTRACT_BE_U_4(tptr)));
+ as_printf(ndo, astostr, sizeof(astostr), GET_BE_U_4(tptr)));
tptr += 4;
len -= 4;
tptr += len;
break;
}
- aflags = EXTRACT_U_1(tptr);
- atype = EXTRACT_U_1(tptr + 1);
+ aflags = GET_U_1(tptr);
+ atype = GET_U_1(tptr + 1);
tptr += 2;
len -= 2;
alenlen = bgp_attr_lenlen(aflags, tptr);
tptr += len;
break;
}
- /* FIXME check for recursion */
- if (!bgp_attr_print(ndo, atype, tptr, alen))
+ /*
+ * The protocol encoding per se allows ATTR_SET to be nested
+ * as many times as the message can accommodate. This printer
+ * used to be able to recurse into ATTR_SET contents until the
+ * stack exhaustion, but now there is a limit on that (if live
+ * protocol exchange goes that many levels deep, something is
+ * probably wrong anyway). Feel free to refine this value if
+ * you can find the spec with respective normative text.
+ */
+ if (attr_set_level == 10)
+ ND_PRINT("(too many nested levels, not recursing)");
+ else if (!bgp_attr_print(ndo, atype, tptr, alen, attr_set_level + 1))
return 0;
tptr += alen;
len -= alen;
}
ND_PRINT("\n\t ");
while (len != 0) {
- ND_TCHECK_LEN(tptr, 12);
ND_PRINT("%u:%u:%u%s",
- EXTRACT_BE_U_4(tptr),
- EXTRACT_BE_U_4(tptr + 4),
- EXTRACT_BE_U_4(tptr + 8),
+ GET_BE_U_4(tptr),
+ GET_BE_U_4(tptr + 4),
+ GET_BE_U_4(tptr + 8),
(len > 12) ? ", " : "");
tptr += 12;
/*
print_unknown_data(ndo, pptr, "\n\t ", len);
break;
}
+done:
if (ndo->ndo_vflag > 1 && len) { /* omit zero length attributes*/
ND_TCHECK_LEN(pptr, len);
print_unknown_data(ndo, pptr, "\n\t ", len);
while (i < caps_len) {
ND_TCHECK_LEN(opt + i, BGP_CAP_HEADER_SIZE);
- cap_type=EXTRACT_U_1(opt + i);
- cap_len=EXTRACT_U_1(opt + i + 1);
+ cap_type=GET_U_1(opt + i);
+ cap_len=GET_U_1(opt + i + 1);
ND_PRINT("\n\t %s (%u), length: %u",
tok2str(bgp_capcode_values, "Unknown", cap_type),
cap_type,
return;
}
ND_PRINT("\n\t\tAFI %s (%u), SAFI %s (%u)",
- tok2str(af_values, "Unknown", EXTRACT_BE_U_2(opt + i + 2)),
- EXTRACT_BE_U_2(opt + i + 2),
- tok2str(bgp_safi_values, "Unknown", EXTRACT_U_1(opt + i + 5)),
- EXTRACT_U_1(opt + i + 5));
+ tok2str(af_values, "Unknown", GET_BE_U_2(opt + i + 2)),
+ GET_BE_U_2(opt + i + 2),
+ tok2str(bgp_safi_values, "Unknown", GET_U_1(opt + i + 5)),
+ GET_U_1(opt + i + 5));
+ break;
+ case BGP_CAPCODE_ML:
+ cap_offset = 2;
+ tcap_len = cap_len;
+ while (tcap_len >= 4) {
+ ND_PRINT( "\n\t\tAFI %s (%u), SAFI %s (%u), Count: %u",
+ tok2str(af_values, "Unknown",
+ GET_BE_U_2(opt + i + cap_offset)),
+ GET_BE_U_2(opt + i + cap_offset),
+ tok2str(bgp_safi_values, "Unknown",
+ GET_U_1(opt + i + cap_offset + 2)),
+ GET_U_1(opt + i + cap_offset + 2),
+ GET_U_1(opt + i + cap_offset + 3));
+ tcap_len -= 4;
+ cap_offset += 4;
+ }
break;
case BGP_CAPCODE_RESTART:
/* Restart Flags (4 bits), Restart Time in seconds (12 bits) */
}
tcap_len=cap_len;
ND_PRINT("\n\t\tRestart Flags: [%s], Restart Time %us",
- ((EXTRACT_U_1(opt + i + 2))&0x80) ? "R" : "none",
- EXTRACT_BE_U_2(opt + i + 2)&0xfff);
+ ((GET_U_1(opt + i + 2))&0x80) ? "R" : "none",
+ GET_BE_U_2(opt + i + 2)&0xfff);
tcap_len-=2;
cap_offset=4;
while(tcap_len>=4) {
ND_PRINT("\n\t\t AFI %s (%u), SAFI %s (%u), Forwarding state preserved: %s",
tok2str(af_values,"Unknown",
- EXTRACT_BE_U_2(opt + i + cap_offset)),
- EXTRACT_BE_U_2(opt + i + cap_offset),
+ GET_BE_U_2(opt + i + cap_offset)),
+ GET_BE_U_2(opt + i + cap_offset),
tok2str(bgp_safi_values,"Unknown",
- EXTRACT_U_1(opt + i + cap_offset + 2)),
- EXTRACT_U_1(opt + (i + cap_offset + 2)),
- ((EXTRACT_U_1(opt + (i + cap_offset + 3)))&0x80) ? "yes" : "no" );
+ GET_U_1(opt + i + cap_offset + 2)),
+ GET_U_1(opt + (i + cap_offset + 2)),
+ ((GET_U_1(opt + (i + cap_offset + 3)))&0x80) ? "yes" : "no" );
tcap_len -= 4;
cap_offset += 4;
}
break;
case BGP_CAPCODE_RR:
+ case BGP_CAPCODE_LLGR:
case BGP_CAPCODE_RR_CISCO:
break;
case BGP_CAPCODE_AS_NEW:
}
ND_PRINT("\n\t\t 4 Byte AS %s",
as_printf(ndo, astostr, sizeof(astostr),
- EXTRACT_BE_U_4(opt + i + 2)));
+ GET_BE_U_4(opt + i + 2)));
break;
case BGP_CAPCODE_ADD_PATH:
if (cap_len == 0) {
break;
}
ND_PRINT("\n\t\tAFI %s (%u), SAFI %s (%u), Send/Receive: %s",
- tok2str(af_values,"Unknown",EXTRACT_BE_U_2(opt + i + cap_offset)),
- EXTRACT_BE_U_2(opt + i + cap_offset),
- tok2str(bgp_safi_values,"Unknown",EXTRACT_U_1(opt + i + cap_offset + 2)),
- EXTRACT_U_1(opt + (i + cap_offset + 2)),
- tok2str(bgp_add_path_recvsend,"Bogus (0x%02x)",EXTRACT_U_1(opt + i + cap_offset + 3))
+ tok2str(af_values,"Unknown",GET_BE_U_2(opt + i + cap_offset)),
+ GET_BE_U_2(opt + i + cap_offset),
+ tok2str(bgp_safi_values,"Unknown",GET_U_1(opt + i + cap_offset + 2)),
+ GET_U_1(opt + (i + cap_offset + 2)),
+ tok2str(bgp_add_path_recvsend,"Bogus (0x%02x)",GET_U_1(opt + i + cap_offset + 3))
);
tcap_len -= 4;
cap_offset += 4;
bgp_open_header = (const struct bgp_open *)dat;
ND_PRINT("\n\t Version %u, ",
- EXTRACT_U_1(bgp_open_header->bgpo_version));
+ GET_U_1(bgp_open_header->bgpo_version));
ND_PRINT("my AS %s, ",
- as_printf(ndo, astostr, sizeof(astostr), EXTRACT_BE_U_2(bgp_open_header->bgpo_myas)));
+ as_printf(ndo, astostr, sizeof(astostr), GET_BE_U_2(bgp_open_header->bgpo_myas)));
ND_PRINT("Holdtime %us, ",
- EXTRACT_BE_U_2(bgp_open_header->bgpo_holdtime));
- ND_PRINT("ID %s", ipaddr_string(ndo, bgp_open_header->bgpo_id));
- optslen = EXTRACT_U_1(bgp_open_header->bgpo_optlen);
+ GET_BE_U_2(bgp_open_header->bgpo_holdtime));
+ ND_PRINT("ID %s", GET_IPADDR_STRING(bgp_open_header->bgpo_id));
+ optslen = GET_U_1(bgp_open_header->bgpo_optlen);
ND_PRINT("\n\t Optional parameters, length: %u", optslen);
opt = dat + BGP_OPEN_SIZE;
if (length < BGP_OPT_SIZE + i)
goto trunc;
bgpopt = (const struct bgp_opt *)(opt + i);
- opt_type = EXTRACT_U_1(bgpopt->bgpopt_type);
- opt_len = EXTRACT_U_1(bgpopt->bgpopt_len);
+ opt_type = GET_U_1(bgpopt->bgpopt_type);
+ opt_len = GET_U_1(bgpopt->bgpopt_len);
if (BGP_OPT_SIZE + i + opt_len > optslen) {
ND_PRINT("\n\t Option %u, length: %u, goes past the end of the options",
opt_type, opt_len);
ND_TCHECK_2(p);
if (length < 2)
goto trunc;
- withdrawn_routes_len = EXTRACT_BE_U_2(p);
+ withdrawn_routes_len = GET_BE_U_2(p);
p += 2;
length -= 2;
if (withdrawn_routes_len > 1) {
length -= withdrawn_routes_len;
break;
}
- path_id = EXTRACT_BE_U_4(p);
+ path_id = GET_BE_U_4(p);
p += 4;
length -= 4;
withdrawn_routes_len -= 4;
ND_PRINT("\n\t (illegal prefix length)");
break;
} else if (wpfx == -2)
- goto trunc;
- else if (wpfx == -3)
goto trunc; /* bytes left, but not enough */
else {
ND_PRINT("\n\t %s", buf);
ND_TCHECK_2(p);
if (length < 2)
goto trunc;
- len = EXTRACT_BE_U_2(p);
+ len = GET_BE_U_2(p);
p += 2;
length -= 2;
if (len) {
/* do something more useful!*/
while (len) {
- u_int aflags, atype, alenlen, alen;
+ uint8_t aflags, atype, alenlen;
+ uint16_t alen;
ND_TCHECK_2(p);
if (length < 2)
length -= len;
break;
}
- aflags = EXTRACT_U_1(p);
- atype = EXTRACT_U_1(p + 1);
+ aflags = GET_U_1(p);
+ atype = GET_U_1(p + 1);
p += 2;
len -= 2;
length -= 2;
}
if (length < alen)
goto trunc;
- if (!bgp_attr_print(ndo, atype, p, alen))
+ if (!bgp_attr_print(ndo, atype, p, alen, 0))
goto trunc;
p += alen;
len -= alen;
ND_TCHECK_4(p);
if (length < 4)
goto trunc;
- path_id = EXTRACT_BE_U_4(p);
+ path_id = GET_BE_U_4(p);
p += 4;
length -= 4;
}
ND_PRINT("\n\t (illegal prefix length)");
break;
} else if (i == -2)
- goto trunc;
- else if (i == -3)
goto trunc; /* bytes left, but not enough */
else {
ND_PRINT("\n\t %s", buf);
return;
bgp_notification_header = (const struct bgp_notification *)dat;
- bgpn_major = EXTRACT_U_1(bgp_notification_header->bgpn_major);
- bgpn_minor = EXTRACT_U_1(bgp_notification_header->bgpn_minor);
+ bgpn_major = GET_U_1(bgp_notification_header->bgpn_major);
+ bgpn_minor = GET_U_1(bgp_notification_header->bgpn_minor);
ND_PRINT(", %s (%u)",
tok2str(bgp_notify_major_values, "Unknown Error",
*/
if(bgpn_minor == BGP_NOTIFY_MINOR_CEASE_MAXPRFX && length >= BGP_NOTIFICATION_SIZE + 7) {
tptr = dat + BGP_NOTIFICATION_SIZE;
- ND_TCHECK_7(tptr);
ND_PRINT(", AFI %s (%u), SAFI %s (%u), Max Prefixes: %u",
- tok2str(af_values, "Unknown", EXTRACT_BE_U_2(tptr)),
- EXTRACT_BE_U_2(tptr),
- tok2str(bgp_safi_values, "Unknown", EXTRACT_U_1((tptr + 2))),
- EXTRACT_U_1((tptr + 2)),
- EXTRACT_BE_U_4(tptr + 3));
+ tok2str(af_values, "Unknown", GET_BE_U_2(tptr)),
+ GET_BE_U_2(tptr),
+ tok2str(bgp_safi_values, "Unknown", GET_U_1((tptr + 2))),
+ GET_U_1((tptr + 2)),
+ GET_BE_U_4(tptr + 3));
}
/*
* draft-ietf-idr-shutdown describes a method to send a communication
bgpn_minor == BGP_NOTIFY_MINOR_CEASE_RESET) &&
length >= BGP_NOTIFICATION_SIZE + 1) {
tptr = dat + BGP_NOTIFICATION_SIZE;
- ND_TCHECK_1(tptr);
- shutdown_comm_length = EXTRACT_U_1(tptr);
+ shutdown_comm_length = GET_U_1(tptr);
remainder_offset = 0;
/* garbage, hexdump it all */
if (shutdown_comm_length > BGP_NOTIFY_MINOR_CEASE_ADMIN_SHUTDOWN_LEN ||
else {
ND_TCHECK_LEN(tptr + 1, shutdown_comm_length);
ND_PRINT(", Shutdown Communication (length: %u): \"", shutdown_comm_length);
- (void)nd_printn(ndo, tptr+1, shutdown_comm_length, NULL);
+ nd_printjn(ndo, tptr+1, shutdown_comm_length);
ND_PRINT("\"");
remainder_offset += shutdown_comm_length + 1;
}
ND_PRINT("\n\t AFI %s (%u), SAFI %s (%u)",
tok2str(af_values,"Unknown",
- EXTRACT_BE_U_2(bgp_route_refresh_header->afi)),
- EXTRACT_BE_U_2(bgp_route_refresh_header->afi),
+ GET_BE_U_2(bgp_route_refresh_header->afi)),
+ GET_BE_U_2(bgp_route_refresh_header->afi),
tok2str(bgp_safi_values,"Unknown",
- EXTRACT_U_1(bgp_route_refresh_header->safi)),
- EXTRACT_U_1(bgp_route_refresh_header->safi));
+ GET_U_1(bgp_route_refresh_header->safi)),
+ GET_U_1(bgp_route_refresh_header->safi));
if (ndo->ndo_vflag > 1) {
ND_TCHECK_LEN(pptr, len);
ND_TCHECK_LEN(dat, BGP_SIZE);
bgp_header = (const struct bgp *)dat;
- bgp_type = EXTRACT_U_1(bgp_header->bgp_type);
+ bgp_type = GET_U_1(bgp_header->bgp_type);
ND_PRINT("\n\t%s Message (%u), length: %u",
tok2str(bgp_msg_values, "Unknown", bgp_type),
while (p < ep) {
if (!ND_TTEST_1(p))
break;
- if (EXTRACT_U_1(p) != 0xff) {
+ if (GET_U_1(p) != 0xff) {
p++;
continue;
}
if (start != p)
nd_print_trunc(ndo);
- hlen = EXTRACT_BE_U_2(bgp_header->bgp_len);
+ hlen = GET_BE_U_2(bgp_header->bgp_len);
if (hlen < BGP_SIZE) {
- ND_PRINT("\n[|BGP Bogus header length %u < %u]", hlen,
- BGP_SIZE);
+ ND_PRINT("\nmessage length %u < %u", hlen, BGP_SIZE);
+ nd_print_invalid(ndo);
break;
}
ND_PRINT("\n[|BGP %s]",
tok2str(bgp_msg_values,
"Unknown Message Type",
- EXTRACT_U_1(bgp_header->bgp_type)));
+ GET_U_1(bgp_header->bgp_type)));
break;
}
}
projects / tcpdump / blobdiff