Use -1 rather than tvb_length() to create a protocol tree item that runs

to the end of the tvbuff.

Don't return a value from "dissect_h4501()" - the value isn't used, and
"dissect_h4501()" is registered with "register_dissector()", so it's not
supposed to return a value.

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

diff --git a/asn1/h450/packet-h450-template.c b/asn1/h450/packet-h450-template.c
index 616c9a7b7136f5b6943c070a6b16b6bce1a07759..bffeecb308d0b6aac1f1399c50b40b6a55eec554 100644 (file)
--- a/asn1/h450/packet-h450-template.c
+++ b/asn1/h450/packet-h450-template.c
@@ -770,19 +770,17 @@ dissect_ros_ROSxxx(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr
        return offset;
 
 }
-static int
+static void
 dissect_h4501(tvbuff_t *tvb, packet_info *pinfo, proto_tree* tree)
 {
    proto_item *it;
    proto_tree *tr;
    guint32 offset=0;
 
-   it=proto_tree_add_protocol_format(tree, proto_h4501, tvb, 0, tvb_length(tvb), "H.450.1");
+   it=proto_tree_add_protocol_format(tree, proto_h4501, tvb, 0, -1, "H.450.1");
    tr=proto_item_add_subtree(it, ett_h4501);
 
    dissect_h450_H4501SupplementaryService(tvb, offset, pinfo, tr, hf_h4501);
-   return offset;
-
 }
 
 /*--- proto_register_h450 -------------------------------------------*/
@@ -971,7 +969,3 @@ proto_reg_handoff_h4501(void)
        h4501_handle = find_dissector("h4501");
 
 }
-
-
-
-

diff --git a/epan/dissectors/packet-h450.c b/epan/dissectors/packet-h450.c
index 68549043ad2c9c9e1be7bfa277d264c8b5433f84..00d2c9399c4613d3701cb528c2088790f1da1c01 100644 (file)
--- a/epan/dissectors/packet-h450.c
+++ b/epan/dissectors/packet-h450.c
@@ -1,6 +1,6 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-h450.c                                                            */
+/* ./packet-h450.c                                                            */
 /* ../../tools/asn2eth.py -X -e -p h450 -c h450.cnf -s packet-h450-template h4501.asn */
 
 /* Input file: packet-h450-template.c */
@@ -2447,19 +2447,17 @@ dissect_ros_ROSxxx(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr
        return offset;
 
 }
-static int
+static void
 dissect_h4501(tvbuff_t *tvb, packet_info *pinfo, proto_tree* tree)
 {
    proto_item *it;
    proto_tree *tr;
    guint32 offset=0;
 
-   it=proto_tree_add_protocol_format(tree, proto_h4501, tvb, 0, tvb_length(tvb), "H.450.1");
+   it=proto_tree_add_protocol_format(tree, proto_h4501, tvb, 0, -1, "H.450.1");
    tr=proto_item_add_subtree(it, ett_h4501);
 
    dissect_h450_H4501SupplementaryService(tvb, offset, pinfo, tr, hf_h4501);
-   return offset;
-
 }
 
 /*--- proto_register_h450 -------------------------------------------*/
@@ -3035,7 +3033,3 @@ proto_reg_handoff_h4501(void)
        h4501_handle = find_dissector("h4501");
 
 }
-
-
-
-

diff --git a/epan/dissectors/packet-h450.h b/epan/dissectors/packet-h450.h
index 8f2f90d1c4b16129c651ec6d384a881da777795c..b8c32c18b8fefaeeed9abd3dfffcc7e0f3efe090 100644 (file)
--- a/epan/dissectors/packet-h450.h
+++ b/epan/dissectors/packet-h450.h
@@ -1,6 +1,6 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-h450.h                                                            */
+/* ./packet-h450.h                                                            */
 /* ../../tools/asn2eth.py -X -e -p h450 -c h450.cnf -s packet-h450-template h4501.asn */
 
 /* Input file: packet-h450-template.h */