diff options
author | Luis Ontanon <luis.ontanon@gmail.com> | 2006-10-04 15:31:31 +0000 |
---|---|---|
committer | Luis Ontanon <luis.ontanon@gmail.com> | 2006-10-04 15:31:31 +0000 |
commit | c284a7f9abfbb4ee010449cb97e5ac1d6d13beec (patch) | |
tree | 2a928037741e326941120780b364047c5b320c36 /asn1 | |
parent | ba90067e6253449a9ca243b75831537c11634d16 (diff) |
more cleanup... almost there...
svn path=/trunk/; revision=19426
Diffstat (limited to 'asn1')
-rw-r--r-- | asn1/h248/h248.cnf | 45 | ||||
-rw-r--r-- | asn1/h248/packet-h248-template.c | 4 |
2 files changed, 4 insertions, 45 deletions
diff --git a/asn1/h248/h248.cnf b/asn1/h248/h248.cnf index 1cde520a03..3634489d06 100644 --- a/asn1/h248/h248.cnf +++ b/asn1/h248/h248.cnf @@ -21,9 +21,6 @@ SigParamValue EventName EventParameterName EventParamValue -EventParameter/value -SigParameter/value -SigParameterName #.TYPE_RENAME IndAudMediaDescriptor/streams indAudMediaDescriptorStreams @@ -32,11 +29,6 @@ ActionReply/contextId contextId TransactionRequest/transactionId transactionId TransactionPending/transactionId transactionId TransactionReply/transactionId transactionId -TransactionResponseAck/transactionId transactionId -EventParameter/eventParameterName EventOrSigParameterName -EventParameter/value EventOrSigParameterValue -SigParameter/sigParameterName EventOrSigParameterName -SigParameter/value EventOrSigParameterValue StatisticsParameter/statName StatName StatisticsParameter/statValue StatValue PropertyParm/propertyName PropertyName @@ -81,8 +73,6 @@ NotifyRequest/terminationID terminationIDList NotifyReply/terminationID terminationIDList ServiceChangeRequest/terminationID terminationIDList ServiceChangeReply/terminationID terminationIDList -EventParameter/value eventParameterValue -SigParameter/value sigParameterValue IndAudStatisticsDescriptor/statName iAStatName @@ -105,39 +95,10 @@ IndAudStatisticsDescriptor/statName iAStatName error_code = 0; #.END -#.FN_BODY TransactionPending/transactionId - guint32 trx_id = 0; - offset = dissect_h248_trx_id(implicit_tag, pinfo, tree, tvb, offset, &trx_id); - curr_info.trx = h248_trx(msg,trx_id,H248_TRX_PENDING); - error_code = 0; -#.END - -#.FN_BODY TransactionReply/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_REPLY); - error_code = 0; -#.END - -#.FN_BODY TransactionResponseAck/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_ACK); - 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.term = NULL; -#.END - -#.FN_BODY ActionReply/contextId - guint32 ctx_id; - 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.cmd = NULL; curr_info.term = NULL; #.END @@ -198,10 +159,10 @@ IndAudStatisticsDescriptor/statName iAStatName curr_info.cmd = NULL; #.END -#.FN_HDR Command/ServiceChangeRequest +#.FN_HDR ServiceChangeRequest curr_info.cmd = h248_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,H248_CMD_SVCCHG_REQ,offset); #.END -#.FN_FTR Command/ServiceChangeRequest +#.FN_FTR ServiceChangeRequest curr_info.cmd = NULL; #.END @@ -239,7 +200,7 @@ IndAudStatisticsDescriptor/statName iAStatName curr_info.cmd = h248_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,H248_CMD_NOTIFY_REPLY,offset); #.END -#.FN_HDR CommandReply/ServiceChangeReply +#.FN_HDR ServiceChangeReply curr_info.cmd = h248_cmd(curr_info.msg,curr_info.trx,curr_info.ctx,H248_CMD_SVCCHG_REPLY,offset); #.END diff --git a/asn1/h248/packet-h248-template.c b/asn1/h248/packet-h248-template.c index 21782616b3..48d8ecbac8 100644 --- a/asn1/h248/packet-h248-template.c +++ b/asn1/h248/packet-h248-template.c @@ -669,9 +669,7 @@ static int dissect_h248_PkgdName(gboolean implicit_tag, tvbuff_t *tvb, int offse if (! pkg ) pkg = &no_package; - printf(">>>%p,%p,%i\n",pkg,pkg->hfid_params,pkg->id); - hf_param = *(pkg->hfid_params); // XXX crashes here! - printf(">>>%i\n",hf_param); + hf_param = *(pkg->hfid_params); proto_tree_add_uint(package_tree, hf_param, tvb, offset-2, 2, name_minor); } else { |