diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2007-09-12 18:12:18 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2007-09-12 18:12:18 +0000 |
| commit | 120a0759b3ac4c95a9cae69fb2683dc8201211b2 (patch) | |
| tree | 17fd2e47dff2d3ca984a602666364d7413e62834 /asn1/tcap | |
| parent | c4daf58278f11b67ae204681cb57d0453d095f33 (diff) | |
| download | wireshark-120a0759b3ac4c95a9cae69fb2683dc8201211b2.tar.gz | |
Warning fixes.
svn path=/trunk/; revision=22855
Diffstat (limited to 'asn1/tcap')
| -rw-r--r-- | asn1/tcap/ansi_tcap.cnf | 2 | ||||
| -rw-r--r-- | asn1/tcap/packet-ansi_tcap-template.c | 13 |
2 files changed, 8 insertions, 7 deletions
diff --git a/asn1/tcap/ansi_tcap.cnf b/asn1/tcap/ansi_tcap.cnf index 042d46710e..0c88f693e9 100644 --- a/asn1/tcap/ansi_tcap.cnf +++ b/asn1/tcap/ansi_tcap.cnf @@ -73,7 +73,7 @@ tvbuff_t *parameter_tvb; static const char * oid_str; %(DEFAULT_BODY)s - ansi_tcap_private.objectApplicationId_oid= (void*) cur_oid; + ansi_tcap_private.objectApplicationId_oid= (void*) oid_str; ansi_tcap_private.oid_is_present=TRUE; #.FN_HDR PackageType/unidirectional diff --git a/asn1/tcap/packet-ansi_tcap-template.c b/asn1/tcap/packet-ansi_tcap-template.c index cf36bf1d5e..8fa9c55ce7 100644 --- a/asn1/tcap/packet-ansi_tcap-template.c +++ b/asn1/tcap/packet-ansi_tcap-template.c @@ -95,10 +95,6 @@ static proto_item * tcap_stat_item=NULL; static dissector_handle_t data_handle; static dissector_handle_t ansi_map_handle; -static dissector_table_t sccp_ssn_table; - -static GHashTable* ansi_sub_dissectors = NULL; -static GHashTable* itu_sub_dissectors = NULL; struct ansi_tcap_private_t ansi_tcap_private; @@ -110,7 +106,12 @@ static void ansi_tcap_ctx_init(struct ansi_tcap_private_t *a_tcap_ctx) { static void dissect_ansi_tcap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree); /* -extern void add_ansi_tcap_subdissector(guint32 ssn, dissector_handle_t dissector) { +static dissector_table_t sccp_ssn_table; + +static GHashTable* ansi_sub_dissectors = NULL; +static GHashTable* itu_sub_dissectors = NULL; + + extern void add_ansi_tcap_subdissector(guint32 ssn, dissector_handle_t dissector) { g_hash_table_insert(ansi_sub_dissectors,GUINT_TO_POINTER(ssn),dissector); dissector_add("sccp.ssn",ssn,tcap_handle); } @@ -328,10 +329,10 @@ dissect_ansi_tcap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) { proto_item *item=NULL; proto_tree *tree=NULL; +#if 0 proto_item *stat_item=NULL; proto_tree *stat_tree=NULL; gint offset = 0; -#if 0 struct tcaphash_context_t * p_tcap_context; dissector_handle_t subdissector_handle; #endif |