diff options
| author | Bill Meier <wmeier@newsguy.com> | 2015-01-30 13:49:59 -0500 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2015-01-30 19:04:32 +0000 |
| commit | eda485ea53c7ac77470f47e886b6513f28f0c20b (patch) | |
| tree | 6b5adad845db04d441bb5a177f0ce8fe6cb92346 /epan/dissectors/packet-pana.c | |
| parent | 7b929e2ff78c5196e5ab7c4413b0eae1b542e445 (diff) | |
Cleanup:
Including:
tvb_length...() ==> tvb_reported_length...()
Remove some dead initializers;
Localize some variables;
Whitespace.
Change-Id: Ide9490f248d558bb7e3af96a1fc17d8f911de4ef
Reviewed-on: https://code.wireshark.org/review/6862
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Diffstat (limited to 'epan/dissectors/packet-pana.c')
| -rw-r--r-- | epan/dissectors/packet-pana.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/epan/dissectors/packet-pana.c b/epan/dissectors/packet-pana.c index a326e68072..50a00aab6b 100644 --- a/epan/dissectors/packet-pana.c +++ b/epan/dissectors/packet-pana.c @@ -461,9 +461,8 @@ dissect_avps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *avp_tree) tvb, offset, avp_data_length, ett_pana_avp, NULL, "AVP Value (EAP packet)"); eap_tvb = tvb_new_subset_length(tvb, offset, avp_data_length); - if (eap_handle != NULL) { - call_dissector(eap_handle, eap_tvb, pinfo, avp_eap_tree); - } + DISSECTOR_ASSERT_HINT(eap_handle, "EAP Dissector not available"); + call_dissector(eap_handle, eap_tvb, pinfo, avp_eap_tree); break; } case PANA_ENCAPSULATED: { @@ -652,7 +651,7 @@ dissect_pana(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ guint32 avp_length; /* Get actual buffer length */ - buffer_length = tvb_length(tvb); + buffer_length = tvb_captured_length(tvb); /* Check minimum buffer length */ if(buffer_length < 12) { @@ -925,7 +924,6 @@ proto_reg_handoff_pana(void) dissector_add_for_decode_as("udp.port", pana_handle); eap_handle = find_dissector("eap"); -/** if(!eap_handle) fprintf(stderr,"PANA warning: EAP dissector not found\n"); **/ } |