diff options
author | Luis Ontanon <luis.ontanon@gmail.com> | 2007-03-25 21:39:40 +0000 |
---|---|---|
committer | Luis Ontanon <luis.ontanon@gmail.com> | 2007-03-25 21:39:40 +0000 |
commit | 753ac017605096cca3812855eaa4b9f8f7bd5b96 (patch) | |
tree | add598fbbdd20f4721ddf5d7b4f62a3767480354 /asn1/h248/h248.cnf | |
parent | fecd33576260d4a3374f20d2a4860d006e7b8f63 (diff) |
Remove the context tracing from packet-h248.c ( migrated to <epan/gcp.c> )
svn path=/trunk/; revision=21188
Diffstat (limited to 'asn1/h248/h248.cnf')
-rw-r--r-- | asn1/h248/h248.cnf | 61 |
1 files changed, 31 insertions, 30 deletions
diff --git a/asn1/h248/h248.cnf b/asn1/h248/h248.cnf index 65c663e2db..f7eed44fa7 100644 --- a/asn1/h248/h248.cnf +++ b/asn1/h248/h248.cnf @@ -20,6 +20,7 @@ SigParamValue EventName EventParameterName EventParamValue +ContextID #.TYPE_RENAME IndAudMediaDescriptor/streams indAudMediaDescriptorStreams @@ -76,41 +77,41 @@ IndAudStatisticsDescriptor/statName iAStatName #.FN_HDR Message - curr_info.msg = h248_msg(pinfo,TVB_RAW_OFFSET(tvb)); + curr_info.msg = gcp_msg(pinfo,TVB_RAW_OFFSET(tvb),keep_persistent_data); #.END #.FN_FTR Message if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, h248_msg_to_str(curr_info.msg)); + col_set_str(pinfo->cinfo, COL_INFO, gcp_msg_to_str(curr_info.msg,keep_persistent_data)); if (keep_persistent_data) - analyze_h248_msg(curr_info.msg); + gcp_analyze_msg(h248_tree, h248_tvb, curr_info.msg, &h248_arrel); #.END #.FN_BODY TransactionRequest/transactionId guint32 trx_id = 0; offset = dissect_h248_trx_id(implicit_tag, pinfo, tree, tvb, offset, &trx_id); - curr_info.trx = h248_trx(curr_info.msg,trx_id,H248_TRX_REQUEST); + curr_info.trx = gcp_trx(curr_info.msg, trx_id, GCP_TRX_REQUEST, keep_persistent_data); error_code = 0; #.END #.FN_BODY ActionRequest/contextId guint32 ctx_id = 0; offset = dissect_h248_ctx_id(implicit_tag, pinfo, tree, tvb, offset, &ctx_id); - curr_info.ctx = h248_ctx(curr_info.msg,curr_info.trx,ctx_id); + curr_info.ctx = gcp_ctx(curr_info.msg,curr_info.trx,ctx_id,keep_persistent_data); curr_info.cmd = NULL; curr_info.term = NULL; #.END #.FN_FTR ActionReply if (!curr_info.cmd) { - curr_info.cmd = h248_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,H248_CMD_REPLY,offset); + curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_REPLY,offset,keep_persistent_data); H248_TAP(); } #.END #.FN_HDR Command/addReq - curr_info.cmd = h248_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,H248_CMD_ADD_REQ,offset); + curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_ADD_REQ,offset,keep_persistent_data); H248_TAP(); #.END @@ -119,7 +120,7 @@ IndAudStatisticsDescriptor/statName iAStatName #.END #.FN_HDR Command/moveReq - curr_info.cmd = h248_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,H248_CMD_MOVE_REQ,offset); + curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_MOVE_REQ,offset,keep_persistent_data); H248_TAP(); #.END @@ -129,7 +130,7 @@ IndAudStatisticsDescriptor/statName iAStatName #.END #.FN_HDR Command/modReq - curr_info.cmd = h248_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,H248_CMD_MOD_REQ,offset); + curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_MOD_REQ,offset,keep_persistent_data); H248_TAP(); #.END #.FN_FTR Command/modReq @@ -137,7 +138,7 @@ IndAudStatisticsDescriptor/statName iAStatName #.END #.FN_HDR Command/subtractReq - curr_info.cmd = h248_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,H248_CMD_SUB_REQ,offset); + curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_SUB_REQ,offset,keep_persistent_data); H248_TAP(); #.END #.FN_FTR Command/subtractReq @@ -145,7 +146,7 @@ IndAudStatisticsDescriptor/statName iAStatName #.END #.FN_HDR Command/auditCapRequest - curr_info.cmd = h248_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,H248_CMD_AUDITCAP_REQ,offset); + curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_AUDITCAP_REQ,offset,keep_persistent_data); H248_TAP(); #.END #.FN_FTR Command/auditCapRequest @@ -153,7 +154,7 @@ IndAudStatisticsDescriptor/statName iAStatName #.END #.FN_HDR Command/auditValueRequest - curr_info.cmd = h248_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,H248_CMD_AUDITVAL_REQ,offset); + curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_AUDITVAL_REQ,offset,keep_persistent_data); H248_TAP(); #.END #.FN_FTR Command/auditValueRequest @@ -161,7 +162,7 @@ IndAudStatisticsDescriptor/statName iAStatName #.END #.FN_HDR Command/notifyReq - curr_info.cmd = h248_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,H248_CMD_NOTIFY_REQ,offset); + curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_NOTIFY_REQ,offset,keep_persistent_data); H248_TAP(); #.END #.FN_FTR Command/notifyReq @@ -169,7 +170,7 @@ IndAudStatisticsDescriptor/statName iAStatName #.END #.FN_HDR ServiceChangeRequest - curr_info.cmd = h248_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,H248_CMD_SVCCHG_REQ,offset); + curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_SVCCHG_REQ,offset,keep_persistent_data); H248_TAP(); #.END #.FN_FTR ServiceChangeRequest @@ -177,7 +178,7 @@ IndAudStatisticsDescriptor/statName iAStatName #.END #.FN_HDR ContextRequest/topologyReq - curr_info.cmd = h248_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,H248_CMD_TOPOLOGY_REQ,offset); + curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_TOPOLOGY_REQ,offset,keep_persistent_data); H248_TAP(); #.END #.FN_FTR ContextRequest/topologyReq @@ -185,7 +186,7 @@ IndAudStatisticsDescriptor/statName iAStatName #.END #.FN_HDR ActionRequest/contextAttrAuditReq - curr_info.cmd = h248_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,H248_CMD_CTX_ATTR_AUDIT_REQ,offset); + 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(); #.END #.FN_FTR ActionRequest/contextAttrAuditReq @@ -193,42 +194,42 @@ IndAudStatisticsDescriptor/statName iAStatName #.END #.FN_HDR CommandReply/addReply - curr_info.cmd = h248_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,H248_CMD_ADD_REPLY,offset); + curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_ADD_REPLY,offset,keep_persistent_data); H248_TAP(); #.END #.FN_HDR CommandReply/moveReply - curr_info.cmd = h248_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,H248_CMD_MOVE_REPLY,offset); + curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_MOVE_REPLY,offset,keep_persistent_data); H248_TAP(); #.END #.FN_HDR CommandReply/modReply - curr_info.cmd = h248_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,H248_CMD_MOD_REPLY,offset); + curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_MOD_REPLY,offset,keep_persistent_data); H248_TAP(); #.END #.FN_HDR CommandReply/subtractReply - curr_info.cmd = h248_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,H248_CMD_SUB_REPLY,offset); + curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_SUB_REPLY,offset,keep_persistent_data); H248_TAP(); #.END #.FN_HDR CommandReply/notifyReply - curr_info.cmd = h248_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,H248_CMD_NOTIFY_REPLY,offset); + curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_NOTIFY_REPLY,offset,keep_persistent_data); H248_TAP(); #.END #.FN_HDR ServiceChangeReply - curr_info.cmd = h248_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,H248_CMD_SVCCHG_REPLY,offset); + curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_SVCCHG_REPLY,offset,keep_persistent_data); H248_TAP(); #.END #.FN_HDR CommandReply/auditCapReply - curr_info.cmd = h248_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,H248_CMD_AUDITCAP_REPLY,offset); + curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_AUDITCAP_REPLY,offset,keep_persistent_data); H248_TAP(); #.END #.FN_HDR CommandReply/auditValueReply - curr_info.cmd = h248_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,H248_CMD_AUDITVAL_REPLY,offset); + curr_info.cmd = gcp_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,GCP_CMD_AUDITVAL_REPLY,offset,keep_persistent_data); H248_TAP(); #.END @@ -237,17 +238,17 @@ IndAudStatisticsDescriptor/statName iAStatName expert_add_info_format(pinfo, get_ber_last_created_item(), PI_RESPONSE_CODE, PI_WARN, "Errored Command"); if (curr_info.cmd) { - h248_cmd_set_error(curr_info.cmd,error_code); + gcp_cmd_set_error(curr_info.cmd,error_code); } else if (curr_info.trx) { - h248_trx_set_error(curr_info.trx,error_code); + gcp_trx_set_error(curr_info.trx,error_code); } return offset; #.END #.FN_HDR TerminationID - curr_info.term = ep_new0(h248_term_t); - wild_term = H248_WILDCARD_NONE; + curr_info.term = ep_new0(gcp_term_t); + wild_term = GCP_WILDCARD_NONE; #.END #.FN_BODY WildcardField @@ -258,7 +259,7 @@ IndAudStatisticsDescriptor/statName iAStatName proto_tree_add_item(tree,hf_h248_term_wild_level,new_tvb,0,1,FALSE); proto_tree_add_item(tree,hf_h248_term_wild_position,new_tvb,0,1,FALSE); - wild_term = tvb_get_guint8(new_tvb,0) & 0x80 ? H248_WILDCARD_CHOOSE : H248_WILDCARD_ALL; + wild_term = tvb_get_guint8(new_tvb,0) & 0x80 ? GCP_WILDCARD_CHOOSE : GCP_WILDCARD_ALL; #.END @@ -275,7 +276,7 @@ IndAudStatisticsDescriptor/statName iAStatName curr_info.term->str = bytes_to_str(curr_info.term->buffer,curr_info.term->len); } - curr_info.term = h248_cmd_add_term(curr_info.msg, curr_info.trx, curr_info.cmd, curr_info.term, wild_term); + curr_info.term = gcp_cmd_add_term(curr_info.msg, curr_info.trx, curr_info.cmd, curr_info.term, wild_term, keep_persistent_data); if (h248_term_handle) { call_dissector(h248_term_handle, new_tvb, pinfo, tree); |