Add CAP_FCNTL and use cap_fcntls_limit().

[tcpdump] / print-mpcp.c

diff --git a/print-mpcp.c b/print-mpcp.c
index 97b5d66d86f6123c0d249b5b17bcfbc9e43dfaf1..7ddfb1d12e380f0d8918394633084c909bacd066 100644 (file)
--- a/print-mpcp.c
+++ b/print-mpcp.c
@@ -17,49 +17,43 @@
  * 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.1 2006-02-10 04:52:25 hannes Exp $";
-#endif
-
+#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 

-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-

 #include "interface.h"
 #include "extract.h"
 #include "interface.h"
 #include "extract.h"

-#include "addrtoname.h"
-#include "ether.h"
+
+#define MPCP_TIMESTAMP_LEN        4
+#define MPCP_TIMESTAMP_DURATION_LEN 2

 
 struct mpcp_common_header_t {
 
 struct mpcp_common_header_t {

-    u_int8_t opcode[2];
-    u_int8_t timestamp[4];
+    uint8_t opcode[2];
+    uint8_t timestamp[MPCP_TIMESTAMP_LEN];

 };
 
 };
 

-#define        MPCP_OPCODE_PAUSE        0x0001
-#define        MPCP_OPCODE_GATE         0x0002
-#define        MPCP_OPCODE_REPORT       0x0003
-#define        MPCP_OPCODE_REGISTER_REQ 0x0004
-#define        MPCP_OPCODE_REGISTER     0x0005
-#define        MPCP_OPCODE_REGISTER_ACK 0x0006
+#define        MPCP_OPCODE_PAUSE   0x0001
+#define        MPCP_OPCODE_GATE    0x0002
+#define        MPCP_OPCODE_REPORT  0x0003
+#define        MPCP_OPCODE_REG_REQ 0x0004
+#define        MPCP_OPCODE_REG     0x0005
+#define        MPCP_OPCODE_REG_ACK 0x0006

 
 static const struct tok mpcp_opcode_values[] = {
     { MPCP_OPCODE_PAUSE, "Pause" },
     { MPCP_OPCODE_GATE, "Gate" },
     { MPCP_OPCODE_REPORT, "Report" },
 
 static const struct tok mpcp_opcode_values[] = {
     { MPCP_OPCODE_PAUSE, "Pause" },
     { MPCP_OPCODE_GATE, "Gate" },
     { MPCP_OPCODE_REPORT, "Report" },

-    { MPCP_OPCODE_REGISTER_REQ, "Register Request" },
-    { MPCP_OPCODE_REGISTER, "Register" },
-    { MPCP_OPCODE_REGISTER_ACK, "Register ACK" },
+    { MPCP_OPCODE_REG_REQ, "Register Request" },
+    { MPCP_OPCODE_REG, "Register" },
+    { MPCP_OPCODE_REG_ACK, "Register ACK" },

     { 0, NULL}
 };
 
     { 0, NULL}
 };
 

-#define        MPCP_GRANT_NUMBER_MASK 0x7 
+#define MPCP_GRANT_NUMBER_LEN 1
+#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" },


@@ -70,17 +64,30 @@ static const struct tok mpcp_grant_flag_values[] = {
 };
 
 struct mpcp_grant_t {
 };
 
 struct mpcp_grant_t {

-    u_int8_t starttime[4];
-    u_int8_t length[2];
+    uint8_t starttime[MPCP_TIMESTAMP_LEN];
+    uint8_t duration[MPCP_TIMESTAMP_DURATION_LEN];

 };
 
 };
 

-static const struct tok mpcp_register_req_flag_values[] = {
+struct mpcp_reg_req_t {
+    uint8_t flags;
+    uint8_t pending_grants;
+};
+
+
+static const struct tok mpcp_reg_req_flag_values[] = {

     { 1, "Register" },
     { 3, "De-Register" },
     { 0, NULL}
 };
 
     { 1, "Register" },
     { 3, "De-Register" },
     { 0, NULL}
 };
 

