diff options
author | Luis Ontanon <luis.ontanon@gmail.com> | 2007-01-31 09:30:08 +0000 |
---|---|---|
committer | Luis Ontanon <luis.ontanon@gmail.com> | 2007-01-31 09:30:08 +0000 |
commit | 5ea201cacf007082fb9bc32f84569fe3cd55f417 (patch) | |
tree | 710850d1d2cfa915a3a6479b6144dc616a0d13d3 /asn1/h248/packet-h248-template.c | |
parent | a267fc21e99b18681a609a9aae2b822bded7de74 (diff) |
Merge Anders' and my own fixes to some bugs
- most paramaters have data set to NULL, have them added to the tree
- avoid the context tracing mecanism bailing out if a ContextList appears in the packet.
- in q9150 do not attempt to dissect sdp unless we believe it is sdp
(BTW we need heuristics for sdp and other potential payloads of this parameter..)
svn path=/trunk/; revision=20649
Diffstat (limited to 'asn1/h248/packet-h248-template.c')
-rw-r--r-- | asn1/h248/packet-h248-template.c | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/asn1/h248/packet-h248-template.c b/asn1/h248/packet-h248-template.c index da7d47da30..615a809fcf 100644 --- a/asn1/h248/packet-h248-template.c +++ b/asn1/h248/packet-h248-template.c @@ -702,27 +702,6 @@ void h248_register_package(h248_package_t* pkg) { g_ptr_array_add(packages,pkg); } -#if 0 -static void -dissect_h248_pkg_data(gboolean implicit_tag, tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,guint16 name_major, guint16 name_minor){ - -guint offset=0; - - switch ( name_major ){ - case 0x001e: /* Bearer Characteristics Q.1950 Annex A */ - { - guint bearer_type = 0; - offset = dissect_ber_integer(FALSE, pinfo, tree, tvb, offset, hf_h248_pkg_bcp_BNCChar_PDU, &bearer_type); - if ( bearer_type && curr_info.term ) - curr_info.term->type = bearer_type; - break; - } - } - -} - -#endif - static guint32 packageandid; static int dissect_h248_PkgdName(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index) { @@ -948,7 +927,7 @@ dissect_h248_PropertyID(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pa prop = &no_param; } - if (prop && prop->hfid && prop->data) { + if (prop && prop->hfid ) { if (!prop->dissector) prop = &no_param; prop->dissector(tree, next_tvb, pinfo, *(prop->hfid), &curr_info, prop->data); } |