Use nd_ types, add EXTRACT_ calls, clean up signed vs. unsigned.

[tcpdump] / print-mpls.c

diff --git a/print-mpls.c b/print-mpls.c
index e2e827ac8f1937f4a25ecd7f1a248ca952e00e16..c566ea1421dea7763e24c77b3c05b4b2c305ad2e 100644 (file)
--- a/print-mpls.c
+++ b/print-mpls.c
@@ -26,11 +26,13 @@
  * SUCH DAMAGE.
  */
 
  * SUCH DAMAGE.
  */
 

+/* \summary: Multi-Protocol Label Switching (MPLS) printer */
+

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>

 
 #include "netdissect.h"
 #include "extract.h"
 
 #include "netdissect.h"
 #include "extract.h"


@@ -65,8 +67,12 @@ mpls_print(netdissect_options *ndo, const u_char *bp, u_int length)
        p = bp;
        ND_PRINT((ndo, "MPLS"));
        do {
        p = bp;
        ND_PRINT((ndo, "MPLS"));
        do {

-               ND_TCHECK2(*p, sizeof(label_entry));
-               label_entry = EXTRACT_32BITS(p);
+               ND_TCHECK_LEN(p, sizeof(label_entry));
+               if (length < sizeof(label_entry)) {
+                       ND_PRINT((ndo, "[|MPLS], length %u", length));
+                       return;
+               }
+               label_entry = EXTRACT_BE_U_4(p);

                ND_PRINT((ndo, "%s(label %u",
                       (label_stack_depth && ndo->ndo_vflag) ? "\n\t" : " ",
                               MPLS_LABEL(label_entry)));
                ND_PRINT((ndo, "%s(label %u",
                       (label_stack_depth && ndo->ndo_vflag) ? "\n\t" : " ",
                               MPLS_LABEL(label_entry)));


@@ -80,6 +86,7 @@ mpls_print(netdissect_options *ndo, const u_char *bp, u_int length)
                ND_PRINT((ndo, ", ttl %u)", MPLS_TTL(label_entry)));
 
                p += sizeof(label_entry);
                ND_PRINT((ndo, ", ttl %u)", MPLS_TTL(label_entry)));
 
                p += sizeof(label_entry);

+               length -= sizeof(label_entry);

        } while (!MPLS_STACK(label_entry));
 
        /*
        } while (!MPLS_STACK(label_entry));
 
        /*


@@ -122,7 +129,12 @@ mpls_print(netdissect_options *ndo, const u_char *bp, u_int length)
                 * Cisco sends control-plane traffic MPLS-encapsulated in
                 * this fashion.
                 */
                 * Cisco sends control-plane traffic MPLS-encapsulated in
                 * this fashion.
                 */

-               switch(*p) {
+               ND_TCHECK_1(p);
+               if (length < 1) {
+                       /* nothing to print */
+                       return;
+               }
+               switch(EXTRACT_U_1(p)) {

 
                case 0x45:
                case 0x46:
 
                case 0x45:
                case 0x46:


@@ -174,22 +186,22 @@ mpls_print(netdissect_options *ndo, const u_char *bp, u_int length)
         */
        if (pt == PT_UNKNOWN) {
                if (!ndo->ndo_suppress_default_print)
         */
        if (pt == PT_UNKNOWN) {
                if (!ndo->ndo_suppress_default_print)

-                       ND_DEFAULTPRINT(p, length - (p - bp));
+                       ND_DEFAULTPRINT(p, length);

                return;
        }
        ND_PRINT((ndo, ndo->ndo_vflag ? "\n\t" : " "));
        switch (pt) {
 
        case PT_IPV4:
                return;
        }
        ND_PRINT((ndo, ndo->ndo_vflag ? "\n\t" : " "));
        switch (pt) {
 
        case PT_IPV4:

-               ip_print(ndo, p, length - (p - bp));
+               ip_print(ndo, p, length);

                break;
 
        case PT_IPV6:
                break;
 
        case PT_IPV6:

-               ip6_print(ndo, p, length - (p - bp));
+               ip6_print(ndo, p, length);

                break;
 
        case PT_OSI:
                break;
 
        case PT_OSI:

-               isoclns_print(ndo, p, length - (p - bp), length - (p - bp));
+               isoclns_print(ndo, p, length);

                break;
 
        default:
                break;
 
        default: