On Solaris, for 64-bit builds, use the 64-bit pcap-config.

[tcpdump] / print-msdp.c

diff --git a/print-msdp.c b/print-msdp.c
index 8680486c2542a35d50603721c43d1648bca463f6..7845116bdc7e03001d64b4e07a1ba2ece4441c60 100644 (file)
--- a/print-msdp.c
+++ b/print-msdp.c
@@ -36,15 +36,14 @@ msdp_print(netdissect_options *ndo, const u_char *sp, u_int length)
        unsigned int type, len;
 
        ndo->ndo_protocol = "msdp";
        unsigned int type, len;
 
        ndo->ndo_protocol = "msdp";

-       ND_TCHECK_3(sp);
+       ND_PRINT(": ");
+       nd_print_protocol(ndo);

        /* See if we think we're at the beginning of a compound packet */
        type = GET_U_1(sp);
        len = GET_BE_U_2(sp + 1);
        if (len > 1500 || len < 3 || type == 0 || type > MSDP_TYPE_MAX)
                goto trunc;     /* not really truncated, but still not decodable */
        /* See if we think we're at the beginning of a compound packet */
        type = GET_U_1(sp);
        len = GET_BE_U_2(sp + 1);
        if (len > 1500 || len < 3 || type == 0 || type > MSDP_TYPE_MAX)
                goto trunc;     /* not really truncated, but still not decodable */

-       ND_PRINT(" msdp:");

        while (length != 0) {
        while (length != 0) {

-               ND_TCHECK_3(sp);

                type = GET_U_1(sp);
                len = GET_BE_U_2(sp + 1);
                if (len > 1400 || ndo->ndo_vflag)
                type = GET_U_1(sp);
                len = GET_BE_U_2(sp + 1);
                if (len > 1400 || ndo->ndo_vflag)


@@ -62,7 +61,6 @@ msdp_print(netdissect_options *ndo, const u_char *sp, u_int length)
                                ND_PRINT(" SA");
                        else
                                ND_PRINT(" SA-Response");
                                ND_PRINT(" SA");
                        else
                                ND_PRINT(" SA-Response");

-                       ND_TCHECK_1(sp);

                        ND_PRINT(" %u entries", GET_U_1(sp));
                        if ((u_int)((GET_U_1(sp) * 12) + 8) < len) {
                                ND_PRINT(" [w/data]");
                        ND_PRINT(" %u entries", GET_U_1(sp));
                        if ((u_int)((GET_U_1(sp) * 12) + 8) < len) {
                                ND_PRINT(" [w/data]");


@@ -76,7 +74,6 @@ msdp_print(netdissect_options *ndo, const u_char *sp, u_int length)
                        break;
                case 2:
                        ND_PRINT(" SA-Request");
                        break;
                case 2:
                        ND_PRINT(" SA-Request");

-                       ND_TCHECK_5(sp);

                        ND_PRINT(" for %s", GET_IPADDR_STRING(sp + 1));
                        break;
                case 4:
                        ND_PRINT(" for %s", GET_IPADDR_STRING(sp + 1));
                        break;
                case 4: