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

From Martin M various updates and fixes 

Hi, Some tiddly changes: pppoe- don't create an empty discovery tags tree when the payload length is 0 chap- make chap.value work as a filterable field rtcp- append the packet type to the protocol tree name 


svn path=/trunk/; revision=16712
This commit is contained in:
Ronnie Sahlberg 2005-12-07 00:35:16 +00:00
parent 213ef19c87
commit a9a437d64a
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/dissectors/packet-ppp.c
View File

@ -4171,7 +4171,7 @@ proto_register_chap(void)
&hf_chap_value,
{
"Value", "chap.value",
FT_BYTES, BASE_HEX,
FT_BYTES, BASE_NONE,
NULL, 0x0,
"CHAP value data", HFILL
}
@ -4179,7 +4179,7 @@ proto_register_chap(void)
{
&hf_chap_name,
{
"Name", "chap.value",
"Name", "chap.name",
FT_STRING, BASE_NONE,
NULL, 0x0,
"CHAP name", HFILL

7
epan/dissectors/packet-pppoe.c
View File

@ -274,8 +274,11 @@ static void dissect_pppoed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(pppoe_tree, hf_pppoe_payload_length, tvb, 4, 2, FALSE);
}
/* Now dissect tags */
dissect_pppoe_tags(tvb, pinfo, 6, tree, 6+pppoe_length);
/* Now dissect any tags */
if (pppoe_length > 0)
{
dissect_pppoe_tags(tvb, pinfo, 6, tree, 6+pppoe_length);
}
}

5
epan/dissectors/packet-rtcp.c
View File

@ -1865,6 +1865,11 @@ dissect_rtcp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree )
packet_length = ( tvb_get_ntohs( tvb, offset + 2 ) + 1 ) * 4;
ti = proto_tree_add_item(tree, proto_rtcp, tvb, offset, packet_length, FALSE );
proto_item_append_text(ti, " (%s)",
val_to_str(packet_type,
rtcp_packet_type_vals,
"Unknown"));
rtcp_tree = proto_item_add_subtree( ti, ett_rtcp );
/* Conversation setup info */