diff options
| author | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-10-07 07:47:41 +0000 |
|---|---|---|
| committer | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-10-07 07:47:41 +0000 |
| commit | d42995f3b4fd08c55395692f585dac071fd02b70 (patch) | |
| tree | 8dd817d8ec5d9c362c50b26e35a52eaae1da04e0 | |
| parent | 8e6d12f36032ef2028532f25de1c0ff324accf79 (diff) | |
Made dissect_pres() static.
Added changes from r29446 to .cnf file:
Switch a bunch of dissectors over to using tvb_new_subset_remaining()
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30385 f5534014-38df-0310-8fa8-9805f1628bb7
| -rw-r--r-- | asn1/pres/packet-pres-template.c | 2 | ||||
| -rw-r--r-- | asn1/pres/pres.cnf | 4 | ||||
| -rw-r--r-- | epan/dissectors/packet-pres.c | 6 |
3 files changed, 6 insertions, 6 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)) { diff --git a/epan/dissectors/packet-pres.c b/epan/dissectors/packet-pres.c index 0162ca85a1..fe6af79751 100644 --- a/epan/dissectors/packet-pres.c +++ b/epan/dissectors/packet-pres.c @@ -1400,7 +1400,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; @@ -1784,7 +1784,7 @@ void proto_register_pres(void) { NULL, HFILL }}, /*--- End of included file: packet-pres-hfarr.c ---*/ -#line 376 "packet-pres-template.c" +#line 374 "packet-pres-template.c" }; /* List of subtrees */ @@ -1830,7 +1830,7 @@ void proto_register_pres(void) { &ett_pres_User_session_requirements, /*--- End of included file: packet-pres-ettarr.c ---*/ -#line 382 "packet-pres-template.c" +#line 380 "packet-pres-template.c" }; static uat_field_t users_flds[] = { |