osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

From Peter Johansson: 

My patch changes the decoding of the Destination address to conform with the
spec found at http://www.cisco.com/univercd/cc/td/doc/product/lan/trsrb/frames.htm#xtocid75
and adds decoding of user field values 4-7 while updating the description of
user field values 0-3 according to IEEE 802.1D-2004, annex G.


svn path=/trunk/; revision=14139
This commit is contained in:
Gerald Combs 2005-04-19 20:53:42 +00:00
parent 38b423ec6b
commit a78465a839
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
epan/dissectors/packet-isl.c
View File

@ -122,10 +122,15 @@ static const value_string type_vals[] = {
};
static const value_string ether_user_vals[] = {
{0x0, "Normal priority"},
{0x1, "Priority 1"},
{0x2, "Priority 2"},
{0x3, "Highest priority"},
/* User values are defined by IEEE 802.1D-2004, annex G */
{0x0, "Best effort (default priority)"},
{0x1, "Background"},
{0x2, "[spare priority]"},
{0x3, "Excellent effort"},
{0x4, "Controlled load"},
{0x5, "\"Video\", < 100ms latency and jitter"},
{0x6, "\"Voice\", < 10ms latency and jitter"},
{0x7, "Network control"},
{0, NULL}
};
@ -163,7 +168,7 @@ dissect_isl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int fcs_len)
ti = proto_tree_add_protocol_format(tree, proto_isl, tvb, 0, ISL_HEADER_SIZE,
"ISL");
fh_tree = proto_item_add_subtree(ti, ett_isl);
proto_tree_add_item(fh_tree, hf_isl_dst, tvb, 0, 6, FALSE);
proto_tree_add_item(fh_tree, hf_isl_dst, tvb, 0, 5, FALSE);
proto_tree_add_item_hidden(fh_tree, hf_isl_addr, tvb, 0, 6, FALSE);
proto_tree_add_item(fh_tree, hf_isl_type, tvb, 5, 1, FALSE);
switch (type) {
@ -324,7 +329,7 @@ proto_register_isl(void)
{
static hf_register_info hf[] = {
{ &hf_isl_dst,
{ "Destination", "isl.dst", FT_ETHER, BASE_NONE, NULL, 0x0,
{ "Destination", "isl.dst", FT_BYTES, BASE_HEX, NULL, 0x0,
"Destination Address", HFILL }},
{ &hf_isl_type,
{ "Type", "isl.type", FT_UINT8, BASE_DEC,