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

From Thomas M. Knoll: 

- New dissector for CoS Capability attributes added
- tiny changes in my committed dissector for QoS Marking attributes

svn path=/trunk/; revision=27232
This commit is contained in:
Jaap Keuter 2009-01-14 22:01:10 +00:00
parent 8e885dd1df
commit 1be7c5c1a4
2 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
epan/dissectors/packet-bgp.c
View File

@ -189,6 +189,7 @@ static const value_string bgpattr_type[] = {
static const value_string bgpext_com8_type[] = {
{ BGP_EXT_COM_QOS_MARK_T, "QoS Marking - transitive" },
{ BGP_EXT_COM_QOS_MARK_NT, "QoS Marking - non-transitive" },
{ BGP_EXT_COM_COS_CAP_NT, "CoS Capability - non-transitive" },
{ 0, NULL }
};
@ -2300,13 +2301,37 @@ dissect_bgp_update(tvbuff_t *tvb, proto_tree *tree)
"Technology Type: 0x%02x (%s)", tvb_get_guint8(tvb,q+3),
val_to_str(tvb_get_guint8(tvb,q+3),qos_tech_type,"Unknown"));
ti = proto_tree_add_text(subtree4, tvb, q+4, 2,
"QoS Marking O (16 bit): %s", decode_numeric_bitfield(tvb_get_guint8(tvb,q+4),
"QoS Marking O (16 bit): %s", decode_numeric_bitfield(tvb_get_ntohs(tvb,q+4),
0xffff, 16, "0x%04x"));
ti = proto_tree_add_text(subtree4, tvb, q+6, 1,
"QoS Marking A (8 bit): %s (decimal %d)", decode_numeric_bitfield(tvb_get_guint8(tvb,q+6),
"QoS Marking A (8 bit): %s (decimal %d)", decode_numeric_bitfield(tvb_get_guint8(tvb,q+6),
0xff, 8, "0x%02x"), tvb_get_guint8(tvb,q+6));
ti = proto_tree_add_text(subtree4, tvb, q+7, 1,
"Processing Count: 0x%02x", tvb_get_guint8(tvb,q+7));
"Defaults to zero: 0x%02x", tvb_get_guint8(tvb,q+7));
break;
case BGP_EXT_COM_COS_CAP_NT:
is_regular_type = TRUE;
ti = proto_tree_add_text(subtree3,tvb,q,8, "%s",junk_gbuf);
subtree4 = proto_item_add_subtree(ti,ett_bgp_extended_communities);
ti = proto_tree_add_text(subtree4, tvb, q, 1,
"Type: 0x%02x", tvb_get_guint8(tvb,q));
ti = proto_tree_add_text(subtree4, tvb, q+1, 1,
"Flags byte 1 : 0x%02x", tvb_get_guint8(tvb,q+1));
subtree5 = proto_item_add_subtree(ti,ett_bgp_ext_com_flags);
/* add flag bitfield */
ti = proto_tree_add_text(subtree5, tvb, q+1, 1, "%s", decode_boolean_bitfield(tvb_get_guint8(tvb,q+1),
0x80, 8, "BE class supported", "BE class NOT supported"));
ti = proto_tree_add_text(subtree5, tvb, q+1, 1, "%s", decode_boolean_bitfield(tvb_get_guint8(tvb,q+1),
0x40, 8, "EF class supported", "EF class NOT supported"));
ti = proto_tree_add_text(subtree5, tvb, q+1, 1, "%s", decode_boolean_bitfield(tvb_get_guint8(tvb,q+1),
0x20, 8, "AF class supported", "AF class NOT supported"));
ti = proto_tree_add_text(subtree5, tvb, q+1, 1, "%s", decode_boolean_bitfield(tvb_get_guint8(tvb,q+1),
0x10, 8, "LE class supported", "LE class NOT supported"));
ti = proto_tree_add_text(subtree4, tvb, q+2, 1,
"Flags byte 2..7 : 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x",
tvb_get_guint8(tvb,q+2),tvb_get_guint8(tvb,q+3),tvb_get_guint8(tvb,q+4),
tvb_get_guint8(tvb,q+5),tvb_get_guint8(tvb,q+6),tvb_get_guint8(tvb,q+7));
break;
}

1
epan/dissectors/packet-bgp.h
View File

@ -170,6 +170,7 @@ struct bgp_attr {
#define BGP_EXT_COM_QOS_MARK_NT 0x44 /* QoS Marking non-transitive attribute of regular type (8bit) */
/* Format Type(1byte):Flags(1byte):QoS Set(1byte):Tec. Type(1byte): */
/* Marking O(2bytes):Marking A(1byte):Proc.Cnt(1byte) */
#define BGP_EXT_COM_COS_CAP_NT 0x40 /* CoS Capability - Format Type(1byte):Flags(1byte):remaining '0..0' */
/* draft-ietf-idr-bgp-ext-communities */
#define BGP_EXT_COM_RT_0 0x0002 /* Route Target,Format AS(2bytes):AN(4bytes) */