diff --git a/packet-ranap.c b/packet-ranap.c index 7ca4eec7a5..da68eec49b 100644 --- a/packet-ranap.c +++ b/packet-ranap.c @@ -3,7 +3,7 @@ * Based on 3GPP TS 25.413 V3.4.0 * Copyright 2001, Martin Held * - * $Id: packet-ranap.c,v 1.11 2002/01/24 09:20:50 guy Exp $ + * $Id: packet-ranap.c,v 1.12 2002/04/14 23:22:21 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -3830,7 +3830,7 @@ dissect_ranap_ie(guint16 ie_id, tvbuff_t *ie_contents_tvb, proto_tree *ie_tree) static int -dissect_ranap_ie_container(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree *ranap_tree) +dissect_ranap_ie_container(tvbuff_t *tvb, proto_tree *ranap_tree) { proto_item *ie_item = NULL; proto_tree *ie_tree = NULL; @@ -4084,7 +4084,7 @@ dissect_ranap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ie_tvb = tvb_new_subset(tvb, offset, -1, -1); /* dissect the ies */ - dissect_ranap_ie_container(ie_tvb, pinfo, tree, ranap_tree); + dissect_ranap_ie_container(ie_tvb, ranap_tree); } diff --git a/packet-rsvp.c b/packet-rsvp.c index 6fcfe92a94..1e5b9973ea 100644 --- a/packet-rsvp.c +++ b/packet-rsvp.c @@ -3,7 +3,7 @@ * * (c) Copyright Ashok Narayanan * - * $Id: packet-rsvp.c,v 1.59 2002/04/14 23:04:04 guy Exp $ + * $Id: packet-rsvp.c,v 1.60 2002/04/14 23:22:21 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -929,7 +929,6 @@ dissect_rsvp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int obj_length; int mylen; int offset2; - char *objtype; int session_off, tempfilt_off; if (check_col(pinfo->cinfo, COL_PROTOCOL)) diff --git a/packet-rx.c b/packet-rx.c index 5f2248cef9..fcd0377d49 100644 --- a/packet-rx.c +++ b/packet-rx.c @@ -4,7 +4,7 @@ * Based on routines from tcpdump patches by * Ken Hornstein * - * $Id: packet-rx.c,v 1.34 2002/02/05 21:02:36 nneul Exp $ + * $Id: packet-rx.c,v 1.35 2002/04/14 23:22:21 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -148,7 +148,7 @@ static gint ett_rx_abort = -1; static dissector_handle_t afs_handle; static int -dissect_rx_response_encrypted(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int offset) +dissect_rx_response_encrypted(tvbuff_t *tvb, proto_tree *parent_tree, int offset) { proto_tree *tree; proto_item *item; @@ -237,7 +237,7 @@ dissect_rx_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, offset += 4; /* encrypted : struct */ - offset = dissect_rx_response_encrypted(tvb, pinfo, tree, offset); + offset = dissect_rx_response_encrypted(tvb, tree, offset); /* kvno */ proto_tree_add_item(tree, hf_rx_kvno, tvb, offset, 4, FALSE); diff --git a/packet-sctp.c b/packet-sctp.c index 4cafeb605c..790433bd4b 100644 --- a/packet-sctp.c +++ b/packet-sctp.c @@ -10,7 +10,7 @@ * - support for reassembly * - code cleanup * - * $Id: packet-sctp.c,v 1.33 2002/03/03 22:42:08 guy Exp $ + * $Id: packet-sctp.c,v 1.34 2002/04/14 23:22:21 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -650,7 +650,7 @@ static void dissect_parameter(tvbuff_t *, packet_info *, proto_tree *); static void -dissect_error_cause(tvbuff_t *cause_tvb, packet_info *pinfo, proto_tree *chunk_tree); +dissect_error_cause(tvbuff_t *, packet_info *, proto_tree *); static gboolean dissect_sctp_chunk(tvbuff_t *, packet_info *, proto_tree *, proto_tree *); @@ -815,7 +815,7 @@ dissect_supported_address_types_parameter(tvbuff_t *parameter_tvb, proto_tree *p } static void -dissect_ecn_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) +dissect_ecn_parameter(proto_item *parameter_item) { proto_item_set_text(parameter_item, "ECN parameter"); } @@ -915,7 +915,7 @@ dissect_set_primary_address_parameter(tvbuff_t *parameter_tvb, packet_info *pinf } static void -dissect_success_report_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) +dissect_success_report_parameter(proto_item *parameter_item) { proto_item_set_text(parameter_item, "Success report parameter"); } @@ -1001,7 +1001,7 @@ dissect_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *chunk dissect_supported_address_types_parameter(parameter_tvb, parameter_tree, parameter_item); break; case ECN_PARAMETER_ID: - dissect_ecn_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_ecn_parameter(parameter_item); break; case UNRELIABLE_STREAMS_PARAMETER_ID: dissect_unreliable_streams_parameter(parameter_tvb, parameter_tree, parameter_item); @@ -1019,7 +1019,7 @@ dissect_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *chunk dissect_set_primary_address_parameter(parameter_tvb, pinfo, parameter_tree, parameter_item); break; case SUCCESS_REPORT_PARAMETER_ID: - dissect_success_report_parameter(parameter_tvb, parameter_tree, parameter_item); + dissect_success_report_parameter(parameter_item); break; case ADAP_LAYER_INDICATION_PARAMETER_ID: dissect_adap_indication_parameter(parameter_tvb, parameter_tree, parameter_item); @@ -1094,7 +1094,7 @@ dissect_stale_cookie_error_cause(tvbuff_t *cause_tvb, proto_tree *cause_tree, pr } static void -dissect_out_of_resource_cause(tvbuff_t *cause_tvb, proto_tree *cause_tree, proto_item *cause_item) +dissect_out_of_resource_cause(proto_item *cause_item) { proto_item_set_text(cause_item, "Error cause reporting lack of resources"); } @@ -1142,7 +1142,7 @@ dissect_unrecognized_chunk_type_cause(tvbuff_t *cause_tvb, packet_info *pinfo, } static void -dissect_invalid_mandatory_parameter_cause(tvbuff_t *cause_tvb, proto_tree *cause_tree, proto_item *cause_item) +dissect_invalid_mandatory_parameter_cause(proto_item *cause_item) { proto_item_set_text(cause_item, "Error cause reporting an invalid mandatory parameter"); } @@ -1179,7 +1179,7 @@ dissect_no_user_data_cause(tvbuff_t *cause_tvb, proto_tree *cause_tree, proto_it } static void -dissect_cookie_received_while_shutting_down_cause(tvbuff_t *cause_tvb, proto_tree *cause_tree, proto_item *cause_item) +dissect_cookie_received_while_shutting_down_cause(proto_item *cause_item) { proto_item_set_text(cause_item, "Error cause reporting cookie reception while shutting down"); } @@ -1276,7 +1276,7 @@ dissect_error_cause(tvbuff_t *cause_tvb, packet_info *pinfo, proto_tree *chunk_t dissect_stale_cookie_error_cause(cause_tvb, cause_tree, cause_item); break; case OUT_OF_RESOURCE: - dissect_out_of_resource_cause(cause_tvb, cause_tree, cause_item); + dissect_out_of_resource_cause(cause_item); break; case UNRESOLVABLE_ADDRESS: dissect_unresolvable_address_cause(cause_tvb, pinfo, cause_tree, cause_item); @@ -1285,7 +1285,7 @@ dissect_error_cause(tvbuff_t *cause_tvb, packet_info *pinfo, proto_tree *chunk_t dissect_unrecognized_chunk_type_cause(cause_tvb, pinfo, cause_tree, cause_item); break; case INVALID_MANDATORY_PARAMETER: - dissect_invalid_mandatory_parameter_cause(cause_tvb, cause_tree, cause_item); + dissect_invalid_mandatory_parameter_cause(cause_item); break; case UNRECOGNIZED_PARAMETERS: dissect_unrecognized_parameters_cause(cause_tvb, pinfo, cause_tree, cause_item); @@ -1294,7 +1294,7 @@ dissect_error_cause(tvbuff_t *cause_tvb, packet_info *pinfo, proto_tree *chunk_t dissect_no_user_data_cause(cause_tvb, cause_tree, cause_item); break; case COOKIE_RECEIVED_WHILE_SHUTTING_DOWN: - dissect_cookie_received_while_shutting_down_cause(cause_tvb, cause_tree, cause_item); + dissect_cookie_received_while_shutting_down_cause(cause_item); break; case REQUEST_TO_DELETE_LAST_ADDRESS: dissect_delete_last_address_cause(cause_tvb, pinfo, cause_tree, cause_item); @@ -1399,8 +1399,8 @@ dissect_data_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *tree, } static void -dissect_init_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *tree, - proto_tree *chunk_tree, proto_item *chunk_item, proto_item *flags_item) +dissect_init_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, + proto_tree *chunk_tree, proto_item *chunk_item) { guint32 initiate_tag, adv_rec_window_credit, initial_tsn; guint16 number_of_inbound_streams, number_of_outbound_streams; @@ -1459,15 +1459,15 @@ dissect_init_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *tree, } static void -dissect_init_ack_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *tree, - proto_tree *chunk_tree, proto_item *chunk_item, proto_item *flags_item) +dissect_init_ack_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, + proto_tree *chunk_tree, proto_item *chunk_item) { - dissect_init_chunk(chunk_tvb, pinfo, tree, chunk_tree, chunk_item, flags_item); + dissect_init_chunk(chunk_tvb, pinfo, chunk_tree, chunk_item); } static void -dissect_sack_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *tree, - proto_tree *chunk_tree, proto_item *chunk_item, proto_item *flags_item) +dissect_sack_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, + proto_tree *chunk_tree, proto_item *chunk_item) { guint32 cumulative_tsn_ack, adv_rec_window_credit, dup_tsn; guint16 number_of_gap_blocks, number_of_dup_tsns; @@ -1544,8 +1544,8 @@ dissect_sack_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *tree, } static void -dissect_heartbeat_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *tree, - proto_tree *chunk_tree, proto_item *chunk_item, proto_item *flags_item) +dissect_heartbeat_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, + proto_tree *chunk_tree, proto_item *chunk_item) { tvbuff_t *parameter_tvb; guint chunk_length, info_length, padding_length, total_length; @@ -1567,8 +1567,8 @@ dissect_heartbeat_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *tre } static void -dissect_heartbeat_ack_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *tree, - proto_tree *chunk_tree, proto_item *chunk_item, proto_item *flags_item) +dissect_heartbeat_ack_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, + proto_tree *chunk_tree, proto_item *chunk_item) { tvbuff_t *parameter_tvb; guint chunk_length, info_length, padding_length, total_length; @@ -1591,8 +1591,8 @@ dissect_heartbeat_ack_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree } static void -dissect_abort_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *tree, - proto_tree *chunk_tree, proto_item *chunk_item, proto_item *flags_item) +dissect_abort_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, + proto_tree *chunk_tree, proto_item *chunk_item) { guint offset, number_of_causes; guint16 length, padding_length, total_length; @@ -1622,8 +1622,8 @@ dissect_abort_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *tree, } static void -dissect_shutdown_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *tree, - proto_tree *chunk_tree, proto_item *chunk_item, proto_item *flags_item) +dissect_shutdown_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, + proto_tree *chunk_tree, proto_item *chunk_item) { guint32 cumulative_tsn_ack; @@ -1644,8 +1644,8 @@ dissect_shutdown_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *tree } static void -dissect_shutdown_ack_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *tree, - proto_tree *chunk_tree, proto_item *chunk_item, proto_item *flags_item) +dissect_shutdown_ack_chunk(packet_info *pinfo, + proto_tree *chunk_tree, proto_item *chunk_item) { if (check_col(pinfo->cinfo, COL_INFO)) col_append_str(pinfo->cinfo, COL_INFO, "SHUTDOWN_ACK "); @@ -1656,8 +1656,8 @@ dissect_shutdown_ack_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree * } static void -dissect_error_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *tree, - proto_tree *chunk_tree, proto_item *chunk_item, proto_item *flags_item) +dissect_error_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, + proto_tree *chunk_tree, proto_item *chunk_item) { guint offset, number_of_causes; guint16 length, padding_length, total_length; @@ -1687,8 +1687,8 @@ dissect_error_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *tree, } static void -dissect_cookie_echo_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *tree, - proto_tree *chunk_tree, proto_item *chunk_item, proto_item *flags_item) +dissect_cookie_echo_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, + proto_tree *chunk_tree, proto_item *chunk_item) { guint length, cookie_length, padding_length; @@ -1714,8 +1714,8 @@ dissect_cookie_echo_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *t } static void -dissect_cookie_ack_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *tree, - proto_tree *chunk_tree, proto_item *chunk_item, proto_item *flags_item) +dissect_cookie_ack_chunk(packet_info *pinfo, + proto_tree *chunk_tree, proto_item *chunk_item) { if (check_col(pinfo->cinfo, COL_INFO)) col_append_str(pinfo->cinfo, COL_INFO, "COOKIE_ACK "); @@ -1726,8 +1726,8 @@ dissect_cookie_ack_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *tr } static void -dissect_ecne_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *tree, - proto_tree *chunk_tree, proto_item *chunk_item, proto_item *flags_item) +dissect_ecne_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, + proto_tree *chunk_tree, proto_item *chunk_item) { guint32 lowest_tsn; @@ -1746,8 +1746,8 @@ dissect_ecne_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *tree, } static void -dissect_cwr_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *tree, - proto_tree *chunk_tree, proto_item *chunk_item, proto_item *flags_item) +dissect_cwr_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, + proto_tree *chunk_tree, proto_item *chunk_item) { guint32 lowest_tsn; @@ -1766,7 +1766,7 @@ dissect_cwr_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *tree, } static void -dissect_shutdown_complete_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *tree, +dissect_shutdown_complete_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *chunk_tree, proto_item *chunk_item, proto_item *flags_item) { guint8 flags; @@ -1792,7 +1792,7 @@ dissect_shutdown_complete_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_t #define FORWARD_TSN_CHUNK_TSN_LENGTH 4 static void -dissect_forward_tsn_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *tree, proto_tree *chunk_tree, proto_item *chunk_item, proto_item *flags_item) +dissect_forward_tsn_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *chunk_tree, proto_item *chunk_item) { guint32 tsn; @@ -1822,7 +1822,7 @@ static const value_string sctp_address_type_values[] = { { 0, NULL } }; static void -dissect_asconf_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *tree, proto_tree *chunk_tree, proto_item *chunk_item, proto_item *flags_item) +dissect_asconf_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *chunk_tree, proto_item *chunk_item) { guint32 serial_number, correlation_id, ipv4_address; guint offset, length, padding_length, total_length; @@ -1877,7 +1877,7 @@ dissect_asconf_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *tree, } static void -dissect_asconf_ack_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *tree, proto_tree *chunk_tree, proto_item *chunk_item, proto_item *flags_item) +dissect_asconf_ack_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *chunk_tree, proto_item *chunk_item) { guint32 serial_number, correlation_id; guint offset, length, padding_length, total_length; @@ -1909,8 +1909,8 @@ dissect_asconf_ack_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *tr } static void -dissect_unknown_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *tree, - proto_tree *chunk_tree, proto_item *chunk_item, proto_item *flags_item) +dissect_unknown_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, + proto_tree *chunk_tree, proto_item *chunk_item) { guint length, chunk_value_length, padding_length; guint8 type; @@ -1979,58 +1979,58 @@ dissect_sctp_chunk(tvbuff_t *chunk_tvb, packet_info *pinfo, proto_tree *tree, pr result = dissect_data_chunk(chunk_tvb, pinfo, tree, chunk_tree, chunk_item, flags_item); break; case SCTP_INIT_CHUNK_ID: - dissect_init_chunk(chunk_tvb, pinfo, tree, chunk_tree, chunk_item, flags_item); + dissect_init_chunk(chunk_tvb, pinfo, chunk_tree, chunk_item); break; case SCTP_INIT_ACK_CHUNK_ID: - dissect_init_ack_chunk(chunk_tvb, pinfo, tree, chunk_tree, chunk_item, flags_item); + dissect_init_ack_chunk(chunk_tvb, pinfo, chunk_tree, chunk_item); break; case SCTP_SACK_CHUNK_ID: - dissect_sack_chunk(chunk_tvb, pinfo, tree, chunk_tree, chunk_item, flags_item); + dissect_sack_chunk(chunk_tvb, pinfo, chunk_tree, chunk_item); break; case SCTP_HEARTBEAT_CHUNK_ID: - dissect_heartbeat_chunk(chunk_tvb, pinfo, tree, chunk_tree, chunk_item, flags_item); + dissect_heartbeat_chunk(chunk_tvb, pinfo, chunk_tree, chunk_item); break; case SCTP_HEARTBEAT_ACK_CHUNK_ID: - dissect_heartbeat_ack_chunk(chunk_tvb, pinfo, tree, chunk_tree, chunk_item, flags_item); + dissect_heartbeat_ack_chunk(chunk_tvb, pinfo, chunk_tree, chunk_item); break; case SCTP_ABORT_CHUNK_ID: - dissect_abort_chunk(chunk_tvb, pinfo, tree, chunk_tree, chunk_item, flags_item); + dissect_abort_chunk(chunk_tvb, pinfo, chunk_tree, chunk_item); break; case SCTP_SHUTDOWN_CHUNK_ID: - dissect_shutdown_chunk(chunk_tvb, pinfo, tree, chunk_tree, chunk_item, flags_item); + dissect_shutdown_chunk(chunk_tvb, pinfo, chunk_tree, chunk_item); break; case SCTP_SHUTDOWN_ACK_CHUNK_ID: - dissect_shutdown_ack_chunk(chunk_tvb, pinfo, tree, chunk_tree, chunk_item, flags_item); + dissect_shutdown_ack_chunk(pinfo, chunk_tree, chunk_item); break; case SCTP_ERROR_CHUNK_ID: - dissect_error_chunk(chunk_tvb, pinfo, tree, chunk_tree, chunk_item, flags_item); + dissect_error_chunk(chunk_tvb, pinfo, chunk_tree, chunk_item); break; case SCTP_COOKIE_ECHO_CHUNK_ID: - dissect_cookie_echo_chunk(chunk_tvb, pinfo, tree, chunk_tree, chunk_item, flags_item); + dissect_cookie_echo_chunk(chunk_tvb, pinfo, chunk_tree, chunk_item); break; case SCTP_COOKIE_ACK_CHUNK_ID: - dissect_cookie_ack_chunk(chunk_tvb, pinfo, tree, chunk_tree, chunk_item, flags_item); + dissect_cookie_ack_chunk(pinfo, chunk_tree, chunk_item); break; case SCTP_ECNE_CHUNK_ID: - dissect_ecne_chunk(chunk_tvb, pinfo, tree, chunk_tree, chunk_item, flags_item); + dissect_ecne_chunk(chunk_tvb, pinfo, chunk_tree, chunk_item); break; case SCTP_CWR_CHUNK_ID: - dissect_cwr_chunk(chunk_tvb, pinfo, tree, chunk_tree, chunk_item, flags_item); + dissect_cwr_chunk(chunk_tvb, pinfo, chunk_tree, chunk_item); break; case SCTP_SHUTDOWN_COMPLETE_CHUNK_ID: - dissect_shutdown_complete_chunk(chunk_tvb, pinfo, tree, chunk_tree, chunk_item, flags_item); + dissect_shutdown_complete_chunk(chunk_tvb, pinfo, chunk_tree, chunk_item, flags_item); break; case SCTP_FORWARD_TSN_CHUNK_ID: - dissect_forward_tsn_chunk(chunk_tvb, pinfo, tree, chunk_tree, chunk_item, flags_item); + dissect_forward_tsn_chunk(chunk_tvb, pinfo, chunk_tree, chunk_item); break; case SCTP_ASCONF_ACK_CHUNK_ID: - dissect_asconf_ack_chunk(chunk_tvb, pinfo, tree, chunk_tree, chunk_item, flags_item); + dissect_asconf_ack_chunk(chunk_tvb, pinfo, chunk_tree, chunk_item); break; case SCTP_ASCONF_CHUNK_ID: - dissect_asconf_chunk(chunk_tvb, pinfo, tree, chunk_tree, chunk_item, flags_item); + dissect_asconf_chunk(chunk_tvb, pinfo, chunk_tree, chunk_item); break; default: - dissect_unknown_chunk(chunk_tvb, pinfo, tree, chunk_tree, chunk_item, flags_item); + dissect_unknown_chunk(chunk_tvb, pinfo, chunk_tree, chunk_item); break; }; return result; diff --git a/packet-sdp.c b/packet-sdp.c index 78723e1008..ce731d5e9a 100644 --- a/packet-sdp.c +++ b/packet-sdp.c @@ -4,7 +4,7 @@ * Jason Lango * Liberally copied from packet-http.c, by Guy Harris * - * $Id: packet-sdp.c,v 1.29 2002/02/02 23:04:31 guy Exp $ + * $Id: packet-sdp.c,v 1.30 2002/04/14 23:22:22 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -128,30 +128,19 @@ static int ett_sdp_media_attribute = -1; /* static functions */ -static void call_sdp_subdissector(tvbuff_t *tvb, packet_info *pinfo, - proto_tree *tree, int hf, proto_tree* ti); +static void call_sdp_subdissector(tvbuff_t *tvb, int hf, proto_tree* ti); /* Subdissector functions */ -static void dissect_sdp_owner(tvbuff_t *tvb, packet_info *pinfo, - proto_tree *tree, proto_item* ti); -static void dissect_sdp_connection_info(tvbuff_t *tvb, packet_info *pinfo, - proto_tree *tree, proto_item* ti); -static void dissect_sdp_bandwidth(tvbuff_t *tvb, packet_info *pinfo, - proto_tree *tree, proto_item *ti); -static void dissect_sdp_time(tvbuff_t *tvb, packet_info *pinfo, - proto_tree *tree, proto_item* ti); -static void dissect_sdp_repeat_time(tvbuff_t *tvb, packet_info *pinfo, - proto_tree *tree, proto_item* ti); -static void dissect_sdp_timezone(tvbuff_t *tvb, packet_info *pinfo, - proto_tree *tree, proto_item* ti); -static void dissect_sdp_encryption_key(tvbuff_t *tvb, packet_info *pinfo, - proto_tree *tree, proto_item * ti); -static void dissect_sdp_session_attribute(tvbuff_t *tvb, packet_info *pinfo, - proto_tree *tree,proto_item *ti); -static void dissect_sdp_media(tvbuff_t *tvb, packet_info *pinfo, - proto_tree *tree, proto_item *ti); -static void dissect_sdp_media_attribute(tvbuff_t *tvb, packet_info *pinfo, - proto_tree *tree,proto_item *ti); +static void dissect_sdp_owner(tvbuff_t *tvb, proto_item* ti); +static void dissect_sdp_connection_info(tvbuff_t *tvb, proto_item* ti); +static void dissect_sdp_bandwidth(tvbuff_t *tvb, proto_item *ti); +static void dissect_sdp_time(tvbuff_t *tvb, proto_item* ti); +static void dissect_sdp_repeat_time(tvbuff_t *tvb, proto_item* ti); +static void dissect_sdp_timezone(tvbuff_t *tvb, proto_item* ti); +static void dissect_sdp_encryption_key(tvbuff_t *tvb, proto_item * ti); +static void dissect_sdp_session_attribute(tvbuff_t *tvb, proto_item *ti); +static void dissect_sdp_media(tvbuff_t *tvb, proto_item *ti); +static void dissect_sdp_media_attribute(tvbuff_t *tvb, proto_item *ti); static void dissect_sdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) @@ -312,7 +301,7 @@ dissect_sdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) CLEANUP_CALL_AND_POP; call_sdp_subdissector(tvb_new_subset(tvb,offset+tokenoffset, linelen-tokenoffset,-1), - pinfo,tree,hf,sub_ti); + hf,sub_ti); offset = next_offset; } @@ -324,40 +313,35 @@ dissect_sdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } static void -call_sdp_subdissector(tvbuff_t *tvb, packet_info *pinfo, - proto_tree *tree, int hf, proto_tree* ti){ +call_sdp_subdissector(tvbuff_t *tvb, int hf, proto_tree* ti){ if(hf == hf_owner){ - dissect_sdp_owner(tvb,pinfo,tree,ti); + dissect_sdp_owner(tvb,ti); } else if ( hf == hf_connection_info) { - dissect_sdp_connection_info(tvb,pinfo,tree,ti); + dissect_sdp_connection_info(tvb,ti); } else if ( hf == hf_bandwidth) { - dissect_sdp_bandwidth(tvb,pinfo,tree,ti); + dissect_sdp_bandwidth(tvb,ti); } else if ( hf == hf_time) { - dissect_sdp_time(tvb,pinfo,tree,ti); + dissect_sdp_time(tvb,ti); } else if ( hf == hf_repeat_time ){ - dissect_sdp_repeat_time(tvb,pinfo,tree,ti); + dissect_sdp_repeat_time(tvb,ti); } else if ( hf == hf_timezone ) { - dissect_sdp_timezone(tvb,pinfo,tree,ti); + dissect_sdp_timezone(tvb,ti); } else if ( hf == hf_encryption_key ) { - dissect_sdp_encryption_key(tvb,pinfo,tree,ti); + dissect_sdp_encryption_key(tvb,ti); } else if ( hf == hf_session_attribute ){ - dissect_sdp_session_attribute(tvb,pinfo,tree,ti); + dissect_sdp_session_attribute(tvb,ti); } else if ( hf == hf_media ) { - dissect_sdp_media(tvb,pinfo,tree,ti); + dissect_sdp_media(tvb,ti); } else if ( hf == hf_media_attribute ){ - dissect_sdp_media_attribute(tvb,pinfo,tree,ti); + dissect_sdp_media_attribute(tvb,ti); } } static void -dissect_sdp_owner(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, - proto_item *ti){ +dissect_sdp_owner(tvbuff_t *tvb, proto_item *ti){ proto_tree *sdp_owner_tree; gint offset,next_offset,tokenlen; - if(!tree) - return; - offset = 0; next_offset = 0; tokenlen = 0; @@ -419,14 +403,10 @@ dissect_sdp_owner(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } static void -dissect_sdp_connection_info(tvbuff_t *tvb, packet_info *pinfo, - proto_tree *tree, proto_item* ti){ +dissect_sdp_connection_info(tvbuff_t *tvb, proto_item* ti){ proto_tree *sdp_connection_info_tree; gint offset,next_offset,tokenlen; - if(!tree) - return; - offset = 0; next_offset = 0; tokenlen = 0; @@ -486,14 +466,10 @@ dissect_sdp_connection_info(tvbuff_t *tvb, packet_info *pinfo, } static void -dissect_sdp_bandwidth(tvbuff_t *tvb, packet_info *pinfo, - proto_tree *tree,proto_item *ti){ +dissect_sdp_bandwidth(tvbuff_t *tvb, proto_item *ti){ proto_tree * sdp_bandwidth_tree; gint offset, next_offset, tokenlen; - if(!tree) - return; - offset = 0; next_offset = 0; tokenlen = 0; @@ -518,14 +494,10 @@ dissect_sdp_bandwidth(tvbuff_t *tvb, packet_info *pinfo, } -static void dissect_sdp_time(tvbuff_t *tvb, packet_info *pinfo, - proto_tree *tree, proto_item* ti){ +static void dissect_sdp_time(tvbuff_t *tvb, proto_item* ti){ proto_tree *sdp_time_tree; gint offset,next_offset, tokenlen; - if(!tree) - return; - offset = 0; next_offset = 0; tokenlen = 0; @@ -547,14 +519,10 @@ static void dissect_sdp_time(tvbuff_t *tvb, packet_info *pinfo, offset, -1, FALSE); } -static void dissect_sdp_repeat_time(tvbuff_t *tvb, packet_info *pinfo, - proto_tree *tree, proto_item* ti){ +static void dissect_sdp_repeat_time(tvbuff_t *tvb, proto_item* ti){ proto_tree *sdp_repeat_time_tree; gint offset,next_offset, tokenlen; - if(!tree) - return; - offset = 0; next_offset = 0; tokenlen = 0; @@ -595,12 +563,9 @@ static void dissect_sdp_repeat_time(tvbuff_t *tvb, packet_info *pinfo, } static void -dissect_sdp_timezone(tvbuff_t *tvb, packet_info *pinfo, - proto_tree *tree, proto_item* ti){ +dissect_sdp_timezone(tvbuff_t *tvb, proto_item* ti){ proto_tree* sdp_timezone_tree; gint offset, next_offset, tokenlen; - if(!tree) - return; offset = 0; next_offset = 0; tokenlen = 0; @@ -630,8 +595,7 @@ dissect_sdp_timezone(tvbuff_t *tvb, packet_info *pinfo, } -static void dissect_sdp_encryption_key(tvbuff_t *tvb, packet_info *pinfo, - proto_tree *tree, proto_item * ti){ +static void dissect_sdp_encryption_key(tvbuff_t *tvb, proto_item * ti){ proto_tree *sdp_encryption_key_tree; gint offset, next_offset, tokenlen; @@ -659,8 +623,7 @@ static void dissect_sdp_encryption_key(tvbuff_t *tvb, packet_info *pinfo, -static void dissect_sdp_session_attribute(tvbuff_t *tvb, packet_info *pinfo, - proto_tree *tree, proto_item * ti){ +static void dissect_sdp_session_attribute(tvbuff_t *tvb, proto_item * ti){ proto_tree *sdp_session_attribute_tree; gint offset, next_offset, tokenlen; @@ -690,14 +653,10 @@ static void dissect_sdp_session_attribute(tvbuff_t *tvb, packet_info *pinfo, } static void -dissect_sdp_media(tvbuff_t *tvb, packet_info *pinfo, - proto_tree *tree, proto_item *ti){ +dissect_sdp_media(tvbuff_t *tvb, proto_item *ti){ proto_tree *sdp_media_tree; gint offset, next_offset, tokenlen; - if(!tree) - return; - offset = 0; next_offset = 0; tokenlen = 0; @@ -773,8 +732,7 @@ dissect_sdp_media(tvbuff_t *tvb, packet_info *pinfo, } -static void dissect_sdp_media_attribute(tvbuff_t *tvb, packet_info *pinfo, - proto_tree *tree, proto_item * ti){ +static void dissect_sdp_media_attribute(tvbuff_t *tvb, proto_item * ti){ proto_tree *sdp_media_attribute_tree; gint offset, next_offset, tokenlen; diff --git a/packet-vj.c b/packet-vj.c index ec3aa2ebd8..78da877fcf 100644 --- a/packet-vj.c +++ b/packet-vj.c @@ -1,7 +1,7 @@ /* packet-vj.c * Routines for Van Jacobson header decompression. * - * $Id: packet-vj.c,v 1.6 2002/02/18 01:08:37 guy Exp $ + * $Id: packet-vj.c,v 1.7 2002/04/14 23:22:22 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -350,7 +350,6 @@ vjc_tvb_setup(tvbuff_t *src_tvb, tvbuff_t **dst_tvb, frame_data * fd) { - tvbuff_t *orig_tvb = NULL; vj_header_t *hdr_buf; guint8 *data_ptr; guint8 *pbuf = NULL; @@ -408,8 +407,8 @@ vjc_update_state(tvbuff_t *src_tvb, slcompress *comp, frame_data *fd) /* Build TCP and IP headers */ hdrlen = lo_nibble(ip->ihl_version) * 4 + TCP_OFFSET(thp) * 4; - thp->cksum = htons((tvb_get_guint8(src_tvb, offset++) << 8) | - tvb_get_guint8(src_tvb, offset++)); + thp->cksum = htons(tvb_get_ntohs(src_tvb, offset)); + offset += 2; if (changes & CHANGE_PUSH_BIT) thp->flags |= TCP_PUSH_BIT; else @@ -578,11 +577,8 @@ vjuc_tvb_setup(tvbuff_t *tvb, frame_data *fd) { guint8 ihl = ZERO; - guint8 index = ZERO; gint isize = tvb_length(tvb); guint8 *buffer = NULL; - tvbuff_t *orig_tvb = NULL; - gint orig_offset = 0; g_assert(comp); g_assert(tvb); @@ -619,7 +615,6 @@ vjuc_update_state(tvbuff_t *tvb, slcompress *comp, guint8 index) { cstate *cs = NULL; guint8 ihl = ZERO; - gint isize = tvb_length(tvb); g_assert(comp); g_assert(tvb);