{ 0, NULL}
};
+/*
+ * XXX - this assumes a 16-byte digest, which is true for HMAC-MD5, but
+ * isn't necessarily the case for other hash algorithms.
+ *
+ * Unless I've missed something, there's nothing in RFC 2747 to indicate
+ * the hash algorithm being used, so it's presumably something set up
+ * out-of-band, or negotiated by other RSVP objects.
+ */
struct rsvp_obj_integrity_t {
uint8_t flags;
uint8_t res;
#define RSVP_OBJ_XRO_MASK_SUBOBJ(x) ((x)&0x7f)
#define RSVP_OBJ_XRO_MASK_LOOSE(x) ((x)&0x80)
-#define RSVP_OBJ_CAPABILITY_FLAGS_MASK 0x7
+#define RSVP_OBJ_CAPABILITY_FLAGS_MASK 0x7U
#define RSVP_OBJ_XRO_RES 0
#define RSVP_OBJ_XRO_IPV4 1
if (obj_tlen < 4)
return 0;
- ND_TCHECK_1(tptr);
parameter_id = GET_U_1(tptr);
- ND_TCHECK_2(tptr + 2);
parameter_length = GET_BE_U_2(tptr + 2)<<2; /* convert wordcount to bytecount */
ND_PRINT("\n\t Parameter ID: %s (%u), length: %u, Flags: [0x%02x]",
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
*/
if (parameter_length == 4) {
- ND_TCHECK_4(tptr + 4);
ND_PRINT("\n\t\tIS hop count: %u", GET_BE_U_4(tptr + 4));
}
break;
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
*/
if (parameter_length == 4) {
- ND_TCHECK_4(tptr + 4);
bw.i = GET_BE_U_4(tptr + 4);
ND_PRINT("\n\t\tPath b/w estimate: %.10g Mbps", bw.f / 125000);
}
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
*/
if (parameter_length == 4) {
- ND_TCHECK_4(tptr + 4);
ND_PRINT("\n\t\tMinimum path latency: ");
if (GET_BE_U_4(tptr + 4) == 0xffffffff)
ND_PRINT("don't care");
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
*/
if (parameter_length == 4) {
- ND_TCHECK_4(tptr + 4);
ND_PRINT("\n\t\tComposed MTU: %u bytes", GET_BE_U_4(tptr + 4));
}
break;
case 135:
case 136:
if (parameter_length == 4) {
- ND_TCHECK_4(tptr + 4);
ND_PRINT("\n\t\tValue: %u", GET_BE_U_4(tptr + 4));
}
break;
switch(rsvp_obj_ctype) {
case RSVP_CTYPE_IPV4:
if (obj_tlen < 8)
- return -1;
+ goto obj_tooshort;
ND_PRINT("%s IPv4 DestAddress: %s, Protocol ID: 0x%02x",
indent,
GET_IPADDR_STRING(obj_tptr),
break;
case RSVP_CTYPE_IPV6:
if (obj_tlen < 20)
- return -1;
+ goto obj_tooshort;
ND_PRINT("%s IPv6 DestAddress: %s, Protocol ID: 0x%02x",
indent,
GET_IP6ADDR_STRING(obj_tptr),
case RSVP_CTYPE_TUNNEL_IPV6:
if (obj_tlen < 36)
- return -1;
+ goto obj_tooshort;
ND_PRINT("%s IPv6 Tunnel EndPoint: %s, Tunnel ID: 0x%04x, Extended Tunnel ID: %s",
indent,
GET_IP6ADDR_STRING(obj_tptr),
case RSVP_CTYPE_14: /* IPv6 p2mp LSP Tunnel */
if (obj_tlen < 26)
- return -1;
+ goto obj_tooshort;
ND_PRINT("%s IPv6 P2MP LSP ID: 0x%08x, Tunnel ID: 0x%04x, Extended Tunnel ID: %s",
indent,
GET_BE_U_4(obj_tptr),
break;
case RSVP_CTYPE_13: /* IPv4 p2mp LSP Tunnel */
if (obj_tlen < 12)
- return -1;
+ goto obj_tooshort;
ND_PRINT("%s IPv4 P2MP LSP ID: %s, Tunnel ID: 0x%04x, Extended Tunnel ID: %s",
indent,
GET_IPADDR_STRING(obj_tptr),
case RSVP_CTYPE_TUNNEL_IPV4:
case RSVP_CTYPE_UNI_IPV4:
if (obj_tlen < 12)
- return -1;
+ goto obj_tooshort;
ND_PRINT("%s IPv4 Tunnel EndPoint: %s, Tunnel ID: 0x%04x, Extended Tunnel ID: %s",
indent,
GET_IPADDR_STRING(obj_tptr),
switch(rsvp_obj_ctype) {
case RSVP_CTYPE_IPV4:
if (obj_tlen < sizeof(nd_ipv4))
- return -1;
+ goto obj_tooshort;
ND_PRINT("%s IPv4 Receiver Address: %s",
indent,
GET_IPADDR_STRING(obj_tptr));
break;
case RSVP_CTYPE_IPV6:
if (obj_tlen < sizeof(nd_ipv6))
- return -1;
+ goto obj_tooshort;
ND_PRINT("%s IPv6 Receiver Address: %s",
indent,
GET_IP6ADDR_STRING(obj_tptr));
switch(rsvp_obj_ctype) {
case RSVP_CTYPE_IPV4:
if (obj_tlen < sizeof(nd_ipv4))
- return -1;
+ goto obj_tooshort;
ND_PRINT("%s IPv4 Notify Node Address: %s",
indent,
GET_IPADDR_STRING(obj_tptr));
break;
case RSVP_CTYPE_IPV6:
if (obj_tlen < sizeof(nd_ipv6))
- return-1;
+ goto obj_tooshort;
ND_PRINT("%s IPv6 Notify Node Address: %s",
indent,
GET_IP6ADDR_STRING(obj_tptr));
break;
case RSVP_CTYPE_2:
if (obj_tlen < 4)
- return-1;
+ goto obj_tooshort;
ND_PRINT("%s Generalized Label: %u",
indent,
GET_BE_U_4(obj_tptr));
break;
case RSVP_CTYPE_3:
if (obj_tlen < 12)
- return-1;
+ goto obj_tooshort;
ND_PRINT("%s Waveband ID: %u%s Start Label: %u, Stop Label: %u",
indent,
GET_BE_U_4(obj_tptr),
switch(rsvp_obj_ctype) {
case RSVP_CTYPE_1:
if (obj_tlen < 4)
- return-1;
+ goto obj_tooshort;
ND_PRINT("%s Reservation Style: %s, Flags: [0x%02x]",
indent,
tok2str(rsvp_resstyle_values,
switch(rsvp_obj_ctype) {
case RSVP_CTYPE_IPV4:
if (obj_tlen < 8)
- return-1;
+ goto obj_tooshort;
ND_PRINT("%s Source Address: %s, Source Port: %u",
indent,
GET_IPADDR_STRING(obj_tptr),
break;
case RSVP_CTYPE_IPV6:
if (obj_tlen < 20)
- return-1;
+ goto obj_tooshort;
ND_PRINT("%s Source Address: %s, Source Port: %u",
indent,
GET_IP6ADDR_STRING(obj_tptr),
break;
case RSVP_CTYPE_13: /* IPv6 p2mp LSP tunnel */
if (obj_tlen < 40)
- return-1;
+ goto obj_tooshort;
ND_PRINT("%s IPv6 Tunnel Sender Address: %s, LSP ID: 0x%04x"
"%s Sub-Group Originator ID: %s, Sub-Group ID: 0x%04x",
indent,
break;
case RSVP_CTYPE_TUNNEL_IPV4:
if (obj_tlen < 8)
- return-1;
+ goto obj_tooshort;
ND_PRINT("%s IPv4 Tunnel Sender Address: %s, LSP-ID: 0x%04x",
indent,
GET_IPADDR_STRING(obj_tptr),
break;
case RSVP_CTYPE_12: /* IPv4 p2mp LSP tunnel */
if (obj_tlen < 16)
- return-1;
+ goto obj_tooshort;
ND_PRINT("%s IPv4 Tunnel Sender Address: %s, LSP ID: 0x%04x"
"%s Sub-Group Originator ID: %s, Sub-Group ID: 0x%04x",
indent,
break;
case RSVP_CTYPE_2:
if (obj_tlen < 12)
- return-1;
+ goto obj_tooshort;
ND_PRINT("%s L3 Protocol ID: %s",
indent,
tok2str(ethertype_values,
break;
case RSVP_CTYPE_3:
if (obj_tlen < 12)
- return-1;
+ goto obj_tooshort;
ND_PRINT("%s L3 Protocol ID: %s",
indent,
tok2str(ethertype_values,
break;
case RSVP_CTYPE_4:
if (obj_tlen < 4)
- return-1;
+ goto obj_tooshort;
ND_PRINT("%s LSP Encoding Type: %s (%u)",
indent,
tok2str(gmpls_encoding_values,
case RSVP_CTYPE_1:
case RSVP_CTYPE_2:
if (obj_tlen < 8)
- return-1;
+ goto obj_tooshort;
ND_PRINT("%s Source Instance: 0x%08x, Destination Instance: 0x%08x",
indent,
GET_BE_U_4(obj_tptr),
switch(rsvp_obj_ctype) {
case RSVP_CTYPE_1:
if (obj_tlen < 8)
- return-1;
+ goto obj_tooshort;
ND_PRINT("%s Restart Time: %ums, Recovery Time: %ums",
indent,
GET_BE_U_4(obj_tptr),
switch(rsvp_obj_ctype) {
case RSVP_CTYPE_1:
if (obj_tlen < 4)
- return-1;
+ goto obj_tooshort;
uint32_t unused_and_flags = GET_BE_U_4(obj_tptr);
if (unused_and_flags & ~RSVP_OBJ_CAPABILITY_FLAGS_MASK)
ND_PRINT("%s [reserved=0x%08x must be zero]", indent,
switch(rsvp_obj_ctype) {
case RSVP_CTYPE_TUNNEL_IPV4:
if (obj_tlen < 4)
- return-1;
+ goto obj_tooshort;
namelen = GET_U_1(obj_tptr + 3);
if (obj_tlen < 4+namelen)
- return-1;
+ goto obj_tooshort;
ND_PRINT("%s Session Name: ", indent);
for (i = 0; i < namelen; i++)
fn_print_char(ndo, GET_U_1(obj_tptr + 4 + i));
case RSVP_CTYPE_1:
if (obj_tlen < 4)
- return-1;
+ goto obj_tooshort;
/* read variable length subobjects */
total_subobj_len = obj_tlen;
switch(af) {
case AFNUM_INET:
if (subobj_len < 8)
- return -1;
+ goto subobj_tooshort;
ND_PRINT("%s UNI IPv4 TNA address: %s",
indent, GET_IPADDR_STRING(obj_tptr + 4));
break;
case AFNUM_INET6:
if (subobj_len < 20)
- return -1;
+ goto subobj_tooshort;
ND_PRINT("%s UNI IPv6 TNA address: %s",
indent, GET_IP6ADDR_STRING(obj_tptr + 4));
break;
case RSVP_GEN_UNI_SUBOBJ_EGRESS_LABEL:
if (subobj_len < 16) {
- return -1;
+ goto subobj_tooshort;
}
ND_PRINT("%s U-bit: %x, Label type: %u, Logical port id: %u, Label: %u",
case RSVP_GEN_UNI_SUBOBJ_SERVICE_LEVEL:
if (subobj_len < 8) {
- return -1;
+ goto subobj_tooshort;
}
ND_PRINT("%s Service level: %u",
case RSVP_CTYPE_3: /* fall through - FIXME add TLV parser */
case RSVP_CTYPE_IPV4:
if (obj_tlen < 8)
- return-1;
+ goto obj_tooshort;
ND_PRINT("%s Previous/Next Interface: %s, Logical Interface Handle: 0x%08x",
indent,
GET_IPADDR_STRING(obj_tptr),
case RSVP_CTYPE_4: /* fall through - FIXME add TLV parser */
case RSVP_CTYPE_IPV6:
if (obj_tlen < 20)
- return-1;
+ goto obj_tooshort;
ND_PRINT("%s Previous/Next Interface: %s, Logical Interface Handle: 0x%08x",
indent,
GET_IP6ADDR_STRING(obj_tptr),
switch(rsvp_obj_ctype) {
case RSVP_CTYPE_1:
if (obj_tlen < 4)
- return-1;
+ goto obj_tooshort;
ND_PRINT("%s Refresh Period: %ums",
indent,
GET_BE_U_4(obj_tptr));
switch(rsvp_obj_ctype) {
case RSVP_CTYPE_2:
if (obj_tlen < 4)
- return-1;
+ goto obj_tooshort;
ND_PRINT("%s Msg-Version: %u, length: %u",
indent,
(GET_U_1(obj_tptr) & 0xf0) >> 4,
switch(rsvp_obj_ctype) {
case RSVP_CTYPE_IPV4:
if (obj_tlen < 8)
- return-1;
+ goto obj_tooshort;
ND_PRINT("%s Source Address: %s, Source Port: %u",
indent,
GET_IPADDR_STRING(obj_tptr),
break;
case RSVP_CTYPE_IPV6:
if (obj_tlen < 20)
- return-1;
+ goto obj_tooshort;
ND_PRINT("%s Source Address: %s, Source Port: %u",
indent,
GET_IP6ADDR_STRING(obj_tptr),
break;
case RSVP_CTYPE_3:
if (obj_tlen < 20)
- return-1;
+ goto obj_tooshort;
ND_PRINT("%s Source Address: %s, Flow Label: %u",
indent,
GET_IP6ADDR_STRING(obj_tptr),
break;
case RSVP_CTYPE_TUNNEL_IPV6:
if (obj_tlen < 20)
- return-1;
+ goto obj_tooshort;
ND_PRINT("%s Source Address: %s, LSP-ID: 0x%04x",
indent,
GET_IPADDR_STRING(obj_tptr),
break;
case RSVP_CTYPE_13: /* IPv6 p2mp LSP tunnel */
if (obj_tlen < 40)
- return-1;
+ goto obj_tooshort;
ND_PRINT("%s IPv6 Tunnel Sender Address: %s, LSP ID: 0x%04x"
"%s Sub-Group Originator ID: %s, Sub-Group ID: 0x%04x",
indent,
break;
case RSVP_CTYPE_TUNNEL_IPV4:
if (obj_tlen < 8)
- return-1;
+ goto obj_tooshort;
ND_PRINT("%s Source Address: %s, LSP-ID: 0x%04x",
indent,
GET_IPADDR_STRING(obj_tptr),
break;
case RSVP_CTYPE_12: /* IPv4 p2mp LSP tunnel */
if (obj_tlen < 16)
- return-1;
+ goto obj_tooshort;
ND_PRINT("%s IPv4 Tunnel Sender Address: %s, LSP ID: 0x%04x"
"%s Sub-Group Originator ID: %s, Sub-Group ID: 0x%04x",
indent,
switch(rsvp_obj_ctype) {
case RSVP_CTYPE_1: /* new style */
if (obj_tlen < sizeof(struct rsvp_obj_frr_t))
- return-1;
+ goto obj_tooshort;
bw.i = GET_BE_U_4(obj_ptr.rsvp_obj_frr->bandwidth);
ND_PRINT("%s Setup Priority: %u, Holding Priority: %u, Hop-limit: %u, Bandwidth: %.10g Mbps",
indent,
case RSVP_CTYPE_TUNNEL_IPV4: /* old style */
if (obj_tlen < 16)
- return-1;
+ goto obj_tooshort;
bw.i = GET_BE_U_4(obj_ptr.rsvp_obj_frr->bandwidth);
ND_PRINT("%s Setup Priority: %u, Holding Priority: %u, Hop-limit: %u, Bandwidth: %.10g Mbps",
indent,
case RSVP_OBJ_CLASSTYPE_OLD: /* fall through */
switch(rsvp_obj_ctype) {
case RSVP_CTYPE_1:
+ if (obj_tlen < 4)
+ goto obj_tooshort;
ND_PRINT("%s CT: %u",
indent,
GET_BE_U_4(obj_tptr) & 0x7);
case RSVP_CTYPE_3: /* fall through - FIXME add TLV parser */
case RSVP_CTYPE_IPV4:
if (obj_tlen < 8)
- return-1;
+ goto obj_tooshort;
error_code=GET_U_1(obj_tptr + 5);
error_value=GET_BE_U_2(obj_tptr + 6);
ND_PRINT("%s Error Node Address: %s, Flags: [0x%02x]%s Error Code: %s (%u)",
case RSVP_CTYPE_4: /* fall through - FIXME add TLV parser */
case RSVP_CTYPE_IPV6:
if (obj_tlen < 20)
- return-1;
+ goto obj_tooshort;
error_code=GET_U_1(obj_tptr + 17);
error_value=GET_BE_U_2(obj_tptr + 18);
ND_PRINT("%s Error Node Address: %s, Flags: [0x%02x]%s Error Code: %s (%u)",
switch(rsvp_obj_ctype) {
case RSVP_CTYPE_1:
if (obj_tlen < 4)
- return-1;
+ goto obj_tooshort;
padbytes = GET_BE_U_2(obj_tptr + 2);
ND_PRINT("%s TLV count: %u, padding bytes: %u",
indent,
GET_U_1(obj_tptr),
GET_U_1(obj_tptr + 1));
if (obj_tlen < GET_U_1(obj_tptr + 1))
- return-1;
- if (GET_U_1(obj_tptr + 1) < 2)
+ goto obj_tooshort;
+ if (GET_U_1(obj_tptr + 1) < 2) {
+ ND_PRINT("%sERROR: property TLV is too short", indent);
return -1;
+ }
print_unknown_data(ndo, obj_tptr + 2, "\n\t\t",
GET_U_1(obj_tptr + 1) - 2);
obj_tlen-=GET_U_1(obj_tptr + 1);
switch(rsvp_obj_ctype) {
case RSVP_CTYPE_1:
case RSVP_CTYPE_2:
- if (obj_tlen < 8)
- return-1;
+ if (obj_tlen < 4)
+ goto obj_tooshort;
ND_PRINT("%s Flags [0x%02x], epoch: %u",
indent,
GET_U_1(obj_tptr),
switch(rsvp_obj_ctype) {
case RSVP_CTYPE_1:
if (obj_tlen < sizeof(struct rsvp_obj_integrity_t))
- return-1;
+ goto obj_tooshort;
obj_ptr.rsvp_obj_integrity = (const struct rsvp_obj_integrity_t *)obj_tptr;
ND_PRINT("%s Key-ID 0x%04x%08x, Sequence 0x%08x%08x, Flags [%s]",
indent,
switch(rsvp_obj_ctype) {
case RSVP_CTYPE_1:
if (obj_tlen < 4)
- return-1;
+ goto obj_tooshort;
ND_PRINT("%s Flags [%s]", indent,
bittok2str(rsvp_obj_admin_status_flag_values, "none",
GET_BE_U_4(obj_tptr)));
switch(rsvp_obj_ctype) {
case RSVP_CTYPE_1:
if (obj_tlen < 4)
- return-1;
+ goto obj_tooshort;
action = (GET_BE_U_2(obj_tptr)>>8);
ND_PRINT("%s Action: %s (%u), Label type: %u", indent,
/* only a couple of subchannels are expected */
if (obj_tlen < 12)
- return -1;
+ goto obj_tooshort;
ND_PRINT("%s Start range: %u, End range: %u", indent,
GET_BE_U_4(obj_tptr + 4),
GET_BE_U_4(obj_tptr + 8));
switch (rsvp_obj_ctype) {
case RSVP_CTYPE_IPV4:
if (obj_tlen < 4)
- return-1;
+ goto obj_tooshort;
ND_PRINT("%s Sub-LSP destination address: %s",
indent, GET_IPADDR_STRING(obj_tptr));
break;
case RSVP_CTYPE_IPV6:
if (obj_tlen < 16)
- return-1;
+ goto obj_tooshort;
ND_PRINT("%s Sub-LSP destination address: %s",
indent, GET_IP6ADDR_STRING(obj_tptr));
tlen-=rsvp_obj_len;
}
return 0;
+subobj_tooshort:
+ ND_PRINT("%sERROR: sub-object is too short", indent);
+ return -1;
+obj_tooshort:
+ ND_PRINT("%sERROR: object is too short", indent);
+ return -1;
invalid:
nd_print_invalid(ndo);
return -1;
projects / tcpdump / blobdiff