Handle rpcaps:// URLs as well, for rpcap-over-TLS.

[tcpdump] / print-mpcp.c

diff --git a/print-mpcp.c b/print-mpcp.c
index 8f988357bc07bb84d4d1fcfee535baf3ff7677fd..ebfe74a6ccdaa34a8534cf36e48a3e2d213b2f79 100644 (file)
--- a/print-mpcp.c
+++ b/print-mpcp.c
@@ -18,20 +18,17 @@
 /* \summary: IEEE 802.3ah Multi-Point Control Protocol (MPCP) printer */
 
 #ifdef HAVE_CONFIG_H
 /* \summary: IEEE 802.3ah Multi-Point Control Protocol (MPCP) 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 "extract.h"
 
 
 #include "netdissect.h"
 #include "extract.h"
 

-#define MPCP_TIMESTAMP_LEN        4
-#define MPCP_TIMESTAMP_DURATION_LEN 2
-

 struct mpcp_common_header_t {
 struct mpcp_common_header_t {

-    uint8_t opcode[2];
-    uint8_t timestamp[MPCP_TIMESTAMP_LEN];
+    nd_uint16_t opcode;
+    nd_uint32_t timestamp;

 };
 
 #define        MPCP_OPCODE_PAUSE   0x0001
 };
 
 #define        MPCP_OPCODE_PAUSE   0x0001


@@ -63,13 +60,13 @@ static const struct tok mpcp_grant_flag_values[] = {
 };
 
 struct mpcp_grant_t {
 };
 
 struct mpcp_grant_t {

-    uint8_t starttime[MPCP_TIMESTAMP_LEN];
-    uint8_t duration[MPCP_TIMESTAMP_DURATION_LEN];
+    nd_uint32_t starttime;
+    nd_uint16_t duration;

 };
 
 struct mpcp_reg_req_t {
 };
 
 struct mpcp_reg_req_t {

-    uint8_t flags;
-    uint8_t pending_grants;
+    nd_uint8_t flags;
+    nd_uint8_t pending_grants;

 };
 
 
 };
 
 


@@ -80,10 +77,10 @@ static const struct tok mpcp_reg_req_flag_values[] = {
 };
 
 struct mpcp_reg_t {
 };
 
 struct mpcp_reg_t {

-    uint8_t assigned_port[2];
-    uint8_t flags;
-    uint8_t sync_time[MPCP_TIMESTAMP_DURATION_LEN];
-    uint8_t echoed_pending_grants;
+    nd_uint16_t assigned_port;
+    nd_uint8_t  flags;
+    nd_uint16_t sync_time;
+    nd_uint8_t  echoed_pending_grants;

 };
 
 static const struct tok mpcp_reg_flag_values[] = {
 };
 
 static const struct tok mpcp_reg_flag_values[] = {


@@ -109,9 +106,9 @@ static const struct tok mpcp_report_bitmap_values[] = {
 };
 
 struct mpcp_reg_ack_t {
 };
 
 struct mpcp_reg_ack_t {

-    uint8_t flags;
-    uint8_t echoed_assigned_port[2];
-    uint8_t echoed_sync_time[MPCP_TIMESTAMP_DURATION_LEN];
+    nd_uint8_t  flags;
+    nd_uint16_t echoed_assigned_port;
+    nd_uint16_t echoed_sync_time;

 };
 
 static const struct tok mpcp_reg_ack_flag_values[] = {
 };
 
 static const struct tok mpcp_reg_ack_flag_values[] = {


@@ -137,16 +134,17 @@ mpcp_print(netdissect_options *ndo, const u_char *pptr, u_int length)
     uint8_t grant_numbers, grant;
     uint8_t queue_sets, queue_set, report_bitmap, report;
 
     uint8_t grant_numbers, grant;
     uint8_t queue_sets, queue_set, report_bitmap, report;
 

+    ndo->ndo_protocol = "mpcp";

     tptr=pptr;
     mpcp.common_header = (const struct mpcp_common_header_t *)pptr;
 
     ND_TCHECK_LEN(tptr, sizeof(struct mpcp_common_header_t));
     opcode = EXTRACT_BE_U_2(mpcp.common_header->opcode);
     tptr=pptr;
     mpcp.common_header = (const struct mpcp_common_header_t *)pptr;
 
     ND_TCHECK_LEN(tptr, sizeof(struct mpcp_common_header_t));
     opcode = EXTRACT_BE_U_2(mpcp.common_header->opcode);

-    ND_PRINT((ndo, "MPCP, Opcode %s", tok2str(mpcp_opcode_values, "Unknown (%u)", opcode)));
+    ND_PRINT("MPCP, Opcode %s", tok2str(mpcp_opcode_values, "Unknown (%u)", opcode));

     if (opcode != MPCP_OPCODE_PAUSE) {
     if (opcode != MPCP_OPCODE_PAUSE) {

-        ND_PRINT((ndo, ", Timestamp %u ticks", EXTRACT_BE_U_4(mpcp.common_header->timestamp)));
+        ND_PRINT(", Timestamp %u ticks", EXTRACT_BE_U_4(mpcp.common_header->timestamp));

     }
     }

-    ND_PRINT((ndo, ", length %u", length));
+    ND_PRINT(", length %u", length);

 
     if (!ndo->ndo_vflag)
         return;
 
     if (!ndo->ndo_vflag)
         return;


@@ -160,25 +158,25 @@ mpcp_print(netdissect_options *ndo, const u_char *pptr, u_int length)
     case MPCP_OPCODE_GATE:
         ND_TCHECK_LEN(tptr, MPCP_GRANT_NUMBER_LEN);
         grant_numbers = EXTRACT_U_1(tptr) & MPCP_GRANT_NUMBER_MASK;
     case MPCP_OPCODE_GATE:
         ND_TCHECK_LEN(tptr, MPCP_GRANT_NUMBER_LEN);
         grant_numbers = EXTRACT_U_1(tptr) & MPCP_GRANT_NUMBER_MASK;

-        ND_PRINT((ndo, "\n\tGrant Numbers %u, Flags [ %s ]",
+        ND_PRINT("\n\tGrant Numbers %u, Flags [ %s ]",

                grant_numbers,
                bittok2str(mpcp_grant_flag_values,
                           "?",
                grant_numbers,
                bittok2str(mpcp_grant_flag_values,
                           "?",

-                          EXTRACT_U_1(tptr) & ~MPCP_GRANT_NUMBER_MASK)));
+                          EXTRACT_U_1(tptr) & ~MPCP_GRANT_NUMBER_MASK));

         tptr++;
 
         for (grant = 1; grant <= grant_numbers; grant++) {
             ND_TCHECK_LEN(tptr, sizeof(struct mpcp_grant_t));
             mpcp.grant = (const struct mpcp_grant_t *)tptr;
         tptr++;
 
         for (grant = 1; grant <= grant_numbers; grant++) {
             ND_TCHECK_LEN(tptr, sizeof(struct mpcp_grant_t));
             mpcp.grant = (const struct mpcp_grant_t *)tptr;

-            ND_PRINT((ndo, "\n\tGrant #%u, Start-Time %u ticks, duration %u ticks",
+            ND_PRINT("\n\tGrant #%u, Start-Time %u ticks, duration %u ticks",

                    grant,
                    EXTRACT_BE_U_4(mpcp.grant->starttime),
                    grant,
                    EXTRACT_BE_U_4(mpcp.grant->starttime),

-                   EXTRACT_BE_U_2(mpcp.grant->duration)));
+                   EXTRACT_BE_U_2(mpcp.grant->duration));

             tptr += sizeof(struct mpcp_grant_t);
         }
 
             tptr += sizeof(struct mpcp_grant_t);
         }
 

-        ND_TCHECK_LEN(tptr, MPCP_TIMESTAMP_DURATION_LEN);
-        ND_PRINT((ndo, "\n\tSync-Time %u ticks", EXTRACT_BE_U_2(tptr)));
+        ND_TCHECK_2(tptr);
+        ND_PRINT("\n\tSync-Time %u ticks", EXTRACT_BE_U_2(tptr));

         break;
 
 
         break;
 
 


@@ -186,24 +184,24 @@ mpcp_print(netdissect_options *ndo, const u_char *pptr, u_int length)
         ND_TCHECK_LEN(tptr, MPCP_REPORT_QUEUESETS_LEN);
         queue_sets = EXTRACT_U_1(tptr);
         tptr+=MPCP_REPORT_QUEUESETS_LEN;
         ND_TCHECK_LEN(tptr, MPCP_REPORT_QUEUESETS_LEN);
         queue_sets = EXTRACT_U_1(tptr);
         tptr+=MPCP_REPORT_QUEUESETS_LEN;

-        ND_PRINT((ndo, "\n\tTotal Queue-Sets %u", queue_sets));
+        ND_PRINT("\n\tTotal Queue-Sets %u", queue_sets);

 
         for (queue_set = 1; queue_set < queue_sets; queue_set++) {
             ND_TCHECK_LEN(tptr, MPCP_REPORT_REPORTBITMAP_LEN);
             report_bitmap = EXTRACT_U_1(tptr);
 
         for (queue_set = 1; queue_set < queue_sets; queue_set++) {
             ND_TCHECK_LEN(tptr, MPCP_REPORT_REPORTBITMAP_LEN);
             report_bitmap = EXTRACT_U_1(tptr);

-            ND_PRINT((ndo, "\n\t  Queue-Set #%u, Report-Bitmap [ %s ]",
+            ND_PRINT("\n\t  Queue-Set #%u, Report-Bitmap [ %s ]",

                    queue_sets,
                    queue_sets,

-                   bittok2str(mpcp_report_bitmap_values, "Unknown", report_bitmap)));
+                   bittok2str(mpcp_report_bitmap_values, "Unknown", report_bitmap));

             tptr++;
 
             report=1;
             while (report_bitmap != 0) {
                 if (report_bitmap & 1) {
             tptr++;
 
             report=1;
             while (report_bitmap != 0) {
                 if (report_bitmap & 1) {

-                    ND_TCHECK_LEN(tptr, MPCP_TIMESTAMP_DURATION_LEN);
-                    ND_PRINT((ndo, "\n\t    Q%u Report, Duration %u ticks",
+                    ND_TCHECK_2(tptr);
+                    ND_PRINT("\n\t    Q%u Report, Duration %u ticks",

                            report,
                            report,

-                           EXTRACT_BE_U_2(tptr)));
-                    tptr+=MPCP_TIMESTAMP_DURATION_LEN;
+                           EXTRACT_BE_U_2(tptr));
+                    tptr += 2;

                 }
                 report++;
                 report_bitmap = report_bitmap >> 1;
                 }
                 report++;
                 report_bitmap = report_bitmap >> 1;


@@ -214,30 +212,30 @@ mpcp_print(netdissect_options *ndo, const u_char *pptr, u_int length)
     case MPCP_OPCODE_REG_REQ:
         ND_TCHECK_LEN(tptr, sizeof(struct mpcp_reg_req_t));
         mpcp.reg_req = (const struct mpcp_reg_req_t *)tptr;
     case MPCP_OPCODE_REG_REQ:
         ND_TCHECK_LEN(tptr, sizeof(struct mpcp_reg_req_t));
         mpcp.reg_req = (const struct mpcp_reg_req_t *)tptr;

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

         break;
 
     case MPCP_OPCODE_REG:
         ND_TCHECK_LEN(tptr, sizeof(struct mpcp_reg_t));
         mpcp.reg = (const struct mpcp_reg_t *)tptr;
         break;
 
     case MPCP_OPCODE_REG:
         ND_TCHECK_LEN(tptr, sizeof(struct mpcp_reg_t));
         mpcp.reg = (const struct mpcp_reg_t *)tptr;

-        ND_PRINT((ndo, "\n\tAssigned-Port %u, Flags [ %s ]" \
+        ND_PRINT("\n\tAssigned-Port %u, Flags [ %s ]"

                "\n\tSync-Time %u ticks, Echoed-Pending-Grants %u",
                EXTRACT_BE_U_2(mpcp.reg->assigned_port),
                "\n\tSync-Time %u ticks, Echoed-Pending-Grants %u",
                EXTRACT_BE_U_2(mpcp.reg->assigned_port),

-               bittok2str(mpcp_reg_flag_values, "Reserved", mpcp.reg->flags),
+               bittok2str(mpcp_reg_flag_values, "Reserved", EXTRACT_U_1(mpcp.reg->flags)),

                EXTRACT_BE_U_2(mpcp.reg->sync_time),
                EXTRACT_BE_U_2(mpcp.reg->sync_time),

-               mpcp.reg->echoed_pending_grants));
+               EXTRACT_U_1(mpcp.reg->echoed_pending_grants));

         break;
 
     case MPCP_OPCODE_REG_ACK:
         ND_TCHECK_LEN(tptr, sizeof(struct mpcp_reg_ack_t));
         mpcp.reg_ack = (const struct mpcp_reg_ack_t *)tptr;
         break;
 
     case MPCP_OPCODE_REG_ACK:
         ND_TCHECK_LEN(tptr, sizeof(struct mpcp_reg_ack_t));
         mpcp.reg_ack = (const struct mpcp_reg_ack_t *)tptr;

-        ND_PRINT((ndo, "\n\tEchoed-Assigned-Port %u, Flags [ %s ]" \
+        ND_PRINT("\n\tEchoed-Assigned-Port %u, Flags [ %s ]"

                "\n\tEchoed-Sync-Time %u ticks",
                EXTRACT_BE_U_2(mpcp.reg_ack->echoed_assigned_port),
                "\n\tEchoed-Sync-Time %u ticks",
                EXTRACT_BE_U_2(mpcp.reg_ack->echoed_assigned_port),

-               bittok2str(mpcp_reg_ack_flag_values, "Reserved", mpcp.reg_ack->flags),
-               EXTRACT_BE_U_2(mpcp.reg_ack->echoed_sync_time)));
+               bittok2str(mpcp_reg_ack_flag_values, "Reserved", EXTRACT_U_1(mpcp.reg_ack->flags)),
+               EXTRACT_BE_U_2(mpcp.reg_ack->echoed_sync_time));

         break;
 
     default:
         break;
 
     default:


@@ -249,11 +247,5 @@ mpcp_print(netdissect_options *ndo, const u_char *pptr, u_int length)
     return;
 
 trunc:
     return;
 
 trunc:

-    ND_PRINT((ndo, "\n\t[|MPCP]"));
+    nd_print_trunc(ndo);

 }
 }

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