-static const struct tok mpcp_register_flag_values[] = {
+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;
+};
+
+static const struct tok mpcp_reg_flag_values[] = {

     { 1, "Re-Register" },
     { 2, "De-Register" },
     { 3, "ACK" },
     { 1, "Re-Register" },
     { 2, "De-Register" },
     { 3, "ACK" },


@@ -88,38 +95,61 @@ static const struct tok mpcp_register_flag_values[] = {
     { 0, NULL}
 };
 
     { 0, NULL}
 };
 

-static const struct tok mpcp_register_ack_flag_values[] = {
+#define MPCP_REPORT_QUEUESETS_LEN    1
+#define MPCP_REPORT_REPORTBITMAP_LEN 1
+static const struct tok mpcp_report_bitmap_values[] = {
+    { 0x01, "Q0" },
+    { 0x02, "Q1" },
+    { 0x04, "Q2" },
+    { 0x08, "Q3" },
+    { 0x10, "Q4" },
+    { 0x20, "Q5" },
+    { 0x40, "Q6" },
+    { 0x80, "Q7" },
+    { 0, NULL}
+};
+
+struct mpcp_reg_ack_t {
+    uint8_t flags;
+    uint8_t echoed_assigned_port[2];
+    uint8_t echoed_sync_time[MPCP_TIMESTAMP_DURATION_LEN];
+};
+
+static const struct tok mpcp_reg_ack_flag_values[] = {

     { 0, "NACK" },
     { 1, "ACK" },
     { 0, NULL}
 };
 
 void
     { 0, "NACK" },
     { 1, "ACK" },
     { 0, NULL}
 };
 
 void

-mpcp_print(register const u_char *pptr, register u_int length) {
+mpcp_print(netdissect_options *ndo, register const u_char *pptr, register u_int length) {

 
     union {
         const struct mpcp_common_header_t *common_header;
         const struct mpcp_grant_t *grant;
 
     union {
         const struct mpcp_common_header_t *common_header;
         const struct mpcp_grant_t *grant;

+        const struct mpcp_reg_req_t *reg_req;
+        const struct mpcp_reg_t *reg;
+        const struct mpcp_reg_ack_t *reg_ack;

     } mpcp;
 
 
     const u_char *tptr;
     } mpcp;
 
 
     const u_char *tptr;

-    u_int16_t opcode;
-    u_int8_t grant_numbers, grant;
+    uint16_t opcode;
+    uint8_t grant_numbers, grant;
+    uint8_t queue_sets, queue_set, report_bitmap, report;

 
     tptr=pptr;
     mpcp.common_header = (const struct mpcp_common_header_t *)pptr;
 
     tptr=pptr;
     mpcp.common_header = (const struct mpcp_common_header_t *)pptr;

-    TCHECK(*mpcp.common_header);

 
 

+    ND_TCHECK2(*tptr, sizeof(const struct mpcp_common_header_t));

     opcode = EXTRACT_16BITS(mpcp.common_header->opcode);
     opcode = EXTRACT_16BITS(mpcp.common_header->opcode);

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

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

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

     }
     }

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

 
 

-    if (!vflag)
+    if (!ndo->ndo_vflag)

         return;
 
     tptr += sizeof(const struct mpcp_common_header_t);
         return;
 
     tptr += sizeof(const struct mpcp_common_header_t);


