H.248 Annex E dissector does not properly dissect event parameters
(Update the h.248 dissector's package registration to support v1 packets.) Applying part of the patch from Alex Lindberg in bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6915 by hand. Fixes bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4842 svn path=/trunk/; revision=41526
This commit is contained in:
Anders Broman
parent
16a7f0db08
commit
fd19aa7c89
|
|
@ -21,6 +21,8 @@ EventName
|
|||
EventParameterName
|
||||
EventParamValue
|
||||
ContextID
|
||||
EventParamValueV1
|
||||
#SigParamValueV1
|
||||
|
||||
#.TYPE_RENAME
|
||||
IndAudMediaDescriptor/streams IndAudMediaDescriptorStreams
|
||||
|
|
@ -81,6 +83,12 @@ TransactionRequest/transactionId transactionId
|
|||
SegmentReply/transactionId seg_rep_transactionId
|
||||
TransactionReply/transactionId trep_transactionId
|
||||
TransactionPending/transactionId tpend_transactionId
|
||||
PropertyParmV1/values prop_param_values
|
||||
EventParameterV1/value event_param_value
|
||||
SigParameterV1/value sig_param_value
|
||||
PropertyParmV1/value prop_parm_value
|
||||
AuditReplyV1/auditResult audit_result
|
||||
PropertyParmV1/extraInfo extra_info
|
||||
|
||||
#.FN_HDR Message
|
||||
curr_info.msg = gcp_msg(actx->pinfo,tvb_raw_offset(tvb),keep_persistent_data);
|
||||
|
|
@ -395,7 +403,7 @@ TransactionPending/transactionId tpend_transactionId
|
|||
|
||||
#.FN_BODY EventParameter
|
||||
/* H248 v1 support */
|
||||
if (h248_version >1) {
|
||||
if (h248_version > 1) {
|
||||
%(DEFAULT_BODY)s
|
||||
} else {
|
||||
offset = dissect_h248_EventParameterV1( implicit_tag, tvb, offset, actx, tree, hf_index);
|
||||
|
|
|
|||
|
|
@ -26,8 +26,8 @@ BEGIN
|
|||
-- V1
|
||||
EventParameterV1 ::= SEQUENCE
|
||||
{
|
||||
eventParamterName [0] Name,
|
||||
value [1] ValueV1
|
||||
eventParamterName [0] EventParameterName,
|
||||
value [1] EventParamValueV1
|
||||
}
|
||||
|
||||
-- V1
|
||||
|
|
@ -47,10 +47,12 @@ BEGIN
|
|||
-- V1
|
||||
SigParameterV1 ::= SEQUENCE
|
||||
{
|
||||
sigParameterName [0] Name,
|
||||
value [1] ValueV1
|
||||
sigParameterName [0] SigParameterName,
|
||||
value [1] SigParamValueV1
|
||||
}
|
||||
|
||||
ValueV1 ::= OCTET STRING
|
||||
EventParamValueV1 ::= OCTET STRING
|
||||
SigParamValueV1 ::= OCTET STRING
|
||||
|
||||
END
|
||||
|
|
@ -1291,6 +1291,34 @@ static int dissect_h248_EventParamValue(gboolean implicit_tag _U_, tvbuff_t *tvb
|
|||
return end_offset;
|
||||
}
|
||||
|
||||
static int dissect_h248_EventParamValueV1(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index _U_) {
|
||||
tvbuff_t *next_tvb;
|
||||
int end_offset;
|
||||
gint8 class;
|
||||
gboolean pc, ind;
|
||||
gint32 tag;
|
||||
guint32 len;
|
||||
|
||||
offset=dissect_ber_identifier(actx->pinfo, tree, tvb, offset, &class, &pc, &tag);
|
||||
offset=dissect_ber_length(actx->pinfo, tree, tvb, offset, &len, &ind);
|
||||
end_offset=offset+len;
|
||||
|
||||
if( (class!=BER_CLASS_UNI)
|
||||
||(tag!=BER_UNI_TAG_OCTETSTRING) ){
|
||||
proto_tree_add_text(tree, tvb, offset-2, 2, "H.248 BER Error: OctetString expected but Class:%d PC:%d Tag:%d was unexpected", class, pc, tag);
|
||||
return end_offset;
|
||||
}
|
||||
|
||||
|
||||
next_tvb = tvb_new_subset(tvb,offset,len,len);
|
||||
|
||||
if ( curr_info.par && curr_info.par->dissector) {
|
||||
curr_info.par->dissector(tree, next_tvb, actx->pinfo, *(curr_info.par->hfid), &curr_info, curr_info.par->data);
|
||||
}
|
||||
|
||||
return end_offset;
|
||||
}
|
||||
|
||||
static int dissect_h248_MtpAddress(gboolean implicit_tag, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
|
||||
tvbuff_t *new_tvb;
|
||||
proto_tree *mtp_tree=NULL;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/* Do not modify this file. */
|
||||
/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
|
||||
/* packet-h248.c */
|
||||
/* ../../../tools/asn2wrs.py -b -p h248 -c ../../../asn1/h248/h248.cnf -s ../../../asn1/h248/packet-h248-template -D ../../../asn1/h248 -O ../../../epan/dissectors h248v3.asn h248v1support.asn */
|
||||
/* ../../tools/asn2wrs.py -b -p h248 -c ./h248.cnf -s ./packet-h248-template -D . -O ../../epan/dissectors h248v3.asn h248v1support.asn */
|
||||
|
||||
/* Input file: packet-h248-template.c */
|
||||
|
||||
|
|
@ -369,14 +369,14 @@ static int hf_h248_manufacturerCode = -1; /* INTEGER_0_65535 */
|
|||
static int hf_h248_date = -1; /* IA5String_SIZE_8 */
|
||||
static int hf_h248_time = -1; /* IA5String_SIZE_8 */
|
||||
static int hf_h248_Value_item = -1; /* OCTET_STRING */
|
||||
static int hf_h248_auditResult_01 = -1; /* AuditResultV1 */
|
||||
static int hf_h248_audit_result = -1; /* AuditResultV1 */
|
||||
static int hf_h248_contectAuditResult = -1; /* TerminationID */
|
||||
static int hf_h248_eventParamterName = -1; /* Name */
|
||||
static int hf_h248_value_01 = -1; /* ValueV1 */
|
||||
static int hf_h248_value_02 = -1; /* T_value */
|
||||
static int hf_h248_value_item = -1; /* OCTET_STRING */
|
||||
static int hf_h248_extraInfo_01 = -1; /* T_extraInfo_01 */
|
||||
static int hf_h248_sigParameterName_01 = -1; /* Name */
|
||||
static int hf_h248_eventParamterName = -1; /* EventParameterName */
|
||||
static int hf_h248_event_param_value = -1; /* EventParamValueV1 */
|
||||
static int hf_h248_prop_parm_value = -1; /* T_prop_parm_value */
|
||||
static int hf_h248_prop_parm_value_item = -1; /* OCTET_STRING */
|
||||
static int hf_h248_extra_info = -1; /* T_extra_info */
|
||||
static int hf_h248_sig_param_value = -1; /* SigParamValueV1 */
|
||||
/* named bits */
|
||||
static int hf_h248_T_auditToken_muxToken = -1;
|
||||
static int hf_h248_T_auditToken_modemToken = -1;
|
||||
|
|
@ -558,8 +558,8 @@ static gint ett_h248_AuditReplyV1 = -1;
|
|||
static gint ett_h248_AuditResultV1 = -1;
|
||||
static gint ett_h248_EventParameterV1 = -1;
|
||||
static gint ett_h248_PropertyParmV1 = -1;
|
||||
static gint ett_h248_T_value = -1;
|
||||
static gint ett_h248_T_extraInfo_01 = -1;
|
||||
static gint ett_h248_T_prop_parm_value = -1;
|
||||
static gint ett_h248_T_extra_info = -1;
|
||||
static gint ett_h248_SigParameterV1 = -1;
|
||||
|
||||
/*--- End of included file: packet-h248-ett.c ---*/
|
||||
|
|
@ -1768,6 +1768,34 @@ static int dissect_h248_EventParamValue(gboolean implicit_tag _U_, tvbuff_t *tvb
|
|||
return end_offset;
|
||||
}
|
||||
|
||||
static int dissect_h248_EventParamValueV1(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index _U_) {
|
||||
tvbuff_t *next_tvb;
|
||||
int end_offset;
|
||||
gint8 class;
|
||||
gboolean pc, ind;
|
||||
gint32 tag;
|
||||
guint32 len;
|
||||
|
||||
offset=dissect_ber_identifier(actx->pinfo, tree, tvb, offset, &class, &pc, &tag);
|
||||
offset=dissect_ber_length(actx->pinfo, tree, tvb, offset, &len, &ind);
|
||||
end_offset=offset+len;
|
||||
|
||||
if( (class!=BER_CLASS_UNI)
|
||||
||(tag!=BER_UNI_TAG_OCTETSTRING) ){
|
||||
proto_tree_add_text(tree, tvb, offset-2, 2, "H.248 BER Error: OctetString expected but Class:%d PC:%d Tag:%d was unexpected", class, pc, tag);
|
||||
return end_offset;
|
||||
}
|
||||
|
||||
|
||||
next_tvb = tvb_new_subset(tvb,offset,len,len);
|
||||
|
||||
if ( curr_info.par && curr_info.par->dissector) {
|
||||
curr_info.par->dissector(tree, next_tvb, actx->pinfo, *(curr_info.par->hfid), &curr_info, curr_info.par->data);
|
||||
}
|
||||
|
||||
return end_offset;
|
||||
}
|
||||
|
||||
static int dissect_h248_MtpAddress(gboolean implicit_tag, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) {
|
||||
tvbuff_t *new_tvb;
|
||||
proto_tree *mtp_tree=NULL;
|
||||
|
|
@ -1858,7 +1886,7 @@ dissect_h248_AuthenticationHeader(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
static int
|
||||
dissect_h248_T_version(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 97 "../../asn1/h248/h248.cnf"
|
||||
#line 105 "../../asn1/h248/h248.cnf"
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
&h248_version);
|
||||
|
||||
|
|
@ -1998,7 +2026,7 @@ dissect_h248_MId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, a
|
|||
|
||||
static int
|
||||
dissect_h248_T_errorCode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 291 "../../asn1/h248/h248.cnf"
|
||||
#line 299 "../../asn1/h248/h248.cnf"
|
||||
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_h248_error_code, &error_code);
|
||||
expert_add_info_format(actx->pinfo, actx->created_item, PI_RESPONSE_CODE, PI_WARN, "Errored Command");
|
||||
|
||||
|
|
@ -2054,7 +2082,7 @@ dissect_h248_TransactionId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
|
|||
|
||||
static int
|
||||
dissect_h248_T_transactionId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 101 "../../asn1/h248/h248.cnf"
|
||||
#line 109 "../../asn1/h248/h248.cnf"
|
||||
guint32 trx_id = 0;
|
||||
offset = dissect_h248_trx_id(implicit_tag, actx->pinfo, tree, tvb, offset, &trx_id);
|
||||
curr_info.trx = gcp_trx(curr_info.msg, trx_id, GCP_TRX_REQUEST, keep_persistent_data);
|
||||
|
|
@ -2069,7 +2097,7 @@ dissect_h248_T_transactionId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
|
|||
|
||||
static int
|
||||
dissect_h248_ContextId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 126 "../../asn1/h248/h248.cnf"
|
||||
#line 134 "../../asn1/h248/h248.cnf"
|
||||
guint32 ctx_id = 0;
|
||||
offset = dissect_h248_ctx_id(implicit_tag, actx->pinfo, tree, tvb, offset, &ctx_id);
|
||||
curr_info.ctx = gcp_ctx(curr_info.msg,curr_info.trx,ctx_id,keep_persistent_data);
|
||||
|
|
@ -2103,7 +2131,7 @@ dissect_h248_BOOLEAN(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U
|
|||
|
||||
static int
|
||||
dissect_h248_WildcardField(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 309 "../../asn1/h248/h248.cnf"
|
||||
#line 317 "../../asn1/h248/h248.cnf"
|
||||
tvbuff_t* new_tvb;
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, &new_tvb);
|
||||
tree = proto_item_add_subtree(actx->created_item,ett_wildcard);
|
||||
|
|
@ -2137,7 +2165,7 @@ dissect_h248_SEQUENCE_OF_WildcardField(gboolean implicit_tag _U_, tvbuff_t *tvb
|
|||
|
||||
static int
|
||||
dissect_h248_T_terminationId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 323 "../../asn1/h248/h248.cnf"
|
||||
#line 331 "../../asn1/h248/h248.cnf"
|
||||
tvbuff_t* new_tvb;
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, &new_tvb);
|
||||
|
||||
|
|
@ -2176,7 +2204,7 @@ static const ber_sequence_t TerminationID_sequence[] = {
|
|||
|
||||
static int
|
||||
dissect_h248_TerminationID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 304 "../../asn1/h248/h248.cnf"
|
||||
#line 312 "../../asn1/h248/h248.cnf"
|
||||
curr_info.term = ep_new0(gcp_term_t);
|
||||
wild_term = GCP_WILDCARD_NONE;
|
||||
|
||||
|
|
@ -2254,14 +2282,14 @@ static const ber_sequence_t T_topologyReq_sequence_of[1] = {
|
|||
|
||||
static int
|
||||
dissect_h248_T_topologyReq(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 209 "../../asn1/h248/h248.cnf"
|
||||
#line 217 "../../asn1/h248/h248.cnf"
|
||||
curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_TOPOLOGY_REQ,offset,keep_persistent_data);
|
||||
H248_TAP();
|
||||
|
||||
offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
|
||||
T_topologyReq_sequence_of, hf_index, ett_h248_T_topologyReq);
|
||||
|
||||
#line 213 "../../asn1/h248/h248.cnf"
|
||||
#line 221 "../../asn1/h248/h248.cnf"
|
||||
curr_info.cmd = NULL;
|
||||
|
||||
return offset;
|
||||
|
|
@ -2351,7 +2379,7 @@ static const ber_sequence_t PropertyParm_sequence[] = {
|
|||
|
||||
static int
|
||||
dissect_h248_PropertyParm(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 416 "../../asn1/h248/h248.cnf"
|
||||
#line 424 "../../asn1/h248/h248.cnf"
|
||||
/* H248 v1 support */
|
||||
if (h248_version >1) {
|
||||
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
|
||||
|
|
@ -2505,13 +2533,13 @@ dissect_h248_ContextAttrAuditRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U
|
|||
|
||||
static int
|
||||
dissect_h248_T_contextAttrAuditReq(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 217 "../../asn1/h248/h248.cnf"
|
||||
#line 225 "../../asn1/h248/h248.cnf"
|
||||
curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_CTX_ATTR_AUDIT_REQ,offset,keep_persistent_data);
|
||||
H248_TAP();
|
||||
|
||||
offset = dissect_h248_ContextAttrAuditRequest(implicit_tag, tvb, offset, actx, tree, hf_index);
|
||||
|
||||
#line 221 "../../asn1/h248/h248.cnf"
|
||||
#line 229 "../../asn1/h248/h248.cnf"
|
||||
curr_info.cmd = NULL;
|
||||
|
||||
return offset;
|
||||
|
|
@ -3158,7 +3186,7 @@ static const ber_sequence_t SigParameter_sequence[] = {
|
|||
|
||||
static int
|
||||
dissect_h248_SigParameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 406 "../../asn1/h248/h248.cnf"
|
||||
#line 414 "../../asn1/h248/h248.cnf"
|
||||
/* H248 v1 support */
|
||||
if (h248_version >1) {
|
||||
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
|
||||
|
|
@ -3394,9 +3422,9 @@ static const ber_sequence_t EventParameter_sequence[] = {
|
|||
|
||||
static int
|
||||
dissect_h248_EventParameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 397 "../../asn1/h248/h248.cnf"
|
||||
#line 405 "../../asn1/h248/h248.cnf"
|
||||
/* H248 v1 support */
|
||||
if (h248_version >1) {
|
||||
if (h248_version > 1) {
|
||||
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
|
||||
EventParameter_sequence, hf_index, ett_h248_EventParameter);
|
||||
|
||||
|
|
@ -3998,13 +4026,13 @@ dissect_h248_AmmRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
|
|||
|
||||
static int
|
||||
dissect_h248_T_addReq(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 142 "../../asn1/h248/h248.cnf"
|
||||
#line 150 "../../asn1/h248/h248.cnf"
|
||||
curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_ADD_REQ,offset,keep_persistent_data);
|
||||
H248_TAP();
|
||||
|
||||
offset = dissect_h248_AmmRequest(implicit_tag, tvb, offset, actx, tree, hf_index);
|
||||
|
||||
#line 147 "../../asn1/h248/h248.cnf"
|
||||
#line 155 "../../asn1/h248/h248.cnf"
|
||||
curr_info.cmd = NULL;
|
||||
|
||||
return offset;
|
||||
|
|
@ -4014,14 +4042,14 @@ dissect_h248_T_addReq(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _
|
|||
|
||||
static int
|
||||
dissect_h248_T_moveReq(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 151 "../../asn1/h248/h248.cnf"
|
||||
#line 159 "../../asn1/h248/h248.cnf"
|
||||
curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_MOVE_REQ,offset,keep_persistent_data);
|
||||
H248_TAP();
|
||||
|
||||
|
||||
offset = dissect_h248_AmmRequest(implicit_tag, tvb, offset, actx, tree, hf_index);
|
||||
|
||||
#line 157 "../../asn1/h248/h248.cnf"
|
||||
#line 165 "../../asn1/h248/h248.cnf"
|
||||
curr_info.cmd = NULL;
|
||||
|
||||
return offset;
|
||||
|
|
@ -4031,13 +4059,13 @@ dissect_h248_T_moveReq(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
|
|||
|
||||
static int
|
||||
dissect_h248_T_modReq(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 161 "../../asn1/h248/h248.cnf"
|
||||
#line 169 "../../asn1/h248/h248.cnf"
|
||||
curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_MOD_REQ,offset,keep_persistent_data);
|
||||
H248_TAP();
|
||||
|
||||
offset = dissect_h248_AmmRequest(implicit_tag, tvb, offset, actx, tree, hf_index);
|
||||
|
||||
#line 165 "../../asn1/h248/h248.cnf"
|
||||
#line 173 "../../asn1/h248/h248.cnf"
|
||||
curr_info.cmd = NULL;
|
||||
|
||||
return offset;
|
||||
|
|
@ -4062,13 +4090,13 @@ dissect_h248_SubtractRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
|
|||
|
||||
static int
|
||||
dissect_h248_T_subtractReq(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 169 "../../asn1/h248/h248.cnf"
|
||||
#line 177 "../../asn1/h248/h248.cnf"
|
||||
curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_SUB_REQ,offset,keep_persistent_data);
|
||||
H248_TAP();
|
||||
|
||||
offset = dissect_h248_SubtractRequest(implicit_tag, tvb, offset, actx, tree, hf_index);
|
||||
|
||||
#line 173 "../../asn1/h248/h248.cnf"
|
||||
#line 181 "../../asn1/h248/h248.cnf"
|
||||
curr_info.cmd = NULL;
|
||||
|
||||
return offset;
|
||||
|
|
@ -4094,13 +4122,13 @@ dissect_h248_AuditRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs
|
|||
|
||||
static int
|
||||
dissect_h248_T_auditCapRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 177 "../../asn1/h248/h248.cnf"
|
||||
#line 185 "../../asn1/h248/h248.cnf"
|
||||
curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_AUDITCAP_REQ,offset,keep_persistent_data);
|
||||
H248_TAP();
|
||||
|
||||
offset = dissect_h248_AuditRequest(implicit_tag, tvb, offset, actx, tree, hf_index);
|
||||
|
||||
#line 181 "../../asn1/h248/h248.cnf"
|
||||
#line 189 "../../asn1/h248/h248.cnf"
|
||||
curr_info.cmd = NULL;
|
||||
|
||||
return offset;
|
||||
|
|
@ -4110,13 +4138,13 @@ dissect_h248_T_auditCapRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
|
|||
|
||||
static int
|
||||
dissect_h248_T_auditValueRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 185 "../../asn1/h248/h248.cnf"
|
||||
#line 193 "../../asn1/h248/h248.cnf"
|
||||
curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_AUDITVAL_REQ,offset,keep_persistent_data);
|
||||
H248_TAP();
|
||||
|
||||
offset = dissect_h248_AuditRequest(implicit_tag, tvb, offset, actx, tree, hf_index);
|
||||
|
||||
#line 189 "../../asn1/h248/h248.cnf"
|
||||
#line 197 "../../asn1/h248/h248.cnf"
|
||||
curr_info.cmd = NULL;
|
||||
|
||||
return offset;
|
||||
|
|
@ -4202,13 +4230,13 @@ dissect_h248_NotifyRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
|
|||
|
||||
static int
|
||||
dissect_h248_T_notifyReq(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 193 "../../asn1/h248/h248.cnf"
|
||||
#line 201 "../../asn1/h248/h248.cnf"
|
||||
curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_NOTIFY_REQ,offset,keep_persistent_data);
|
||||
H248_TAP();
|
||||
|
||||
offset = dissect_h248_NotifyRequest(implicit_tag, tvb, offset, actx, tree, hf_index);
|
||||
|
||||
#line 197 "../../asn1/h248/h248.cnf"
|
||||
#line 205 "../../asn1/h248/h248.cnf"
|
||||
curr_info.cmd = NULL;
|
||||
|
||||
return offset;
|
||||
|
|
@ -4293,7 +4321,7 @@ dissect_h248_ServiceChangeProfile(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
|
|||
|
||||
static int
|
||||
dissect_h248_SCreasonValueOctetStr(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 362 "../../asn1/h248/h248.cnf"
|
||||
#line 370 "../../asn1/h248/h248.cnf"
|
||||
|
||||
tvbuff_t *parameter_tvb;
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
|
|
@ -4316,7 +4344,7 @@ static const ber_sequence_t SCreasonValue_sequence_of[1] = {
|
|||
|
||||
static int
|
||||
dissect_h248_SCreasonValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 350 "../../asn1/h248/h248.cnf"
|
||||
#line 358 "../../asn1/h248/h248.cnf"
|
||||
/* H248 v1 support */
|
||||
if ( h248_version >1 ) {
|
||||
/* Not V1, so call "standard" function */
|
||||
|
|
@ -4376,14 +4404,14 @@ static const ber_sequence_t ServiceChangeRequest_sequence[] = {
|
|||
|
||||
static int
|
||||
dissect_h248_ServiceChangeRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 201 "../../asn1/h248/h248.cnf"
|
||||
#line 209 "../../asn1/h248/h248.cnf"
|
||||
curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_SVCCHG_REQ,offset,keep_persistent_data);
|
||||
H248_TAP();
|
||||
|
||||
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
|
||||
ServiceChangeRequest_sequence, hf_index, ett_h248_ServiceChangeRequest);
|
||||
|
||||
#line 205 "../../asn1/h248/h248.cnf"
|
||||
#line 213 "../../asn1/h248/h248.cnf"
|
||||
curr_info.cmd = NULL;
|
||||
|
||||
return offset;
|
||||
|
|
@ -4501,7 +4529,7 @@ dissect_h248_TransactionRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
|
|||
|
||||
static int
|
||||
dissect_h248_T_tpend_transactionId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 108 "../../asn1/h248/h248.cnf"
|
||||
#line 116 "../../asn1/h248/h248.cnf"
|
||||
guint32 trx_id = 0;
|
||||
offset = dissect_h248_trx_id(implicit_tag, actx->pinfo, tree, tvb, offset, &trx_id);
|
||||
curr_info.trx = gcp_trx(curr_info.msg, trx_id, GCP_TRX_PENDING, keep_persistent_data);
|
||||
|
|
@ -4530,7 +4558,7 @@ dissect_h248_TransactionPending(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
|
|||
|
||||
static int
|
||||
dissect_h248_T_trep_transactionId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 114 "../../asn1/h248/h248.cnf"
|
||||
#line 122 "../../asn1/h248/h248.cnf"
|
||||
guint32 trx_id = 0;
|
||||
offset = dissect_h248_trx_id(implicit_tag, actx->pinfo, tree, tvb, offset, &trx_id);
|
||||
curr_info.trx = gcp_trx(curr_info.msg, trx_id, GCP_TRX_REPLY, keep_persistent_data);
|
||||
|
|
@ -4643,7 +4671,7 @@ dissect_h248_AmmsReply(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
|
|||
|
||||
static int
|
||||
dissect_h248_T_addReply(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 225 "../../asn1/h248/h248.cnf"
|
||||
#line 233 "../../asn1/h248/h248.cnf"
|
||||
curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_ADD_REPLY,offset,keep_persistent_data);
|
||||
H248_TAP();
|
||||
|
||||
|
|
@ -4656,7 +4684,7 @@ dissect_h248_T_addReply(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
|
|||
|
||||
static int
|
||||
dissect_h248_T_moveReply(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 230 "../../asn1/h248/h248.cnf"
|
||||
#line 238 "../../asn1/h248/h248.cnf"
|
||||
curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_MOVE_REPLY,offset,keep_persistent_data);
|
||||
H248_TAP();
|
||||
|
||||
|
|
@ -4669,7 +4697,7 @@ dissect_h248_T_moveReply(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse
|
|||
|
||||
static int
|
||||
dissect_h248_T_modReply(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 235 "../../asn1/h248/h248.cnf"
|
||||
#line 243 "../../asn1/h248/h248.cnf"
|
||||
curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_MOD_REPLY,offset,keep_persistent_data);
|
||||
H248_TAP();
|
||||
|
||||
|
|
@ -4682,7 +4710,7 @@ dissect_h248_T_modReply(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
|
|||
|
||||
static int
|
||||
dissect_h248_T_subtractReply(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 240 "../../asn1/h248/h248.cnf"
|
||||
#line 248 "../../asn1/h248/h248.cnf"
|
||||
curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_SUB_REPLY,offset,keep_persistent_data);
|
||||
H248_TAP();
|
||||
|
||||
|
|
@ -4751,11 +4779,11 @@ dissect_h248_AuditReply(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
|
|||
|
||||
static int
|
||||
dissect_h248_T_auditCapReply(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 255 "../../asn1/h248/h248.cnf"
|
||||
#line 263 "../../asn1/h248/h248.cnf"
|
||||
curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_AUDITCAP_REPLY,offset,keep_persistent_data);
|
||||
H248_TAP();
|
||||
|
||||
#line 260 "../../asn1/h248/h248.cnf"
|
||||
#line 268 "../../asn1/h248/h248.cnf"
|
||||
/* h248v1 support */
|
||||
if(h248_version > 1) {
|
||||
offset = dissect_h248_AuditReply(implicit_tag, tvb, offset, actx, tree, hf_index);
|
||||
|
|
@ -4773,11 +4801,11 @@ dissect_h248_T_auditCapReply(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
|
|||
|
||||
static int
|
||||
dissect_h248_T_auditValueReply(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 270 "../../asn1/h248/h248.cnf"
|
||||
#line 278 "../../asn1/h248/h248.cnf"
|
||||
curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_AUDITVAL_REPLY,offset,keep_persistent_data);
|
||||
H248_TAP();
|
||||
|
||||
#line 275 "../../asn1/h248/h248.cnf"
|
||||
#line 283 "../../asn1/h248/h248.cnf"
|
||||
/* h248v1 support */
|
||||
if(h248_version > 1) {
|
||||
offset = dissect_h248_AuditReply(implicit_tag, tvb, offset, actx, tree, hf_index);
|
||||
|
|
@ -4810,7 +4838,7 @@ dissect_h248_NotifyReply(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse
|
|||
|
||||
static int
|
||||
dissect_h248_T_notifyReply(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 245 "../../asn1/h248/h248.cnf"
|
||||
#line 253 "../../asn1/h248/h248.cnf"
|
||||
curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_NOTIFY_REPLY,offset,keep_persistent_data);
|
||||
H248_TAP();
|
||||
|
||||
|
|
@ -4868,7 +4896,7 @@ static const ber_sequence_t ServiceChangeReply_sequence[] = {
|
|||
|
||||
static int
|
||||
dissect_h248_ServiceChangeReply(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 250 "../../asn1/h248/h248.cnf"
|
||||
#line 258 "../../asn1/h248/h248.cnf"
|
||||
curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_SVCCHG_REPLY,offset,keep_persistent_data);
|
||||
H248_TAP();
|
||||
|
||||
|
|
@ -4939,7 +4967,7 @@ dissect_h248_ActionReply(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse
|
|||
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
|
||||
ActionReply_sequence, hf_index, ett_h248_ActionReply);
|
||||
|
||||
#line 135 "../../asn1/h248/h248.cnf"
|
||||
#line 143 "../../asn1/h248/h248.cnf"
|
||||
if (!curr_info.cmd) {
|
||||
curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_REPLY,offset,keep_persistent_data);
|
||||
H248_TAP();
|
||||
|
|
@ -5043,7 +5071,7 @@ dissect_h248_TransactionResponseAck(gboolean implicit_tag _U_, tvbuff_t *tvb _U_
|
|||
|
||||
static int
|
||||
dissect_h248_T_seg_rep_transactionId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 120 "../../asn1/h248/h248.cnf"
|
||||
#line 128 "../../asn1/h248/h248.cnf"
|
||||
guint32 trx_id = 0;
|
||||
offset = dissect_h248_trx_id(implicit_tag, actx->pinfo, tree, tvb, offset, &trx_id);
|
||||
curr_info.trx = gcp_trx(curr_info.msg, trx_id, GCP_TRX_ACK, keep_persistent_data);
|
||||
|
|
@ -5143,13 +5171,13 @@ static const ber_sequence_t Message_sequence[] = {
|
|||
|
||||
static int
|
||||
dissect_h248_Message(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 86 "../../asn1/h248/h248.cnf"
|
||||
#line 94 "../../asn1/h248/h248.cnf"
|
||||
curr_info.msg = gcp_msg(actx->pinfo,tvb_raw_offset(tvb),keep_persistent_data);
|
||||
|
||||
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
|
||||
Message_sequence, hf_index, ett_h248_Message);
|
||||
|
||||
#line 90 "../../asn1/h248/h248.cnf"
|
||||
#line 98 "../../asn1/h248/h248.cnf"
|
||||
col_add_str(actx->pinfo->cinfo, COL_INFO, gcp_msg_to_str(curr_info.msg,keep_persistent_data));
|
||||
|
||||
if (keep_persistent_data)
|
||||
|
|
@ -5209,13 +5237,13 @@ dissect_h248_AuditResultV1(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
|
|||
|
||||
static const ber_sequence_t AuditReplyV1_sequence[] = {
|
||||
{ &hf_h248_terminationID , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_h248_TerminationID },
|
||||
{ &hf_h248_auditResult_01 , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_h248_AuditResultV1 },
|
||||
{ &hf_h248_audit_result , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_h248_AuditResultV1 },
|
||||
{ NULL, 0, 0, 0, NULL }
|
||||
};
|
||||
|
||||
static int
|
||||
dissect_h248_AuditReplyV1(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 285 "../../asn1/h248/h248.cnf"
|
||||
#line 293 "../../asn1/h248/h248.cnf"
|
||||
/* h248v1 support */
|
||||
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
|
||||
AuditReplyV1_sequence, hf_h248_auditValueReplyV1, ett_h248_AuditReplyV1);
|
||||
|
|
@ -5226,13 +5254,107 @@ dissect_h248_AuditReplyV1(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs
|
|||
|
||||
|
||||
|
||||
static const ber_sequence_t EventParameterV1_sequence[] = {
|
||||
{ &hf_h248_eventParamterName, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_h248_EventParameterName },
|
||||
{ &hf_h248_event_param_value, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_h248_EventParamValueV1 },
|
||||
{ NULL, 0, 0, 0, NULL }
|
||||
};
|
||||
|
||||
static int
|
||||
dissect_h248_EventParameterV1(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
|
||||
EventParameterV1_sequence, hf_index, ett_h248_EventParameterV1);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
||||
|
||||
static const ber_sequence_t T_prop_parm_value_sequence_of[1] = {
|
||||
{ &hf_h248_prop_parm_value_item, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_h248_OCTET_STRING },
|
||||
};
|
||||
|
||||
static int
|
||||
dissect_h248_T_prop_parm_value(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
|
||||
T_prop_parm_value_sequence_of, hf_index, ett_h248_T_prop_parm_value);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
||||
|
||||
static const value_string h248_T_extra_info_vals[] = {
|
||||
{ 0, "relation" },
|
||||
{ 1, "range" },
|
||||
{ 2, "sublist" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
static const ber_choice_t T_extra_info_choice[] = {
|
||||
{ 0, &hf_h248_relation , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_h248_Relation },
|
||||
{ 1, &hf_h248_range , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_h248_BOOLEAN },
|
||||
{ 2, &hf_h248_sublist , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_h248_BOOLEAN },
|
||||
{ 0, NULL, 0, 0, 0, NULL }
|
||||
};
|
||||
|
||||
static int
|
||||
dissect_h248_T_extra_info(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
offset = dissect_ber_choice(actx, tree, tvb, offset,
|
||||
T_extra_info_choice, hf_index, ett_h248_T_extra_info,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
||||
|
||||
static const ber_sequence_t PropertyParmV1_sequence[] = {
|
||||
{ &hf_h248_name , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_h248_PkgdName },
|
||||
{ &hf_h248_prop_parm_value, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_h248_T_prop_parm_value },
|
||||
{ &hf_h248_extra_info , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_h248_T_extra_info },
|
||||
{ NULL, 0, 0, 0, NULL }
|
||||
};
|
||||
|
||||
static int
|
||||
dissect_h248_PropertyParmV1(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
|
||||
PropertyParmV1_sequence, hf_index, ett_h248_PropertyParmV1);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
||||
|
||||
|
||||
static int
|
||||
dissect_h248_SigParamValueV1(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
||||
|
||||
static const ber_sequence_t SigParameterV1_sequence[] = {
|
||||
{ &hf_h248_sigParameterName, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_h248_SigParameterName },
|
||||
{ &hf_h248_sig_param_value, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_h248_SigParamValueV1 },
|
||||
{ NULL, 0, 0, 0, NULL }
|
||||
};
|
||||
|
||||
static int
|
||||
dissect_h248_SigParameterV1(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
|
||||
SigParameterV1_sequence, hf_index, ett_h248_SigParameterV1);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
||||
|
||||
|
||||
static int
|
||||
dissect_h248_ValueV1(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
#line 373 "../../asn1/h248/h248.cnf"
|
||||
#line 381 "../../asn1/h248/h248.cnf"
|
||||
guint8 i;
|
||||
guint32 len;
|
||||
|
||||
#line 378 "../../asn1/h248/h248.cnf"
|
||||
#line 386 "../../asn1/h248/h248.cnf"
|
||||
/* check tvb to verify all values ascii or not. If so, output string, else hex */
|
||||
len=tvb_length_remaining(tvb, offset);
|
||||
for( i=0;i<len;i++) {
|
||||
|
|
@ -5255,91 +5377,8 @@ dissect_h248_ValueV1(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U
|
|||
}
|
||||
|
||||
|
||||
static const ber_sequence_t EventParameterV1_sequence[] = {
|
||||
{ &hf_h248_eventParamterName, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_h248_Name },
|
||||
{ &hf_h248_value_01 , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_h248_ValueV1 },
|
||||
{ NULL, 0, 0, 0, NULL }
|
||||
};
|
||||
|
||||
static int
|
||||
dissect_h248_EventParameterV1(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
|
||||
EventParameterV1_sequence, hf_index, ett_h248_EventParameterV1);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
||||
|
||||
static const ber_sequence_t T_value_sequence_of[1] = {
|
||||
{ &hf_h248_value_item , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_h248_OCTET_STRING },
|
||||
};
|
||||
|
||||
static int
|
||||
dissect_h248_T_value(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
|
||||
T_value_sequence_of, hf_index, ett_h248_T_value);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
||||
|
||||
static const value_string h248_T_extraInfo_01_vals[] = {
|
||||
{ 0, "relation" },
|
||||
{ 1, "range" },
|
||||
{ 2, "sublist" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
static const ber_choice_t T_extraInfo_01_choice[] = {
|
||||
{ 0, &hf_h248_relation , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_h248_Relation },
|
||||
{ 1, &hf_h248_range , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_h248_BOOLEAN },
|
||||
{ 2, &hf_h248_sublist , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_h248_BOOLEAN },
|
||||
{ 0, NULL, 0, 0, 0, NULL }
|
||||
};
|
||||
|
||||
static int
|
||||
dissect_h248_T_extraInfo_01(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
offset = dissect_ber_choice(actx, tree, tvb, offset,
|
||||
T_extraInfo_01_choice, hf_index, ett_h248_T_extraInfo_01,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
||||
|
||||
static const ber_sequence_t PropertyParmV1_sequence[] = {
|
||||
{ &hf_h248_name , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_h248_PkgdName },
|
||||
{ &hf_h248_value_02 , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_h248_T_value },
|
||||
{ &hf_h248_extraInfo_01 , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_h248_T_extraInfo_01 },
|
||||
{ NULL, 0, 0, 0, NULL }
|
||||
};
|
||||
|
||||
static int
|
||||
dissect_h248_PropertyParmV1(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
|
||||
PropertyParmV1_sequence, hf_index, ett_h248_PropertyParmV1);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
||||
|
||||
static const ber_sequence_t SigParameterV1_sequence[] = {
|
||||
{ &hf_h248_sigParameterName_01, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_h248_Name },
|
||||
{ &hf_h248_value_01 , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_h248_ValueV1 },
|
||||
{ NULL, 0, 0, 0, NULL }
|
||||
};
|
||||
|
||||
static int
|
||||
dissect_h248_SigParameterV1(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
|
||||
SigParameterV1_sequence, hf_index, ett_h248_SigParameterV1);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
||||
|
||||
/*--- End of included file: packet-h248-fn.c ---*/
|
||||
#line 1326 "../../asn1/h248/packet-h248-template.c"
|
||||
#line 1354 "../../asn1/h248/packet-h248-template.c"
|
||||
|
||||
static void dissect_h248_tpkt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
|
||||
dissect_tpkt_encap(tvb, pinfo, tree, h248_desegment, h248_handle);
|
||||
|
|
@ -6638,7 +6677,7 @@ void proto_register_h248(void) {
|
|||
{ "Value item", "h248.Value_item",
|
||||
FT_BYTES, BASE_NONE, NULL, 0,
|
||||
"OCTET_STRING", HFILL }},
|
||||
{ &hf_h248_auditResult_01,
|
||||
{ &hf_h248_audit_result,
|
||||
{ "auditResult", "h248.auditResult",
|
||||
FT_UINT32, BASE_DEC, VALS(h248_AuditResultV1_vals), 0,
|
||||
"AuditResultV1", HFILL }},
|
||||
|
|
@ -6649,27 +6688,27 @@ void proto_register_h248(void) {
|
|||
{ &hf_h248_eventParamterName,
|
||||
{ "eventParamterName", "h248.eventParamterName",
|
||||
FT_BYTES, BASE_NONE, NULL, 0,
|
||||
"Name", HFILL }},
|
||||
{ &hf_h248_value_01,
|
||||
"EventParameterName", HFILL }},
|
||||
{ &hf_h248_event_param_value,
|
||||
{ "value", "h248.value",
|
||||
FT_BYTES, BASE_NONE, NULL, 0,
|
||||
"ValueV1", HFILL }},
|
||||
{ &hf_h248_value_02,
|
||||
"EventParamValueV1", HFILL }},
|
||||
{ &hf_h248_prop_parm_value,
|
||||
{ "value", "h248.value",
|
||||
FT_UINT32, BASE_DEC, NULL, 0,
|
||||
NULL, HFILL }},
|
||||
{ &hf_h248_value_item,
|
||||
"T_prop_parm_value", HFILL }},
|
||||
{ &hf_h248_prop_parm_value_item,
|
||||
{ "value item", "h248.value_item",
|
||||
FT_BYTES, BASE_NONE, NULL, 0,
|
||||
"OCTET_STRING", HFILL }},
|
||||
{ &hf_h248_extraInfo_01,
|
||||
{ &hf_h248_extra_info,
|
||||
{ "extraInfo", "h248.extraInfo",
|
||||
FT_UINT32, BASE_DEC, VALS(h248_T_extraInfo_01_vals), 0,
|
||||
"T_extraInfo_01", HFILL }},
|
||||
{ &hf_h248_sigParameterName_01,
|
||||
{ "sigParameterName", "h248.sigParameterName",
|
||||
FT_UINT32, BASE_DEC, VALS(h248_T_extra_info_vals), 0,
|
||||
"T_extra_info", HFILL }},
|
||||
{ &hf_h248_sig_param_value,
|
||||
{ "value", "h248.value",
|
||||
FT_BYTES, BASE_NONE, NULL, 0,
|
||||
"Name", HFILL }},
|
||||
"SigParamValueV1", HFILL }},
|
||||
{ &hf_h248_T_auditToken_muxToken,
|
||||
{ "muxToken", "h248.muxToken",
|
||||
FT_BOOLEAN, 8, NULL, 0x80,
|
||||
|
|
@ -6732,7 +6771,7 @@ void proto_register_h248(void) {
|
|||
NULL, HFILL }},
|
||||
|
||||
/*--- End of included file: packet-h248-hfarr.c ---*/
|
||||
#line 1466 "../../asn1/h248/packet-h248-template.c"
|
||||
#line 1494 "../../asn1/h248/packet-h248-template.c"
|
||||
|
||||
GCP_HF_ARR_ELEMS("h248",h248_arrel)
|
||||
|
||||
|
|
@ -6896,12 +6935,12 @@ void proto_register_h248(void) {
|
|||
&ett_h248_AuditResultV1,
|
||||
&ett_h248_EventParameterV1,
|
||||
&ett_h248_PropertyParmV1,
|
||||
&ett_h248_T_value,
|
||||
&ett_h248_T_extraInfo_01,
|
||||
&ett_h248_T_prop_parm_value,
|
||||
&ett_h248_T_extra_info,
|
||||
&ett_h248_SigParameterV1,
|
||||
|
||||
/*--- End of included file: packet-h248-ettarr.c ---*/
|
||||
#line 1484 "../../asn1/h248/packet-h248-template.c"
|
||||
#line 1512 "../../asn1/h248/packet-h248-template.c"
|
||||
};
|
||||
|
||||
module_t *h248_module;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/* Do not modify this file. */
|
||||
/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
|
||||
/* packet-h248.h */
|
||||
/* ../../../tools/asn2wrs.py -b -p h248 -c ../../../asn1/h248/h248.cnf -s ../../../asn1/h248/packet-h248-template -D ../../../asn1/h248 -O ../../../epan/dissectors h248v3.asn h248v1support.asn */
|
||||
/* ../../tools/asn2wrs.py -b -p h248 -c ./h248.cnf -s ./packet-h248-template -D . -O ../../epan/dissectors h248v3.asn h248v1support.asn */
|
||||
|
||||
/* Input file: packet-h248-template.h */
|
||||
|
||||
|
|
|
|||
|
|
@ -39,6 +39,7 @@
|
|||
static int proto_h248_annex_E = -1;
|
||||
|
||||
static gboolean h248_e_implicit = FALSE;
|
||||
static gboolean implicit = FALSE;
|
||||
|
||||
/* H.248.1 E.1 Generic Package */
|
||||
static int hf_h248_pkg_generic = -1;
|
||||
|
|
@ -55,25 +56,24 @@ static gint ett_h248_pkg_generic_cause_evt = -1;
|
|||
static gint ett_h248_pkg_generic = -1;
|
||||
static gint ett_h248_pkg_generic_sc_evt = -1;
|
||||
|
||||
static const value_string h248_pkg_generic_cause_vals[] _U_ = {
|
||||
{1, "gencause"},
|
||||
{2, "failurecause"},
|
||||
static const value_string h248_pkg_generic_props_vals[] = {
|
||||
{ 0,"Generic Package - Annex E (g)" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
static const value_string h248_pkg_generic_evt_vals[] = {
|
||||
{1, "Cause"},
|
||||
{2, "Signal Completion"},
|
||||
static const value_string h248_pkg_generic_cause_vals[] _U_ = {
|
||||
{1, "General Cause (gencause)"},
|
||||
{2, "Faiure Cause (failurecause)"},
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
static const value_string h248_pkg_generic_cause_gencause_vals[] = {
|
||||
{ 1, "NR (Normal Release)"},
|
||||
{ 2, "UR (Unavailable Resources)"},
|
||||
{ 3, "FT (Failure, Temporary)"},
|
||||
{ 4, "FP (Failure, Permanent)"},
|
||||
{ 5, "IW (Interworking Error)"},
|
||||
{ 6, "UN (Unsupported)"},
|
||||
{ 1, "Normal Release (NR)"},
|
||||
{ 2, "Unavailable Resources (UR)"},
|
||||
{ 3, "Failure, Temporary (FT)"},
|
||||
{ 4, "Failure, Permanent (FP)"},
|
||||
{ 5, "Interworking Error (IW)"},
|
||||
{ 6, "Unsupported (UN)"},
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
|
|
@ -84,10 +84,10 @@ static h248_pkg_param_t h248_pkg_generic_cause_evt_params[] = {
|
|||
};
|
||||
|
||||
static const value_string h248_pkg_generic_sc_meth_vals[] _U_ = {
|
||||
{0x0001,"SigID"},
|
||||
{0x0002,"Meth"},
|
||||
{0x0003,"SLID"},
|
||||
{0x0004,"RID"},
|
||||
{0x0001,"Signal Identity (SigID)"},
|
||||
{0x0002,"Termination Method (Meth)"},
|
||||
{0x0003,"Signal List ID (SLID)"},
|
||||
{0x0004,"Request ID (RID)"},
|
||||
{0,NULL}
|
||||
};
|
||||
|
||||
|
|
@ -118,9 +118,9 @@ static h248_package_t h248_pkg_generic = {
|
|||
0x0001,
|
||||
&hf_h248_pkg_generic,
|
||||
&ett_h248_pkg_generic,
|
||||
h248_pkg_generic_props_vals,
|
||||
NULL,
|
||||
NULL,
|
||||
h248_pkg_generic_evt_vals,
|
||||
h248_pkg_generic_cause_vals,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
|
|
@ -129,107 +129,308 @@ static h248_package_t h248_pkg_generic = {
|
|||
};
|
||||
|
||||
|
||||
/* H.248.1 E.2 Base Root Package
|
||||
/* H.248.1 E.2 Base Root Package */
|
||||
static int hf_h248_pkg_root = -1;
|
||||
static int hf_h248_pkg_root_params = -1;
|
||||
static int hf_h248_pkg_root_maxnrofctx = -1;
|
||||
static int hf_h248_pkg_root_maxtermsperctx = -1;
|
||||
static int hf_h248_pkg_root_normalmgexectime = -1;
|
||||
static int hf_h248_pkg_root_normalmgcexecutiontime = -1;
|
||||
static int hf_h248_pkg_root_provisionalresponsetimervalue = -1;
|
||||
static int hf_h248_pkg_root_mg_provisionalresponsetimervalue = -1;
|
||||
static int hf_h248_pkg_root_mgc_provisionalresponsetimervalue = -1;
|
||||
static int hf_h248_pkg_root_mgc_orginalpendinglimit = -1;
|
||||
static int hf_h248_pkg_root_mg_orginalpendinglimit = -1;
|
||||
|
||||
static gint ett_h248_pkg_root = -1;
|
||||
static gint ett_h248_pkg_root_params = -1;
|
||||
|
||||
static const value_string h248_pkg_root_props_vals[] = {
|
||||
{ 0x0000, "Base Root Package - Annex E (root)" },
|
||||
{ 0x0001, "Maximum Number of Contexts" },
|
||||
{ 0x0002, "Maximum Terminations Per Context" },
|
||||
{ 0x0003, "Normal MG Execution Time" },
|
||||
{ 0x0004, "Normal MGC Execution Time" },
|
||||
{ 0x0005, "MG Provisional Response Timer Value" },
|
||||
{ 0x0006, "MGC Provisional Response Timer Value" },
|
||||
{ 0x0007, "MGC Originated Pending Limit" },
|
||||
{ 0x0008, "MG Originated Pending Limit" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
static h248_pkg_param_t h248_pkg_root_properties[] = {
|
||||
{ 0x0001, &hf_h248_pkg_root_maxnrofctx, h248_param_ber_integer, &h248_e_implicit },
|
||||
{ 0x0002, &hf_h248_pkg_root_maxtermsperctx, h248_param_ber_integer, &h248_e_implicit },
|
||||
{ 0x0003, &hf_h248_pkg_root_normalmgexectime, h248_param_ber_integer, &h248_e_implicit },
|
||||
{ 0x0004, &hf_h248_pkg_root_normalmgcexecutiontime, h248_param_ber_integer, &h248_e_implicit },
|
||||
{ 0x0005, &hf_h248_pkg_root_provisionalresponsetimervalue, h248_param_ber_integer, &h248_e_implicit },
|
||||
{ 0x0005, &hf_h248_pkg_root_mg_provisionalresponsetimervalue, h248_param_ber_integer, &implicit },
|
||||
{ 0x0006, &hf_h248_pkg_root_mgc_provisionalresponsetimervalue, h248_param_ber_integer, &implicit },
|
||||
{ 0x0007, &hf_h248_pkg_root_mgc_orginalpendinglimit, h248_param_ber_integer, &implicit },
|
||||
{ 0x0008, &hf_h248_pkg_root_mg_orginalpendinglimit, h248_param_ber_integer, &implicit },
|
||||
{ 0, NULL, NULL, NULL}
|
||||
};
|
||||
|
||||
static h248_package_t h248_pkg_root = {
|
||||
0x0002,
|
||||
&hf_h248_pkg_root,
|
||||
&hf_h248_pkg_root_params,
|
||||
&ett_h248_pkg_root,
|
||||
NULL,
|
||||
&ett_h248_pkg_root_params,
|
||||
h248_pkg_root_props_vals,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
h248_pkg_root_properties,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL
|
||||
};
|
||||
*/
|
||||
|
||||
/* H.248.1 E.3 Tone Generator Package
|
||||
static int hf_h248_pkg_tonegen = -1;
|
||||
static int hf_h248_pkg_tonegen_params = -1;
|
||||
static int hf_h248_pkg_tonegen_sig_pt = -1;
|
||||
static int hf_h248_pkg_tonegen_sig_pt_tl = -1;
|
||||
static int hf_h248_pkg_tonegen_sig_pt_ind = -1;
|
||||
/* H.248.1 E.3 Tone Generator Package */
|
||||
static int hf_h248_pkg_tonegen = -1;
|
||||
static int hf_h248_pkg_tonegen_sig_pt = -1;
|
||||
static int hf_h248_pkg_tonegen_sig_pt_tl = -1;
|
||||
static int hf_h248_pkg_tonegen_sig_pt_ind = -1;
|
||||
static int hf_h248_pkg_tonegen_sig_pg_btd = -1;
|
||||
|
||||
static gint ett_h248_pkg_tonegen = -1;
|
||||
static gint ett_h248_pkg_tonegen_params = -1;
|
||||
static gint ett_h248_pkg_tonegen_sig_pt = -1;
|
||||
|
||||
static h248_pkg_param_t hf_h248_pkg_tonegen_properties[] = {
|
||||
static const value_string h248_pkg_tonegen_props_vals[] = {
|
||||
{ 0x0000, "Tone Generator - Annex E (tonegen)" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
static const value_string h248_pkg_tonegen_sigs_vals[] = {
|
||||
{ 0x0001, "Play Tone (pt)1" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
static const value_string h248_pkg_tonegen_pt_param_vals[] = {
|
||||
{ 0x0001, "Tone ID List (tl)" },
|
||||
{ 0x0002, "Inter-signal duration (ind)" },
|
||||
{ 0x0003, "Tone Direction (td)" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
static const value_string h248_pkg_tonegen_pt_btd_param_vals[] = {
|
||||
{ 0x0001, "External (EXT)" },
|
||||
{ 0x0002, "Internal (INT)" },
|
||||
{ 0x0003, "Both (BOTH)" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
static h248_pkg_param_t h248_pkg_tonegen_sig_params[] = {
|
||||
{ 0x0001, &hf_h248_pkg_tonegen_sig_pt_tl, h248_param_ber_integer, &h248_e_implicit },
|
||||
{ 0x0002, &hf_h248_pkg_tonegen_sig_pt_ind, h248_param_ber_integer, &h248_e_implicit },
|
||||
{ 0x0003, &hf_h248_pkg_tonegen_sig_pg_btd, h248_param_ber_integer, &implicit },
|
||||
{ 0, NULL, NULL, NULL}
|
||||
};
|
||||
|
||||
static const h248_pkg_sig_t h248_pkg_tonegen_signals[] = {
|
||||
{ 0x0001, &hf_h248_pkg_tonegen_sig_pt, &ett_h248_pkg_tonegen_sig_pt, h248_pkg_tonegen_sig_params, h248_pkg_tonegen_pt_param_vals },
|
||||
{ 0, NULL, NULL, NULL, NULL }
|
||||
};
|
||||
|
||||
static h248_package_t h248_pkg_tonegen = {
|
||||
0x0002,
|
||||
0x0003,
|
||||
&hf_h248_pkg_tonegen,
|
||||
&hf_h248_pkg_tonegen_params,
|
||||
&ett_h248_pkg_tonegen,
|
||||
h248_pkg_root_properties,
|
||||
NULL,
|
||||
NULL,
|
||||
&ett_h248_pkg_tonegen_params,
|
||||
h248_pkg_tonegen_props_vals,
|
||||
h248_pkg_tonegen_sigs_vals,
|
||||
NULL,NULL,NULL,
|
||||
h248_pkg_tonegen_signals,
|
||||
NULL,
|
||||
NULL
|
||||
};
|
||||
*/
|
||||
|
||||
|
||||
/* 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;
|
||||
static int hf_h248_pkg_tonedet_evt_ltd = -1;
|
||||
*/
|
||||
|
||||
static int hf_h248_pkg_tonedet_evt_tl_param = -1;
|
||||
static int hf_h248_pkg_tonedet_evt_dur_param = -1;
|
||||
static int hf_h248_pkg_tonedet_evt_tid_param = -1;
|
||||
|
||||
static gint ett_h248_pkg_tonedet = -1;
|
||||
static gint ett_h248_pkg_tonedet_evt_std = -1;
|
||||
static gint ett_h248_pkg_tonedet_evt_etd = -1;
|
||||
static gint ett_h248_pkg_tonedet_evt_ltd = -1;
|
||||
|
||||
static const value_string h248_pkg_tonedet_props_vals[] = {
|
||||
{ 0x0000, "Tone Detection Package - Annex E (tonedet)" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
static const value_string h248_pkg_tonedet_events_vals[] = {
|
||||
{ 0x0001, "Start Tone Detected (std)" },
|
||||
{ 0x0002, "End Tone Detected (etd)" },
|
||||
{ 0x0003, "Long Tone Detected (ltd)" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
static const value_string h248_pkg_tonedet_evt_param_vals[] = {
|
||||
{ 0x0001, "Tone ID List (tl)" },
|
||||
{ 0x0002, "Duration (dur)" },
|
||||
{ 0x0003, "Tone ID (tid)" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
static const value_string h248_pkg_tonedet_tl_params_vals[] = {
|
||||
{ 0x0000, "Wildcard (*)" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
static const h248_pkg_param_t h248_pkg_tonedet_event_params[] = {
|
||||
{ 0x0001, &hf_h248_pkg_tonedet_evt_tl_param, h248_param_item, &implicit },
|
||||
{ 0x0002, &hf_h248_pkg_tonedet_evt_dur_param, h248_param_ber_integer, &implicit },
|
||||
{ 0x0003, &hf_h248_pkg_tonedet_evt_tid_param, h248_param_ber_integer, &implicit },
|
||||
{ 0, NULL, NULL, NULL }
|
||||
};
|
||||
|
||||
static const h248_pkg_evt_t h248_pkg_tonedet_events[] = {
|
||||
{ 0x0001, &hf_h248_pkg_tonedet_evt_std, &ett_h248_pkg_tonedet_evt_std, h248_pkg_tonedet_event_params, h248_pkg_tonedet_evt_param_vals },
|
||||
{ 0x0002, &hf_h248_pkg_tonedet_evt_etd, &ett_h248_pkg_tonedet_evt_etd, h248_pkg_tonedet_event_params, h248_pkg_tonedet_evt_param_vals },
|
||||
{ 0x0003, &hf_h248_pkg_tonedet_evt_ltd, &ett_h248_pkg_tonedet_evt_ltd, h248_pkg_tonedet_event_params, h248_pkg_tonedet_evt_param_vals },
|
||||
{ 0, NULL, NULL, NULL, NULL }
|
||||
};
|
||||
|
||||
static h248_package_t h248_pkg_tonedet = {
|
||||
0x0004,
|
||||
&hf_h248_pkg_tonedet,
|
||||
&ett_h248_pkg_tonedet,
|
||||
h248_pkg_tonedet_props_vals,
|
||||
NULL,
|
||||
h248_pkg_tonedet_events_vals,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
h248_pkg_tonedet_events,
|
||||
NULL
|
||||
};
|
||||
|
||||
|
||||
/* E.5 Basic DTMF Generator Package */
|
||||
static int hf_h248_pkg_dg = -1;
|
||||
static int hf_h248_pkg_dg_sig_d0 = -1;
|
||||
static int hf_h248_pkg_dg_sig_d1 = -1;
|
||||
static int hf_h248_pkg_dg_sig_d2 = -1;
|
||||
static int hf_h248_pkg_dg_sig_d3 = -1;
|
||||
static int hf_h248_pkg_dg = -1;
|
||||
static int hf_h248_pkg_dg_sig_pt = -1;
|
||||
static int hf_h248_pkg_dg_sig_d0 = -1;
|
||||
static int hf_h248_pkg_dg_sig_d1 = -1;
|
||||
static int hf_h248_pkg_dg_sig_d2 = -1;
|
||||
static int hf_h248_pkg_dg_sig_d3 = -1;
|
||||
static int hf_h248_pkg_dg_sig_d4 = -1;
|
||||
static int hf_h248_pkg_dg_sig_d5 = -1;
|
||||
static int hf_h248_pkg_dg_sig_d6 = -1;
|
||||
static int hf_h248_pkg_dg_sig_d7 = -1;
|
||||
static int hf_h248_pkg_dg_sig_d8 = -1;
|
||||
static int hf_h248_pkg_dg_sig_d9 = -1;
|
||||
static int hf_h248_pkg_dg_sig_da = -1;
|
||||
static int hf_h248_pkg_dg_sig_db = -1;
|
||||
static int hf_h248_pkg_dg_sig_dc = -1;
|
||||
static int hf_h248_pkg_dg_sig_dd = -1;
|
||||
static int hf_h248_pkg_dg_sig_ds = -1;
|
||||
static int hf_h248_pkg_dg_sig_do = -1;
|
||||
static int hf_h248_pkg_dg_sig_params = -1;
|
||||
|
||||
static gint ett_h248_pkg_dg = -1;
|
||||
static gint ett_h248_pkg_dg_sig_d0 = -1;
|
||||
static gint ett_h248_pkg_dg_sig_d1 = -1;
|
||||
static gint ett_h248_pkg_dg_sig_d2 = -1;
|
||||
static gint ett_h248_pkg_dg_sig_d3 = -1;
|
||||
static gint ett_h248_pkg_dg = -1;
|
||||
static gint ett_h248_pkg_dg_sig_pt = -1;
|
||||
static gint ett_h248_pkg_dg_sig_d0 = -1;
|
||||
static gint ett_h248_pkg_dg_sig_d1 = -1;
|
||||
static gint ett_h248_pkg_dg_sig_d2 = -1;
|
||||
static gint ett_h248_pkg_dg_sig_d3 = -1;
|
||||
static gint ett_h248_pkg_dg_sig_d4 = -1;
|
||||
static gint ett_h248_pkg_dg_sig_d5 = -1;
|
||||
static gint ett_h248_pkg_dg_sig_d6 = -1;
|
||||
static gint ett_h248_pkg_dg_sig_d7 = -1;
|
||||
static gint ett_h248_pkg_dg_sig_d8 = -1;
|
||||
static gint ett_h248_pkg_dg_sig_d9 = -1;
|
||||
static gint ett_h248_pkg_dg_sig_da = -1;
|
||||
static gint ett_h248_pkg_dg_sig_db = -1;
|
||||
static gint ett_h248_pkg_dg_sig_dc = -1;
|
||||
static gint ett_h248_pkg_dg_sig_dd = -1;
|
||||
static gint ett_h248_pkg_dg_sig_ds = -1;
|
||||
static gint ett_h248_pkg_dg_sig_do = -1;
|
||||
|
||||
static const value_string h248_pkg_dg_props_vals[] = {
|
||||
{ 0x0000, "Basic DTMF Generator Package - Annex E (dg)" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
static const value_string h248_pkg_dg_signals_vals[] = {
|
||||
{ 0x0010, "d0"},
|
||||
{ 0x0011, "d1"},
|
||||
{ 0x0012, "d2"},
|
||||
{ 0x0013, "d3"},
|
||||
/* from tonegeg */
|
||||
{ 0x0001, "Tone ID List (tl)" },
|
||||
{ 0x0002, "End Tone Detected (etd)" },
|
||||
{ 0x0003, "Long Tone Detected (ltd)" },
|
||||
|
||||
/* from dd */
|
||||
{ 0x0010, "0 (d0)"},
|
||||
{ 0x0011, "1 (d1)"},
|
||||
{ 0x0012, "2 (d2)"},
|
||||
{ 0x0013, "3 (d3)"},
|
||||
{ 0x0014, "4 (d4)"},
|
||||
{ 0x0015, "5 (d5)"},
|
||||
{ 0x0016, "6 (d6)"},
|
||||
{ 0x0017, "7 (d7)"},
|
||||
{ 0x0018, "8 (d8)"},
|
||||
{ 0x0019, "9 (d9)"},
|
||||
{ 0x001a, "A (dA)"},
|
||||
{ 0x001b, "B (dB)"},
|
||||
{ 0x001c, "C (dC)"},
|
||||
{ 0x001d, "D (dD)"},
|
||||
{ 0x0020, "* (ds)"},
|
||||
{ 0x0021, "# (do)"},
|
||||
{0,NULL}
|
||||
};
|
||||
|
||||
static const value_string h248_pkg_dg_sig_params_vals[] = {
|
||||
{ 0x0001, "Tone Direction (btd)" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
static const value_string h248_pkg_dg_sig_btd_vals[] = {
|
||||
{ 0x0001, "External (EXT)" },
|
||||
{ 0x0002, "Internal (INT)" },
|
||||
{ 0x0003, "Both (BOTH)" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
static const h248_pkg_param_t h248_pkg_dg_signal_params[] = {
|
||||
{ 0x0001, &hf_h248_pkg_dg_sig_params, h248_param_ber_integer, &implicit },
|
||||
{ 0x0010, &hf_h248_pkg_dg_sig_params, h248_param_ber_integer, &implicit },
|
||||
{ 0x0011, &hf_h248_pkg_dg_sig_params, h248_param_ber_integer, &implicit },
|
||||
{ 0x0012, &hf_h248_pkg_dg_sig_params, h248_param_ber_integer, &implicit },
|
||||
{ 0x0013, &hf_h248_pkg_dg_sig_params, h248_param_ber_integer, &implicit },
|
||||
{ 0x0014, &hf_h248_pkg_dg_sig_params, h248_param_ber_integer, &implicit },
|
||||
{ 0x0015, &hf_h248_pkg_dg_sig_params, h248_param_ber_integer, &implicit },
|
||||
{ 0x0016, &hf_h248_pkg_dg_sig_params, h248_param_ber_integer, &implicit },
|
||||
{ 0x0017, &hf_h248_pkg_dg_sig_params, h248_param_ber_integer, &implicit },
|
||||
{ 0x0018, &hf_h248_pkg_dg_sig_params, h248_param_ber_integer, &implicit },
|
||||
{ 0x0019, &hf_h248_pkg_dg_sig_params, h248_param_ber_integer, &implicit },
|
||||
{ 0x001a, &hf_h248_pkg_dg_sig_params, h248_param_ber_integer, &implicit },
|
||||
{ 0x001b, &hf_h248_pkg_dg_sig_params, h248_param_ber_integer, &implicit },
|
||||
{ 0x001c, &hf_h248_pkg_dg_sig_params, h248_param_ber_integer, &implicit },
|
||||
{ 0x001d, &hf_h248_pkg_dg_sig_params, h248_param_ber_integer, &implicit },
|
||||
{ 0x0020, &hf_h248_pkg_dg_sig_params, h248_param_ber_integer, &implicit },
|
||||
{ 0x0021, &hf_h248_pkg_dg_sig_params, h248_param_ber_integer, &implicit },
|
||||
{ 0, NULL, NULL, NULL }
|
||||
};
|
||||
|
||||
/* Signals defenitions */
|
||||
static h248_pkg_sig_t h248_pkg_dg_signals[] = {
|
||||
{ 0x0010, &hf_h248_pkg_dg_sig_d0, &ett_h248_pkg_dg_sig_d0, NULL, NULL },
|
||||
{ 0x0011, &hf_h248_pkg_dg_sig_d1, &ett_h248_pkg_dg_sig_d1, NULL, NULL },
|
||||
{ 0x0012, &hf_h248_pkg_dg_sig_d2, &ett_h248_pkg_dg_sig_d2, NULL, NULL },
|
||||
{ 0x0013, &hf_h248_pkg_dg_sig_d3, &ett_h248_pkg_dg_sig_d3, NULL, NULL },
|
||||
/* TODO add the rest of the signals */
|
||||
|
||||
{ 0X0001, &hf_h248_pkg_dg_sig_pt, &ett_h248_pkg_dg_sig_pt, h248_pkg_dg_signal_params,h248_pkg_dg_signals_vals },
|
||||
{ 0x0010, &hf_h248_pkg_dg_sig_d0, &ett_h248_pkg_dg_sig_d0, h248_pkg_dg_signal_params,h248_pkg_dg_signals_vals },
|
||||
{ 0x0011, &hf_h248_pkg_dg_sig_d1, &ett_h248_pkg_dg_sig_d1, h248_pkg_dg_signal_params,h248_pkg_dg_signals_vals },
|
||||
{ 0x0012, &hf_h248_pkg_dg_sig_d2, &ett_h248_pkg_dg_sig_d2, h248_pkg_dg_signal_params,h248_pkg_dg_signals_vals },
|
||||
{ 0x0013, &hf_h248_pkg_dg_sig_d3, &ett_h248_pkg_dg_sig_d3, h248_pkg_dg_signal_params,h248_pkg_dg_signals_vals },
|
||||
{ 0x0014, &hf_h248_pkg_dg_sig_d4, &ett_h248_pkg_dg_sig_d4, h248_pkg_dg_signal_params,h248_pkg_dg_signals_vals },
|
||||
{ 0x0015, &hf_h248_pkg_dg_sig_d5, &ett_h248_pkg_dg_sig_d5, h248_pkg_dg_signal_params,h248_pkg_dg_signals_vals },
|
||||
{ 0x0016, &hf_h248_pkg_dg_sig_d6, &ett_h248_pkg_dg_sig_d6, h248_pkg_dg_signal_params,h248_pkg_dg_signals_vals },
|
||||
{ 0x0017, &hf_h248_pkg_dg_sig_d7, &ett_h248_pkg_dg_sig_d7, h248_pkg_dg_signal_params,h248_pkg_dg_signals_vals },
|
||||
{ 0x0018, &hf_h248_pkg_dg_sig_d8, &ett_h248_pkg_dg_sig_d8, h248_pkg_dg_signal_params,h248_pkg_dg_signals_vals },
|
||||
{ 0x0019, &hf_h248_pkg_dg_sig_d9, &ett_h248_pkg_dg_sig_d9, h248_pkg_dg_signal_params,h248_pkg_dg_signals_vals },
|
||||
{ 0x001a, &hf_h248_pkg_dg_sig_da, &ett_h248_pkg_dg_sig_da, h248_pkg_dg_signal_params,h248_pkg_dg_signals_vals },
|
||||
{ 0x001b, &hf_h248_pkg_dg_sig_db, &ett_h248_pkg_dg_sig_db, h248_pkg_dg_signal_params,h248_pkg_dg_signals_vals },
|
||||
{ 0x001c, &hf_h248_pkg_dg_sig_dc, &ett_h248_pkg_dg_sig_dc, h248_pkg_dg_signal_params,h248_pkg_dg_signals_vals },
|
||||
{ 0x001d, &hf_h248_pkg_dg_sig_dd, &ett_h248_pkg_dg_sig_dd, h248_pkg_dg_signal_params,h248_pkg_dg_signals_vals },
|
||||
{ 0x0020, &hf_h248_pkg_dg_sig_ds, &ett_h248_pkg_dg_sig_ds, h248_pkg_dg_signal_params,h248_pkg_dg_signals_vals },
|
||||
{ 0x0021, &hf_h248_pkg_dg_sig_do, &ett_h248_pkg_dg_sig_do, h248_pkg_dg_signal_params,h248_pkg_dg_signals_vals },
|
||||
{ 0, NULL, NULL, NULL, NULL}
|
||||
};
|
||||
|
||||
|
|
@ -238,16 +439,246 @@ static h248_package_t h248_pkg_dg = {
|
|||
0x0005,
|
||||
&hf_h248_pkg_dg,
|
||||
&ett_h248_pkg_dg,
|
||||
NULL,
|
||||
h248_pkg_dg_props_vals,
|
||||
h248_pkg_dg_signals_vals,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL, /* Properties */
|
||||
NULL, NULL, NULL,
|
||||
h248_pkg_dg_signals, /* signals */
|
||||
NULL, /* events */
|
||||
NULL /* statistics */
|
||||
NULL, NULL
|
||||
};
|
||||
|
||||
/* H248.1 E.6 DTMF Detection Package (dd) */
|
||||
|
||||
static int hf_h248_pkg_dd = -1;
|
||||
static int hf_h248_pkg_dd_evt_std = -1;
|
||||
static int hf_h248_pkg_dd_evt_etd = -1;
|
||||
static int hf_h248_pkg_dd_evt_ltd = -1;
|
||||
static int hf_h248_pkg_dd_evt_ce = -1;
|
||||
/*static int hf_h248_pkg_dd_evt_d0 = -1;
|
||||
static int hf_h248_pkg_dd_evt_d1 = -1;
|
||||
static int hf_h248_pkg_dd_evt_d2 = -1;
|
||||
static int hf_h248_pkg_dd_evt_d3 = -1;
|
||||
static int hf_h248_pkg_dd_evt_d4 = -1;
|
||||
static int hf_h248_pkg_dd_evt_d5 = -1;
|
||||
static int hf_h248_pkg_dd_evt_d6 = -1;
|
||||
static int hf_h248_pkg_dd_evt_d7 = -1;
|
||||
static int hf_h248_pkg_dd_evt_d8 = -1;
|
||||
static int hf_h248_pkg_dd_evt_d9 = -1;
|
||||
static int hf_h248_pkg_dd_evt_da = -1;
|
||||
static int hf_h248_pkg_dd_evt_db = -1;
|
||||
static int hf_h248_pkg_dd_evt_dc = -1;
|
||||
static int hf_h248_pkg_dd_evt_dd = -1;
|
||||
static int hf_h248_pkg_dd_evt_ds = -1;
|
||||
static int hf_h248_pkg_dd_evt_do = -1;*/
|
||||
static int hf_h248_pkg_dd_evt_ce_ds = -1;
|
||||
static int hf_h248_pkg_dd_evt_ce_meth = -1;
|
||||
static int hf_h248_pkg_dd_evt_tl_param = -1;
|
||||
static int hf_h248_pkg_dd_evt_dur_param = -1;
|
||||
static int hf_h248_pkg_dd_evt_tid_param = -1;
|
||||
|
||||
static gint ett_h248_pkg_dd = -1;
|
||||
static gint ett_h248_pkg_dd_evt_ce = -1;
|
||||
static gint ett_h248_pkg_dd_evt_std = -1;
|
||||
static gint ett_h248_pkg_dd_evt_etd = -1;
|
||||
static gint ett_h248_pkg_dd_evt_ltd = -1;
|
||||
|
||||
static const value_string h248_pkg_dd_props_vals[] = {
|
||||
{ 0x0000, "DTMF Detection Package - Annex E (dd)" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
static const value_string h248_pkg_dd_event_vals[] = {
|
||||
/* from tonedet */
|
||||
{ 0x0000, "Wildcard (*)" },
|
||||
{ 0x0001, "Start Tone Detected (std)" },
|
||||
{ 0x0002, "End Tone Detected (etd)" },
|
||||
{ 0x0003, "Long Tone Detected (ltd)" },
|
||||
{ 0x0004, "Digit Completion Map (ce)" },
|
||||
|
||||
/* from dd */
|
||||
{ 0x0010, "0 (d0)"},
|
||||
{ 0x0011, "1 (d1)"},
|
||||
{ 0x0012, "2 (d2)"},
|
||||
{ 0x0013, "3 (d3)"},
|
||||
{ 0x0014, "4 (d4)"},
|
||||
{ 0x0015, "5 (d5)"},
|
||||
{ 0x0016, "6 (d6)"},
|
||||
{ 0x0017, "7 (d7)"},
|
||||
{ 0x0018, "8 (d8)"},
|
||||
{ 0x0019, "9 (d9)"},
|
||||
{ 0x001a, "A (dA)"},
|
||||
{ 0x001b, "B (dB)"},
|
||||
{ 0x001c, "C (dC)"},
|
||||
{ 0x001d, "D (dD)"},
|
||||
{ 0x0020, "* (ds)"},
|
||||
{ 0x0021, "# (do)"},
|
||||
{0,NULL}
|
||||
};
|
||||
|
||||
static const value_string h248_pkg_dd_event_params_vals[] = {
|
||||
{ 0x0001, "Unambiguous Match (UM)" },
|
||||
{ 0x0002, "Partial Match (PM)" },
|
||||
{ 0x0003, "Full Match (FM)" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
static const value_string h248_pkg_dd_ce_vals[] = {
|
||||
{ 0x0001, "Digit String (ds)" },
|
||||
{ 0x0003, "Termination Method (meth)" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
static h248_pkg_param_t h248_pkg_dd_ds_events[] = {
|
||||
{ 0x0001, &hf_h248_pkg_dd_evt_ce_ds, h248_param_ber_octetstring, &implicit },
|
||||
{ 0x0003, &hf_h248_pkg_dd_evt_ce_meth, h248_param_ber_integer, &implicit },
|
||||
{ 0, NULL, NULL, NULL }
|
||||
};
|
||||
|
||||
static const h248_pkg_param_t h248_pkg_dd_event_params[] = {
|
||||
{ 0x0001, &hf_h248_pkg_dd_evt_tl_param, h248_param_item, &implicit },
|
||||
{ 0x0002, &hf_h248_pkg_dd_evt_dur_param, h248_param_ber_integer, &implicit },
|
||||
{ 0x0003, &hf_h248_pkg_dd_evt_tid_param, h248_param_ber_integer, &implicit },
|
||||
{ 0, NULL, NULL, NULL }
|
||||
};
|
||||
|
||||
|
||||
static h248_pkg_evt_t h248_pkg_dd_events[] = {
|
||||
{ 0x0001, &hf_h248_pkg_dd_evt_std, &ett_h248_pkg_dd_evt_std, h248_pkg_dd_event_params, h248_pkg_dd_event_vals },
|
||||
{ 0x0002, &hf_h248_pkg_dd_evt_etd, &ett_h248_pkg_dd_evt_etd, h248_pkg_dd_event_params, h248_pkg_dd_event_vals },
|
||||
{ 0x0003, &hf_h248_pkg_dd_evt_ltd, &ett_h248_pkg_dd_evt_ltd, h248_pkg_dd_event_params, h248_pkg_dd_event_vals },
|
||||
{ 0x0004,&hf_h248_pkg_dd_evt_ce, &ett_h248_pkg_dd_evt_ce, h248_pkg_dd_ds_events, h248_pkg_dd_ce_vals},
|
||||
{ 0, NULL, NULL, NULL, NULL }
|
||||
};
|
||||
|
||||
static h248_package_t h248_pkg_dd = {
|
||||
0x0006,
|
||||
&hf_h248_pkg_dd,
|
||||
&ett_h248_pkg_dd,
|
||||
h248_pkg_dd_props_vals,
|
||||
NULL,
|
||||
h248_pkg_dd_event_vals,
|
||||
NULL,
|
||||
NULL, NULL,
|
||||
h248_pkg_dd_events,
|
||||
NULL
|
||||
};
|
||||
|
||||
/* H.248.1.E.7 Call Progress Tones Generator package */
|
||||
static int hf_h248_pkg_cg = -1;
|
||||
static int hf_h248_pkg_cg_sig_pt = -1;
|
||||
static int hf_h248_pkg_cg_sig_pt_tl = -1;
|
||||
static int hf_h248_pkg_cg_sig_pt_ind = -1;
|
||||
static int hf_h248_pkg_cg_sig_pt_btd = -1;
|
||||
static int hf_h248_pkg_cg_sig_dt = -1;
|
||||
static int hf_h248_pkg_cg_sig_rt = -1;
|
||||
static int hf_h248_pkg_cg_sig_bt = -1;
|
||||
static int hf_h248_pkg_cg_sig_ct = -1;
|
||||
static int hf_h248_pkg_cg_sig_sit = -1;
|
||||
static int hf_h248_pkg_cg_sig_wt = -1;
|
||||
static int hf_h248_pkg_cg_sig_prt = -1;
|
||||
static int hf_h248_pkg_cg_sig_cw = -1;
|
||||
static int hf_h248_pkg_cg_sig_cr = -1;
|
||||
|
||||
static gint ett_h248_pkg_cg_params = -1;
|
||||
static gint ett_h248_pkg_cg_sig_pt = -1;
|
||||
static gint ett_h248_pkg_cg_sig_dt = -1;
|
||||
static gint ett_h248_pkg_cg_sig_rt = -1;
|
||||
static gint ett_h248_pkg_cg_sig_bt = -1;
|
||||
static gint ett_h248_pkg_cg_sig_ct = -1;
|
||||
static gint ett_h248_pkg_cg_sig_sit = -1;
|
||||
static gint ett_h248_pkg_cg_sig_wt = -1;
|
||||
static gint ett_h248_pkg_cg_sig_prt = -1;
|
||||
static gint ett_h248_pkg_cg_sig_cw = -1;
|
||||
static gint ett_h248_pkg_cg_sig_cr = -1;
|
||||
|
||||
static const value_string h248_pkg_cg_props_vals[] = {
|
||||
{ 0x0000, "Call Progress Tones Generator - Annex E (cg)" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
static const value_string h248_pkg_cg_sig_cd_evt_vals[] = {
|
||||
{ 0x0001, "Play Tone (pt)" },
|
||||
{ 0x0030, "Dial Tone"},
|
||||
{ 0x0031, "Ring Tone" },
|
||||
{ 0x0032, "Busy Tone" },
|
||||
{ 0x0033, "Congestion Tone" },
|
||||
{ 0x0034, "Special Information Tone" },
|
||||
{ 0x0035, "(Recording) Warning Tone" },
|
||||
{ 0x0036, "Payphone Recognition Tone" },
|
||||
{ 0x0037, "Call Waiting Tone" },
|
||||
{ 0x0038, "Caller Waiting Tone" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
static const value_string h248_pkg_cg_sig_pt_param_vals[] = {
|
||||
{ 0x0001, "Tone ID List (tl)"},
|
||||
{ 0x0002, "Inter-signal duration (ind)" },
|
||||
{ 0x0003, "Tone Direction (td)" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
static const value_string h248_pkg_cg_pt_btd_param_vals[] = {
|
||||
{ 0x0001, "External (EXT)" },
|
||||
{ 0x0002, "Internal (INT)" },
|
||||
{ 0x0003, "Both (BOTH)" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
static const h248_pkg_param_t h248_pkg_cg_sig_pt_params[] = {
|
||||
{ 0x0001, &hf_h248_pkg_cg_sig_pt_tl, h248_param_ber_integer, &implicit },
|
||||
{ 0x0002, &hf_h248_pkg_cg_sig_pt_ind, h248_param_ber_integer, &implicit },
|
||||
{ 0x0003, &hf_h248_pkg_cg_sig_pt_btd, h248_param_ber_integer, &implicit },
|
||||
{ 0, NULL, NULL, NULL}
|
||||
};
|
||||
|
||||
static const h248_pkg_sig_t h248_pkg_cg_signals_cd_events[] = {
|
||||
{ 0x0001, &hf_h248_pkg_cg_sig_pt, &ett_h248_pkg_cg_sig_pt, h248_pkg_cg_sig_pt_params, h248_pkg_cg_sig_pt_param_vals },
|
||||
{ 0x0030, &hf_h248_pkg_cg_sig_dt, &ett_h248_pkg_cg_sig_dt, h248_pkg_cg_sig_pt_params, h248_pkg_cg_sig_pt_param_vals },
|
||||
{ 0x0031, &hf_h248_pkg_cg_sig_rt, &ett_h248_pkg_cg_sig_rt, h248_pkg_cg_sig_pt_params, h248_pkg_cg_sig_pt_param_vals },
|
||||
{ 0x0032, &hf_h248_pkg_cg_sig_bt, &ett_h248_pkg_cg_sig_bt, h248_pkg_cg_sig_pt_params, h248_pkg_cg_sig_pt_param_vals },
|
||||
{ 0x0033, &hf_h248_pkg_cg_sig_ct, &ett_h248_pkg_cg_sig_ct, h248_pkg_cg_sig_pt_params, h248_pkg_cg_sig_pt_param_vals },
|
||||
{ 0x0034, &hf_h248_pkg_cg_sig_sit, &ett_h248_pkg_cg_sig_sit, h248_pkg_cg_sig_pt_params, h248_pkg_cg_sig_pt_param_vals },
|
||||
{ 0x0035, &hf_h248_pkg_cg_sig_wt, &ett_h248_pkg_cg_sig_wt, h248_pkg_cg_sig_pt_params, h248_pkg_cg_sig_pt_param_vals },
|
||||
{ 0x0036, &hf_h248_pkg_cg_sig_prt, &ett_h248_pkg_cg_sig_prt, h248_pkg_cg_sig_pt_params, h248_pkg_cg_sig_pt_param_vals },
|
||||
{ 0x0037, &hf_h248_pkg_cg_sig_cw, &ett_h248_pkg_cg_sig_cw, h248_pkg_cg_sig_pt_params, h248_pkg_cg_sig_pt_param_vals },
|
||||
{ 0x0038, &hf_h248_pkg_cg_sig_cr, &ett_h248_pkg_cg_sig_cr, h248_pkg_cg_sig_pt_params, h248_pkg_cg_sig_pt_param_vals },
|
||||
{ 0, NULL, NULL, NULL, NULL }
|
||||
};
|
||||
|
||||
static h248_package_t h248_pkg_cg = {
|
||||
0x0007,
|
||||
&hf_h248_pkg_cg,
|
||||
&ett_h248_pkg_cg_params,
|
||||
h248_pkg_cg_props_vals,
|
||||
h248_pkg_cg_sig_cd_evt_vals,
|
||||
NULL,NULL, /* value_stings: event, stats */
|
||||
NULL, /* dissectors: prop */
|
||||
h248_pkg_cg_signals_cd_events,
|
||||
NULL, /* disectors: events */
|
||||
NULL /* dissectors: stats */
|
||||
};
|
||||
|
||||
/* H.248.1 E.8 - Call Tones Detection Package */
|
||||
static int hf_h248_pkg_cd = -1;
|
||||
|
||||
static gint ett_h248_pkg_cd = -1;
|
||||
|
||||
static const value_string h248_pkg_cd_params_vals[] = {
|
||||
{ 0x0000, "Call Progress Tones Detection Package (cd)" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
static h248_package_t h248_pkg_cd = {
|
||||
0x0008,
|
||||
&hf_h248_pkg_cd,
|
||||
&ett_h248_pkg_cd,
|
||||
h248_pkg_cd_params_vals,
|
||||
NULL,
|
||||
h248_pkg_cg_sig_cd_evt_vals,
|
||||
NULL,
|
||||
NULL,NULL,
|
||||
(h248_pkg_evt_t *)h248_pkg_cg_signals_cd_events,
|
||||
NULL
|
||||
};
|
||||
|
||||
/* H.248.1 E.9 Analog Line Supervision Package */
|
||||
static int hf_h248_pkg_al = -1;
|
||||
|
|
@ -265,6 +696,10 @@ static gint ett_h248_pkg_al_evt_onhook = -1;
|
|||
static gint ett_h248_pkg_al_evt_offhook = -1;
|
||||
static gint ett_h248_pkg_al_evt_flashhook = -1;
|
||||
|
||||
static const value_string h248_pkg_al_props_vals[] = {
|
||||
{ 0x0000, "Analog Line Supervision Package - Annex E (al)" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
static const value_string h248_pkg_al_evt_onhook_params_vals[] = {
|
||||
{ 0x0001, "strict"},
|
||||
|
|
@ -345,7 +780,7 @@ static h248_package_t h248_pkg_al = {
|
|||
0x0009,
|
||||
&hf_h248_pkg_al,
|
||||
&ett_h248_pkg_al,
|
||||
NULL,
|
||||
h248_pkg_al_props_vals,
|
||||
NULL,
|
||||
h248_pkg_al_evts_vals,
|
||||
NULL,
|
||||
|
|
@ -355,6 +790,60 @@ static h248_package_t h248_pkg_al = {
|
|||
NULL /* statistics */
|
||||
};
|
||||
|
||||
|
||||
/* H.248.1 E.10 - Basic Continuity Package */
|
||||
static int hf_h248_pkg_ct = -1;
|
||||
static gint ett_h248_pkg_ct = -1;
|
||||
|
||||
static const value_string h248_pkg_ct_props_vals[] = {
|
||||
{ 0x0000, "Basic Continuity Package (ct)" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
static const value_string h248_pkg_ct_evt_sig_vals[] = {
|
||||
{ 0x0003, "Continuity Test (ct)" },
|
||||
{ 0x0004, "Respond (rsp)" },
|
||||
{ 0x0005, "Completion (cmp)" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
static h248_package_t h248_pkg_ct = {
|
||||
0x000a,
|
||||
&hf_h248_pkg_ct,
|
||||
&ett_h248_pkg_ct,
|
||||
h248_pkg_ct_props_vals,
|
||||
h248_pkg_ct_evt_sig_vals,
|
||||
h248_pkg_ct_evt_sig_vals,
|
||||
NULL,
|
||||
NULL, NULL, NULL, NULL
|
||||
};
|
||||
|
||||
/* H.248.1 E.11 Network Package */
|
||||
static int hf_h248_pkg_nt = -1;
|
||||
static gint ett_h248_pkg_nt = -1;
|
||||
|
||||
static const value_string h248_pkg_nt_props_evt_stats_vals[] = {
|
||||
{ 0x0000, "Network Package (nt)" },
|
||||
{ 0x0001, "Duration (dur)" },
|
||||
{ 0x0002, "Octets Sent (os)" },
|
||||
{ 0x0003, "Octets Received (or)" },
|
||||
{ 0x0005, "Network Failure (netfail)" },
|
||||
{ 0x0006, "Quality Alert (qualert)" },
|
||||
{ 0x0007, "Maximum Jitter Buffer (jit)" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
static h248_package_t h248_pkg_nt = {
|
||||
0x000b,
|
||||
&hf_h248_pkg_nt,
|
||||
&ett_h248_pkg_nt,
|
||||
h248_pkg_nt_props_evt_stats_vals,
|
||||
h248_pkg_nt_props_evt_stats_vals,
|
||||
NULL,
|
||||
h248_pkg_nt_props_evt_stats_vals,
|
||||
NULL, NULL, NULL, NULL
|
||||
};
|
||||
|
||||
/* H.248.1 E.12 RTP package */
|
||||
static int hf_h248_pkg_rtp = -1;
|
||||
static int hf_h248_pkg_rtp_stat_ps = -1;
|
||||
|
|
@ -366,7 +855,8 @@ static const value_string h248_pkg_rtp_stat_vals[] _U_ = {
|
|||
{ 0, NULL}
|
||||
};
|
||||
|
||||
static const value_string h248_pkg_rtp_parameters[] = {
|
||||
static const value_string h248_pkg_rtp_props_vals[] = {
|
||||
{ 0x0000, "RTP Package - Annex E (rtp)" },
|
||||
{ 0x0001, "pltrans (Payload Transition)" },
|
||||
{ 0x0004, "ps (Packets Sent)" },
|
||||
{ 0x0005, "pr (Packets Received)" },
|
||||
|
|
@ -385,7 +875,7 @@ static h248_package_t h248_pkg_rtp = {
|
|||
0x000c,
|
||||
&hf_h248_pkg_rtp,
|
||||
&ett_h248_pkg_rtp,
|
||||
h248_pkg_rtp_parameters,
|
||||
h248_pkg_rtp_props_vals,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
|
|
@ -407,8 +897,9 @@ static const true_false_string h248_tdmc_ec_vals = {
|
|||
"Off"
|
||||
};
|
||||
static const value_string h248_pkg_tdmc_props_vals[] = {
|
||||
{ 0x0008, "ec"},
|
||||
{ 0x000a, "gain"},
|
||||
{ 0x0000, "TDM Circuit Package - Annex E (tdmc)" },
|
||||
{ 0x0008, "Echo Cancellation (ec)"},
|
||||
{ 0x000a, "Gain Control (gain)"},
|
||||
{ 0, NULL}
|
||||
};
|
||||
|
||||
|
|
@ -442,11 +933,78 @@ void proto_register_h248_annex_e(void) {
|
|||
{ &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_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_evt, {"Signal Completion2","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 }},
|
||||
|
||||
/* H.248.1.E 3 Tone Generator (tonegeg) */
|
||||
{ &hf_h248_pkg_tonegen, { "Tone Generator (tonegen)", "h248.pkg.tonegen", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
|
||||
{ &hf_h248_pkg_tonegen_sig_pt, { "Play Tone (pt)", "h248.pkg.tonegen.pg", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
|
||||
{ &hf_h248_pkg_tonegen_sig_pt_tl, { "Tone List ID (tl)2", "h248.pkg.tonegen.pt.tl", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
|
||||
{ &hf_h248_pkg_tonegen_sig_pt_ind, { "Inter-signal Duration (ind)", "h248.pkg.tonegem.pt.ind", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
|
||||
{ &hf_h248_pkg_tonegen_sig_pg_btd, { "Tone Direction (btd)", "h248.pkg.tonegen.pt.btd", FT_UINT32, BASE_NONE, VALS(h248_pkg_tonegen_pt_btd_param_vals), 0, NULL, HFILL }},
|
||||
|
||||
/* H.248.1 E.4 Tone Detection (tonedet) */
|
||||
{ &hf_h248_pkg_tonedet, { "Tone Detection Package", "h248.pkg.tonedet", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
|
||||
{ &hf_h248_pkg_tonedet_evt_std, { "Start Tone", "h248.pkg.tonedet.std", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
|
||||
{ &hf_h248_pkg_tonedet_evt_etd, { "End Tone", "h248.pkg.tonedet.etd", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
|
||||
{ &hf_h248_pkg_tonedet_evt_ltd, { "Long Tone", "h248.pkg.tonedet.ltd", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
|
||||
{ &hf_h248_pkg_tonedet_evt_tl_param, {"Tone Detail", "h248.pkg.tonedet.evt.tl", FT_UINT16, BASE_DEC, VALS(h248_pkg_tonedet_tl_params_vals), 0, NULL, HFILL }},
|
||||
{ &hf_h248_pkg_tonedet_evt_dur_param, {"Duration (ms)", "h248.pkg.tonedet.evt.dur", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
|
||||
{ &hf_h248_pkg_tonedet_evt_tid_param, {"Tone ID", "h248.pkg.tonedet.evt.tid", FT_UINT16, BASE_DEC, VALS(h248_pkg_tonedet_tl_params_vals), 0, NULL, HFILL }},
|
||||
|
||||
|
||||
/* H.248.1 E.5 Basic DTMF Generator Package */
|
||||
{ &hf_h248_pkg_dg, { "Basic DTMF Generator Package (dg)", "h248.pkg.dg", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
|
||||
{ &hf_h248_pkg_dg_sig_pt, { "Play Tone", "h248.pkg.dg.pt", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
|
||||
{ &hf_h248_pkg_dg_sig_d0, { "Digit 0", "h248.pkg.dg.d0", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
|
||||
{ &hf_h248_pkg_dg_sig_d1, { "Digit 1", "h248.pkg.dg.d1", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
|
||||
{ &hf_h248_pkg_dg_sig_d2, { "Digit 2", "h248.pkg.dg.d2", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
|
||||
{ &hf_h248_pkg_dg_sig_d3, { "Digit 3", "h248.pkg.dg.d3", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
|
||||
{ &hf_h248_pkg_dg_sig_d4, { "Digit 4", "h248.pkg.dg.d4", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
|
||||
{ &hf_h248_pkg_dg_sig_d5, { "Digit 5", "h248.pkg.dg.d5", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
|
||||
{ &hf_h248_pkg_dg_sig_d6, { "Digit 6", "h248.pkg.dg.d6", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
|
||||
{ &hf_h248_pkg_dg_sig_d7, { "Digit 7", "h248.pkg.dg.d7", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
|
||||
{ &hf_h248_pkg_dg_sig_d8, { "Digit 8", "h248.pkg.dg.d8", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
|
||||
{ &hf_h248_pkg_dg_sig_d9, { "Digit 9", "h248.pkg.dg.d9", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
|
||||
{ &hf_h248_pkg_dg_sig_da, { "Digit A", "h248.pkg.dg.da", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
|
||||
{ &hf_h248_pkg_dg_sig_db, { "Digit B", "h248.pkg.dg.db", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
|
||||
{ &hf_h248_pkg_dg_sig_dc, { "Digit C", "h248.pkg.dg.dc", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
|
||||
{ &hf_h248_pkg_dg_sig_dd, { "Digit D", "h248.pkg.dg.dd", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
|
||||
{ &hf_h248_pkg_dg_sig_ds, { "Digit *", "h248.pkg.dg.ds", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
|
||||
{ &hf_h248_pkg_dg_sig_do, { "Digit #", "h248.pkg.dg.do", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
|
||||
{ &hf_h248_pkg_dg_sig_params, { "Event Parameters", "h248.pkg.dg.signal.direction", FT_UINT16, BASE_DEC, VALS(h248_pkg_dg_sig_btd_vals), 0, NULL, HFILL }},
|
||||
|
||||
/* H.248.1 E.6 DTMF Detection Package */
|
||||
{ &hf_h248_pkg_dd_evt_ce_ds, { "Digit(s) Detected", "h248.pkg.dd.ce.ds", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
|
||||
{ &hf_h248_pkg_dd_evt_ce_meth, { "Method Used", "h248.pkg.dd.ce.meth", FT_UINT16, BASE_DEC, VALS(h248_pkg_dd_event_params_vals), 0, NULL, HFILL }},
|
||||
{ &hf_h248_pkg_dd_evt_tl_param, {"Tone Detail", "h248.pkg.dd.evt.tl", FT_UINT16, BASE_DEC, VALS(h248_pkg_dd_event_vals), 0, NULL, HFILL }},
|
||||
{ &hf_h248_pkg_dd_evt_dur_param, {"Duration (ms)", "h248.pkg.dd.evt.dur", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
|
||||
{ &hf_h248_pkg_dd_evt_tid_param, {"Tone ID", "h248.pkg.dd.evt.tid", FT_UINT16, BASE_DEC, VALS(h248_pkg_dd_event_vals), 0, NULL, HFILL }},
|
||||
|
||||
|
||||
/* H.248.1.E.7 Call Progress Tones Generator package */
|
||||
{ &hf_h248_pkg_cg, { "Call Progress Tones Generator", "h248.pkg.cg", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
|
||||
{ &hf_h248_pkg_cg_sig_pt, { "Play Tone (pt)", "h248.pkg.cg.pt", FT_UINT16, BASE_HEX, VALS(h248_pkg_cg_sig_cd_evt_vals), 0, NULL, HFILL }},
|
||||
{ &hf_h248_pkg_cg_sig_pt_tl, {"Tone List", "h248.pkg.cg.pt.tl", FT_UINT16, BASE_HEX, VALS(h248_pkg_cg_sig_cd_evt_vals), 0, NULL, HFILL }},
|
||||
{ &hf_h248_pkg_cg_sig_pt_ind, { "Inter-Signal Duration (ind)", "h248.pkg-cg.pt.ind", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
|
||||
{ &hf_h248_pkg_cg_sig_pt_btd, { "Tone Direction (btd)", "h248.pkg.cg.pt.btd", FT_UINT8, BASE_DEC, VALS(h248_pkg_cg_pt_btd_param_vals), 0, NULL, HFILL }},
|
||||
|
||||
{ &hf_h248_pkg_cg_sig_dt, { "Dial Tone (dt)", "h248.pkg.cg.dt", FT_UINT16, BASE_HEX, VALS(h248_pkg_cg_sig_cd_evt_vals), 0, NULL, HFILL }},
|
||||
{ &hf_h248_pkg_cg_sig_rt, { "Ring Tone (rt)", "h248.pkg.cg.rt",FT_UINT16, BASE_HEX, VALS(h248_pkg_cg_sig_cd_evt_vals), 0, NULL, HFILL }},
|
||||
{ &hf_h248_pkg_cg_sig_bt, { "Buzy Tone (bt)", "h248.pkg.cg.bt", FT_UINT16, BASE_HEX, VALS(h248_pkg_cg_sig_cd_evt_vals), 0, NULL, HFILL }},
|
||||
{ &hf_h248_pkg_cg_sig_ct, { "Congestion Tone (ct)", "h248.pkg.cg.ct", FT_UINT16, BASE_HEX, VALS(h248_pkg_cg_sig_cd_evt_vals), 0, NULL, HFILL }},
|
||||
{ &hf_h248_pkg_cg_sig_sit, { "Special Information Tone (sit)", "h248.pkg.cg.sit", FT_UINT16, BASE_HEX, VALS(h248_pkg_cg_sig_cd_evt_vals), 0, NULL, HFILL }},
|
||||
{ &hf_h248_pkg_cg_sig_wt, { "(Recording) Warning Tone (wt)", "h248.pkg.cg.wt", FT_UINT16, BASE_HEX, VALS(h248_pkg_cg_sig_cd_evt_vals), 0, NULL, HFILL }},
|
||||
{ &hf_h248_pkg_cg_sig_prt, { "Payphone Recognition Tone (prt)", "h248.pkg.cg.prt", FT_UINT16, BASE_HEX, VALS(h248_pkg_cg_sig_cd_evt_vals), 0, NULL, HFILL }},
|
||||
{ &hf_h248_pkg_cg_sig_cw, { "Call Waiting Tone (wt)", "h248.pkg.cg.cw", FT_UINT16, BASE_HEX, VALS(h248_pkg_cg_sig_cd_evt_vals), 0, NULL, HFILL }},
|
||||
{ &hf_h248_pkg_cg_sig_cr, { "Caller Waiting Tone (rt)", "h248.pkg.cg.cr", FT_UINT16, BASE_HEX, VALS(h248_pkg_cg_sig_cd_evt_vals), 0, NULL, HFILL }},
|
||||
|
||||
/* H.248.1 E.8 Call Progress Tones Detection Package */
|
||||
{ &hf_h248_pkg_cd, { "Call Progress Tones Detection Package", "h248.pkg.cd", FT_BYTES, BASE_NONE, 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 }},
|
||||
|
|
@ -467,23 +1025,81 @@ void proto_register_h248_annex_e(void) {
|
|||
};
|
||||
|
||||
static gint *ett[] = {
|
||||
/* generic 0x0001 */
|
||||
&ett_h248_pkg_generic_cause_evt,
|
||||
&ett_h248_pkg_generic,
|
||||
&ett_h248_pkg_generic_sc_evt,
|
||||
|
||||
&ett_h248_pkg_root_params,
|
||||
|
||||
&ett_h248_pkg_tonegen_params,
|
||||
|
||||
/* tonegen 0x0003 */
|
||||
&ett_h248_pkg_tonedet,
|
||||
&ett_h248_pkg_tonedet_evt_std,
|
||||
&ett_h248_pkg_tonedet_evt_etd,
|
||||
&ett_h248_pkg_tonedet_evt_ltd,
|
||||
|
||||
/* dg 0x0005 */
|
||||
&ett_h248_pkg_dg,
|
||||
&ett_h248_pkg_dg_sig_pt,
|
||||
&ett_h248_pkg_dg_sig_d0,
|
||||
&ett_h248_pkg_dg_sig_d1,
|
||||
&ett_h248_pkg_dg_sig_d2,
|
||||
&ett_h248_pkg_dg_sig_d3,
|
||||
&ett_h248_pkg_dg_sig_d4,
|
||||
&ett_h248_pkg_dg_sig_d5,
|
||||
&ett_h248_pkg_dg_sig_d6,
|
||||
&ett_h248_pkg_dg_sig_d7,
|
||||
&ett_h248_pkg_dg_sig_d8,
|
||||
&ett_h248_pkg_dg_sig_d9,
|
||||
&ett_h248_pkg_dg_sig_da,
|
||||
&ett_h248_pkg_dg_sig_db,
|
||||
&ett_h248_pkg_dg_sig_dc,
|
||||
&ett_h248_pkg_dg_sig_dd,
|
||||
&ett_h248_pkg_dg_sig_ds,
|
||||
&ett_h248_pkg_dg_sig_do,
|
||||
|
||||
/* dd 0x0006 */
|
||||
&ett_h248_pkg_dd,
|
||||
&ett_h248_pkg_dd_evt_std,
|
||||
&ett_h248_pkg_dd_evt_ltd,
|
||||
&ett_h248_pkg_dd_evt_etd,
|
||||
&ett_h248_pkg_dd_evt_ce,
|
||||
|
||||
/* 0x0007 Package cg */
|
||||
&ett_h248_pkg_cg_params,
|
||||
&ett_h248_pkg_cg_sig_pt,
|
||||
&ett_h248_pkg_tonegen_sig_pt,
|
||||
&ett_h248_pkg_cg_sig_dt,
|
||||
&ett_h248_pkg_cg_sig_rt,
|
||||
&ett_h248_pkg_cg_sig_bt,
|
||||
&ett_h248_pkg_cg_sig_ct,
|
||||
&ett_h248_pkg_cg_sig_sit,
|
||||
&ett_h248_pkg_cg_sig_wt,
|
||||
&ett_h248_pkg_cg_sig_prt,
|
||||
&ett_h248_pkg_cg_sig_cw,
|
||||
&ett_h248_pkg_cg_sig_cr,
|
||||
|
||||
/* cd 0x0008 */
|
||||
&ett_h248_pkg_cd,
|
||||
|
||||
/* al 0x0009 */
|
||||
&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_al_evt_offhook,
|
||||
&ett_h248_pkg_al_evt_onhook,
|
||||
|
||||
/* ct 0x000a */
|
||||
&ett_h248_pkg_ct,
|
||||
|
||||
/* nt 0x000b */
|
||||
&ett_h248_pkg_nt,
|
||||
|
||||
/* rtp 0x000c */
|
||||
&ett_h248_pkg_rtp,
|
||||
|
||||
/* tdmc 0x000d */
|
||||
&ett_h248_pkg_tdmc
|
||||
};
|
||||
|
||||
|
|
@ -493,11 +1109,19 @@ void proto_register_h248_annex_e(void) {
|
|||
|
||||
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);
|
||||
h248_register_package(&h248_pkg_rtp);
|
||||
h248_register_package(&h248_pkg_tdmc);
|
||||
h248_register_package(&h248_pkg_generic); /* 0x0001 */
|
||||
h248_register_package(&h248_pkg_root); /* 0x0002 */
|
||||
h248_register_package(&h248_pkg_tonegen); /* 0x0003 */
|
||||
h248_register_package(&h248_pkg_tonedet); /* 0x0004 */
|
||||
h248_register_package(&h248_pkg_dg); /* 0X0005 */
|
||||
h248_register_package(&h248_pkg_dd); /* 0x0006 */
|
||||
h248_register_package(&h248_pkg_cg); /* 0x0007 */
|
||||
h248_register_package(&h248_pkg_cd); /* 0x0008 */
|
||||
h248_register_package(&h248_pkg_al); /* 0x0009 */
|
||||
h248_register_package(&h248_pkg_ct); /* 0x000a */
|
||||
h248_register_package(&h248_pkg_nt); /* 0x000b */
|
||||
h248_register_package(&h248_pkg_rtp); /* 0x000c */
|
||||
h248_register_package(&h248_pkg_tdmc); /* 0x000d */
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue