diff options
| author | Graeme Lunt <graeme.lunt@smhs.co.uk> | 2011-09-21 10:10:00 +0000 |
|---|---|---|
| committer | Graeme Lunt <graeme.lunt@smhs.co.uk> | 2011-09-21 10:10:00 +0000 |
| commit | dc75d97b914e1f7f78c66c3ed36a1c45f85dc0db (patch) | |
| tree | 3f58c27da6a0e4d31559c01ae9ca12dafec1d13f /asn1/t124 | |
| parent | 665de0725426b00e5f1163980cc2c24154ad48eb (diff) | |
Fix and suppress some warnings
svn path=/trunk/; revision=39072
Diffstat (limited to 'asn1/t124')
| -rw-r--r-- | asn1/t124/packet-t124-template.c | 17 | ||||
| -rw-r--r-- | asn1/t124/t124.cnf | 1 |
2 files changed, 15 insertions, 3 deletions
diff --git a/asn1/t124/packet-t124-template.c b/asn1/t124/packet-t124-template.c index d620f2cf15..876d9dea88 100644 --- a/asn1/t124/packet-t124-template.c +++ b/asn1/t124/packet-t124-template.c @@ -120,7 +120,7 @@ int dissect_DomainMCSPDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tr } static int -dissect_t124(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *parent_tree) +dissect_t124_new(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *parent_tree) { proto_item *item = NULL; proto_tree *tree = NULL; @@ -140,6 +140,12 @@ dissect_t124(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *parent_tree) return tvb_length(tvb); } +static void +dissect_t124(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *parent_tree) +{ + dissect_t124_new(tvb, pinfo, parent_tree); +} + static gboolean dissect_t124_heur(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *parent_tree) { @@ -187,6 +193,7 @@ void proto_register_t124(void) { &ett_t124_connectGCCPDU, #include "packet-t124-ettarr.c" }; + per_type_fn warning_suppressor; /* Register protocol */ proto_t124 = proto_register_protocol(PNAME, PSNAME, PFNAME); @@ -197,9 +204,15 @@ void proto_register_t124(void) { t124_ns_dissector_table = register_dissector_table("t124.ns", "T.124 H.221 Non Standard Dissectors", FT_STRING, BASE_NONE); t124_sd_dissector_table = register_dissector_table("t124.sd", "T.124 H.221 Send Data Dissectors", FT_UINT32, BASE_NONE); - new_register_dissector("t124", dissect_t124, proto_t124); + new_register_dissector("t124", dissect_t124_new, proto_t124); + + /* suppress some warnings */ + warning_suppressor = dissect_t124_GCCPDU; + warning_suppressor = dissect_t124_ConnectMCSPDU; + } +void proto_reg_handoff_t124(void) { register_ber_oid_dissector("0.0.20.124.0.1", dissect_t124, proto_t124, "Generic Conference Control"); diff --git a/asn1/t124/t124.cnf b/asn1/t124/t124.cnf index d0a992f3d0..851c2082e3 100644 --- a/asn1/t124/t124.cnf +++ b/asn1/t124/t124.cnf @@ -151,7 +151,6 @@ StaticChannelID TokenID StaticTokenID RosterRefreshRequest -GCCPDU #.END #.VIRTUAL_ASSGN #---------------------------------------------------------------------------------------- |