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 

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@16712 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c
index c62405277ad5c583602cb7f26539a33721741040..6d1b33ad44a56bc07216f27e5d2fbbab6275d846 100644 (file)
--- a/epan/dissectors/packet-ppp.c
+++ b/epan/dissectors/packet-ppp.c
@@ -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

diff --git a/epan/dissectors/packet-pppoe.c b/epan/dissectors/packet-pppoe.c
index 09eb6912c2ffa1bc64135f449b04efa2d8e74bb1..510312d8398ef9faacbcb7ccdbaab6baf0cf6046 100644 (file)
--- a/epan/dissectors/packet-pppoe.c
+++ b/epan/dissectors/packet-pppoe.c
@@ -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);
+       }
 
 }
 

diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c
index fc18a8e06191784d0e366272ca7d78832bbb9315..ae66d0f7af3760c0fdc87ea75213dee8c9be0cc8 100644 (file)
--- a/epan/dissectors/packet-rtcp.c
+++ b/epan/dissectors/packet-rtcp.c
@@ -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 */