X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/585ac3db0663f474fd3417ea91953b58022cc9d9..refs/pull/433/head:/print-mpcp.c diff --git a/print-mpcp.c b/print-mpcp.c index cf36866f..7ddfb1d1 100644 --- a/print-mpcp.c +++ b/print-mpcp.c @@ -17,27 +17,22 @@ * Original code by Hannes Gredler (hannes@juniper.net) */ +#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif #include -#include -#include -#include - #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 { - u_int8_t opcode[2]; - u_int8_t timestamp[MPCP_TIMESTAMP_LEN]; + uint8_t opcode[2]; + uint8_t timestamp[MPCP_TIMESTAMP_LEN]; }; #define MPCP_OPCODE_PAUSE 0x0001 @@ -69,13 +64,13 @@ static const struct tok mpcp_grant_flag_values[] = { }; struct mpcp_grant_t { - u_int8_t starttime[MPCP_TIMESTAMP_LEN]; - u_int8_t duration[MPCP_TIMESTAMP_DURATION_LEN]; + uint8_t starttime[MPCP_TIMESTAMP_LEN]; + uint8_t duration[MPCP_TIMESTAMP_DURATION_LEN]; }; struct mpcp_reg_req_t { - u_int8_t flags; - u_int8_t pending_grants; + uint8_t flags; + uint8_t pending_grants; }; @@ -86,10 +81,10 @@ static const struct tok mpcp_reg_req_flag_values[] = { }; struct mpcp_reg_t { - u_int8_t assigned_port[2]; - u_int8_t flags; - u_int8_t sync_time[MPCP_TIMESTAMP_DURATION_LEN]; - u_int8_t echoed_pending_grants; + 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[] = { @@ -115,9 +110,9 @@ static const struct tok mpcp_report_bitmap_values[] = { }; struct mpcp_reg_ack_t { - u_int8_t flags; - u_int8_t echoed_assigned_port[2]; - u_int8_t echoed_sync_time[MPCP_TIMESTAMP_DURATION_LEN]; + 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[] = { @@ -127,7 +122,7 @@ static const struct tok mpcp_reg_ack_flag_values[] = { }; 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; @@ -139,23 +134,22 @@ mpcp_print(register const u_char *pptr, register u_int length) { const u_char *tptr; - u_int16_t opcode; - u_int8_t grant_numbers, grant; - u_int8_t queue_sets, queue_set, report_bitmap, report; + 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; - if (!TTEST2(*tptr, sizeof(const struct mpcp_common_header_t))) - goto trunc; + ND_TCHECK2(*tptr, sizeof(const struct mpcp_common_header_t)); 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) { - printf(", Timestamp %u ticks", 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); @@ -165,57 +159,51 @@ mpcp_print(register const u_char *pptr, register u_int length) { break; case MPCP_OPCODE_GATE: - if (!TTEST2(*tptr, MPCP_GRANT_NUMBER_LEN)) - goto trunc; + ND_TCHECK2(*tptr, MPCP_GRANT_NUMBER_LEN); 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, "?", - *tptr &~ MPCP_GRANT_NUMBER_MASK)); + *tptr &~ MPCP_GRANT_NUMBER_MASK))); tptr++; for (grant = 1; grant <= grant_numbers; grant++) { - if (!TTEST2(*tptr, sizeof(const struct mpcp_grant_t))) - goto trunc; + ND_TCHECK2(*tptr, sizeof(const struct mpcp_grant_t)); mpcp.grant = (const struct mpcp_grant_t *)tptr; - printf("\n\tGrant #%u, Start-Time %u ticks, duration %u ticks", + ND_PRINT((ndo, "\n\tGrant #%u, Start-Time %u ticks, duration %u ticks", grant, EXTRACT_32BITS(mpcp.grant->starttime), - EXTRACT_16BITS(mpcp.grant->duration)); + EXTRACT_16BITS(mpcp.grant->duration))); tptr += sizeof(const struct mpcp_grant_t); } - if (!TTEST2(*tptr, MPCP_TIMESTAMP_DURATION_LEN)) - goto trunc; - printf("\n\tSync-Time %u ticks", EXTRACT_16BITS(tptr)); + ND_TCHECK2(*tptr, MPCP_TIMESTAMP_DURATION_LEN); + ND_PRINT((ndo, "\n\tSync-Time %u ticks", EXTRACT_16BITS(tptr))); break; case MPCP_OPCODE_REPORT: - if (!TTEST2(*tptr, MPCP_REPORT_QUEUESETS_LEN)) - goto trunc; + ND_TCHECK2(*tptr, MPCP_REPORT_QUEUESETS_LEN); queue_sets = *tptr; tptr+=MPCP_REPORT_QUEUESETS_LEN; - printf("\n\tTotal Queue-Sets %u", queue_sets); + ND_PRINT((ndo, "\n\tTotal Queue-Sets %u", queue_sets)); for (queue_set = 1; queue_set < queue_sets; queue_set++) { - if (!TTEST2(*tptr, MPCP_REPORT_REPORTBITMAP_LEN)) - goto trunc; + ND_TCHECK2(*tptr, MPCP_REPORT_REPORTBITMAP_LEN); report_bitmap = *(tptr); - printf("\n\t Queue-Set #%u, Report-Bitmap [ %s ]", + ND_PRINT((ndo, "\n\t Queue-Set #%u, Report-Bitmap [ %s ]", 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) { - if (!TTEST2(*tptr, MPCP_TIMESTAMP_DURATION_LEN)) - goto trunc; - printf("\n\t Q%u Report, Duration %u ticks", + ND_TCHECK2(*tptr, MPCP_TIMESTAMP_DURATION_LEN); + ND_PRINT((ndo, "\n\t Q%u Report, Duration %u ticks", report, - EXTRACT_16BITS(tptr)); + EXTRACT_16BITS(tptr))); tptr+=MPCP_TIMESTAMP_DURATION_LEN; } report++; @@ -225,47 +213,44 @@ mpcp_print(register const u_char *pptr, register u_int length) { break; case MPCP_OPCODE_REG_REQ: - if (!TTEST2(*tptr, sizeof(const struct mpcp_reg_req_t))) - goto trunc; + ND_TCHECK2(*tptr, sizeof(const struct mpcp_reg_req_t)); mpcp.reg_req = (const struct mpcp_reg_req_t *)tptr; - printf("\n\tFlags [ %s ], Pending-Grants %u", + 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); + mpcp.reg_req->pending_grants)); break; case MPCP_OPCODE_REG: - if (!TTEST2(*tptr, sizeof(const struct mpcp_reg_t))) - goto trunc; + ND_TCHECK2(*tptr, sizeof(const struct mpcp_reg_t)); mpcp.reg = (const struct mpcp_reg_t *)tptr; - printf("\n\tAssigned-Port %u, Flags [ %s ]" \ + 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); + mpcp.reg->echoed_pending_grants)); break; case MPCP_OPCODE_REG_ACK: - if (!TTEST2(*tptr, sizeof(const struct mpcp_reg_ack_t))) - goto trunc; + ND_TCHECK2(*tptr, sizeof(const struct mpcp_reg_ack_t)); mpcp.reg_ack = (const struct mpcp_reg_ack_t *)tptr; - printf("\n\tEchoed-Assigned-Port %u, Flags [ %s ]" \ + 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)); + EXTRACT_16BITS(mpcp.reg_ack->echoed_sync_time))); break; default: /* unknown opcode - hexdump for now */ - print_unknown_data(gndo,pptr, "\n\t", length); + print_unknown_data(ndo,pptr, "\n\t", length); break; } return; trunc: - printf("\n\t[|MPCP]"); + ND_PRINT((ndo, "\n\t[|MPCP]")); } /* * Local Variables: