osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
wireshark/epan/dissectors/packet-trmac.c

621 lines
20 KiB
C
Raw Normal View History

Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
/* packet-trmac.c
* Routines for Token-Ring Media Access Control
Hopefully the last time I have to change my e-mail address. svn path=/trunk/; revision=4199
2001-11-13 23:55:44 +00:00
* Gilbert Ramirez <gram@alumni.rice.edu>
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
*
Set the svn:eol-style property on all text files to "native", so that they have LF at the end of the line on UN*X and CR/LF on Windows; hopefully this means that if a CR/LF version is checked in on Windows, the CRs will be stripped so that they show up only when checked out on Windows, not on UN*X. svn path=/trunk/; revision=11400
2004-07-18 00:24:25 +00:00
* $Id$
Added ID tags to the beginning of each source file. svn path=/trunk/; revision=7
1998-09-16 03:22:19 +00:00
*
change a whole bunch of ethereal into wireshark svn path=/trunk/; revision=18196
2006-05-21 04:49:01 +00:00
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
* Copyright 1998 Gerald Combs
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
*
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
*
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
*
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
Update Free Software Foundation address. (COPYING will be updated in next commit) svn path=/trunk/; revision=43536
2012-06-28 22:56:06 +00:00
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
*/
We always HAVE_CONFIG_H so don't bother checking whether we have it or not. svn path=/trunk/; revision=45017
2012-09-20 02:03:38 +00:00
#include "config.h"
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
Add #include <string.h>, to get prototypes for mem* and str* functions. svn path=/trunk/; revision=2654
2000-11-17 21:00:40 +00:00
#include <string.h>
Removed all references to gtk objects from packet*.[ch] files. They now reference the protocol tree with struct proto_tree and struct proto_item objects. That way, the packet decoding source code file can be used with non-gtk packet decoders, like a curses-based ethereal, e.g. I also re-arranged some of the information in packet.h to more appropriate places (like other packet-*.[ch] files). svn path=/trunk/; revision=223
1999-03-23 03:14:46 +00:00
#include <glib.h>
Include files from the "epan" directory and subdirectories thereof with "epan/..." pathnames, so as to avoid collisions with header files in any of the directories in which we look (e.g., "proto.h", as some other package has its own "proto.h" file which it installs in the top-level include directory). Don't add "-I" flags to search "epan", as that's no longer necessary (and we want includes of "epan" headers to fail if the "epan/" is left out, so that we don't re-introduce includes lacking "epan/"). svn path=/trunk/; revision=4586
2002-01-21 07:37:49 +00:00
#include <epan/packet.h>
For subvectors, make a top-level item to cover the entire subvector, and put the length, identifier, and value as visible sub-items underneath it. If the length is bad, add an expert info indication under the item for the length, rather than using proto_malformed. Add checks for the lengths of each type of subvector. Add some more subvector types from IEEE 802.5-1998, and use the names from that spec. svn path=/trunk/; revision=47923
2013-02-27 22:07:44 +00:00
#include <epan/expert.h>
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
Made the protocol (but not the fields) use the new proto_tree routine, allowing users to filter on the existence of these protocols. I also added packet-clip.c to the Nmake makefile. svn path=/trunk/; revision=402
1999-07-29 05:47:07 +00:00
static int proto_trmac = -1;
Changed short packet handling in TR code to understand minimum-length TR packets (it's a variable-length header, remember). Added lots of proto_tree-style fields to TRMAC code. svn path=/trunk/; revision=683
1999-09-17 04:20:23 +00:00
static int hf_trmac_mv = -1;
static int hf_trmac_length = -1;
static int hf_trmac_srcclass = -1;
static int hf_trmac_dstclass = -1;
For subvectors, make a top-level item to cover the entire subvector, and put the length, identifier, and value as visible sub-items underneath it. If the length is bad, add an expert info indication under the item for the length, rather than using proto_malformed. Add checks for the lengths of each type of subvector. Add some more subvector types from IEEE 802.5-1998, and use the names from that spec. svn path=/trunk/; revision=47923
2013-02-27 22:07:44 +00:00
static int hf_trmac_sv_len = -1;
static int hf_trmac_sv_id = -1;
Changed short packet handling in TR code to understand minimum-length TR packets (it's a variable-length header, remember). Added lots of proto_tree-style fields to TRMAC code. svn path=/trunk/; revision=683
1999-09-17 04:20:23 +00:00
static int hf_trmac_errors_iso = -1;
static int hf_trmac_errors_line = -1;
static int hf_trmac_errors_internal = -1;
static int hf_trmac_errors_burst = -1;
static int hf_trmac_errors_ac = -1;
static int hf_trmac_errors_abort = -1;
static int hf_trmac_errors_noniso = -1;
static int hf_trmac_errors_lost = -1;
static int hf_trmac_errors_congestion = -1;
static int hf_trmac_errors_fc = -1;
static int hf_trmac_errors_freq = -1;
static int hf_trmac_errors_token = -1;
static int hf_trmac_naun = -1;
Made the protocol (but not the fields) use the new proto_tree routine, allowing users to filter on the existence of these protocols. I also added packet-clip.c to the Nmake makefile. svn path=/trunk/; revision=402
1999-07-29 05:47:07 +00:00
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
static gint ett_tr_mac = -1;
For subvectors, make a top-level item to cover the entire subvector, and put the length, identifier, and value as visible sub-items underneath it. If the length is bad, add an expert info indication under the item for the length, rather than using proto_malformed. Add checks for the lengths of each type of subvector. Add some more subvector types from IEEE 802.5-1998, and use the names from that spec. svn path=/trunk/; revision=47923
2013-02-27 22:07:44 +00:00
static gint ett_tr_sv = -1;
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
static gint ett_tr_ierr_cnt = -1;
static gint ett_tr_nerr_cnt = -1;
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
/* Major Vector */
Use const with value_string array definitions svn path=/trunk/; revision=26028
2008-08-14 23:51:52 +00:00
static const value_string major_vector_vs[] = {
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
{ 0x00, "Response" },
{ 0x02, "Beacon" },
{ 0x03, "Claim Token" },
{ 0x04, "Ring Purge" },
{ 0x05, "Active Monitor Present" },
{ 0x06, "Standby Monitor Present" },
{ 0x07, "Duplicate Address Test" },
{ 0x09, "Transmit Forward" },
{ 0x0B, "Remove Ring Station" },
{ 0x0C, "Change Parameters" },
{ 0x0D, "Initialize Ring Station" },
{ 0x0E, "Request Ring Station Address" },
{ 0x0F, "Request Ring Station Address" },
{ 0x10, "Request Ring Station Attachments" },
{ 0x20, "Request Initialization" },
{ 0x22, "Report Ring Station Address" },
{ 0x23, "Report Ring Station State" },
{ 0x24, "Report Ring Station Attachments" },
{ 0x25, "Report New Active Monitor" },
{ 0x26, "Report NAUN Change" },
{ 0x27, "Report Poll Error" },
{ 0x28, "Report Monitor Errors" },
{ 0x29, "Report Error" },
{ 0x2A, "Report Transmit Forward" },
{ 0x00, NULL }
Removed some routines in support of match_strval function. svn path=/trunk/; revision=67
1998-10-21 02:36:54 +00:00
};
Changed short packet handling in TR code to understand minimum-length TR packets (it's a variable-length header, remember). Added lots of proto_tree-style fields to TRMAC code. svn path=/trunk/; revision=683
1999-09-17 04:20:23 +00:00
/* Src. and Dest. Classes */
Use const with value_string array definitions svn path=/trunk/; revision=26028
2008-08-14 23:51:52 +00:00
static const value_string classes_vs[] = {
Changed short packet handling in TR code to understand minimum-length TR packets (it's a variable-length header, remember). Added lots of proto_tree-style fields to TRMAC code. svn path=/trunk/; revision=683
1999-09-17 04:20:23 +00:00
{ 0x00, "Ring Station" },
{ 0x01, "LLC Manager" },
{ 0x04, "Configuration Report Server" },
{ 0x05, "Ring Parameter Server" },
{ 0x06, "Ring Error Monitor" },
{ 0x00, NULL }
};
For subvectors, make a top-level item to cover the entire subvector, and put the length, identifier, and value as visible sub-items underneath it. If the length is bad, add an expert info indication under the item for the length, rather than using proto_malformed. Add checks for the lengths of each type of subvector. Add some more subvector types from IEEE 802.5-1998, and use the names from that spec. svn path=/trunk/; revision=47923
2013-02-27 22:07:44 +00:00
static const value_string subvector_vs[] = {
{ 0x01, "Beacon Type" },
{ 0x02, "Upstream Neighbor's Address" },
{ 0x03, "Local Ring Number" },
{ 0x04, "Assign Physical Drop Number" },
{ 0x05, "Error Report Timer Value" },
{ 0x06, "Authorized Function Classes" },
{ 0x07, "Authorized Access Priority" },
{ 0x09, "Correlator" },
{ 0x0A, "SA of Last AMP or SMP Frame" },
{ 0x0B, "Physical Drop Number" },
{ 0x20, "Response Code" },
{ 0x21, "Individual Address Count" },
{ 0x22, "Product Instance ID" },
{ 0x23, "Ring Station Version Number" },
{ 0x26, "Wrap Data" },
{ 0x27, "Frame Forward" },
{ 0x28, "Station Identifier" },
{ 0x29, "Ring Station Status" },
{ 0x2A, "Transmit Forward Status Code" },
{ 0x2B, "Group Addresses" },
{ 0x2C, "Functional Addresses" },
{ 0x2D, "Isolating Error Counts" },
{ 0x2E, "Non-Isolating Error Counts" },
{ 0x2F, "Function Request ID" },
{ 0x30, "Error Code" },
{ 0x00, NULL }
};
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
/* Sub-vectors */
static int
For subvectors, make a top-level item to cover the entire subvector, and put the length, identifier, and value as visible sub-items underneath it. If the length is bad, add an expert info indication under the item for the length, rather than using proto_malformed. Add checks for the lengths of each type of subvector. Add some more subvector types from IEEE 802.5-1998, and use the names from that spec. svn path=/trunk/; revision=47923
2013-02-27 22:07:44 +00:00
sv_text(tvbuff_t *tvb, int svoff, packet_info *pinfo, proto_tree *tree)
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
{
For subvectors, make a top-level item to cover the entire subvector, and put the length, identifier, and value as visible sub-items underneath it. If the length is bad, add an expert info indication under the item for the length, rather than using proto_malformed. Add checks for the lengths of each type of subvector. Add some more subvector types from IEEE 802.5-1998, and use the names from that spec. svn path=/trunk/; revision=47923
2013-02-27 22:07:44 +00:00
guint sv_length, sv_id;
tvbuff-ify the TR MAC dissector. svn path=/trunk/; revision=2081
2000-06-20 03:05:37 +00:00
guint16 beacon_type, ring;
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
More char -> const char warning fixes svn path=/trunk/; revision=15222
2005-08-05 13:10:58 +00:00
const char *beacon[] = {
"Recovery mode set", "Signal loss error",
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
"Streaming signal not Claim Token MAC frame",
More char -> const char warning fixes svn path=/trunk/; revision=15222
2005-08-05 13:10:58 +00:00
"Streaming signal, Claim Token MAC frame"
};
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
For subvectors, make a top-level item to cover the entire subvector, and put the length, identifier, and value as visible sub-items underneath it. If the length is bad, add an expert info indication under the item for the length, rather than using proto_malformed. Add checks for the lengths of each type of subvector. Add some more subvector types from IEEE 802.5-1998, and use the names from that spec. svn path=/trunk/; revision=47923
2013-02-27 22:07:44 +00:00
proto_tree *sv_tree, *sv_subtree;
proto_item *sv_item, *len_item, *ti;
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
Replace the types from sys/types.h and netinet/in.h by their glib.h equivalents for the toplevel directory. The removal of winsock2.h will hopefully not cause any problems under MSVC++, as those files using struct timeval still include wtap.h, which still includes winsock2.h. svn path=/trunk/; revision=5932
2002-08-02 23:36:07 +00:00
guchar errors[6]; /* isolating or non-isolating */
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
For subvectors, make a top-level item to cover the entire subvector, and put the length, identifier, and value as visible sub-items underneath it. If the length is bad, add an expert info indication under the item for the length, rather than using proto_malformed. Add checks for the lengths of each type of subvector. Add some more subvector types from IEEE 802.5-1998, and use the names from that spec. svn path=/trunk/; revision=47923
2013-02-27 22:07:44 +00:00
sv_length = tvb_get_guint8(tvb, svoff+0);
/* Check the SV length; it must be at least 2, to include
the subvector length and indicator. */
if (sv_length < 2) {
ti = proto_tree_add_text(tree, tvb, svoff+0, 1,
"Invalid subvector: length < 2");
sv_tree = proto_item_add_subtree(ti, ett_tr_sv);
len_item = proto_tree_add_uint(sv_tree, hf_trmac_sv_len, tvb, svoff+0, 1, sv_length);
expert_add_info_format(pinfo, len_item, PI_MALFORMED, PI_ERROR,
"Subvector length is zero");
return 0; /* tells our caller to give up */
Mark frames with a subvector length of less than one as being invalid. svn path=/trunk/; revision=5610
2002-06-02 17:51:00 +00:00
}
For subvectors, make a top-level item to cover the entire subvector, and put the length, identifier, and value as visible sub-items underneath it. If the length is bad, add an expert info indication under the item for the length, rather than using proto_malformed. Add checks for the lengths of each type of subvector. Add some more subvector types from IEEE 802.5-1998, and use the names from that spec. svn path=/trunk/; revision=47923
2013-02-27 22:07:44 +00:00
sv_item = proto_tree_add_text(tree, tvb, svoff+0, sv_length,
"Subvector: length %u", sv_length);
sv_tree = proto_item_add_subtree(sv_item, ett_tr_sv);
len_item = proto_tree_add_uint(sv_tree, hf_trmac_sv_len, tvb, svoff+0, 1, sv_length);
sv_id = tvb_get_guint8(tvb, svoff+1);
proto_tree_add_uint(sv_tree, hf_trmac_sv_id, tvb, svoff+1, 1, sv_id);
proto_item_set_text(sv_item, "%s", val_to_str(sv_id, subvector_vs, "Unknown subvector ID 0x%02X"));
Changed short packet handling in TR code to understand minimum-length TR packets (it's a variable-length header, remember). Added lots of proto_tree-style fields to TRMAC code. svn path=/trunk/; revision=683
1999-09-17 04:20:23 +00:00
For subvectors, make a top-level item to cover the entire subvector, and put the length, identifier, and value as visible sub-items underneath it. If the length is bad, add an expert info indication under the item for the length, rather than using proto_malformed. Add checks for the lengths of each type of subvector. Add some more subvector types from IEEE 802.5-1998, and use the names from that spec. svn path=/trunk/; revision=47923
2013-02-27 22:07:44 +00:00
switch(sv_id) {
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
case 0x01: /* Beacon Type */
For subvectors, make a top-level item to cover the entire subvector, and put the length, identifier, and value as visible sub-items underneath it. If the length is bad, add an expert info indication under the item for the length, rather than using proto_malformed. Add checks for the lengths of each type of subvector. Add some more subvector types from IEEE 802.5-1998, and use the names from that spec. svn path=/trunk/; revision=47923
2013-02-27 22:07:44 +00:00
if (sv_length != 4) {
expert_add_info_format(pinfo, len_item, PI_MALFORMED, PI_ERROR,
"Subvector length is != 4");
break;
}
tvbuff-ify the TR MAC dissector. svn path=/trunk/; revision=2081
2000-06-20 03:05:37 +00:00
beacon_type = tvb_get_ntohs(tvb, svoff+2);
Removed two cases where protocol decoding assumed that the data in the packets were correct. Bad packets could cause segfaults. svn path=/trunk/; revision=641
1999-09-09 04:47:17 +00:00
if (beacon_type < array_length(beacon)) {
For subvectors, make a top-level item to cover the entire subvector, and put the length, identifier, and value as visible sub-items underneath it. If the length is bad, add an expert info indication under the item for the length, rather than using proto_malformed. Add checks for the lengths of each type of subvector. Add some more subvector types from IEEE 802.5-1998, and use the names from that spec. svn path=/trunk/; revision=47923
2013-02-27 22:07:44 +00:00
proto_tree_add_text(sv_tree, tvb, svoff+2, sv_length-2,
Removed two cases where protocol decoding assumed that the data in the packets were correct. Bad packets could cause segfaults. svn path=/trunk/; revision=641
1999-09-09 04:47:17 +00:00
"Beacon Type: %s", beacon[beacon_type] );
For subvectors, make a top-level item to cover the entire subvector, and put the length, identifier, and value as visible sub-items underneath it. If the length is bad, add an expert info indication under the item for the length, rather than using proto_malformed. Add checks for the lengths of each type of subvector. Add some more subvector types from IEEE 802.5-1998, and use the names from that spec. svn path=/trunk/; revision=47923
2013-02-27 22:07:44 +00:00
proto_item_append_text(sv_item,
": %s", beacon[beacon_type] );
Removed two cases where protocol decoding assumed that the data in the packets were correct. Bad packets could cause segfaults. svn path=/trunk/; revision=641
1999-09-09 04:47:17 +00:00
} else {
For subvectors, make a top-level item to cover the entire subvector, and put the length, identifier, and value as visible sub-items underneath it. If the length is bad, add an expert info indication under the item for the length, rather than using proto_malformed. Add checks for the lengths of each type of subvector. Add some more subvector types from IEEE 802.5-1998, and use the names from that spec. svn path=/trunk/; revision=47923
2013-02-27 22:07:44 +00:00
proto_tree_add_text(sv_tree, tvb, svoff+2, sv_length-2,
Removed two cases where protocol decoding assumed that the data in the packets were correct. Bad packets could cause segfaults. svn path=/trunk/; revision=641
1999-09-09 04:47:17 +00:00
"Beacon Type: Illegal value: %d", beacon_type );
For subvectors, make a top-level item to cover the entire subvector, and put the length, identifier, and value as visible sub-items underneath it. If the length is bad, add an expert info indication under the item for the length, rather than using proto_malformed. Add checks for the lengths of each type of subvector. Add some more subvector types from IEEE 802.5-1998, and use the names from that spec. svn path=/trunk/; revision=47923
2013-02-27 22:07:44 +00:00
proto_item_append_text(sv_item,
": Illegal value: %d", beacon_type );
Removed two cases where protocol decoding assumed that the data in the packets were correct. Bad packets could cause segfaults. svn path=/trunk/; revision=641
1999-09-09 04:47:17 +00:00
}
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
break;
For subvectors, make a top-level item to cover the entire subvector, and put the length, identifier, and value as visible sub-items underneath it. If the length is bad, add an expert info indication under the item for the length, rather than using proto_malformed. Add checks for the lengths of each type of subvector. Add some more subvector types from IEEE 802.5-1998, and use the names from that spec. svn path=/trunk/; revision=47923
2013-02-27 22:07:44 +00:00
case 0x02: /* Upstream Neighbor's Address */
if (sv_length != 8) {
expert_add_info_format(pinfo, len_item, PI_MALFORMED, PI_ERROR,
"Subvector length is != 8");
break;
}
proto_tree_add_item(sv_tree, hf_trmac_naun, tvb, svoff+2, sv_length-2, ENC_NA);
proto_item_append_text(sv_item, ": %s",
tvb_ether_to_str(tvb, svoff+2));
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
break;
case 0x03: /* Local Ring Number */
For subvectors, make a top-level item to cover the entire subvector, and put the length, identifier, and value as visible sub-items underneath it. If the length is bad, add an expert info indication under the item for the length, rather than using proto_malformed. Add checks for the lengths of each type of subvector. Add some more subvector types from IEEE 802.5-1998, and use the names from that spec. svn path=/trunk/; revision=47923
2013-02-27 22:07:44 +00:00
if (sv_length != 4) {
expert_add_info_format(pinfo, len_item, PI_MALFORMED, PI_ERROR,
"Subvector length is != 4");
break;
}
tvbuff-ify the TR MAC dissector. svn path=/trunk/; revision=2081
2000-06-20 03:05:37 +00:00
ring = tvb_get_ntohs(tvb, svoff+2);
For subvectors, make a top-level item to cover the entire subvector, and put the length, identifier, and value as visible sub-items underneath it. If the length is bad, add an expert info indication under the item for the length, rather than using proto_malformed. Add checks for the lengths of each type of subvector. Add some more subvector types from IEEE 802.5-1998, and use the names from that spec. svn path=/trunk/; revision=47923
2013-02-27 22:07:44 +00:00
proto_tree_add_text(sv_tree, tvb, svoff+2, sv_length-2,
tvbuff-ify the TR MAC dissector. svn path=/trunk/; revision=2081
2000-06-20 03:05:37 +00:00
"Local Ring Number: 0x%04X (%d)", ring, ring);
For subvectors, make a top-level item to cover the entire subvector, and put the length, identifier, and value as visible sub-items underneath it. If the length is bad, add an expert info indication under the item for the length, rather than using proto_malformed. Add checks for the lengths of each type of subvector. Add some more subvector types from IEEE 802.5-1998, and use the names from that spec. svn path=/trunk/; revision=47923
2013-02-27 22:07:44 +00:00
proto_item_append_text(sv_item,
": 0x%04X (%d)", ring, ring);
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
break;
For subvectors, make a top-level item to cover the entire subvector, and put the length, identifier, and value as visible sub-items underneath it. If the length is bad, add an expert info indication under the item for the length, rather than using proto_malformed. Add checks for the lengths of each type of subvector. Add some more subvector types from IEEE 802.5-1998, and use the names from that spec. svn path=/trunk/; revision=47923
2013-02-27 22:07:44 +00:00
case 0x04: /* Assign Physical Drop Number */
if (sv_length != 6) {
expert_add_info_format(pinfo, len_item, PI_MALFORMED, PI_ERROR,
"Subvector length is != 6");
break;
}
proto_tree_add_text(sv_tree, tvb, svoff+2, sv_length-2,
"Assign Physical Drop Number: 0x%08X", tvb_get_ntohl(tvb, svoff+2) );
proto_item_append_text(sv_item,
": 0x%08X", tvb_get_ntohl(tvb, svoff+2) );
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
break;
For subvectors, make a top-level item to cover the entire subvector, and put the length, identifier, and value as visible sub-items underneath it. If the length is bad, add an expert info indication under the item for the length, rather than using proto_malformed. Add checks for the lengths of each type of subvector. Add some more subvector types from IEEE 802.5-1998, and use the names from that spec. svn path=/trunk/; revision=47923
2013-02-27 22:07:44 +00:00
case 0x05: /* Error Report Timer Value */
if (sv_length != 4) {
expert_add_info_format(pinfo, len_item, PI_MALFORMED, PI_ERROR,
"Subvector length is != 4");
break;
}
proto_tree_add_text(sv_tree, tvb, svoff+2, sv_length-2,
"Error Report Timer Value: %d ms", 10 * tvb_get_ntohs(tvb, svoff+2) );
proto_item_append_text(sv_item,
": %d ms", 10 * tvb_get_ntohs(tvb, svoff+2) );
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
break;
For subvectors, make a top-level item to cover the entire subvector, and put the length, identifier, and value as visible sub-items underneath it. If the length is bad, add an expert info indication under the item for the length, rather than using proto_malformed. Add checks for the lengths of each type of subvector. Add some more subvector types from IEEE 802.5-1998, and use the names from that spec. svn path=/trunk/; revision=47923
2013-02-27 22:07:44 +00:00
case 0x06: /* Authorized Function Classes */
if (sv_length != 4) {
expert_add_info_format(pinfo, len_item, PI_MALFORMED, PI_ERROR,
"Subvector length is != 4");
break;
}
proto_tree_add_text(sv_tree, tvb, svoff+2, sv_length-2,
"Authorized Function Classes: %04X", tvb_get_ntohs(tvb, svoff+2) );
proto_item_append_text(sv_item,
": %04X", tvb_get_ntohs(tvb, svoff+2) );
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
break;
For subvectors, make a top-level item to cover the entire subvector, and put the length, identifier, and value as visible sub-items underneath it. If the length is bad, add an expert info indication under the item for the length, rather than using proto_malformed. Add checks for the lengths of each type of subvector. Add some more subvector types from IEEE 802.5-1998, and use the names from that spec. svn path=/trunk/; revision=47923
2013-02-27 22:07:44 +00:00
case 0x07: /* Authorized Access Priority */
if (sv_length != 4) {
expert_add_info_format(pinfo, len_item, PI_MALFORMED, PI_ERROR,
"Subvector length is != 4");
break;
}
proto_tree_add_text(sv_tree, tvb, svoff+2, sv_length-2,
"Authorized Access Priority: %04X", tvb_get_ntohs(tvb, svoff+2) );
proto_item_append_text(sv_item,
": %04X", tvb_get_ntohs(tvb, svoff+2) );
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
break;
case 0x09: /* Correlator */
For subvectors, make a top-level item to cover the entire subvector, and put the length, identifier, and value as visible sub-items underneath it. If the length is bad, add an expert info indication under the item for the length, rather than using proto_malformed. Add checks for the lengths of each type of subvector. Add some more subvector types from IEEE 802.5-1998, and use the names from that spec. svn path=/trunk/; revision=47923
2013-02-27 22:07:44 +00:00
if (sv_length != 4) {
expert_add_info_format(pinfo, len_item, PI_MALFORMED, PI_ERROR,
"Subvector length is != 4");
break;
}
proto_tree_add_text(sv_tree, tvb, svoff+2, sv_length-2,
tvbuff-ify the TR MAC dissector. svn path=/trunk/; revision=2081
2000-06-20 03:05:37 +00:00
"Correlator: %04X", tvb_get_ntohs(tvb, svoff+2) );
For subvectors, make a top-level item to cover the entire subvector, and put the length, identifier, and value as visible sub-items underneath it. If the length is bad, add an expert info indication under the item for the length, rather than using proto_malformed. Add checks for the lengths of each type of subvector. Add some more subvector types from IEEE 802.5-1998, and use the names from that spec. svn path=/trunk/; revision=47923
2013-02-27 22:07:44 +00:00
proto_item_append_text(sv_item,
": %04X", tvb_get_ntohs(tvb, svoff+2) );
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
break;
For subvectors, make a top-level item to cover the entire subvector, and put the length, identifier, and value as visible sub-items underneath it. If the length is bad, add an expert info indication under the item for the length, rather than using proto_malformed. Add checks for the lengths of each type of subvector. Add some more subvector types from IEEE 802.5-1998, and use the names from that spec. svn path=/trunk/; revision=47923
2013-02-27 22:07:44 +00:00
case 0x0A: /* SA of Last AMP or SMP Frame */
if (sv_length != 8) {
expert_add_info_format(pinfo, len_item, PI_MALFORMED, PI_ERROR,
"Subvector length is != 8");
break;
}
proto_tree_add_text(sv_tree, tvb, svoff+2, sv_length-2,
"SA of Last AMP or SMP Frame: %s",
tvb_ether_to_str(tvb, svoff+2));
proto_item_append_text(sv_item,
": %s",
Introduce, and start using, tvb_eth_to_str(). Export tvb_*_to_str() and put them in alphabetical order. svn path=/trunk/; revision=35602
2011-01-21 02:48:55 +00:00
tvb_ether_to_str(tvb, svoff+2));
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
break;
For subvectors, make a top-level item to cover the entire subvector, and put the length, identifier, and value as visible sub-items underneath it. If the length is bad, add an expert info indication under the item for the length, rather than using proto_malformed. Add checks for the lengths of each type of subvector. Add some more subvector types from IEEE 802.5-1998, and use the names from that spec. svn path=/trunk/; revision=47923
2013-02-27 22:07:44 +00:00
case 0x0B: /* Physical Drop Number */
if (sv_length != 6) {
expert_add_info_format(pinfo, len_item, PI_MALFORMED, PI_ERROR,
"Subvector length is != 6");
break;
}
proto_tree_add_text(sv_tree, tvb, svoff+2, sv_length-2,
"Physical Drop Number: 0x%08X", tvb_get_ntohl(tvb, svoff+2) );
proto_item_append_text(sv_item,
": 0x%08X", tvb_get_ntohl(tvb, svoff+2) );
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
break;
case 0x20: /* Response Code */
For subvectors, make a top-level item to cover the entire subvector, and put the length, identifier, and value as visible sub-items underneath it. If the length is bad, add an expert info indication under the item for the length, rather than using proto_malformed. Add checks for the lengths of each type of subvector. Add some more subvector types from IEEE 802.5-1998, and use the names from that spec. svn path=/trunk/; revision=47923
2013-02-27 22:07:44 +00:00
if (sv_length != 4 && sv_length != 6) {
expert_add_info_format(pinfo, len_item, PI_MALFORMED, PI_ERROR,
"Subvector length is != 4 and != 6");
break;
}
if (sv_length == 4) {
proto_tree_add_text(sv_tree, tvb, svoff+2, sv_length-2,
"Response Code: 0x%04X 0x%02X 0x%02x",
tvb_get_ntohs(tvb, svoff+2),
tvb_get_guint8(tvb, svoff+4),
tvb_get_guint8(tvb, svoff+5));
proto_item_append_text(sv_item,
": 0x%04X 0x%02X 0x%02x",
tvb_get_ntohs(tvb, svoff+2),
tvb_get_guint8(tvb, svoff+4),
tvb_get_guint8(tvb, svoff+5));
} else {
proto_tree_add_text(sv_tree, tvb, svoff+2, sv_length-2,
"Response Code: 0x%04X 0x%02X 0x%06X",
tvb_get_ntohs(tvb, svoff+2),
tvb_get_guint8(tvb, svoff+4),
tvb_get_ntoh24(tvb, svoff+5));
proto_item_append_text(sv_item,
": 0x%04X 0x%02X 0x%06X",
tvb_get_ntohs(tvb, svoff+2),
tvb_get_guint8(tvb, svoff+4),
tvb_get_ntoh24(tvb, svoff+5));
}
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
break;
For subvectors, make a top-level item to cover the entire subvector, and put the length, identifier, and value as visible sub-items underneath it. If the length is bad, add an expert info indication under the item for the length, rather than using proto_malformed. Add checks for the lengths of each type of subvector. Add some more subvector types from IEEE 802.5-1998, and use the names from that spec. svn path=/trunk/; revision=47923
2013-02-27 22:07:44 +00:00
case 0x21: /* Individual Address Count */
if (sv_length != 4) {
expert_add_info_format(pinfo, len_item, PI_MALFORMED, PI_ERROR,
"Subvector length is != 4");
break;
}
proto_tree_add_text(sv_tree, tvb, svoff+2, sv_length-2,
"Individual Address Count: %u", tvb_get_ntohs(tvb, svoff+2) );
proto_item_append_text(sv_item,
": %u", tvb_get_ntohs(tvb, svoff+2) );
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
break;
case 0x22: /* Product Instance ID */
For subvectors, make a top-level item to cover the entire subvector, and put the length, identifier, and value as visible sub-items underneath it. If the length is bad, add an expert info indication under the item for the length, rather than using proto_malformed. Add checks for the lengths of each type of subvector. Add some more subvector types from IEEE 802.5-1998, and use the names from that spec. svn path=/trunk/; revision=47923
2013-02-27 22:07:44 +00:00
proto_tree_add_text(sv_tree, tvb, svoff+2, sv_length-2,
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
"Product Instance ID: ...");
break;
For subvectors, make a top-level item to cover the entire subvector, and put the length, identifier, and value as visible sub-items underneath it. If the length is bad, add an expert info indication under the item for the length, rather than using proto_malformed. Add checks for the lengths of each type of subvector. Add some more subvector types from IEEE 802.5-1998, and use the names from that spec. svn path=/trunk/; revision=47923
2013-02-27 22:07:44 +00:00
case 0x23: /* Ring Station Version Number */
proto_tree_add_text(sv_tree, tvb, svoff+2, sv_length-2,
"Ring Station Version Number: ...");
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
break;
case 0x26: /* Wrap data */
For subvectors, make a top-level item to cover the entire subvector, and put the length, identifier, and value as visible sub-items underneath it. If the length is bad, add an expert info indication under the item for the length, rather than using proto_malformed. Add checks for the lengths of each type of subvector. Add some more subvector types from IEEE 802.5-1998, and use the names from that spec. svn path=/trunk/; revision=47923
2013-02-27 22:07:44 +00:00
proto_tree_add_text(sv_tree, tvb, svoff+2, sv_length-2,
"Wrap Data: ... (%u bytes)", sv_length - 2);
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
break;
case 0x27: /* Frame Forward */
For subvectors, make a top-level item to cover the entire subvector, and put the length, identifier, and value as visible sub-items underneath it. If the length is bad, add an expert info indication under the item for the length, rather than using proto_malformed. Add checks for the lengths of each type of subvector. Add some more subvector types from IEEE 802.5-1998, and use the names from that spec. svn path=/trunk/; revision=47923
2013-02-27 22:07:44 +00:00
proto_tree_add_text(sv_tree, tvb, svoff+2, sv_length-2,
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
"Frame Forward: ... (%d bytes)", sv_length - 2);
break;
For subvectors, make a top-level item to cover the entire subvector, and put the length, identifier, and value as visible sub-items underneath it. If the length is bad, add an expert info indication under the item for the length, rather than using proto_malformed. Add checks for the lengths of each type of subvector. Add some more subvector types from IEEE 802.5-1998, and use the names from that spec. svn path=/trunk/; revision=47923
2013-02-27 22:07:44 +00:00
case 0x28: /* Station Identifier */
if (sv_length != 8) {
expert_add_info_format(pinfo, len_item, PI_MALFORMED, PI_ERROR,
"Subvector length is != 8");
break;
}
proto_tree_add_text(sv_tree, tvb, svoff+2, sv_length-2,
"Station Identifier: %s",
tvb_ether_to_str(tvb, svoff+2));
proto_item_append_text(sv_item,
": %s",
tvb_ether_to_str(tvb, svoff+2));
break;
case 0x29: /* Ring Station Status */
proto_tree_add_text(sv_tree, tvb, svoff+2, sv_length-2,
"Ring Station Status: ...");
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
break;
case 0x2A: /* Transmit Status Code */
For subvectors, make a top-level item to cover the entire subvector, and put the length, identifier, and value as visible sub-items underneath it. If the length is bad, add an expert info indication under the item for the length, rather than using proto_malformed. Add checks for the lengths of each type of subvector. Add some more subvector types from IEEE 802.5-1998, and use the names from that spec. svn path=/trunk/; revision=47923
2013-02-27 22:07:44 +00:00
if (sv_length != 4) {
expert_add_info_format(pinfo, len_item, PI_MALFORMED, PI_ERROR,
"Subvector length is != 4");
break;
}
proto_tree_add_text(sv_tree, tvb, svoff+2, sv_length-2,
tvbuff-ify the TR MAC dissector. svn path=/trunk/; revision=2081
2000-06-20 03:05:37 +00:00
"Transmit Status Code: %04X", tvb_get_ntohs(tvb, svoff+2) );
For subvectors, make a top-level item to cover the entire subvector, and put the length, identifier, and value as visible sub-items underneath it. If the length is bad, add an expert info indication under the item for the length, rather than using proto_malformed. Add checks for the lengths of each type of subvector. Add some more subvector types from IEEE 802.5-1998, and use the names from that spec. svn path=/trunk/; revision=47923
2013-02-27 22:07:44 +00:00
proto_item_append_text(sv_item,
": %04X", tvb_get_ntohs(tvb, svoff+2) );
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
break;
case 0x2B: /* Group Address */
For subvectors, make a top-level item to cover the entire subvector, and put the length, identifier, and value as visible sub-items underneath it. If the length is bad, add an expert info indication under the item for the length, rather than using proto_malformed. Add checks for the lengths of each type of subvector. Add some more subvector types from IEEE 802.5-1998, and use the names from that spec. svn path=/trunk/; revision=47923
2013-02-27 22:07:44 +00:00
if (sv_length != 6 && sv_length != 8) {
expert_add_info_format(pinfo, len_item, PI_MALFORMED, PI_ERROR,
"Subvector length is != 6 and != 8");
break;
}
Fix Coverity CID 988967: Logically dead code. svn path=/trunk/; revision=47963
2013-03-01 04:53:26 +00:00
if (sv_length == 6) {
For subvectors, make a top-level item to cover the entire subvector, and put the length, identifier, and value as visible sub-items underneath it. If the length is bad, add an expert info indication under the item for the length, rather than using proto_malformed. Add checks for the lengths of each type of subvector. Add some more subvector types from IEEE 802.5-1998, and use the names from that spec. svn path=/trunk/; revision=47923
2013-02-27 22:07:44 +00:00
proto_tree_add_text(sv_tree, tvb, svoff+2, sv_length-2,
"Group Address: %08X", tvb_get_ntohl(tvb, svoff+2) );
proto_item_append_text(sv_item,
": %08X", tvb_get_ntohl(tvb, svoff+2) );
} else {
proto_tree_add_text(sv_tree, tvb, svoff+2, sv_length-2,
"Group Address: %s",
tvb_ether_to_str(tvb, svoff+2));
proto_item_append_text(sv_item,
": %s",
tvb_ether_to_str(tvb, svoff+2));
}
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
break;
For subvectors, make a top-level item to cover the entire subvector, and put the length, identifier, and value as visible sub-items underneath it. If the length is bad, add an expert info indication under the item for the length, rather than using proto_malformed. Add checks for the lengths of each type of subvector. Add some more subvector types from IEEE 802.5-1998, and use the names from that spec. svn path=/trunk/; revision=47923
2013-02-27 22:07:44 +00:00
case 0x2C: /* Functional Addresses */
if (sv_length != 6) {
expert_add_info_format(pinfo, len_item, PI_MALFORMED, PI_ERROR,
"Subvector length is != 6");
break;
}
proto_tree_add_text(sv_tree, tvb, svoff+2, sv_length-2,
"Functional Addresses: %08X", tvb_get_ntohl(tvb, svoff+2) );
proto_item_append_text(sv_item,
": %08X", tvb_get_ntohl(tvb, svoff+2) );
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
break;
case 0x2D: /* Isolating Error Counts */
For subvectors, make a top-level item to cover the entire subvector, and put the length, identifier, and value as visible sub-items underneath it. If the length is bad, add an expert info indication under the item for the length, rather than using proto_malformed. Add checks for the lengths of each type of subvector. Add some more subvector types from IEEE 802.5-1998, and use the names from that spec. svn path=/trunk/; revision=47923
2013-02-27 22:07:44 +00:00
if (sv_length != 8) {
expert_add_info_format(pinfo, len_item, PI_MALFORMED, PI_ERROR,
"Subvector length is != 8");
break;
}
There's no need to pass the result of tvb_get_ptr() as the 'value' in proto_tree_add_*(): just use proto_tree_add_item(). Replace some tvb_get_ptr()s with tvb_get_ephemeral_string() or tvb_get_const_stringz(). Use tvb_memeql() & tvb_memcmp(). svn path=/trunk/; revision=35558
2011-01-16 20:51:21 +00:00
tvb_memcpy(tvb, errors, svoff+2, 6);
For subvectors, make a top-level item to cover the entire subvector, and put the length, identifier, and value as visible sub-items underneath it. If the length is bad, add an expert info indication under the item for the length, rather than using proto_malformed. Add checks for the lengths of each type of subvector. Add some more subvector types from IEEE 802.5-1998, and use the names from that spec. svn path=/trunk/; revision=47923
2013-02-27 22:07:44 +00:00
ti = proto_tree_add_uint(sv_tree, hf_trmac_errors_iso, tvb, svoff+2, sv_length-2,
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
errors[0] + errors[1] + errors[2] + errors[3] + errors[4]);
For subvectors, make a top-level item to cover the entire subvector, and put the length, identifier, and value as visible sub-items underneath it. If the length is bad, add an expert info indication under the item for the length, rather than using proto_malformed. Add checks for the lengths of each type of subvector. Add some more subvector types from IEEE 802.5-1998, and use the names from that spec. svn path=/trunk/; revision=47923
2013-02-27 22:07:44 +00:00
sv_subtree = proto_item_add_subtree(ti, ett_tr_ierr_cnt);
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
For subvectors, make a top-level item to cover the entire subvector, and put the length, identifier, and value as visible sub-items underneath it. If the length is bad, add an expert info indication under the item for the length, rather than using proto_malformed. Add checks for the lengths of each type of subvector. Add some more subvector types from IEEE 802.5-1998, and use the names from that spec. svn path=/trunk/; revision=47923
2013-02-27 22:07:44 +00:00
proto_tree_add_uint(sv_subtree, hf_trmac_errors_line, tvb, svoff+2, 1, errors[0]);
proto_tree_add_uint(sv_subtree, hf_trmac_errors_internal, tvb, svoff+3, 1, errors[1]);
proto_tree_add_uint(sv_subtree, hf_trmac_errors_burst, tvb, svoff+4, 1, errors[2]);
proto_tree_add_uint(sv_subtree, hf_trmac_errors_ac, tvb, svoff+5, 1, errors[3]);
proto_tree_add_uint(sv_subtree, hf_trmac_errors_abort, tvb, svoff+6, 1, errors[4]);
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
break;
case 0x2E: /* Non-Isolating Error Counts */
For subvectors, make a top-level item to cover the entire subvector, and put the length, identifier, and value as visible sub-items underneath it. If the length is bad, add an expert info indication under the item for the length, rather than using proto_malformed. Add checks for the lengths of each type of subvector. Add some more subvector types from IEEE 802.5-1998, and use the names from that spec. svn path=/trunk/; revision=47923
2013-02-27 22:07:44 +00:00
if (sv_length != 8) {
expert_add_info_format(pinfo, len_item, PI_MALFORMED, PI_ERROR,
"Subvector length is != 8");
break;
}
There's no need to pass the result of tvb_get_ptr() as the 'value' in proto_tree_add_*(): just use proto_tree_add_item(). Replace some tvb_get_ptr()s with tvb_get_ephemeral_string() or tvb_get_const_stringz(). Use tvb_memeql() & tvb_memcmp(). svn path=/trunk/; revision=35558
2011-01-16 20:51:21 +00:00
tvb_memcpy(tvb, errors, svoff+2, 6);
For subvectors, make a top-level item to cover the entire subvector, and put the length, identifier, and value as visible sub-items underneath it. If the length is bad, add an expert info indication under the item for the length, rather than using proto_malformed. Add checks for the lengths of each type of subvector. Add some more subvector types from IEEE 802.5-1998, and use the names from that spec. svn path=/trunk/; revision=47923
2013-02-27 22:07:44 +00:00
ti = proto_tree_add_uint(sv_tree, hf_trmac_errors_noniso, tvb, svoff+2, sv_length-2,
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
errors[0] + errors[1] + errors[2] + errors[3] + errors[4]);
For subvectors, make a top-level item to cover the entire subvector, and put the length, identifier, and value as visible sub-items underneath it. If the length is bad, add an expert info indication under the item for the length, rather than using proto_malformed. Add checks for the lengths of each type of subvector. Add some more subvector types from IEEE 802.5-1998, and use the names from that spec. svn path=/trunk/; revision=47923
2013-02-27 22:07:44 +00:00
sv_subtree = proto_item_add_subtree(ti, ett_tr_nerr_cnt);
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
For subvectors, make a top-level item to cover the entire subvector, and put the length, identifier, and value as visible sub-items underneath it. If the length is bad, add an expert info indication under the item for the length, rather than using proto_malformed. Add checks for the lengths of each type of subvector. Add some more subvector types from IEEE 802.5-1998, and use the names from that spec. svn path=/trunk/; revision=47923
2013-02-27 22:07:44 +00:00
proto_tree_add_uint(sv_subtree, hf_trmac_errors_lost, tvb, svoff+2, 1, errors[0]);
proto_tree_add_uint(sv_subtree, hf_trmac_errors_congestion, tvb, svoff+3, 1, errors[1]);
proto_tree_add_uint(sv_subtree, hf_trmac_errors_fc, tvb, svoff+4, 1, errors[2]);
proto_tree_add_uint(sv_subtree, hf_trmac_errors_freq, tvb, svoff+5, 1, errors[3]);
proto_tree_add_uint(sv_subtree, hf_trmac_errors_token, tvb, svoff+6, 1, errors[4]);
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
break;
case 0x30: /* Error Code */
For subvectors, make a top-level item to cover the entire subvector, and put the length, identifier, and value as visible sub-items underneath it. If the length is bad, add an expert info indication under the item for the length, rather than using proto_malformed. Add checks for the lengths of each type of subvector. Add some more subvector types from IEEE 802.5-1998, and use the names from that spec. svn path=/trunk/; revision=47923
2013-02-27 22:07:44 +00:00
if (sv_length != 4) {
expert_add_info_format(pinfo, len_item, PI_MALFORMED, PI_ERROR,
"Subvector length is != 4");
break;
}
proto_tree_add_text(sv_tree, tvb, svoff+2, sv_length-2,
tvbuff-ify the TR MAC dissector. svn path=/trunk/; revision=2081
2000-06-20 03:05:37 +00:00
"Error Code: %04X", tvb_get_ntohs(tvb, svoff+2) );
For subvectors, make a top-level item to cover the entire subvector, and put the length, identifier, and value as visible sub-items underneath it. If the length is bad, add an expert info indication under the item for the length, rather than using proto_malformed. Add checks for the lengths of each type of subvector. Add some more subvector types from IEEE 802.5-1998, and use the names from that spec. svn path=/trunk/; revision=47923
2013-02-27 22:07:44 +00:00
proto_item_append_text(sv_item,
": %04X", tvb_get_ntohs(tvb, svoff+2) );
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
break;
default: /* Unknown */
For subvectors, make a top-level item to cover the entire subvector, and put the length, identifier, and value as visible sub-items underneath it. If the length is bad, add an expert info indication under the item for the length, rather than using proto_malformed. Add checks for the lengths of each type of subvector. Add some more subvector types from IEEE 802.5-1998, and use the names from that spec. svn path=/trunk/; revision=47923
2013-02-27 22:07:44 +00:00
proto_tree_add_text(sv_tree, tvb, svoff+2, sv_length-2,
"Unknown Subvector");
break;
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
}
return sv_length;
}
Have the TR MAC and LLC dissectors register themselves, make them static, and have other dissectors call them through handles. svn path=/trunk/; revision=2816
2001-01-03 10:34:42 +00:00
static void
tvbuff-ify the TR MAC dissector. svn path=/trunk/; revision=2081
2000-06-20 03:05:37 +00:00
dissect_trmac(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
Removed all references to gtk objects from packet*.[ch] files. They now reference the protocol tree with struct proto_tree and struct proto_item objects. That way, the packet decoding source code file can be used with non-gtk packet decoders, like a curses-based ethereal, e.g. I also re-arranged some of the information in packet.h to more appropriate places (like other packet-*.[ch] files). svn path=/trunk/; revision=223
1999-03-23 03:14:46 +00:00
proto_tree *mac_tree = NULL;
proto_item *ti;
tvbuff-ify the TR MAC dissector. svn path=/trunk/; revision=2081
2000-06-20 03:05:37 +00:00
int mv_length, sv_offset, sv_additional;
Changed short packet handling in TR code to understand minimum-length TR packets (it's a variable-length header, remember). Added lots of proto_tree-style fields to TRMAC code. svn path=/trunk/; revision=683
1999-09-17 04:20:23 +00:00
guint8 mv_val;
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
Don't guard col_set_str (COL_PROTOCOL) with col_check svn path=/trunk/; revision=29340
2009-08-09 06:26:46 +00:00
col_set_str(pinfo->cinfo, COL_PROTOCOL, "TR MAC");
Don't guard col_clear with col_check svn path=/trunk/; revision=29344
2009-08-09 07:36:13 +00:00
col_clear(pinfo->cinfo, COL_INFO);
tvbuff-ify the TR MAC dissector. svn path=/trunk/; revision=2081
2000-06-20 03:05:37 +00:00
mv_val = tvb_get_guint8(tvb, 3);
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
/* Interpret the major vector */
Move the pointer to the "column_info" structure in the "frame_data" structure to the "packet_info" structure; only stuff that's permanently stored with each frame should be in the "frame_data" structure, and the "column_info" structure is not guaranteed to hold the column values for that frame at all times - it was only in the "frame_data" structure so that it could be passed to dissectors, and, as all dissectors are now passed a pointer to a "packet_info" structure, it could just as well be put in the "packet_info" structure. That saves memory, by shrinking the "frame_data" structure (there's one of those per frame), and also lets us clean up the code a bit. svn path=/trunk/; revision=4370
2001-12-10 00:26:21 +00:00
if (check_col(pinfo->cinfo, COL_INFO))
Get rid of the private "my_match_strval()" routine in many dissectors; add a "match_strval_idx()" routine that does the same thing, and have "match_strval()" call it. Make those routines, and "val_to_str()", return a "const" pointer. Update dissectors as necessary to squelch compiler warnings produced by that. Use "val_to_str()" rather than using "match_strval()" and then, if the result is null, substituting a specific string. Clean up some other "match_strval()"/"val_to_str()" usages. Add a null pointer check in the NDPS dissector's "attribute_value()" routine, as it's not clear that "global_attribute_name" won't be null at that point. Make some global variables in the AFS4INT dissector local. Make some routines not used outside the module they're in static. Make some tables "static const". Clean up white space. Fix Gerald's address in some files. svn path=/trunk/; revision=14786
2005-06-26 19:56:52 +00:00
col_add_str(pinfo->cinfo, COL_INFO,
val_to_str(mv_val, major_vector_vs, "Unknown Major Vector: %u"));
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
if (tree) {
tvbuff-ify the TR MAC dissector. svn path=/trunk/; revision=2081
2000-06-20 03:05:37 +00:00
mv_length = tvb_get_ntohs(tvb, 0);
For proto_tree_add_item(..., proto_xxx, ...)use ENC_NA as the encoding arg. Also: remove trailing whitespace for a number of files. svn path=/trunk/; revision=39503
2011-10-21 02:10:19 +00:00
ti = proto_tree_add_item(tree, proto_trmac, tvb, 0, mv_length, ENC_NA);
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
mac_tree = proto_item_add_subtree(ti, ett_tr_mac);
Made the protocol (but not the fields) use the new proto_tree routine, allowing users to filter on the existence of these protocols. I also added packet-clip.c to the Nmake makefile. svn path=/trunk/; revision=402
1999-07-29 05:47:07 +00:00
tvbuff-ify the TR MAC dissector. svn path=/trunk/; revision=2081
2000-06-20 03:05:37 +00:00
proto_tree_add_uint(mac_tree, hf_trmac_mv, tvb, 3, 1, mv_val);
proto_tree_add_uint_format(mac_tree, hf_trmac_length, tvb, 0, 2, mv_length,
Changed short packet handling in TR code to understand minimum-length TR packets (it's a variable-length header, remember). Added lots of proto_tree-style fields to TRMAC code. svn path=/trunk/; revision=683
1999-09-17 04:20:23 +00:00
"Total Length: %d bytes", mv_length);
tvbuff-ify the TR MAC dissector. svn path=/trunk/; revision=2081
2000-06-20 03:05:37 +00:00
proto_tree_add_uint(mac_tree, hf_trmac_srcclass, tvb, 2, 1, tvb_get_guint8(tvb, 2) & 0x0f);
proto_tree_add_uint(mac_tree, hf_trmac_dstclass, tvb, 2, 1, tvb_get_guint8(tvb, 2) >> 4 );
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
/* interpret the subvectors */
tvbuff-ify the TR MAC dissector. svn path=/trunk/; revision=2081
2000-06-20 03:05:37 +00:00
sv_offset = 4;
while (sv_offset < mv_length) {
For subvectors, make a top-level item to cover the entire subvector, and put the length, identifier, and value as visible sub-items underneath it. If the length is bad, add an expert info indication under the item for the length, rather than using proto_malformed. Add checks for the lengths of each type of subvector. Add some more subvector types from IEEE 802.5-1998, and use the names from that spec. svn path=/trunk/; revision=47923
2013-02-27 22:07:44 +00:00
sv_additional = sv_text(tvb, sv_offset, pinfo, mac_tree);
Fixed a bug regarding bad packets. If a sub-vector indicated a 0-length, dissect_trmac() would spin in an infinite loop. Now that condition is checked and properly handled. svn path=/trunk/; revision=168
1999-01-12 17:44:52 +00:00
/* if this is a bad packet, we could get a 0-length added here,
* looping forever */
tvbuff-ify the TR MAC dissector. svn path=/trunk/; revision=2081
2000-06-20 03:05:37 +00:00
if (sv_additional > 0)
Fixed a bug regarding bad packets. If a sub-vector indicated a 0-length, dissect_trmac() would spin in an infinite loop. Now that condition is checked and properly handled. svn path=/trunk/; revision=168
1999-01-12 17:44:52 +00:00
sv_offset += sv_additional;
else
break;
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
}
}
}
Made the protocol (but not the fields) use the new proto_tree routine, allowing users to filter on the existence of these protocols. I also added packet-clip.c to the Nmake makefile. svn path=/trunk/; revision=402
1999-07-29 05:47:07 +00:00
void
proto_register_trmac(void)
{
Changed short packet handling in TR code to understand minimum-length TR packets (it's a variable-length header, remember). Added lots of proto_tree-style fields to TRMAC code. svn path=/trunk/; revision=683
1999-09-17 04:20:23 +00:00
static hf_register_info hf[] = {
{ &hf_trmac_mv,
New proto_tree header_field_info stuff. Header_field_infos now contain the base for numbers to be displayed in, bitmasks for bitfields, and blurbs (which are one or two sentences describing the field). proto_tree_add*() routines now automatically handle bitfields. You tell it which header field you are adding, and just pass it the value of the entire field, and the proto_tree routines will do the masking and shifting for you. This means that bitfields are more naturally filtered via dfilter now. Added Phil Techau's support for signed integers in dfilters/proto_tree. Added the beginning of the SNA dissector. It's not complete, but I'm committing it now because it has example after example of how to use bitfields with the new header_field_info struct and proto_tree routines. It was the impetus to change how header_field_info works. svn path=/trunk/; revision=815
1999-10-12 06:21:15 +00:00
{ "Major Vector", "trmac.mvec", FT_UINT8, BASE_HEX, major_vector_vs, 0x0,
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
NULL, HFILL }},
Changed short packet handling in TR code to understand minimum-length TR packets (it's a variable-length header, remember). Added lots of proto_tree-style fields to TRMAC code. svn path=/trunk/; revision=683
1999-09-17 04:20:23 +00:00
{ &hf_trmac_length,
New proto_tree header_field_info stuff. Header_field_infos now contain the base for numbers to be displayed in, bitmasks for bitfields, and blurbs (which are one or two sentences describing the field). proto_tree_add*() routines now automatically handle bitfields. You tell it which header field you are adding, and just pass it the value of the entire field, and the proto_tree routines will do the masking and shifting for you. This means that bitfields are more naturally filtered via dfilter now. Added Phil Techau's support for signed integers in dfilters/proto_tree. Added the beginning of the SNA dissector. It's not complete, but I'm committing it now because it has example after example of how to use bitfields with the new header_field_info struct and proto_tree routines. It was the impetus to change how header_field_info works. svn path=/trunk/; revision=815
1999-10-12 06:21:15 +00:00
{ "Total Length", "trmac.length", FT_UINT8, BASE_DEC, NULL, 0x0,
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
NULL, HFILL }},
Changed short packet handling in TR code to understand minimum-length TR packets (it's a variable-length header, remember). Added lots of proto_tree-style fields to TRMAC code. svn path=/trunk/; revision=683
1999-09-17 04:20:23 +00:00
{ &hf_trmac_srcclass,
New proto_tree header_field_info stuff. Header_field_infos now contain the base for numbers to be displayed in, bitmasks for bitfields, and blurbs (which are one or two sentences describing the field). proto_tree_add*() routines now automatically handle bitfields. You tell it which header field you are adding, and just pass it the value of the entire field, and the proto_tree routines will do the masking and shifting for you. This means that bitfields are more naturally filtered via dfilter now. Added Phil Techau's support for signed integers in dfilters/proto_tree. Added the beginning of the SNA dissector. It's not complete, but I'm committing it now because it has example after example of how to use bitfields with the new header_field_info struct and proto_tree routines. It was the impetus to change how header_field_info works. svn path=/trunk/; revision=815
1999-10-12 06:21:15 +00:00
{ "Source Class", "trmac.srcclass", FT_UINT8, BASE_HEX, classes_vs, 0x0,
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
NULL, HFILL }},
Changed short packet handling in TR code to understand minimum-length TR packets (it's a variable-length header, remember). Added lots of proto_tree-style fields to TRMAC code. svn path=/trunk/; revision=683
1999-09-17 04:20:23 +00:00
{ &hf_trmac_dstclass,
New proto_tree header_field_info stuff. Header_field_infos now contain the base for numbers to be displayed in, bitmasks for bitfields, and blurbs (which are one or two sentences describing the field). proto_tree_add*() routines now automatically handle bitfields. You tell it which header field you are adding, and just pass it the value of the entire field, and the proto_tree routines will do the masking and shifting for you. This means that bitfields are more naturally filtered via dfilter now. Added Phil Techau's support for signed integers in dfilters/proto_tree. Added the beginning of the SNA dissector. It's not complete, but I'm committing it now because it has example after example of how to use bitfields with the new header_field_info struct and proto_tree routines. It was the impetus to change how header_field_info works. svn path=/trunk/; revision=815
1999-10-12 06:21:15 +00:00
{ "Destination Class", "trmac.dstclass", FT_UINT8, BASE_HEX, classes_vs, 0x0,
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
NULL, HFILL }},
Changed short packet handling in TR code to understand minimum-length TR packets (it's a variable-length header, remember). Added lots of proto_tree-style fields to TRMAC code. svn path=/trunk/; revision=683
1999-09-17 04:20:23 +00:00
For subvectors, make a top-level item to cover the entire subvector, and put the length, identifier, and value as visible sub-items underneath it. If the length is bad, add an expert info indication under the item for the length, rather than using proto_malformed. Add checks for the lengths of each type of subvector. Add some more subvector types from IEEE 802.5-1998, and use the names from that spec. svn path=/trunk/; revision=47923
2013-02-27 22:07:44 +00:00
{ &hf_trmac_sv_len,
{ "Subvector Length", "trmac.svec.len", FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_trmac_sv_id,
{ "Subvector Identifier", "trmac.svec.id", FT_UINT8, BASE_HEX, VALS(subvector_vs), 0x0,
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
NULL, HFILL }},
Changed short packet handling in TR code to understand minimum-length TR packets (it's a variable-length header, remember). Added lots of proto_tree-style fields to TRMAC code. svn path=/trunk/; revision=683
1999-09-17 04:20:23 +00:00
{ &hf_trmac_errors_iso,
New proto_tree header_field_info stuff. Header_field_infos now contain the base for numbers to be displayed in, bitmasks for bitfields, and blurbs (which are one or two sentences describing the field). proto_tree_add*() routines now automatically handle bitfields. You tell it which header field you are adding, and just pass it the value of the entire field, and the proto_tree routines will do the masking and shifting for you. This means that bitfields are more naturally filtered via dfilter now. Added Phil Techau's support for signed integers in dfilters/proto_tree. Added the beginning of the SNA dissector. It's not complete, but I'm committing it now because it has example after example of how to use bitfields with the new header_field_info struct and proto_tree routines. It was the impetus to change how header_field_info works. svn path=/trunk/; revision=815
1999-10-12 06:21:15 +00:00
{ "Isolating Errors", "trmac.errors.iso", FT_UINT16, BASE_DEC, NULL, 0x0,
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
NULL, HFILL }},
Changed short packet handling in TR code to understand minimum-length TR packets (it's a variable-length header, remember). Added lots of proto_tree-style fields to TRMAC code. svn path=/trunk/; revision=683
1999-09-17 04:20:23 +00:00
{ &hf_trmac_errors_line,
New proto_tree header_field_info stuff. Header_field_infos now contain the base for numbers to be displayed in, bitmasks for bitfields, and blurbs (which are one or two sentences describing the field). proto_tree_add*() routines now automatically handle bitfields. You tell it which header field you are adding, and just pass it the value of the entire field, and the proto_tree routines will do the masking and shifting for you. This means that bitfields are more naturally filtered via dfilter now. Added Phil Techau's support for signed integers in dfilters/proto_tree. Added the beginning of the SNA dissector. It's not complete, but I'm committing it now because it has example after example of how to use bitfields with the new header_field_info struct and proto_tree routines. It was the impetus to change how header_field_info works. svn path=/trunk/; revision=815
1999-10-12 06:21:15 +00:00
{ "Line Errors", "trmac.errors.line", FT_UINT8, BASE_DEC, NULL, 0x0,
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
NULL, HFILL }},
Changed short packet handling in TR code to understand minimum-length TR packets (it's a variable-length header, remember). Added lots of proto_tree-style fields to TRMAC code. svn path=/trunk/; revision=683
1999-09-17 04:20:23 +00:00
{ &hf_trmac_errors_internal,
New proto_tree header_field_info stuff. Header_field_infos now contain the base for numbers to be displayed in, bitmasks for bitfields, and blurbs (which are one or two sentences describing the field). proto_tree_add*() routines now automatically handle bitfields. You tell it which header field you are adding, and just pass it the value of the entire field, and the proto_tree routines will do the masking and shifting for you. This means that bitfields are more naturally filtered via dfilter now. Added Phil Techau's support for signed integers in dfilters/proto_tree. Added the beginning of the SNA dissector. It's not complete, but I'm committing it now because it has example after example of how to use bitfields with the new header_field_info struct and proto_tree routines. It was the impetus to change how header_field_info works. svn path=/trunk/; revision=815
1999-10-12 06:21:15 +00:00
{ "Internal Errors", "trmac.errors.internal", FT_UINT8, BASE_DEC, NULL, 0x0,
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
NULL, HFILL }},
Changed short packet handling in TR code to understand minimum-length TR packets (it's a variable-length header, remember). Added lots of proto_tree-style fields to TRMAC code. svn path=/trunk/; revision=683
1999-09-17 04:20:23 +00:00
{ &hf_trmac_errors_burst,
New proto_tree header_field_info stuff. Header_field_infos now contain the base for numbers to be displayed in, bitmasks for bitfields, and blurbs (which are one or two sentences describing the field). proto_tree_add*() routines now automatically handle bitfields. You tell it which header field you are adding, and just pass it the value of the entire field, and the proto_tree routines will do the masking and shifting for you. This means that bitfields are more naturally filtered via dfilter now. Added Phil Techau's support for signed integers in dfilters/proto_tree. Added the beginning of the SNA dissector. It's not complete, but I'm committing it now because it has example after example of how to use bitfields with the new header_field_info struct and proto_tree routines. It was the impetus to change how header_field_info works. svn path=/trunk/; revision=815
1999-10-12 06:21:15 +00:00
{ "Burst Errors", "trmac.errors.burst", FT_UINT8, BASE_DEC, NULL, 0x0,
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
NULL, HFILL }},
Changed short packet handling in TR code to understand minimum-length TR packets (it's a variable-length header, remember). Added lots of proto_tree-style fields to TRMAC code. svn path=/trunk/; revision=683
1999-09-17 04:20:23 +00:00
{ &hf_trmac_errors_ac,
New proto_tree header_field_info stuff. Header_field_infos now contain the base for numbers to be displayed in, bitmasks for bitfields, and blurbs (which are one or two sentences describing the field). proto_tree_add*() routines now automatically handle bitfields. You tell it which header field you are adding, and just pass it the value of the entire field, and the proto_tree routines will do the masking and shifting for you. This means that bitfields are more naturally filtered via dfilter now. Added Phil Techau's support for signed integers in dfilters/proto_tree. Added the beginning of the SNA dissector. It's not complete, but I'm committing it now because it has example after example of how to use bitfields with the new header_field_info struct and proto_tree routines. It was the impetus to change how header_field_info works. svn path=/trunk/; revision=815
1999-10-12 06:21:15 +00:00
{ "A/C Errors", "trmac.errors.ac", FT_UINT8, BASE_DEC, NULL, 0x0,
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
NULL, HFILL }},
Changed short packet handling in TR code to understand minimum-length TR packets (it's a variable-length header, remember). Added lots of proto_tree-style fields to TRMAC code. svn path=/trunk/; revision=683
1999-09-17 04:20:23 +00:00
{ &hf_trmac_errors_abort,
New proto_tree header_field_info stuff. Header_field_infos now contain the base for numbers to be displayed in, bitmasks for bitfields, and blurbs (which are one or two sentences describing the field). proto_tree_add*() routines now automatically handle bitfields. You tell it which header field you are adding, and just pass it the value of the entire field, and the proto_tree routines will do the masking and shifting for you. This means that bitfields are more naturally filtered via dfilter now. Added Phil Techau's support for signed integers in dfilters/proto_tree. Added the beginning of the SNA dissector. It's not complete, but I'm committing it now because it has example after example of how to use bitfields with the new header_field_info struct and proto_tree routines. It was the impetus to change how header_field_info works. svn path=/trunk/; revision=815
1999-10-12 06:21:15 +00:00
{ "Abort Delimiter Transmitted Errors", "trmac.errors.abort", FT_UINT8, BASE_DEC, NULL, 0x0,
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
NULL, HFILL }},
Changed short packet handling in TR code to understand minimum-length TR packets (it's a variable-length header, remember). Added lots of proto_tree-style fields to TRMAC code. svn path=/trunk/; revision=683
1999-09-17 04:20:23 +00:00
{ &hf_trmac_errors_noniso,
New proto_tree header_field_info stuff. Header_field_infos now contain the base for numbers to be displayed in, bitmasks for bitfields, and blurbs (which are one or two sentences describing the field). proto_tree_add*() routines now automatically handle bitfields. You tell it which header field you are adding, and just pass it the value of the entire field, and the proto_tree routines will do the masking and shifting for you. This means that bitfields are more naturally filtered via dfilter now. Added Phil Techau's support for signed integers in dfilters/proto_tree. Added the beginning of the SNA dissector. It's not complete, but I'm committing it now because it has example after example of how to use bitfields with the new header_field_info struct and proto_tree routines. It was the impetus to change how header_field_info works. svn path=/trunk/; revision=815
1999-10-12 06:21:15 +00:00
{ "Non-Isolating Errors", "trmac.errors.noniso", FT_UINT16, BASE_DEC, NULL, 0x0,
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
NULL, HFILL }},
Changed short packet handling in TR code to understand minimum-length TR packets (it's a variable-length header, remember). Added lots of proto_tree-style fields to TRMAC code. svn path=/trunk/; revision=683
1999-09-17 04:20:23 +00:00
{ &hf_trmac_errors_lost,
New proto_tree header_field_info stuff. Header_field_infos now contain the base for numbers to be displayed in, bitmasks for bitfields, and blurbs (which are one or two sentences describing the field). proto_tree_add*() routines now automatically handle bitfields. You tell it which header field you are adding, and just pass it the value of the entire field, and the proto_tree routines will do the masking and shifting for you. This means that bitfields are more naturally filtered via dfilter now. Added Phil Techau's support for signed integers in dfilters/proto_tree. Added the beginning of the SNA dissector. It's not complete, but I'm committing it now because it has example after example of how to use bitfields with the new header_field_info struct and proto_tree routines. It was the impetus to change how header_field_info works. svn path=/trunk/; revision=815
1999-10-12 06:21:15 +00:00
{ "Lost Frame Errors", "trmac.errors.lost", FT_UINT8, BASE_DEC, NULL, 0x0,
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
NULL, HFILL }},
Changed short packet handling in TR code to understand minimum-length TR packets (it's a variable-length header, remember). Added lots of proto_tree-style fields to TRMAC code. svn path=/trunk/; revision=683
1999-09-17 04:20:23 +00:00
{ &hf_trmac_errors_congestion,
New proto_tree header_field_info stuff. Header_field_infos now contain the base for numbers to be displayed in, bitmasks for bitfields, and blurbs (which are one or two sentences describing the field). proto_tree_add*() routines now automatically handle bitfields. You tell it which header field you are adding, and just pass it the value of the entire field, and the proto_tree routines will do the masking and shifting for you. This means that bitfields are more naturally filtered via dfilter now. Added Phil Techau's support for signed integers in dfilters/proto_tree. Added the beginning of the SNA dissector. It's not complete, but I'm committing it now because it has example after example of how to use bitfields with the new header_field_info struct and proto_tree routines. It was the impetus to change how header_field_info works. svn path=/trunk/; revision=815
1999-10-12 06:21:15 +00:00
{ "Receiver Congestion Errors", "trmac.errors.congestion", FT_UINT8, BASE_DEC, NULL, 0x0,
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
NULL, HFILL }},
Changed short packet handling in TR code to understand minimum-length TR packets (it's a variable-length header, remember). Added lots of proto_tree-style fields to TRMAC code. svn path=/trunk/; revision=683
1999-09-17 04:20:23 +00:00
{ &hf_trmac_errors_fc,
New proto_tree header_field_info stuff. Header_field_infos now contain the base for numbers to be displayed in, bitmasks for bitfields, and blurbs (which are one or two sentences describing the field). proto_tree_add*() routines now automatically handle bitfields. You tell it which header field you are adding, and just pass it the value of the entire field, and the proto_tree routines will do the masking and shifting for you. This means that bitfields are more naturally filtered via dfilter now. Added Phil Techau's support for signed integers in dfilters/proto_tree. Added the beginning of the SNA dissector. It's not complete, but I'm committing it now because it has example after example of how to use bitfields with the new header_field_info struct and proto_tree routines. It was the impetus to change how header_field_info works. svn path=/trunk/; revision=815
1999-10-12 06:21:15 +00:00
{ "Frame-Copied Errors", "trmac.errors.fc", FT_UINT8, BASE_DEC, NULL, 0x0,
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
NULL, HFILL }},
Changed short packet handling in TR code to understand minimum-length TR packets (it's a variable-length header, remember). Added lots of proto_tree-style fields to TRMAC code. svn path=/trunk/; revision=683
1999-09-17 04:20:23 +00:00
{ &hf_trmac_errors_freq,
New proto_tree header_field_info stuff. Header_field_infos now contain the base for numbers to be displayed in, bitmasks for bitfields, and blurbs (which are one or two sentences describing the field). proto_tree_add*() routines now automatically handle bitfields. You tell it which header field you are adding, and just pass it the value of the entire field, and the proto_tree routines will do the masking and shifting for you. This means that bitfields are more naturally filtered via dfilter now. Added Phil Techau's support for signed integers in dfilters/proto_tree. Added the beginning of the SNA dissector. It's not complete, but I'm committing it now because it has example after example of how to use bitfields with the new header_field_info struct and proto_tree routines. It was the impetus to change how header_field_info works. svn path=/trunk/; revision=815
1999-10-12 06:21:15 +00:00
{ "Frequency Errors", "trmac.errors.freq", FT_UINT8, BASE_DEC, NULL, 0x0,
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
NULL, HFILL }},
Changed short packet handling in TR code to understand minimum-length TR packets (it's a variable-length header, remember). Added lots of proto_tree-style fields to TRMAC code. svn path=/trunk/; revision=683
1999-09-17 04:20:23 +00:00
{ &hf_trmac_errors_token,
New proto_tree header_field_info stuff. Header_field_infos now contain the base for numbers to be displayed in, bitmasks for bitfields, and blurbs (which are one or two sentences describing the field). proto_tree_add*() routines now automatically handle bitfields. You tell it which header field you are adding, and just pass it the value of the entire field, and the proto_tree routines will do the masking and shifting for you. This means that bitfields are more naturally filtered via dfilter now. Added Phil Techau's support for signed integers in dfilters/proto_tree. Added the beginning of the SNA dissector. It's not complete, but I'm committing it now because it has example after example of how to use bitfields with the new header_field_info struct and proto_tree routines. It was the impetus to change how header_field_info works. svn path=/trunk/; revision=815
1999-10-12 06:21:15 +00:00
{ "Token Errors", "trmac.errors.token", FT_UINT8, BASE_DEC, NULL, 0x0,
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
NULL, HFILL }},
Changed short packet handling in TR code to understand minimum-length TR packets (it's a variable-length header, remember). Added lots of proto_tree-style fields to TRMAC code. svn path=/trunk/; revision=683
1999-09-17 04:20:23 +00:00
{ &hf_trmac_naun,
For subvectors, make a top-level item to cover the entire subvector, and put the length, identifier, and value as visible sub-items underneath it. If the length is bad, add an expert info indication under the item for the length, rather than using proto_malformed. Add checks for the lengths of each type of subvector. Add some more subvector types from IEEE 802.5-1998, and use the names from that spec. svn path=/trunk/; revision=47923
2013-02-27 22:07:44 +00:00
{ "Upstream Neighbor's Address", "trmac.naun", FT_ETHER, BASE_NONE, NULL, 0x0,
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
NULL, HFILL }},
Changed short packet handling in TR code to understand minimum-length TR packets (it's a variable-length header, remember). Added lots of proto_tree-style fields to TRMAC code. svn path=/trunk/; revision=683
1999-09-17 04:20:23 +00:00
};
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
static gint *ett[] = {
&ett_tr_mac,
For subvectors, make a top-level item to cover the entire subvector, and put the length, identifier, and value as visible sub-items underneath it. If the length is bad, add an expert info indication under the item for the length, rather than using proto_malformed. Add checks for the lengths of each type of subvector. Add some more subvector types from IEEE 802.5-1998, and use the names from that spec. svn path=/trunk/; revision=47923
2013-02-27 22:07:44 +00:00
&ett_tr_sv,
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
&ett_tr_ierr_cnt,
&ett_tr_nerr_cnt,
};
Made the protocol (but not the fields) use the new proto_tree routine, allowing users to filter on the existence of these protocols. I also added packet-clip.c to the Nmake makefile. svn path=/trunk/; revision=402
1999-07-29 05:47:07 +00:00
Have "proto_register_protocol()" build a list of data structures for protocols, in addition to adding structures to the list of filterable fields. Give it an extra argument that specifies a "short name" for the protocol, for use in such places as pinfo->current_proto; the dialog box for constructing filters; the preferences tab for the protocol; and so on (although we're not yet using it in all those places). Make the preference name that appears in the preferences file and the command line for the DIAMETER protocol "diameter", not "Diameter"; the convention is that the name in question be all-lower-case. Make some routines and variables that aren't exported static. Update a comment in the ICP dissector to make it clear that the dissector won't see fragments other than the first fragment of a fragmented datagram. svn path=/trunk/; revision=2810
2001-01-03 06:56:03 +00:00
proto_trmac = proto_register_protocol("Token-Ring Media Access Control",
"TR MAC", "trmac");
Changed short packet handling in TR code to understand minimum-length TR packets (it's a variable-length header, remember). Added lots of proto_tree-style fields to TRMAC code. svn path=/trunk/; revision=683
1999-09-17 04:20:23 +00:00
proto_register_field_array(proto_trmac, hf, array_length(hf));
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
proto_register_subtree_array(ett, array_length(ett));
Have the TR MAC and LLC dissectors register themselves, make them static, and have other dissectors call them through handles. svn path=/trunk/; revision=2816
2001-01-03 10:34:42 +00:00
Add an additional "protocol index" argument to "{old_}dissector_add()", "{old_}heur_dissector_add()", "{old_}conv_dissector_add()", and "register_dissector()", so that an entry in those tables has associated with it the protocol index of the protocol the dissector handles (or -1, if there is no protocol index for it). This is for future use in a number of places. (Arguably, "proto_register_protocol()" should take a dissector pointer as an argument, but 1) it'd have to handle both regular and heuristic dissectors; 2) making it take either a "dissector_t" or a union of that and a "heur_dissector_t" introduces some painful header-file interdependencies so I'm punting on that for now. As with other Ethereal internal APIs, these APIs are subject to change in the future, at least until Ethereal 1.0 comes out....) svn path=/trunk/; revision=2849
2001-01-09 06:32:10 +00:00
register_dissector("trmac", dissect_trmac, proto_trmac);
Made the protocol (but not the fields) use the new proto_tree routine, allowing users to filter on the existence of these protocols. I also added packet-clip.c to the Nmake makefile. svn path=/trunk/; revision=402
1999-07-29 05:47:07 +00:00
}