diff options
| -rw-r--r-- | epan/dissectors/packet-h248_10.c | 9 | ||||
| -rw-r--r-- | epan/dissectors/packet-h248_3gpp.c | 1 | ||||
| -rw-r--r-- | epan/dissectors/packet-h248_annex_c.c | 1 | ||||
| -rw-r--r-- | epan/dissectors/packet-h248_q1950.c | 48 |
4 files changed, 46 insertions, 13 deletions
diff --git a/epan/dissectors/packet-h248_10.c b/epan/dissectors/packet-h248_10.c index a48cc622f2..61012c5d8b 100644 --- a/epan/dissectors/packet-h248_10.c +++ b/epan/dissectors/packet-h248_10.c @@ -46,6 +46,11 @@ static int hf_h248_CHP_mgcon_reduction = -1; static gint ett_h248_CHP = -1; static gint ett_h248_CHP_mgcon = -1; +static const value_string h248_CHP_prop_vals[] = { + { 0, "chp (MG Congestion Handling)" }, + { 0, NULL } +}; + static const value_string h248_CHP_events_vals[] = { {1, "MGCon"}, { 0, NULL } @@ -72,12 +77,10 @@ static const h248_package_t h248_pkg_CHP = { 0x0029, &proto_h248_CHP, &ett_h248_CHP, - - NULL, + h248_CHP_prop_vals, NULL, h248_CHP_events_vals, NULL, - NULL, NULL, h248_CHP_mgcon_events, diff --git a/epan/dissectors/packet-h248_3gpp.c b/epan/dissectors/packet-h248_3gpp.c index 8d22b9ec34..cc42180634 100644 --- a/epan/dissectors/packet-h248_3gpp.c +++ b/epan/dissectors/packet-h248_3gpp.c @@ -53,6 +53,7 @@ static gint ett_h248_package_3GUP = -1; static gboolean implicit = FALSE; static const value_string h248_3GUP_properties_vals[] = { + { 0x0000, "threegup (3G User Plane)" }, { 0x0001, "Mode" }, { 0x0002, "Versions" }, { 0x0003, "delerrsdu" }, diff --git a/epan/dissectors/packet-h248_annex_c.c b/epan/dissectors/packet-h248_annex_c.c index 9cd13d4e43..67c8582887 100644 --- a/epan/dissectors/packet-h248_annex_c.c +++ b/epan/dissectors/packet-h248_annex_c.c @@ -180,6 +180,7 @@ static gint ett_vpvc = -1; static gint ett_codec = -1; static const value_string h248_annexc_package_properties_vals[] = { + { 0x0000, "Media stream properties H.248.1 Annex C" }, { 0x1001, "media" }, { 0x1002, "transmission mode" }, { 0x1003, "num_of_channels" }, diff --git a/epan/dissectors/packet-h248_q1950.c b/epan/dissectors/packet-h248_q1950.c index 57e8a66fed..cf13da9d19 100644 --- a/epan/dissectors/packet-h248_q1950.c +++ b/epan/dissectors/packet-h248_q1950.c @@ -53,6 +53,8 @@ static const value_string h248_pkg_BCP_parameters[] _U_ = { }; static const value_string h248_pkg_BCP_props_vals[] = { + {0, "Bearer Characteristics Q.1950 Annex A (bcp)" }, + {1, "BNC Characteristics (BNCChar)"}, {1,"BNCChar"}, {0,NULL} }; @@ -91,6 +93,7 @@ static const value_string h248_pkg_BNCCT_parameters[] _U_ = { }; static const value_string h248_pkg_BNCCT_props_vals[] = { + {0,"Bearer Network Connection Cut Q.1950 Annex A" }, {1,"BNCCT"}, {0,NULL} }; @@ -130,7 +133,8 @@ static int hf_h248_pkg_RII= -1; static gint ett_h248_pkg_RI= -1; static const value_string h248_pkg_RI_parameters[] = { - { 0x0001, "Reuse Idle Indication" }, + { 0x0000, "Reuse Idle Q.1950 Annex A" }, + { 0x0001, "Reuse Idle Indication" }, { 0, NULL } }; @@ -252,11 +256,16 @@ static const h248_pkg_sig_t h248_pkg_GB_signals[] = { { 0, NULL, NULL, NULL, NULL} }; +static const value_string h248_pkg_GB_props_vals[] = { + { 0x0000, "Generic Bearer Connection Q.1950 Annex A (gb)" }, + { 0, NULL } +}; + static h248_package_t h248_pkg_GB = { 0x0021, &hf_h248_pkg_GB, &ett_h248_pkg_GB, - NULL, + h248_pkg_GB_props_vals, h248_pkg_GB_signals_vals, h248_pkg_GB_events_vals, NULL, @@ -306,15 +315,16 @@ static void dissect_bt_tunneled_proto(proto_tree* tree, tvbuff_t* tvb, packet_in /* Properties */ static const value_string h248_pkg_bt_props_vals[] = { - {1,"Tunnelling Options"}, - {0,NULL} + { 0, "Bearer Control Tunnelling Q.1950 Annex A" }, + { 1, "Tunnelling Options"}, + { 0, NULL} }; static const value_string h248_pkg_bt_tunopt_vals[] _U_ = { - {1,"1 (In the same message as the command response to the command which generated the bearer control tunnel)"}, - {2,"2 (Tunnel message at any time)"}, - {3,"NO"}, - {0,NULL} + { 1, "1 (In the same message as the command response to the command which generated the bearer control tunnel)"}, + { 2, "2 (Tunnel message at any time)"}, + { 3, "NO"}, + { 0, NULL} }; static const h248_pkg_param_t h248_pkg_bt_props[] _U_ = { @@ -397,6 +407,19 @@ static h248_pkg_param_t h248_pkg_h248_pkg_bcg_sig_bdt_params[] = { { 0, NULL, NULL, NULL} }; +static const value_string h248_pkg_bcg_signals_vals[] = { + { 0x0041, "Dial Tone (bdt)" }, + { 0x0042, "Ringing Tone (brt)" }, + { 0x0043, "Busy Tone (bbt)" }, + { 0x0044, "Congestion Tone (bct)" }, + { 0x0045, "Warning Tone (bwt)" }, + { 0x0046, "Payphone Recognition Tone (bpt)" }, + { 0x0047, "Call Waiting Tone (bcw)" }, + { 0x0048, "Caller Waiting Tone (bcr)" }, + { 0x0049, "Pay Tone (bpy)" }, + { 0, NULL } +}; + static h248_pkg_sig_t h248_pkg_bcg_signals[] = { /* All the tones have the same parameters */ { 0x0040, &hf_h248_pkg_bcg_sig_bdt, &ett_h248_pkg_bcg_sig_bdt, h248_pkg_h248_pkg_bcg_sig_bdt_params, NULL }, @@ -412,13 +435,18 @@ static h248_pkg_sig_t h248_pkg_bcg_signals[] = { { 0, NULL, NULL, NULL,NULL} }; +static const value_string h248_pkg_bcg_props_vals[] = { + { 0, "Basic Call Progress Tones Q.1950 Annex A" }, + { 0, NULL } +}; + /* Packet defenitions */ static h248_package_t h248_pkg_bcg = { 0x0023, &hf_h248_pkg_bcg, &ett_h248_pkg_bcg, - NULL, - NULL, + h248_pkg_bcg_props_vals, + h248_pkg_bcg_signals_vals, NULL, NULL, NULL, /* Properties */ |