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.

svn path=/trunk/; revision=13104
This commit is contained in:
Guy Harris 2005-01-17 23:26:45 +00:00
parent fb24498c12
commit 4f81f615b0
3 changed files with 6 additions and 18 deletions

View File

@ -770,19 +770,17 @@ dissect_ros_ROSxxx(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr
return offset; return offset;
} }
static int static void
dissect_h4501(tvbuff_t *tvb, packet_info *pinfo, proto_tree* tree) dissect_h4501(tvbuff_t *tvb, packet_info *pinfo, proto_tree* tree)
{ {
proto_item *it; proto_item *it;
proto_tree *tr; proto_tree *tr;
guint32 offset=0; 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); tr=proto_item_add_subtree(it, ett_h4501);
dissect_h450_H4501SupplementaryService(tvb, offset, pinfo, tr, hf_h4501); dissect_h450_H4501SupplementaryService(tvb, offset, pinfo, tr, hf_h4501);
return offset;
} }
/*--- proto_register_h450 -------------------------------------------*/ /*--- proto_register_h450 -------------------------------------------*/
@ -971,7 +969,3 @@ proto_reg_handoff_h4501(void)
h4501_handle = find_dissector("h4501"); h4501_handle = find_dissector("h4501");
} }

View File

@ -1,6 +1,6 @@
/* Do not modify this file. */ /* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */ /* 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 */ /* ../../tools/asn2eth.py -X -e -p h450 -c h450.cnf -s packet-h450-template h4501.asn */
/* Input file: packet-h450-template.c */ /* 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; return offset;
} }
static int static void
dissect_h4501(tvbuff_t *tvb, packet_info *pinfo, proto_tree* tree) dissect_h4501(tvbuff_t *tvb, packet_info *pinfo, proto_tree* tree)
{ {
proto_item *it; proto_item *it;
proto_tree *tr; proto_tree *tr;
guint32 offset=0; 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); tr=proto_item_add_subtree(it, ett_h4501);
dissect_h450_H4501SupplementaryService(tvb, offset, pinfo, tr, hf_h4501); dissect_h450_H4501SupplementaryService(tvb, offset, pinfo, tr, hf_h4501);
return offset;
} }
/*--- proto_register_h450 -------------------------------------------*/ /*--- proto_register_h450 -------------------------------------------*/
@ -3035,7 +3033,3 @@ proto_reg_handoff_h4501(void)
h4501_handle = find_dissector("h4501"); h4501_handle = find_dissector("h4501");
} }

View File

@ -1,6 +1,6 @@
/* Do not modify this file. */ /* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */ /* 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 */ /* ../../tools/asn2eth.py -X -e -p h450 -c h450.cnf -s packet-h450-template h4501.asn */
/* Input file: packet-h450-template.h */ /* Input file: packet-h450-template.h */