@@ -129,36 +159,102 @@ mpcp_print(register const u_char *pptr, register u_int length) {
         break;
 
     case MPCP_OPCODE_GATE:
         break;
 
     case MPCP_OPCODE_GATE:

+        ND_TCHECK2(*tptr, MPCP_GRANT_NUMBER_LEN);

         grant_numbers = *tptr & MPCP_GRANT_NUMBER_MASK;
         grant_numbers = *tptr & MPCP_GRANT_NUMBER_MASK;

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

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

-                          *tptr &~ MPCP_GRANT_NUMBER_MASK));
+                          *tptr &~ MPCP_GRANT_NUMBER_MASK)));

         tptr++;
 
         for (grant = 1; grant <= grant_numbers; grant++) {
         tptr++;
 
         for (grant = 1; grant <= grant_numbers; grant++) {

-            mpcp.grant = (const struct mpcp_grant_t *)tptr;        
-            printf("\n\tGrant #%u, Start-Time %u, length %u",
+            ND_TCHECK2(*tptr, sizeof(const 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",

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

-                   EXTRACT_16BITS(mpcp.grant->length));
+                   EXTRACT_16BITS(mpcp.grant->duration)));

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

-        printf("\n\tSync-Time %u", EXTRACT_16BITS(tptr));
+        ND_TCHECK2(*tptr, MPCP_TIMESTAMP_DURATION_LEN);
+        ND_PRINT((ndo, "\n\tSync-Time %u ticks", EXTRACT_16BITS(tptr)));

         break;
 
         break;
 

-        /* FIXME */
+

     case MPCP_OPCODE_REPORT:
     case MPCP_OPCODE_REPORT:

-    case MPCP_OPCODE_REGISTER_REQ:
-    case MPCP_OPCODE_REGISTER:
-    case MPCP_OPCODE_REGISTER_ACK:
+        ND_TCHECK2(*tptr, MPCP_REPORT_QUEUESETS_LEN);
+        queue_sets = *tptr;
+        tptr+=MPCP_REPORT_QUEUESETS_LEN;
+        ND_PRINT((ndo, "\n\tTotal Queue-Sets %u", queue_sets));
+
+        for (queue_set = 1; queue_set < queue_sets; queue_set++) {
+            ND_TCHECK2(*tptr, MPCP_REPORT_REPORTBITMAP_LEN);
+            report_bitmap = *(tptr);
+            ND_PRINT((ndo, "\n\t  Queue-Set #%u, Report-Bitmap [ %s ]",
+                   queue_sets,
+                   bittok2str(mpcp_report_bitmap_values, "Unknown", report_bitmap)));
+            tptr++;
+
+            report=1;
+            while (report_bitmap != 0) {
+                if (report_bitmap & 1) {
+                    ND_TCHECK2(*tptr, MPCP_TIMESTAMP_DURATION_LEN);
+                    ND_PRINT((ndo, "\n\t    Q%u Report, Duration %u ticks",
+                           report,
+                           EXTRACT_16BITS(tptr)));
+                    tptr+=MPCP_TIMESTAMP_DURATION_LEN;
+                }
+                report++;
+                report_bitmap = report_bitmap >> 1;
+            }
+        }
+        break;
+
+    case MPCP_OPCODE_REG_REQ:
+        ND_TCHECK2(*tptr, sizeof(const 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));
+        break;
+
+    case MPCP_OPCODE_REG:
+        ND_TCHECK2(*tptr, sizeof(const struct mpcp_reg_t));
+        mpcp.reg = (const struct mpcp_reg_t *)tptr;
+        ND_PRINT((ndo, "\n\tAssigned-Port %u, Flags [ %s ]" \
+               "\n\tSync-Time %u ticks, Echoed-Pending-Grants %u",
+               EXTRACT_16BITS(mpcp.reg->assigned_port),
+               bittok2str(mpcp_reg_flag_values, "Reserved", mpcp.reg->flags),
+               EXTRACT_16BITS(mpcp.reg->sync_time),
+               mpcp.reg->echoed_pending_grants));
+        break;
+
+    case MPCP_OPCODE_REG_ACK:
+        ND_TCHECK2(*tptr, sizeof(const 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 ]" \
+               "\n\tEchoed-Sync-Time %u ticks",
+               EXTRACT_16BITS(mpcp.reg_ack->echoed_assigned_port),
+               bittok2str(mpcp_reg_ack_flag_values, "Reserved", mpcp.reg_ack->flags),
+               EXTRACT_16BITS(mpcp.reg_ack->echoed_sync_time)));
+        break;
+

     default:
     default:

+        /* unknown opcode - hexdump for now */
+        print_unknown_data(ndo,pptr, "\n\t", length);

         break;
     }
 
     return;
         break;
     }
 
     return;

+

 trunc:
 trunc:

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

 }
 }

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