diff options
author | Stig Bjørlykke <stig@bjorlykke.org> | 2009-10-07 07:47:41 +0000 |
---|---|---|
committer | Stig Bjørlykke <stig@bjorlykke.org> | 2009-10-07 07:47:41 +0000 |
commit | 843459d07551c168a49aa9a332839c503f21525f (patch) | |
tree | 8dd817d8ec5d9c362c50b26e35a52eaae1da04e0 /asn1 | |
parent | d86f67b925ed4315c754bac3f70d04d21dd493f0 (diff) |
Made dissect_pres() static.
Added changes from r29446 to .cnf file:
Switch a bunch of dissectors over to using tvb_new_subset_remaining()
svn path=/trunk/; revision=30385
Diffstat (limited to 'asn1')
-rw-r--r-- | asn1/pres/packet-pres-template.c | 2 | ||||
-rw-r--r-- | asn1/pres/pres.cnf | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/asn1/pres/packet-pres-template.c b/asn1/pres/packet-pres-template.c index 01236857f5..aecacaf203 100644 --- a/asn1/pres/packet-pres-template.c +++ b/asn1/pres/packet-pres-template.c @@ -295,7 +295,7 @@ dissect_ppdu(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) return offset; } -void +static void dissect_pres(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) { int offset = 0, old_offset; diff --git a/asn1/pres/pres.cnf b/asn1/pres/pres.cnf index 32863a43b0..9bc98ea6fa 100644 --- a/asn1/pres/pres.cnf +++ b/asn1/pres/pres.cnf @@ -38,7 +38,7 @@ CPR-PPDU/normal-mode-parameters/provider-reason cPR_PPDU__provider-reason oid=find_oid_by_pres_ctx_id(actx->pinfo, presentation_context_identifier); if(oid){ - next_tvb = tvb_new_subset(tvb, offset, -1, -1); + next_tvb = tvb_new_subset_remaining(tvb, offset); call_ber_oid_callback(oid, next_tvb, offset, actx->pinfo, global_tree); } else { if (!pres_try_users_table(presentation_context_identifier, tvb, offset, actx->pinfo)) { @@ -54,7 +54,7 @@ CPR-PPDU/normal-mode-parameters/provider-reason cPR_PPDU__provider-reason oid=find_oid_by_pres_ctx_id(actx->pinfo, presentation_context_identifier); if(oid){ - next_tvb = tvb_new_subset(tvb, offset, -1, -1); + next_tvb = tvb_new_subset_remaining(tvb, offset); call_ber_oid_callback(oid, next_tvb, offset, actx->pinfo, global_tree); } else { if (!pres_try_users_table(presentation_context_identifier, tvb, offset, actx->pinfo)) { |