rsvp: clean up length checks.

Add a missing length check in one case; fix another length check that's
checking for more than necessary.

Add a space between "return" and "-1" while we're at it.

diff --git a/print-rsvp.c b/print-rsvp.c
index 873559321ee70162218422e4acbcfb27af46886d..c482ca93d089e10fc34904f950051988679ce7cf 100644 (file)
--- a/print-rsvp.c
+++ b/print-rsvp.c
@@ -867,7 +867,7 @@ rsvp_obj_print(netdissect_options *ndo,
                 break;
             case RSVP_CTYPE_IPV6:
                 if (obj_tlen < sizeof(nd_ipv6))
-                    return-1;
+                    return -1;
                 ND_PRINT("%s  IPv6 Notify Node Address: %s",
                        indent,
                        GET_IP6ADDR_STRING(obj_tptr));
@@ -893,7 +893,7 @@ rsvp_obj_print(netdissect_options *ndo,
                 break;
             case RSVP_CTYPE_2:
                 if (obj_tlen < 4)
-                    return-1;
+                    return -1;
                 ND_PRINT("%s  Generalized Label: %u",
                        indent,
                        GET_BE_U_4(obj_tptr));
@@ -902,7 +902,7 @@ rsvp_obj_print(netdissect_options *ndo,
                 break;
             case RSVP_CTYPE_3:
                 if (obj_tlen < 12)
-                    return-1;
+                    return -1;
                 ND_PRINT("%s  Waveband ID: %u%s  Start Label: %u, Stop Label: %u",
                        indent,
                        GET_BE_U_4(obj_tptr),
@@ -921,7 +921,7 @@ rsvp_obj_print(netdissect_options *ndo,
             switch(rsvp_obj_ctype) {
             case RSVP_CTYPE_1:
                 if (obj_tlen < 4)
-                    return-1;
+                    return -1;
                 ND_PRINT("%s  Reservation Style: %s, Flags: [0x%02x]",
                        indent,
                        tok2str(rsvp_resstyle_values,
@@ -940,7 +940,7 @@ rsvp_obj_print(netdissect_options *ndo,
             switch(rsvp_obj_ctype) {
             case RSVP_CTYPE_IPV4:
                 if (obj_tlen < 8)
-                    return-1;
+                    return -1;
                 ND_PRINT("%s  Source Address: %s, Source Port: %u",
                        indent,
                        GET_IPADDR_STRING(obj_tptr),
@@ -950,7 +950,7 @@ rsvp_obj_print(netdissect_options *ndo,
                 break;
             case RSVP_CTYPE_IPV6:
                 if (obj_tlen < 20)
-                    return-1;
+                    return -1;
                 ND_PRINT("%s  Source Address: %s, Source Port: %u",
                        indent,
                        GET_IP6ADDR_STRING(obj_tptr),
@@ -960,7 +960,7 @@ rsvp_obj_print(netdissect_options *ndo,
                 break;
             case RSVP_CTYPE_13: /* IPv6 p2mp LSP tunnel */
                 if (obj_tlen < 40)
-                    return-1;
+                    return -1;
                 ND_PRINT("%s  IPv6 Tunnel Sender Address: %s, LSP ID: 0x%04x"
                        "%s  Sub-Group Originator ID: %s, Sub-Group ID: 0x%04x",
                        indent,
@@ -974,7 +974,7 @@ rsvp_obj_print(netdissect_options *ndo,
                 break;
             case RSVP_CTYPE_TUNNEL_IPV4:
                 if (obj_tlen < 8)
-                    return-1;
+                    return -1;
                 ND_PRINT("%s  IPv4 Tunnel Sender Address: %s, LSP-ID: 0x%04x",
                        indent,
                        GET_IPADDR_STRING(obj_tptr),
@@ -984,7 +984,7 @@ rsvp_obj_print(netdissect_options *ndo,
                 break;
             case RSVP_CTYPE_12: /* IPv4 p2mp LSP tunnel */
                 if (obj_tlen < 16)
-                    return-1;
+                    return -1;
                 ND_PRINT("%s  IPv4 Tunnel Sender Address: %s, LSP ID: 0x%04x"
                        "%s  Sub-Group Originator ID: %s, Sub-Group ID: 0x%04x",
                        indent,
@@ -1016,7 +1016,7 @@ rsvp_obj_print(netdissect_options *ndo,
                 break;
             case RSVP_CTYPE_2:
                 if (obj_tlen < 12)
-                    return-1;
+                    return -1;
                 ND_PRINT("%s  L3 Protocol ID: %s",
                        indent,
                        tok2str(ethertype_values,
@@ -1037,7 +1037,7 @@ rsvp_obj_print(netdissect_options *ndo,
                 break;
             case RSVP_CTYPE_3:
                 if (obj_tlen < 12)
-                    return-1;
+                    return -1;
                 ND_PRINT("%s  L3 Protocol ID: %s",
                        indent,
                        tok2str(ethertype_values,
@@ -1054,7 +1054,7 @@ rsvp_obj_print(netdissect_options *ndo,
                 break;
             case RSVP_CTYPE_4:
                 if (obj_tlen < 4)
-                    return-1;
+                    return -1;
                 ND_PRINT("%s  LSP Encoding Type: %s (%u)",
                        indent,
                        tok2str(gmpls_encoding_values,
@@ -1158,7 +1158,7 @@ rsvp_obj_print(netdissect_options *ndo,
             case RSVP_CTYPE_1:
             case RSVP_CTYPE_2:
                 if (obj_tlen < 8)
-                    return-1;
+                    return -1;
                 ND_PRINT("%s  Source Instance: 0x%08x, Destination Instance: 0x%08x",
                        indent,
                        GET_BE_U_4(obj_tptr),
@@ -1175,7 +1175,7 @@ rsvp_obj_print(netdissect_options *ndo,
             switch(rsvp_obj_ctype) {
             case RSVP_CTYPE_1:
                 if (obj_tlen < 8)
-                    return-1;
+                    return -1;
                 ND_PRINT("%s  Restart  Time: %ums, Recovery Time: %ums",
                        indent,
                        GET_BE_U_4(obj_tptr),
@@ -1192,7 +1192,7 @@ rsvp_obj_print(netdissect_options *ndo,
             switch(rsvp_obj_ctype) {
             case RSVP_CTYPE_1:
                 if (obj_tlen < 4)
-                    return-1;
+                    return -1;
                 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,
@@ -1214,10 +1214,10 @@ rsvp_obj_print(netdissect_options *ndo,
             switch(rsvp_obj_ctype) {
             case RSVP_CTYPE_TUNNEL_IPV4:
                 if (obj_tlen < 4)
-                    return-1;
+                    return -1;
                 namelen = GET_U_1(obj_tptr + 3);
                 if (obj_tlen < 4+namelen)
-                    return-1;
+                    return -1;
                 ND_PRINT("%s  Session Name: ", indent);
                 for (i = 0; i < namelen; i++)
                     fn_print_char(ndo, GET_U_1(obj_tptr + 4 + i));
@@ -1244,7 +1244,7 @@ rsvp_obj_print(netdissect_options *ndo,
             case RSVP_CTYPE_1:
 
                 if (obj_tlen < 4)
-                    return-1;
+                    return -1;
 
                /* read variable length subobjects */
                total_subobj_len = obj_tlen;
@@ -1376,7 +1376,7 @@ rsvp_obj_print(netdissect_options *ndo,
             case RSVP_CTYPE_3: /* fall through - FIXME add TLV parser */
             case RSVP_CTYPE_IPV4:
                 if (obj_tlen < 8)
-                    return-1;
+                    return -1;
                 ND_PRINT("%s  Previous/Next Interface: %s, Logical Interface Handle: 0x%08x",
                        indent,
                        GET_IPADDR_STRING(obj_tptr),
@@ -1389,7 +1389,7 @@ rsvp_obj_print(netdissect_options *ndo,
             case RSVP_CTYPE_4: /* fall through - FIXME add TLV parser */
             case RSVP_CTYPE_IPV6:
                 if (obj_tlen < 20)
-                    return-1;
+                    return -1;
                 ND_PRINT("%s  Previous/Next Interface: %s, Logical Interface Handle: 0x%08x",
                        indent,
                        GET_IP6ADDR_STRING(obj_tptr),
@@ -1407,7 +1407,7 @@ rsvp_obj_print(netdissect_options *ndo,
             switch(rsvp_obj_ctype) {
             case RSVP_CTYPE_1:
                 if (obj_tlen < 4)
-                    return-1;
+                    return -1;
                 ND_PRINT("%s  Refresh Period: %ums",
                        indent,
                        GET_BE_U_4(obj_tptr));
@@ -1426,7 +1426,7 @@ rsvp_obj_print(netdissect_options *ndo,
             switch(rsvp_obj_ctype) {
             case RSVP_CTYPE_2:
                 if (obj_tlen < 4)
-                    return-1;
+                    return -1;
                 ND_PRINT("%s  Msg-Version: %u, length: %u",
                        indent,
                        (GET_U_1(obj_tptr) & 0xf0) >> 4,
@@ -1465,7 +1465,7 @@ rsvp_obj_print(netdissect_options *ndo,
             switch(rsvp_obj_ctype) {
             case RSVP_CTYPE_IPV4:
                 if (obj_tlen < 8)
-                    return-1;
+                    return -1;
                 ND_PRINT("%s  Source Address: %s, Source Port: %u",
                        indent,
                        GET_IPADDR_STRING(obj_tptr),
@@ -1475,7 +1475,7 @@ rsvp_obj_print(netdissect_options *ndo,
                 break;
             case RSVP_CTYPE_IPV6:
                 if (obj_tlen < 20)
-                    return-1;
+                    return -1;
                 ND_PRINT("%s  Source Address: %s, Source Port: %u",
                        indent,
                        GET_IP6ADDR_STRING(obj_tptr),
@@ -1485,7 +1485,7 @@ rsvp_obj_print(netdissect_options *ndo,
                 break;
             case RSVP_CTYPE_3:
                 if (obj_tlen < 20)
-                    return-1;
+                    return -1;
                 ND_PRINT("%s  Source Address: %s, Flow Label: %u",
                        indent,
                        GET_IP6ADDR_STRING(obj_tptr),
@@ -1495,7 +1495,7 @@ rsvp_obj_print(netdissect_options *ndo,
                 break;
             case RSVP_CTYPE_TUNNEL_IPV6:
                 if (obj_tlen < 20)
-                    return-1;
+                    return -1;
                 ND_PRINT("%s  Source Address: %s, LSP-ID: 0x%04x",
                        indent,
                        GET_IPADDR_STRING(obj_tptr),
@@ -1505,7 +1505,7 @@ rsvp_obj_print(netdissect_options *ndo,
                 break;
             case RSVP_CTYPE_13: /* IPv6 p2mp LSP tunnel */
                 if (obj_tlen < 40)
-                    return-1;
+                    return -1;
                 ND_PRINT("%s  IPv6 Tunnel Sender Address: %s, LSP ID: 0x%04x"
                        "%s  Sub-Group Originator ID: %s, Sub-Group ID: 0x%04x",
                        indent,
@@ -1519,7 +1519,7 @@ rsvp_obj_print(netdissect_options *ndo,
                 break;
             case RSVP_CTYPE_TUNNEL_IPV4:
                 if (obj_tlen < 8)
-                    return-1;
+                    return -1;
                 ND_PRINT("%s  Source Address: %s, LSP-ID: 0x%04x",
                        indent,
                        GET_IPADDR_STRING(obj_tptr),
@@ -1529,7 +1529,7 @@ rsvp_obj_print(netdissect_options *ndo,
                 break;
             case RSVP_CTYPE_12: /* IPv4 p2mp LSP tunnel */
                 if (obj_tlen < 16)
-                    return-1;
+                    return -1;
                 ND_PRINT("%s  IPv4 Tunnel Sender Address: %s, LSP ID: 0x%04x"
                        "%s  Sub-Group Originator ID: %s, Sub-Group ID: 0x%04x",
                        indent,
@@ -1553,7 +1553,7 @@ rsvp_obj_print(netdissect_options *ndo,
             switch(rsvp_obj_ctype) {
             case RSVP_CTYPE_1: /* new style */
                 if (obj_tlen < sizeof(struct rsvp_obj_frr_t))
-                    return-1;
+                    return -1;
                 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,
@@ -1572,7 +1572,7 @@ rsvp_obj_print(netdissect_options *ndo,
 
             case RSVP_CTYPE_TUNNEL_IPV4: /* old style */
                 if (obj_tlen < 16)
-                    return-1;
+                    return -1;
                 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,
@@ -1614,6 +1614,8 @@ rsvp_obj_print(netdissect_options *ndo,
         case RSVP_OBJ_CLASSTYPE_OLD: /* fall through */
             switch(rsvp_obj_ctype) {
             case RSVP_CTYPE_1:
+                if (obj_tlen < 4)
+                    return -1;
                 ND_PRINT("%s  CT: %u",
                        indent,
                        GET_BE_U_4(obj_tptr) & 0x7);
@@ -1630,7 +1632,7 @@ rsvp_obj_print(netdissect_options *ndo,
             case RSVP_CTYPE_3: /* fall through - FIXME add TLV parser */
             case RSVP_CTYPE_IPV4:
                 if (obj_tlen < 8)
-                    return-1;
+                    return -1;
                 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)",
@@ -1662,7 +1664,7 @@ rsvp_obj_print(netdissect_options *ndo,
             case RSVP_CTYPE_4: /* fall through - FIXME add TLV parser */
             case RSVP_CTYPE_IPV6:
                 if (obj_tlen < 20)
-                    return-1;
+                    return -1;
                 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)",
@@ -1694,7 +1696,7 @@ rsvp_obj_print(netdissect_options *ndo,
             switch(rsvp_obj_ctype) {
             case RSVP_CTYPE_1:
                 if (obj_tlen < 4)
-                    return-1;
+                    return -1;
                 padbytes = GET_BE_U_2(obj_tptr + 2);
                 ND_PRINT("%s  TLV count: %u, padding bytes: %u",
                        indent,
@@ -1710,7 +1712,7 @@ rsvp_obj_print(netdissect_options *ndo,
                            GET_U_1(obj_tptr),
                            GET_U_1(obj_tptr + 1));
                     if (obj_tlen < GET_U_1(obj_tptr + 1))
-                        return-1;
+                        return -1;
                     if (GET_U_1(obj_tptr + 1) < 2)
                         return -1;
                     print_unknown_data(ndo, obj_tptr + 2, "\n\t\t",
@@ -1730,8 +1732,8 @@ rsvp_obj_print(netdissect_options *ndo,
             switch(rsvp_obj_ctype) {
             case RSVP_CTYPE_1:
             case RSVP_CTYPE_2:
-                if (obj_tlen < 8)
-                    return-1;
+                if (obj_tlen < 4)
+                    return -1;
                 ND_PRINT("%s  Flags [0x%02x], epoch: %u",
                        indent,
                        GET_U_1(obj_tptr),
@@ -1757,7 +1759,7 @@ rsvp_obj_print(netdissect_options *ndo,
             switch(rsvp_obj_ctype) {
             case RSVP_CTYPE_1:
                 if (obj_tlen < sizeof(struct rsvp_obj_integrity_t))
-                    return-1;
+                    return -1;
                 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,
@@ -1793,7 +1795,7 @@ rsvp_obj_print(netdissect_options *ndo,
             switch(rsvp_obj_ctype) {
             case RSVP_CTYPE_1:
                 if (obj_tlen < 4)
-                    return-1;
+                    return -1;
                 ND_PRINT("%s  Flags [%s]", indent,
                        bittok2str(rsvp_obj_admin_status_flag_values, "none",
                                   GET_BE_U_4(obj_tptr)));
@@ -1809,7 +1811,7 @@ rsvp_obj_print(netdissect_options *ndo,
             switch(rsvp_obj_ctype) {
             case RSVP_CTYPE_1:
                 if (obj_tlen < 4)
-                    return-1;
+                    return -1;
                 action = (GET_BE_U_2(obj_tptr)>>8);
 
                 ND_PRINT("%s  Action: %s (%u), Label type: %u", indent,
@@ -1853,7 +1855,7 @@ rsvp_obj_print(netdissect_options *ndo,
             switch (rsvp_obj_ctype) {
             case RSVP_CTYPE_IPV4:
                 if (obj_tlen < 4)
-                    return-1;
+                    return -1;
                 ND_PRINT("%s  Sub-LSP destination address: %s",
                        indent, GET_IPADDR_STRING(obj_tptr));
 
@@ -1862,7 +1864,7 @@ rsvp_obj_print(netdissect_options *ndo,
                 break;
             case RSVP_CTYPE_IPV6:
                 if (obj_tlen < 16)
-                    return-1;
+                    return -1;
                 ND_PRINT("%s  Sub-LSP destination address: %s",
                        indent, GET_IP6ADDR_STRING(obj_tptr));