diff options
author | Gilbert Ramirez <gram@alumni.rice.edu> | 1999-07-07 22:52:57 +0000 |
---|---|---|
committer | Gilbert Ramirez <gram@alumni.rice.edu> | 1999-07-07 22:52:57 +0000 |
commit | 07f42b5b31f9523deeb147226521f77a2c8dd797 (patch) | |
tree | c720d2a42f11c9d14ac1a161eb785b438c2c4b14 /packet-trmac.c | |
parent | fba49cfe85d4b23ebbffa97fae126a379e913ecd (diff) |
Created a new protocol tree implementation and a new display filter
mechanism that is built into ethereal. Wiretap is now used to read all
file formats. Libpcap is used only for capturing.
svn path=/trunk/; revision=342
Diffstat (limited to 'packet-trmac.c')
-rw-r--r-- | packet-trmac.c | 93 |
1 files changed, 45 insertions, 48 deletions
diff --git a/packet-trmac.c b/packet-trmac.c index 5bba8b17f2..ff58766fc8 100644 --- a/packet-trmac.c +++ b/packet-trmac.c @@ -2,7 +2,7 @@ * Routines for Token-Ring Media Access Control * Gilbert Ramirez <gram@verdict.uthscsa.edu> * - * $Id: packet-trmac.c,v 1.11 1999/03/23 03:14:44 gram Exp $ + * $Id: packet-trmac.c,v 1.12 1999/07/07 22:51:56 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@unicom.net> @@ -81,161 +81,159 @@ sv_text(const u_char *pd, int pkt_offset, proto_tree *tree) u_char errors[6]; /* isolating or non-isolating */ /* this just adds to the clutter on the screen... - proto_tree_add_item(tree, pkt_offset, 1, + proto_tree_add_text(tree, pkt_offset, 1, "Subvector Length: %d bytes", sv_length);*/ switch(pd[1]) { case 0x01: /* Beacon Type */ - proto_tree_add_item(tree, pkt_offset+1, sv_length-1, + proto_tree_add_text(tree, pkt_offset+1, sv_length-1, "Beacon Type: %s", beacon[ pntohs( &pd[2] ) ] ); break; case 0x02: /* NAUN */ - proto_tree_add_item(tree, pkt_offset+1, sv_length-1, + proto_tree_add_text(tree, pkt_offset+1, sv_length-1, "NAUN: %s", ether_to_str((guint8*)&pd[2])); break; case 0x03: /* Local Ring Number */ - proto_tree_add_item(tree, pkt_offset+1, sv_length-1, + proto_tree_add_text(tree, pkt_offset+1, sv_length-1, "Local Ring Number: 0x%04X (%d)", pntohs( &pd[2] ), pntohs( &pd[2] )); break; case 0x04: /* Assign Physical Location */ - proto_tree_add_item(tree, pkt_offset+1, sv_length-1, + proto_tree_add_text(tree, pkt_offset+1, sv_length-1, "Assign Physical Location: 0x%08X", pntohl( &pd[2] ) ); break; case 0x05: /* Soft Error Report Value */ - proto_tree_add_item(tree, pkt_offset+1, sv_length-1, + proto_tree_add_text(tree, pkt_offset+1, sv_length-1, "Soft Error Report Value: %d ms", 10 * pntohs( &pd[2] ) ); break; case 0x06: /* Enabled Function Classes */ - proto_tree_add_item(tree, pkt_offset+1, sv_length-1, + proto_tree_add_text(tree, pkt_offset+1, sv_length-1, "Enabled Function Classes: %04X", pntohs( &pd[2] ) ); break; case 0x07: /* Allowed Access Priority */ - proto_tree_add_item(tree, pkt_offset+1, sv_length-1, + proto_tree_add_text(tree, pkt_offset+1, sv_length-1, "Allowed Access Priority: %04X", pntohs( &pd[2] ) ); break; case 0x09: /* Correlator */ - proto_tree_add_item(tree, pkt_offset+1, sv_length-1, + proto_tree_add_text(tree, pkt_offset+1, sv_length-1, "Correlator: %04X", pntohs( &pd[2] ) ); break; case 0x0A: /* Address of last neighbor notification */ - proto_tree_add_item(tree, pkt_offset+1, sv_length-1, + proto_tree_add_text(tree, pkt_offset+1, sv_length-1, "Address of Last Neighbor Notification: %s", ether_to_str((guint8*)&pd[2])); break; case 0x0B: /* Physical Location */ - proto_tree_add_item(tree, pkt_offset+1, sv_length-1, + proto_tree_add_text(tree, pkt_offset+1, sv_length-1, "Physical Location: 0x%08X", pntohl( &pd[2] ) ); break; case 0x20: /* Response Code */ - proto_tree_add_item(tree, pkt_offset+1, sv_length-1, + proto_tree_add_text(tree, pkt_offset+1, sv_length-1, "Response Code: 0x%04X 0x%04X", pntohl( &pd[2] ), pntohl( &pd[4] ) ); break; case 0x21: /* Reserved */ - proto_tree_add_item(tree, pkt_offset+1, sv_length-1, + proto_tree_add_text(tree, pkt_offset+1, sv_length-1, "Reserved: 0x%04X", pntohs( &pd[2] ) ); break; case 0x22: /* Product Instance ID */ - proto_tree_add_item(tree, pkt_offset+1, sv_length-1, + proto_tree_add_text(tree, pkt_offset+1, sv_length-1, "Product Instance ID: ..."); break; case 0x23: /* Ring Station Microcode Level */ - proto_tree_add_item(tree, pkt_offset+1, sv_length-1, + proto_tree_add_text(tree, pkt_offset+1, sv_length-1, "Ring Station Microcode Level: ..."); break; case 0x26: /* Wrap data */ - proto_tree_add_item(tree, pkt_offset+1, sv_length-1, + proto_tree_add_text(tree, pkt_offset+1, sv_length-1, "Wrap Data: ... (%d bytes)", sv_length - 2); break; case 0x27: /* Frame Forward */ - proto_tree_add_item(tree, pkt_offset+1, sv_length-1, + proto_tree_add_text(tree, pkt_offset+1, sv_length-1, "Frame Forward: ... (%d bytes)", sv_length - 2); break; case 0x29: /* Ring Station Status Subvector */ - proto_tree_add_item(tree, pkt_offset+1, sv_length-1, + proto_tree_add_text(tree, pkt_offset+1, sv_length-1, "Ring Station Status Subvector: ..."); break; case 0x2A: /* Transmit Status Code */ - proto_tree_add_item(tree, pkt_offset+1, sv_length-1, + proto_tree_add_text(tree, pkt_offset+1, sv_length-1, "Transmit Status Code: %04X", pntohs( &pd[2] ) ); break; case 0x2B: /* Group Address */ - proto_tree_add_item(tree, pkt_offset+1, sv_length-1, + proto_tree_add_text(tree, pkt_offset+1, sv_length-1, "Group Address: %08X", pntohl( &pd[2] ) ); break; case 0x2C: /* Functional Address */ - proto_tree_add_item(tree, pkt_offset+1, sv_length-1, + proto_tree_add_text(tree, pkt_offset+1, sv_length-1, "Functional Address: %08X", pntohl( &pd[2] ) ); break; case 0x2D: /* Isolating Error Counts */ memcpy(errors, &pd[2], 6); - ti = proto_tree_add_item(tree, pkt_offset+1, sv_length-1, + ti = proto_tree_add_text(tree, pkt_offset+1, sv_length-1, "Isolating Error Counts (%d total)", errors[0] + errors[1] + errors[2] + errors[3] + errors[4]); - sv_tree = proto_tree_new(); - proto_item_add_subtree(ti, sv_tree, ETT_TR_IERR_CNT); + sv_tree = proto_item_add_subtree(ti, ETT_TR_IERR_CNT); - proto_tree_add_item(sv_tree, pkt_offset+2, 1, + proto_tree_add_text(sv_tree, pkt_offset+2, 1, "Line Errors: %d", errors[0]); - proto_tree_add_item(sv_tree, pkt_offset+3, 1, + proto_tree_add_text(sv_tree, pkt_offset+3, 1, "Internal Errors: %d", errors[1]); - proto_tree_add_item(sv_tree, pkt_offset+4, 1, + proto_tree_add_text(sv_tree, pkt_offset+4, 1, "Burst Errors: %d", errors[2]); - proto_tree_add_item(sv_tree, pkt_offset+5, 1, + proto_tree_add_text(sv_tree, pkt_offset+5, 1, "A/C Errors: %d", errors[3]); - proto_tree_add_item(sv_tree, pkt_offset+6, 1, + proto_tree_add_text(sv_tree, pkt_offset+6, 1, "Abort delimiter transmitted: %d", errors[4]); break; case 0x2E: /* Non-Isolating Error Counts */ memcpy(errors, &pd[2], 6); - ti = proto_tree_add_item(tree, pkt_offset+1, sv_length-1, + ti = proto_tree_add_text(tree, pkt_offset+1, sv_length-1, "Non-Isolating Error Counts (%d total)", errors[0] + errors[1] + errors[2] + errors[3] + errors[4]); - sv_tree = proto_tree_new(); - proto_item_add_subtree(ti, sv_tree, ETT_TR_NERR_CNT); + sv_tree = proto_item_add_subtree(ti, ETT_TR_NERR_CNT); - proto_tree_add_item(sv_tree, pkt_offset+2, 1, + proto_tree_add_text(sv_tree, pkt_offset+2, 1, "Lost Frame Errors: %d", errors[0]); - proto_tree_add_item(sv_tree, pkt_offset+3, 1, + proto_tree_add_text(sv_tree, pkt_offset+3, 1, "Receiver Congestion: %d", errors[1]); - proto_tree_add_item(sv_tree, pkt_offset+4, 1, + proto_tree_add_text(sv_tree, pkt_offset+4, 1, "Frame-Copied Congestion: %d", errors[2]); - proto_tree_add_item(sv_tree, pkt_offset+5, 1, + proto_tree_add_text(sv_tree, pkt_offset+5, 1, "Frequency Errors: %d", errors[3]); - proto_tree_add_item(sv_tree, pkt_offset+6, 1, + proto_tree_add_text(sv_tree, pkt_offset+6, 1, "Token Errors: %d", errors[4]); break; case 0x30: /* Error Code */ - proto_tree_add_item(tree, pkt_offset+1, sv_length-1, + proto_tree_add_text(tree, pkt_offset+1, sv_length-1, "Error Code: %04X", pntohs( &pd[2] ) ); break; default: /* Unknown */ - proto_tree_add_item(tree, pkt_offset+1, 1, + proto_tree_add_text(tree, pkt_offset+1, 1, "Unknown Sub-Vector: 0x%02X", pd[1]); } return sv_length; @@ -255,10 +253,9 @@ dissect_trmac(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) { mv_length = pntohs(&pd[offset]); if (tree) { - ti = proto_tree_add_item(tree, offset, mv_length, + ti = proto_tree_add_text(tree, offset, mv_length, "Media Access Control"); - mac_tree = proto_tree_new(); - proto_item_add_subtree(ti, mac_tree, ETT_TR_MAC); + mac_tree = proto_item_add_subtree(ti, ETT_TR_MAC); } /* Interpret the major vector */ @@ -272,16 +269,16 @@ dissect_trmac(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) { if (tree) { if (mv_text) - proto_tree_add_item(mac_tree, offset+3, 1, "Major Vector Command: %s", + proto_tree_add_text(mac_tree, offset+3, 1, "Major Vector Command: %s", mv_text); else - proto_tree_add_item(mac_tree, offset+3, 1, "Major Vector Command: %02X (Unknown)", + proto_tree_add_text(mac_tree, offset+3, 1, "Major Vector Command: %02X (Unknown)", pd[offset+3]); - proto_tree_add_item(mac_tree, offset, 2, "Total Length: %d bytes", + proto_tree_add_text(mac_tree, offset, 2, "Total Length: %d bytes", mv_length); - proto_tree_add_item(mac_tree, offset+2, 1, "Source Class: %s", + proto_tree_add_text(mac_tree, offset+2, 1, "Source Class: %s", class[ pd[offset+2] & 0x0f ]); - proto_tree_add_item(mac_tree, offset+2, 1, "Destination Class: %s", + proto_tree_add_text(mac_tree, offset+2, 1, "Destination Class: %s", class[ pd[offset+2] >> 4 ]); /* interpret the subvectors */ |