Fix spaces

[tcpdump] / print-msdp.c

diff --git a/print-msdp.c b/print-msdp.c
index 1044582e59556e777e12201f02712ee81e8146c4..8680486c2542a35d50603721c43d1648bca463f6 100644 (file)
--- a/print-msdp.c
+++ b/print-msdp.c
@@ -19,10 +19,10 @@
 /* \summary: Multicast Source Discovery Protocol (MSDP) printer */
 
 #ifdef HAVE_CONFIG_H
 /* \summary: Multicast Source Discovery Protocol (MSDP) printer */
 
 #ifdef HAVE_CONFIG_H

-#include "config.h"
+#include <config.h>

 #endif
 
 #endif
 

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

 
 #include "netdissect.h"
 #include "addrtoname.h"
 
 #include "netdissect.h"
 #include "addrtoname.h"


@@ -35,17 +35,18 @@ msdp_print(netdissect_options *ndo, const u_char *sp, u_int length)
 {
        unsigned int type, len;
 
 {
        unsigned int type, len;
 

+       ndo->ndo_protocol = "msdp";

        ND_TCHECK_3(sp);
        /* See if we think we're at the beginning of a compound packet */
        ND_TCHECK_3(sp);
        /* See if we think we're at the beginning of a compound packet */

-       type = EXTRACT_U_1(sp);
-       len = EXTRACT_BE_U_2(sp + 1);
+       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) {
                ND_TCHECK_3(sp);
        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) {
                ND_TCHECK_3(sp);

-               type = EXTRACT_U_1(sp);
-               len = EXTRACT_BE_U_2(sp + 1);
+               type = GET_U_1(sp);
+               len = GET_BE_U_2(sp + 1);

                if (len > 1400 || ndo->ndo_vflag)
                        ND_PRINT(" [len %u]", len);
                if (len < 3)
                if (len > 1400 || ndo->ndo_vflag)
                        ND_PRINT(" [len %u]", len);
                if (len < 3)


@@ -62,21 +63,21 @@ msdp_print(netdissect_options *ndo, const u_char *sp, u_int length)
                        else
                                ND_PRINT(" SA-Response");
                        ND_TCHECK_1(sp);
                        else
                                ND_PRINT(" SA-Response");
                        ND_TCHECK_1(sp);

-                       ND_PRINT(" %u entries", EXTRACT_U_1(sp));
-                       if ((u_int)((EXTRACT_U_1(sp) * 12) + 8) < len) {
+                       ND_PRINT(" %u entries", GET_U_1(sp));
+                       if ((u_int)((GET_U_1(sp) * 12) + 8) < len) {

                                ND_PRINT(" [w/data]");
                                if (ndo->ndo_vflag > 1) {
                                        ND_PRINT(" ");
                                        ip_print(ndo, sp +
                                ND_PRINT(" [w/data]");
                                if (ndo->ndo_vflag > 1) {
                                        ND_PRINT(" ");
                                        ip_print(ndo, sp +

-                                                EXTRACT_U_1(sp) * 12 + 8 - 3,
-                                                len - (EXTRACT_U_1(sp) * 12 + 8));
+                                                GET_U_1(sp) * 12 + 8 - 3,
+                                                len - (GET_U_1(sp) * 12 + 8));

                                }
                        }
                        break;
                case 2:
                        ND_PRINT(" SA-Request");
                        ND_TCHECK_5(sp);
                                }
                        }
                        break;
                case 2:
                        ND_PRINT(" SA-Request");
                        ND_TCHECK_5(sp);

-                       ND_PRINT(" for %s", ipaddr_string(ndo, sp + 1));
+                       ND_PRINT(" for %s", GET_IPADDR_STRING(sp + 1));

                        break;
                case 4:
                        ND_PRINT(" Keepalive");
                        break;
                case 4:
                        ND_PRINT(" Keepalive");


@@ -95,12 +96,5 @@ msdp_print(netdissect_options *ndo, const u_char *sp, u_int length)
        }
        return;
 trunc:
        }
        return;
 trunc:

-       ND_PRINT(" [|msdp]");
+       nd_print_trunc(ndo);

 }
 }

-
-/*
- * Local Variables:
- * c-style: whitesmith
- * c-basic-offset: 8
- * End:
- */