osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Register a bunch of ett_ variables. 

Use gint (instead of int) for ett_ variables (for consistency only).

svn path=/trunk/; revision=35922
This commit is contained in:
Jeff Morriss 2011-02-11 21:27:46 +00:00
parent 5fbe65d670
commit e92dd56b71
3 changed files with 104 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
epan/dissectors/packet-h248_3gpp.c
View File

@ -36,7 +36,7 @@
#include "packet-isup.h"
/*
/*
* 3GUP Package
* 3GPP TS 29.232 -- 15.1.1
*/
@ -139,7 +139,7 @@ static const h248_package_t h248_package_3GUP = {
};
/*
/*
* Circuit Switched Data package
* 3GPP TS 29.232 -- 15.2.1
*/
@ -260,7 +260,7 @@ static const h248_package_t h248_package_3GCSD = {
};
/*
/*
* TFO package
* 3GPP TS 29.232 -- 15.2.2
*/
@ -291,13 +291,13 @@ static void dissect_3GTFO_codec_mode(proto_tree* tree, tvbuff_t* tvb, packet_inf
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
get_ber_identifier(tvb, 0, &class, &pc, &tag);
/* XXX: is this enough to guess it? */
if ((tag==BER_UNI_TAG_OCTETSTRING)) {
dissect_ber_octet_string(FALSE, &asn1_ctx, tree, tvb, 0, hfid, &sub_tvb );
if (sub_tvb) {
proto_tree* pt = proto_item_add_subtree(asn1_ctx.created_item, ett_h248_3GTFO_codec);
dissect_codec_mode(pt, sub_tvb, 0, tvb_length(tvb));
@ -305,7 +305,7 @@ static void dissect_3GTFO_codec_mode(proto_tree* tree, tvbuff_t* tvb, packet_inf
} else {
proto_tree_add_item(tree,hfid,tvb,0,-1,FALSE);
}
}
static void dissect_3GTFO_codec_list(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, int hfid, h248_curr_info_t* cu _U_, void* ignored _U_) {
@ -316,12 +316,12 @@ static void dissect_3GTFO_codec_list(proto_tree* tree, tvbuff_t* tvb, packet_inf
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
get_ber_identifier(tvb, 0, &class, &pc, &tag);
if ((tag==BER_UNI_TAG_OCTETSTRING)) {
dissect_ber_octet_string(FALSE, &asn1_ctx, tree, tvb, 0, hfid, &sub_tvb );
if (sub_tvb) {
proto_tree* pt = proto_item_add_subtree(asn1_ctx.created_item,ett_h248_3GTFO_codec_list);
int len = tvb_length(sub_tvb);
@ -415,35 +415,35 @@ static const h248_package_t h248_package_3GTFO = {
h248_package_3GTFO_evts,
NULL};
/*
/*
* 3G Expanded Call Progress Tones Generator Package
* 3GPP TS 29.232 -- 15.2.3
*/
/*
/*
* Modification Of Link Characteristics Bearer Capability
* 3GPP TS 29.232 -- 15.2.4
*/
/*
/*
* Enhanced Circuit Switched Data package
* 3GPP TS 29.232 -- 15.2.5
*/
/*
/*
* Cellular Text telephone Modem Text Transport
* 3GPP TS 29.232 -- 15.2.6
*/
/*
/*
* IP transport package
* 3GPP TS 29.232 -- 15.2.7
*/
/*
/*
* Flexible Tone Generator Package
* 3GPP TS 29.232 -- 15.2.8
*/
/*
/*
* Trace Package
* 3GPP TS 29.232 -- 15.2.9
*/
/*
/*
* ASCI Group call package
* 3GPP TS 29.232 -- 15.2.10
*/
@ -471,8 +471,8 @@ void proto_register_h248_3gpp(void) {
{ "Initialisation Direction", "h248.package_3GUP.initdir",
FT_UINT32, BASE_DEC, VALS(h248_3GUP_initdir_vals), 0,
NULL, HFILL }},
{ &hf_h248_package_3GCSD,
{ "CSD Package", "h248.package_3GCSD",
FT_BYTES, BASE_NONE, NULL, 0,
@ -513,7 +513,7 @@ void proto_register_h248_3gpp(void) {
{ "Local Peer Role", "h248.package_3GCSD.actprot.localpeer",
FT_UINT32, BASE_DEC, VALS(h248_3GCSD_actprot_sig_localpeer_vals), 0,
"It is used to inform the modem whether it should act as originating or terminating peer", HFILL }},
{ &hf_h248_package_3GTFO,
{ "Tandem Free Operation", "h248.package_3GTFO",
@ -527,7 +527,7 @@ void proto_register_h248_3gpp(void) {
{ "TFO Codec List", "h248.package_3GTFO.codeclist",
FT_BYTES, BASE_NONE, NULL, 0,
"List of codecs for use in TFO protocol", HFILL }},
{ &hf_h248_pkg_3GTFO_evt_codec_modify,
{ "Optimal Codec Event", "h248.package_3GTFO.codec_modify",
FT_BYTES, BASE_NONE, NULL, 0,
@ -536,17 +536,17 @@ void proto_register_h248_3gpp(void) {
{ "Optimal Codec Type", "h248.package_3GTFO.codec_modify.optimalcodec",
FT_BYTES, BASE_NONE, NULL, 0,
"indicates which is the proposed codec type for TFO", HFILL }},
{ &hf_h248_pkg_3GTFO_evt_distant_codec_list,
{ "Codec List Event", "h248.package_3GTFO.distant_codec_list",
FT_BYTES, BASE_NONE, NULL, 0,
"The event is used to notify the MGC of the distant TFO partner's supported codec list", HFILL }},
{ &hf_h248_pkg_3GTFO_evt_distant_codec_list_distlist,
{ "Distant Codec List", "h248.package_3GTFO.distant_codec_list.distlist",
FT_BYTES, BASE_NONE, NULL, 0,
"indicates the codec list for TFO", HFILL }},
{ &hf_h248_pkg_3GTFO_evt_status,
{ "TFO Status Event", "h248.package_3GTFO.status",
FT_BYTES, BASE_NONE, NULL, 0,
@ -556,7 +556,7 @@ void proto_register_h248_3gpp(void) {
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
"reports whether TFO has been established or broken", HFILL }},
};
static gint *ett[] = {
&ett_h248_package_3GUP,
&ett_h248_package_3GCSD,
@ -567,15 +567,16 @@ void proto_register_h248_3gpp(void) {
&ett_h248_3GTFO_evt_distant_codec_list,
&ett_h248_3GTFO_evt_codec_modify,
&ett_h248_3GTFO_codec_list,
&ett_h248_3GTFO_codec
&ett_h248_3GTFO_codec,
&ett_pkg_3GCSD_sig_actprot
};
hf_h248_package_3GUP = proto_register_protocol(PNAME, PSNAME, PFNAME);
proto_register_field_array(hf_h248_package_3GUP, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
h248_register_package(&h248_package_3GUP);
h248_register_package(&h248_package_3GCSD);
h248_register_package(&h248_package_3GTFO);

29
epan/dissectors/packet-h248_annex_e.c
View File

@ -53,7 +53,7 @@ static int hf_h248_pkg_generic_sc_rid = -1;
static gint ett_h248_pkg_generic_cause_evt = -1;
static gint ett_h248_pkg_generic = -1;
static int ett_h248_pkg_generic_sc_evt = -1;
static gint ett_h248_pkg_generic_sc_evt = -1;
static const value_string h248_pkg_generic_cause_vals[] _U_ = {
{1, "gencause"},
@ -194,7 +194,7 @@ static h248_package_t h248_pkg_tonegen = {
*/
/* H.248.1 E.4 Tone Detector Package
/* H.248.1 E.4 Tone Detector Package
static int hf_h248_pkg_tonedet = -1;
static int hf_h248_pkg_tonedet_evt_std = -1;
static int hf_h248_pkg_tonedet_evt_etd = -1;
@ -325,7 +325,7 @@ static h248_pkg_evt_t h248_pkg_al_evts[] = {
{ 0x0004, &hf_h248_pkg_al_evt_onhook, &ett_h248_pkg_al_evt_onhook, h248_pkg_al_evt_onhook_params, h248_pkg_al_evt_onhook_params_vals},
{ 0x0005, &hf_h248_pkg_al_evt_offhook, &ett_h248_pkg_al_evt_offhook, h248_pkg_al_evt_offhook_params, h248_pkg_al_evt_onhook_params_vals },
{ 0x0006, &hf_h248_pkg_al_evt_flashhook, &ett_h248_pkg_al_evt_flashhook, h248_pkg_al_evt_flashhook_params, h248_pkg_al_evt_flashhook_params_vals },
{ 0, NULL, NULL, NULL, NULL}
};
@ -359,7 +359,7 @@ static h248_package_t h248_pkg_al = {
static int hf_h248_pkg_rtp = -1;
static int hf_h248_pkg_rtp_stat_ps = -1;
static int ett_h248_pkg_rtp = -1;
static gint ett_h248_pkg_rtp = -1;
static const value_string h248_pkg_rtp_stat_vals[] _U_ = {
{ 0x0004, "ps"},
@ -440,13 +440,13 @@ void proto_register_h248_annex_e(void) {
/* H.248.1 E.1 Generic Package */
{ &hf_h248_pkg_generic, { "Generic Package", "h248.pkg.generic", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_h248_pkg_generic_cause_evt, { "Cause Event", "h248.pkg.generic.cause", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_h248_pkg_generic_cause_gencause, { "Generic Cause", "h248.pkg.generic.cause.gencause", FT_UINT32, BASE_HEX, VALS(h248_pkg_generic_cause_gencause_vals), 0, NULL, HFILL }},
{ &hf_h248_pkg_generic_cause_gencause, { "Generic Cause", "h248.pkg.generic.cause.gencause", FT_UINT32, BASE_HEX, VALS(h248_pkg_generic_cause_gencause_vals), 0, NULL, HFILL }},
{ &hf_h248_pkg_generic_cause_failurecause, { "Generic Cause", "h248.pkg.generic.cause.failurecause", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
{&hf_h248_pkg_generic_sc_evt, {"Signal Completion","h248.pkg.generic.sc",FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL}},
{ &hf_h248_pkg_generic_sc_sig_id, { "Signal Identity", "h248.pkg.generic.sc.sig_id", FT_BYTES, BASE_NONE, NULL , 0, NULL, HFILL }},
{ &hf_h248_pkg_generic_sc_meth, { "Termination Method", "h248.pkg.generic.sc.meth", FT_UINT32, BASE_DEC, VALS(h248_pkg_generic_sc_vals) , 0, NULL, HFILL }},
{ &hf_h248_pkg_generic_sc_slid, { "Signal List ID", "h248.pkg.generic.sc.slid", FT_UINT32, BASE_DEC, NULL , 0, NULL, HFILL }},
{ &hf_h248_pkg_generic_sc_rid, { "Request ID", "h248.pkg.generic.sc.rid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_h248_pkg_generic_sc_sig_id, { "Signal Identity", "h248.pkg.generic.sc.sig_id", FT_BYTES, BASE_NONE, NULL , 0, NULL, HFILL }},
{ &hf_h248_pkg_generic_sc_meth, { "Termination Method", "h248.pkg.generic.sc.meth", FT_UINT32, BASE_DEC, VALS(h248_pkg_generic_sc_vals) , 0, NULL, HFILL }},
{ &hf_h248_pkg_generic_sc_slid, { "Signal List ID", "h248.pkg.generic.sc.slid", FT_UINT32, BASE_DEC, NULL , 0, NULL, HFILL }},
{ &hf_h248_pkg_generic_sc_rid, { "Request ID", "h248.pkg.generic.sc.rid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
/* H.248.1 E.9 Analog Line Supervision Package */
{ &hf_h248_pkg_al, { "Analog Line Supervision Package", "h248.pkg.al", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_h248_pkg_al_evt_onhook, { "onhook", "h248.pkg.al.onhook", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
@ -465,10 +465,11 @@ void proto_register_h248_annex_e(void) {
{ &hf_h248_pkg_tdmc_ec, { "Echo Cancellation", "h248.pkg.tdmc.ec", FT_BOOLEAN, BASE_NONE, TFS(&h248_tdmc_ec_vals), 0x0, NULL, HFILL }},
{ &hf_h248_pkg_tdmc_gain, { "Gain", "h248.pkg.tdmc.gain", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
};
static gint *ett[] = {
&ett_h248_pkg_generic_cause_evt,
&ett_h248_pkg_generic,
&ett_h248_pkg_generic_sc_evt,
&ett_h248_pkg_dg,
&ett_h248_pkg_dg_sig_d0,
@ -478,8 +479,12 @@ void proto_register_h248_annex_e(void) {
&ett_h248_pkg_al,
&ett_h248_pkg_al_evt_onhook,
&ett_h248_pkg_al_evt_offhook,
&ett_h248_pkg_al_evt_flashhook,
&ett_h248_pkg_rtp,
&ett_h248_pkg_tdmc
};
proto_h248_annex_E = proto_register_protocol(PNAME, PSNAME, PFNAME);
@ -487,7 +492,7 @@ void proto_register_h248_annex_e(void) {
proto_register_field_array(proto_h248_annex_E, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
h248_register_package(&h248_pkg_generic);
h248_register_package(&h248_pkg_dg);
h248_register_package(&h248_pkg_al);

103
epan/dissectors/packet-h248_q1950.c
View File

@ -45,7 +45,7 @@ static gboolean implicit = FALSE;
static int hf_h248_pkg_BCP = -1;
static int hf_h248_pkg_BCP_BNCChar = -1;
static int ett_h248_pkg_BCP = -1;
static gint ett_h248_pkg_BCP = -1;
static const value_string h248_pkg_BCP_parameters[] _U_ = {
{ 0x0001, "BNCChar (BNC Characteristics)" },
@ -83,7 +83,7 @@ static int hf_h248_pkg_BNCCT = -1;
static int hf_h248_pkg_BNCCT_prop = -1;
static int ett_h248_pkg_BNCCT = -1;
static gint ett_h248_pkg_BNCCT = -1;
static const value_string h248_pkg_BNCCT_parameters[] _U_ = {
{ 0x0001, "BNC Cut Through Capability" },
@ -127,7 +127,7 @@ static int hf_h248_pkg_RI = -1;
static int hf_h248_pkg_RII= -1;
static int ett_h248_pkg_RI= -1;
static gint ett_h248_pkg_RI= -1;
static const value_string h248_pkg_RI_parameters[] = {
{ 0x0001, "Reuse Idle Indication" },
@ -164,7 +164,7 @@ static h248_package_t h248_pkg_RI = {
/* A.5 Bearer Reuse Idle Package */
/* A.6 Generic bearer connection package
/* A.6 Generic bearer connection package
Package Name: GB
Package ID: 0x0021
*/
@ -287,20 +287,20 @@ static void dissect_bt_tunneled_proto(proto_tree* tree, tvbuff_t* tvb, packet_in
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
get_ber_identifier(tvb, 0, &class, &pc, &tag);
/* XXX: is this enough to guess it? */
if ((tag==BER_UNI_TAG_OCTETSTRING)) {
dissect_ber_octet_string(FALSE, &asn1_ctx, tree, tvb, 0, hfid, &bctp_tvb);
if (bctp_tvb) {
call_dissector(bctp_dissector,bctp_tvb,pinfo,tree);
}
} else {
proto_tree_add_item(tree,hfid,tvb,0,-1,FALSE);
}
}
@ -382,8 +382,8 @@ static int hf_h248_pkg_bcg_sig_bcw = -1;
static int hf_h248_pkg_bcg_sig_bcr = -1;
static int hf_h248_pkg_bcg_sig_bpy = -1;
static int ett_h248_pkg_bcg = -1;
static int ett_h248_pkg_bcg_sig_bdt = -1;
static gint ett_h248_pkg_bcg = -1;
static gint ett_h248_pkg_bcg_sig_bdt = -1;
static const value_string h248_pkg_bcg_sig_bdt_par_btd_vals[] = {
{ 0x0001, "ext (External)" },
@ -430,7 +430,7 @@ static h248_package_t h248_pkg_bcg = {
void proto_reg_handoff_q1950(void) {
bctp_dissector = find_dissector("bctp");
}
/* Register dissector */
@ -438,136 +438,136 @@ void proto_register_q1950(void) {
static hf_register_info hf[] = {
/* A.3 Bearer characteristics package */
{ &hf_h248_pkg_BCP,
{ "BCP (Bearer characteristics package)", "h248.pkg.BCP",
{ "BCP (Bearer characteristics package)", "h248.pkg.BCP",
FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }
},
{ &hf_h248_pkg_BCP_BNCChar,
{ "BNCChar (BNC Characteristics)", "h248.pkg.bcp.bncchar",
{ "BNCChar (BNC Characteristics)", "h248.pkg.bcp.bncchar",
FT_UINT32, BASE_HEX|BASE_EXT_STRING, &bearer_network_connection_characteristics_vals_ext, 0, "BNC Characteristics", HFILL }
},
/* A.4 Bearer Network connection cut-through package */
{ &hf_h248_pkg_BNCCT,
{ "BNCCT (Bearer network connection cut-through package)", "h248.pkg.BNCCT",
{ "BNCCT (Bearer network connection cut-through package)", "h248.pkg.BNCCT",
FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }
},
{ &hf_h248_pkg_BNCCT_prop,
{ "Bearer network connection cut-through capability", "h248.pkg.bcp.bncct",
{ "Bearer network connection cut-through capability", "h248.pkg.bcp.bncct",
FT_UINT32, BASE_HEX, VALS(h248_pkg_BNCCT_prop_vals), 0, "This property allows the MGC to ask the MG when the cut through of a bearer will occur, early or late.", HFILL }
},
{ &hf_h248_pkg_GB,
{ "GB (Generic bearer connection)", "h248.pkg.GB",
{ "GB (Generic bearer connection)", "h248.pkg.GB",
FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }
},
{ &hf_h248_pkg_GB_BNCChange,
{ "BNCChange", "h248.pkg.GB.BNCChang",
{ "BNCChange", "h248.pkg.GB.BNCChang",
FT_BYTES, BASE_NONE, NULL, 0, "This event occurs whenever a change to a Bearer Network connection occurs", HFILL }
},
{ &hf_h248_pkg_GB_BNCChange_type,
{ "Type", "h248.pkg.GB.BNCChang.Type",
{ "Type", "h248.pkg.GB.BNCChang.Type",
FT_UINT32, BASE_HEX, VALS(h248_pkg_GB_BNCChange_type_vals), 0, NULL, HFILL }
},
{ &hf_h248_pkg_GB_EstBNC,
{ "Type", "h248.pkg.GB.BNCChang.EstBNC",
{ "Type", "h248.pkg.GB.BNCChang.EstBNC",
FT_BYTES, BASE_NONE, NULL, 0, "This signal triggers the bearer control function to send bearer establishment signalling", HFILL }
},
{ &hf_h248_pkg_GB_ModBNC,
{ "Type", "h248.pkg.GB.BNCChang.Type",
{ "Type", "h248.pkg.GB.BNCChang.Type",
FT_BYTES, BASE_NONE, NULL, 0, "This signal triggers the bearer control function to send bearer modification", HFILL }
},
{ &hf_h248_pkg_GB_RelBNC,
{ "RelBNC", "h248.pkg.GB.BNCChang.RelBNC",
{ "RelBNC", "h248.pkg.GB.BNCChang.RelBNC",
FT_BYTES, BASE_NONE, NULL, 0, "This signal triggers the bearer control function to send bearer release", HFILL }
},
{ &hf_h248_pkg_GB_RelBNC_Generalcause,
{ "Generalcause", "h248.pkg.GB.BNCChang.RelBNC.Generalcause",
{ "Generalcause", "h248.pkg.GB.BNCChang.RelBNC.Generalcause",
FT_UINT32, BASE_HEX, VALS(h248_pkg_GB_RelBNC_Generalcause_vals), 0, "This indicates the general reason for the Release", HFILL }
},
{ &hf_h248_pkg_GB_RelBNC_Failurecause,
{ "Failurecause", "h248.pkg.GB.BNCChang.RelBNC.Failurecause",
{ "Failurecause", "h248.pkg.GB.BNCChang.RelBNC.Failurecause",
FT_BYTES, BASE_NONE, NULL, 0, "The Release Cause is the value generated by the Released equipment", HFILL }
},
{ &hf_h248_pkg_GB_RelBNC_Reset,
{ "RelBNC", "h248.pkg.GB.BNCChang.RelBNC",
{ "RelBNC", "h248.pkg.GB.BNCChang.RelBNC",
FT_BOOLEAN, BASE_NONE, NULL, 0x0, "This signal triggers the bearer control function to send bearer release", HFILL }
},
/* A.5 Bearer Network connection cut-through package */
{ &hf_h248_pkg_RI,
{ "RI (Reuse idle package)", "h248.pkg.RI",
{ "RI (Reuse idle package)", "h248.pkg.RI",
FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }
},
{ &hf_h248_pkg_RII,
{ "Reuse Idle Indication", "h248.pkg.bcp.rii",
{ "Reuse Idle Indication", "h248.pkg.bcp.rii",
FT_UINT32, BASE_HEX, VALS(h248_pkg_RII_vals), 0, "This property indicates that the provided bearer network connection relates to an Idle Bearer.", HFILL }
},
{ &hf_h248_pkg_bt,
{ "BT (Bearer control Tunneling)", "h248.pkg.BT",
{ "BT (Bearer control Tunneling)", "h248.pkg.BT",
FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }
},
{ &hf_h248_pkg_bt_tunopt,
{ "Tunnelling Options", "h248.pkg.BT.TunOpt",
{ "Tunnelling Options", "h248.pkg.BT.TunOpt",
FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }
},
{ &hf_h248_pkg_bt_tind,
{ "tind (Tunnel INDication)", "h248.pkg.BT.TIND",
{ "tind (Tunnel INDication)", "h248.pkg.BT.TIND",
FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }
},
{ &hf_h248_pkg_bt_bit,
{ "Bearer Information Transport", "h248.pkg.BT.BIT",
{ "Bearer Information Transport", "h248.pkg.BT.BIT",
FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }
},
/* A.8 Basic call progress tones generator with directionality */
{ &hf_h248_pkg_bcg,
{ "bcg (Basic call progress tones generator with directionality)", "h248.pkg.bcg",
{ "bcg (Basic call progress tones generator with directionality)", "h248.pkg.bcg",
FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }
},
{ &hf_h248_pkg_bcg_sig_bdt_par_btd,
{ "btd (Tone Direction)", "h248.pkg.bcp.btd",
{ "btd (Tone Direction)", "h248.pkg.bcp.btd",
FT_UINT32, BASE_HEX, VALS(h248_pkg_bcg_sig_bdt_par_btd_vals), 0, NULL, HFILL }
},
{ &hf_h248_pkg_bcg_sig_bdt,
{ "bdt (Dial Tone)", "h248.pkg.bcg.bdt",
{ "bdt (Dial Tone)", "h248.pkg.bcg.bdt",
FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }
},
{ &hf_h248_pkg_bcg_sig_brt,
{ "brt (Ringing tone)", "h248.pkg.bcg.brt",
{ "brt (Ringing tone)", "h248.pkg.bcg.brt",
FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }
},
{ &hf_h248_pkg_bcg_sig_bbt,
{ "bbt (Busy tone)", "h248.pkg.bcg.bbt",
{ "bbt (Busy tone)", "h248.pkg.bcg.bbt",
FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }
},
{ &hf_h248_pkg_bcg_sig_bct,
{ "bct (Congestion tone)", "h248.pkg.bcg.bct",
{ "bct (Congestion tone)", "h248.pkg.bcg.bct",
FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }
},
{ &hf_h248_pkg_bcg_sig_bsit,
{ "bsit (Special information tone)", "h248.pkg.bcg.bsit",
{ "bsit (Special information tone)", "h248.pkg.bcg.bsit",
FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }
},
{ &hf_h248_pkg_bcg_sig_bwt,
{ "bwt (Warning tone)", "h248.pkg.bcg.bwt",
{ "bwt (Warning tone)", "h248.pkg.bcg.bwt",
FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }
},
{ &hf_h248_pkg_bcg_sig_bpt,
{ "bpt (Payphone recognition tone)", "h248.pkg.bcg.bpt",
{ "bpt (Payphone recognition tone)", "h248.pkg.bcg.bpt",
FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }
},
{ &hf_h248_pkg_bcg_sig_bcw,
{ "bcw (Call waiting tone)", "h248.pkg.bcg.bcw",
{ "bcw (Call waiting tone)", "h248.pkg.bcg.bcw",
FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }
},
{ &hf_h248_pkg_bcg_sig_bcr,
{ "bcr (Call ringing tone)", "h248.pkg.bcg.bcr",
{ "bcr (Call ringing tone)", "h248.pkg.bcg.bcr",
FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }
},
{ &hf_h248_pkg_bcg_sig_bpy,
{ "bpy (Pay tone)", "h248.pkg.bcg.bpy",
{ "bpy (Pay tone)", "h248.pkg.bcg.bpy",
FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }
},
};
@ -577,16 +577,23 @@ void proto_register_q1950(void) {
&ett_h248_pkg_bt,
&ett_h248_pkg_bt_tind,
&ett_h248_pkg_bt_bit,
&ett_h248_pkg_bcg,
&ett_h248_pkg_bcg_sig_bdt,
&ett_h248_pkg_BNCCT,
&ett_h248_pkg_RI,
&ett_h248_pkg_GB,
&ett_h248_pkg_GB_EstBNC,
&ett_h248_pkg_GB_ModBNC,
&ett_h248_pkg_GB_RelBNC,
&ett_h248_pkg_GB_BNCChange
};
proto_q1950 = proto_register_protocol(PNAME, PSNAME, PFNAME);
proto_register_field_array(proto_q1950, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
/* Register the packages */
h248_register_package(&h248_pkg_BCP);
h248_register_package(&h248_pkg_BNCCT);