IPv6: refresh options decoding (GH #47 pt. 3)

[tcpdump] / print-mpcp.c

diff --git a/print-mpcp.c b/print-mpcp.c
index 244f2802bb440004c51f5048d8ef76f8cb955cb9..cf36866f426cce65b8a9fad520bb21926a4c679e 100644 (file)
--- a/print-mpcp.c
+++ b/print-mpcp.c
@@ -17,11 +17,6 @@
  * Original code by Hannes Gredler ([email protected])
  */
 
  * Original code by Hannes Gredler ([email protected])
  */
 

-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-mpcp.c,v 1.2 2006-02-10 17:24:55 hannes Exp $";
-#endif
-

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


@@ -63,7 +58,7 @@ static const struct tok mpcp_opcode_values[] = {
 };
 
 #define MPCP_GRANT_NUMBER_LEN 1
 };
 
 #define MPCP_GRANT_NUMBER_LEN 1

-#define        MPCP_GRANT_NUMBER_MASK 0x7 
+#define        MPCP_GRANT_NUMBER_MASK 0x7

 static const struct tok mpcp_grant_flag_values[] = {
     { 0x08, "Discovery" },
     { 0x10, "Force Grant #1" },
 static const struct tok mpcp_grant_flag_values[] = {
     { 0x08, "Discovery" },
     { 0x10, "Force Grant #1" },


@@ -183,7 +178,7 @@ mpcp_print(register const u_char *pptr, register u_int length) {
         for (grant = 1; grant <= grant_numbers; grant++) {
             if (!TTEST2(*tptr, sizeof(const struct mpcp_grant_t)))
                 goto trunc;
         for (grant = 1; grant <= grant_numbers; grant++) {
             if (!TTEST2(*tptr, sizeof(const struct mpcp_grant_t)))
                 goto trunc;

-            mpcp.grant = (const struct mpcp_grant_t *)tptr;        
+            mpcp.grant = (const struct mpcp_grant_t *)tptr;

             printf("\n\tGrant #%u, Start-Time %u ticks, duration %u ticks",
                    grant,
                    EXTRACT_32BITS(mpcp.grant->starttime),
             printf("\n\tGrant #%u, Start-Time %u ticks, duration %u ticks",
                    grant,
                    EXTRACT_32BITS(mpcp.grant->starttime),


@@ -214,7 +209,7 @@ mpcp_print(register const u_char *pptr, register u_int length) {
             tptr++;
 
             report=1;
             tptr++;
 
             report=1;

-            while (report_bitmap != 0) { 
+            while (report_bitmap != 0) {

                 if (report_bitmap & 1) {
                     if (!TTEST2(*tptr, MPCP_TIMESTAMP_DURATION_LEN))
                         goto trunc;
                 if (report_bitmap & 1) {
                     if (!TTEST2(*tptr, MPCP_TIMESTAMP_DURATION_LEN))
                         goto trunc;


@@ -232,7 +227,7 @@ mpcp_print(register const u_char *pptr, register u_int length) {
     case MPCP_OPCODE_REG_REQ:
         if (!TTEST2(*tptr, sizeof(const struct mpcp_reg_req_t)))
             goto trunc;
     case MPCP_OPCODE_REG_REQ:
         if (!TTEST2(*tptr, sizeof(const struct mpcp_reg_req_t)))
             goto trunc;

-        mpcp.reg_req = (const struct mpcp_reg_req_t *)tptr;        
+        mpcp.reg_req = (const struct mpcp_reg_req_t *)tptr;

         printf("\n\tFlags [ %s ], Pending-Grants %u",
                bittok2str(mpcp_reg_req_flag_values, "Reserved", mpcp.reg_req->flags),
                mpcp.reg_req->pending_grants);
         printf("\n\tFlags [ %s ], Pending-Grants %u",
                bittok2str(mpcp_reg_req_flag_values, "Reserved", mpcp.reg_req->flags),
                mpcp.reg_req->pending_grants);


@@ -241,7 +236,7 @@ mpcp_print(register const u_char *pptr, register u_int length) {
     case MPCP_OPCODE_REG:
         if (!TTEST2(*tptr, sizeof(const struct mpcp_reg_t)))
             goto trunc;
     case MPCP_OPCODE_REG:
         if (!TTEST2(*tptr, sizeof(const struct mpcp_reg_t)))
             goto trunc;

-        mpcp.reg = (const struct mpcp_reg_t *)tptr;        
+        mpcp.reg = (const struct mpcp_reg_t *)tptr;

         printf("\n\tAssigned-Port %u, Flags [ %s ]" \
                "\n\tSync-Time %u ticks, Echoed-Pending-Grants %u",
                EXTRACT_16BITS(mpcp.reg->assigned_port),
         printf("\n\tAssigned-Port %u, Flags [ %s ]" \
                "\n\tSync-Time %u ticks, Echoed-Pending-Grants %u",
                EXTRACT_16BITS(mpcp.reg->assigned_port),


@@ -253,7 +248,7 @@ mpcp_print(register const u_char *pptr, register u_int length) {
     case MPCP_OPCODE_REG_ACK:
         if (!TTEST2(*tptr, sizeof(const struct mpcp_reg_ack_t)))
             goto trunc;
     case MPCP_OPCODE_REG_ACK:
         if (!TTEST2(*tptr, sizeof(const struct mpcp_reg_ack_t)))
             goto trunc;

-        mpcp.reg_ack = (const struct mpcp_reg_ack_t *)tptr;        
+        mpcp.reg_ack = (const struct mpcp_reg_ack_t *)tptr;

         printf("\n\tEchoed-Assigned-Port %u, Flags [ %s ]" \
                "\n\tEchoed-Sync-Time %u ticks",
                EXTRACT_16BITS(mpcp.reg_ack->echoed_assigned_port),
         printf("\n\tEchoed-Assigned-Port %u, Flags [ %s ]" \
                "\n\tEchoed-Sync-Time %u ticks",
                EXTRACT_16BITS(mpcp.reg_ack->echoed_assigned_port),


@@ -263,7 +258,7 @@ mpcp_print(register const u_char *pptr, register u_int length) {
 
     default:
         /* unknown opcode - hexdump for now */
 
     default:
         /* unknown opcode - hexdump for now */

-        print_unknown_data(pptr, "\n\t", length);
+        print_unknown_data(gndo,pptr, "\n\t", length);

         break;
     }
 
         break;
     }
 


@@ -272,3 +267,9 @@ mpcp_print(register const u_char *pptr, register u_int length) {
 trunc:
     printf("\n\t[|MPCP]");
 }
 trunc:
     printf("\n\t[|MPCP]");
 }

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