--- Begin Message ---
On Wed, May 01, 2002 at 03:12:38AM -0700, Guy Harris wrote:
> the ISIS dissector;
> the ISUP dissector;
gone with the attached patches...
--
Joerg Mayer <[EMAIL PROTECTED]>
I found out that "pro" means "instead of" (as in proconsul). Now I know
what proactive means.
Changelog: <[EMAIL PROTECTED]>
Removed unused parameters (parameter_tree in all cases)
Index: ethereal/packet-isup.c
===================================================================
RCS file: /cvsroot/ethereal/packet-isup.c,v
retrieving revision 1.11
diff -u -r1.11 packet-isup.c
--- packet-isup.c 2002/02/01 04:34:15 1.11
+++ packet-isup.c 2002/05/01 11:06:15
@@ -1450,7 +1450,7 @@
Dissector Parameter Cause Indicators - no detailed dissection since defined in Rec.
Q.850
*/
void
-dissect_isup_cause_indicators_parameter(tvbuff_t *parameter_tvb, proto_tree
*parameter_tree, proto_item *parameter_item)
+dissect_isup_cause_indicators_parameter(tvbuff_t *parameter_tvb, proto_item
*parameter_item)
{ guint length = tvb_length(parameter_tvb);
proto_tree_add_text(parameter_item, parameter_tvb,0, length, "Cause indicators (->
Q.850)");
proto_item_set_text(parameter_item, "Cause indicators, see Q.850 (%u byte%s
length)", length , plurality(length, "", "s"));
@@ -1505,7 +1505,7 @@
Dissector Parameter Facility indicator parameter
*/
void
-dissect_isup_facility_ind_parameter(tvbuff_t *parameter_tvb, proto_tree
*parameter_tree, proto_item *parameter_item)
+dissect_isup_facility_ind_parameter(tvbuff_t *parameter_tvb, proto_item
*parameter_item)
{
guint8 indicator;
@@ -1567,7 +1567,7 @@
Dissector Parameter User-to-user information- no detailed dissection since defined
in Rec. Q.931
*/
void
-dissect_isup_user_to_user_information_parameter(tvbuff_t *parameter_tvb, proto_tree
*parameter_tree, proto_item *parameter_item)
+dissect_isup_user_to_user_information_parameter(tvbuff_t *parameter_tvb, proto_item
*parameter_item)
{ guint length = tvb_length(parameter_tvb);
proto_tree_add_text(parameter_item, parameter_tvb, 0, length, "User-to-user info
(-> Q.931)");
proto_item_set_text(parameter_item, "User-to-user information, see Q.931 (%u byte%s
length)", length , plurality(length, "", "s"));
@@ -1576,7 +1576,7 @@
Dissector Parameter Call Reference
*/
void
-dissect_isup_call_reference_parameter(tvbuff_t *parameter_tvb, proto_tree
*parameter_tree, proto_item *parameter_item)
+dissect_isup_call_reference_parameter(tvbuff_t *parameter_tvb, proto_item
*parameter_item)
{
guint32 call_id;
guint16 spc;
@@ -1592,7 +1592,7 @@
Dissector Parameter Access Transport - no detailed dissection since defined in Rec.
Q.931
*/
void
-dissect_isup_access_transport_parameter(tvbuff_t *parameter_tvb, proto_tree
*parameter_tree, proto_item *parameter_item)
+dissect_isup_access_transport_parameter(tvbuff_t *parameter_tvb, proto_item
*parameter_item)
{ guint length = tvb_length(parameter_tvb);
proto_tree_add_text(parameter_item, parameter_tvb, 0, length, "Access transport
parameter field (-> Q.931)");
proto_item_set_text(parameter_item, "Access transport, see Q.931 (%u byte%s
length)", length , plurality(length, "", "s"));
@@ -1821,7 +1821,7 @@
Dissector Parameter Connection request
*/
void
-dissect_isup_connection_request_parameter(tvbuff_t *parameter_tvb, proto_tree
*parameter_tree, proto_item *parameter_item)
+dissect_isup_connection_request_parameter(tvbuff_t *parameter_tvb, proto_item
*parameter_item)
{
guint32 local_ref;
guint16 spc;
@@ -1868,7 +1868,7 @@
/* ------------------------------------------------------------------
Dissector Parameter Closed user group interlock code
*/
-void dissect_isup_closed_user_group_interlock_code_parameter(tvbuff_t *parameter_tvb,
proto_tree *parameter_tree, proto_item *parameter_item)
+void dissect_isup_closed_user_group_interlock_code_parameter(tvbuff_t *parameter_tvb,
proto_item *parameter_item)
{
char NI_digits[5]="";
guint8 digit_pair;
@@ -1890,7 +1890,7 @@
Dissector Parameter User service information- no detailed dissection since defined
in Rec. Q.931
*/
void
-dissect_isup_user_service_information_parameter(tvbuff_t *parameter_tvb, proto_tree
*parameter_tree, proto_item *parameter_item)
+dissect_isup_user_service_information_parameter(tvbuff_t *parameter_tvb, proto_item
*parameter_item)
{ guint length = tvb_length(parameter_tvb);
proto_tree_add_text(parameter_item, parameter_tvb, 0, length, "User service
information (-> Q.931)");
proto_item_set_text(parameter_item, "User service information, see Q.931 (%u byte%s
length)", length , plurality(length, "", "s"));
@@ -1899,7 +1899,7 @@
Dissector Parameter Signalling point code
*/
void
-dissect_isup_signalling_point_code_parameter(tvbuff_t *parameter_tvb, proto_tree
*parameter_tree, proto_item *parameter_item)
+dissect_isup_signalling_point_code_parameter(tvbuff_t *parameter_tvb, proto_item
*parameter_item)
{
guint16 spc;
@@ -2053,7 +2053,7 @@
Dissector Parameter User-to-user indicators
*/
void
-dissect_isup_user_to_user_indicators_parameter(tvbuff_t *parameter_tvb, proto_tree
*parameter_tree, proto_item *parameter_item)
+dissect_isup_user_to_user_indicators_parameter(tvbuff_t *parameter_tvb, proto_item
*parameter_item)
{
guint8 indicators;
@@ -2065,7 +2065,7 @@
Dissector Parameter Original ISC point code
*/
void
-dissect_isup_original_isc_point_code_parameter(tvbuff_t *parameter_tvb, proto_tree
*parameter_tree, proto_item *parameter_item)
+dissect_isup_original_isc_point_code_parameter(tvbuff_t *parameter_tvb, proto_item
*parameter_item)
{
guint16 spc;
@@ -2078,7 +2078,7 @@
Dissector Parameter Generic notification indicator
*/
void
-dissect_isup_generic_notification_indicator_parameter(tvbuff_t *parameter_tvb,
proto_tree *parameter_tree, proto_item *parameter_item)
+dissect_isup_generic_notification_indicator_parameter(tvbuff_t *parameter_tvb,
proto_item *parameter_item)
{
guint8 indicators;
@@ -2090,7 +2090,7 @@
Dissector Parameter Call history information
*/
void
-dissect_isup_call_history_information_parameter(tvbuff_t *parameter_tvb, proto_tree
*parameter_tree, proto_item *parameter_item)
+dissect_isup_call_history_information_parameter(tvbuff_t *parameter_tvb, proto_item
*parameter_item)
{
guint16 info;
@@ -2113,7 +2113,7 @@
Dissector Parameter Network specific facility
*/
void
-dissect_isup_network_specific_facility_parameter(tvbuff_t *parameter_tvb, proto_tree
*parameter_tree, proto_item *parameter_item)
+dissect_isup_network_specific_facility_parameter(tvbuff_t *parameter_tvb, proto_item
*parameter_item)
{ guint length = tvb_length(parameter_tvb);
proto_tree_add_text(parameter_item, parameter_tvb, 0, length, "Network specific
facility (refer to 3.36/Q.763 for detailed decoding)");
proto_item_set_text(parameter_item, "Network specific facility (%u byte%s length)",
length , plurality(length, "", "s"));
@@ -2122,7 +2122,7 @@
Dissector Parameter User service information prime
*/
void
-dissect_isup_user_service_information_prime_parameter(tvbuff_t *parameter_tvb,
proto_tree *parameter_tree, proto_item *parameter_item)
+dissect_isup_user_service_information_prime_parameter(tvbuff_t *parameter_tvb,
proto_item *parameter_item)
{ guint length = tvb_length(parameter_tvb);
proto_tree_add_text(parameter_item, parameter_tvb, 0, length, "User service
information prime (-> Q.931)");
proto_item_set_text(parameter_item, "User service information prime, see Q.931 (%u
byte%s length)", length , plurality(length, "", "s"));
@@ -2131,7 +2131,7 @@
Dissector Parameter Propagation delay counter
*/
void
-dissect_isup_propagation_delay_counter_parameter(tvbuff_t *parameter_tvb, proto_tree
*parameter_tree, proto_item *parameter_item)
+dissect_isup_propagation_delay_counter_parameter(tvbuff_t *parameter_tvb, proto_item
*parameter_item)
{
guint16 info;
@@ -2143,7 +2143,7 @@
Dissector Parameter Remote operations
*/
void
-dissect_isup_remote_operations_parameter(tvbuff_t *parameter_tvb, proto_tree
*parameter_tree, proto_item *parameter_item)
+dissect_isup_remote_operations_parameter(tvbuff_t *parameter_tvb, proto_item
*parameter_item)
{ guint length = tvb_length(parameter_tvb);
proto_tree_add_text(parameter_item, parameter_tvb, 0, length, "Remote operations");
proto_item_set_text(parameter_item, "Remote operations (%u byte%s length)", length
, plurality(length, "", "s"));
@@ -2152,7 +2152,7 @@
Dissector Parameter Service activation
*/
void
-dissect_isup_service_activation_parameter(tvbuff_t *parameter_tvb, proto_tree
*parameter_tree, proto_item *parameter_item)
+dissect_isup_service_activation_parameter(tvbuff_t *parameter_tvb, proto_item
*parameter_item)
{
guint i;
guint8 feature_code;
@@ -2167,7 +2167,7 @@
Dissector Parameter User service information prime - no detailed dissection since
defined in Rec. Q.931
*/
void
-dissect_isup_user_teleservice_information_parameter(tvbuff_t *parameter_tvb,
proto_tree *parameter_tree, proto_item *parameter_item)
+dissect_isup_user_teleservice_information_parameter(tvbuff_t *parameter_tvb,
proto_item *parameter_item)
{
proto_tree_add_text(parameter_item, parameter_tvb, 0, USER_TELESERVICE_INFO_LENGTH,
"User teleservice information (-> Q.931)");
proto_item_set_text(parameter_item, "User teleservice information, see Q.931");
@@ -2189,7 +2189,7 @@
Dissector Parameter Call diversion information
*/
void
-dissect_isup_call_diversion_information_parameter(tvbuff_t *parameter_tvb, proto_tree
*parameter_tree, proto_item *parameter_item)
+dissect_isup_call_diversion_information_parameter(tvbuff_t *parameter_tvb, proto_item
*parameter_item)
{ guint8 indicator;
indicator = tvb_get_guint8(parameter_tvb, 0);
@@ -2200,7 +2200,7 @@
Dissector Parameter Echo control information
*/
void
-dissect_isup_echo_control_information_parameter(tvbuff_t *parameter_tvb, proto_tree
*parameter_tree, proto_item *parameter_item)
+dissect_isup_echo_control_information_parameter(tvbuff_t *parameter_tvb, proto_item
*parameter_item)
{ guint8 indicator;
indicator = tvb_get_guint8(parameter_tvb, 0);
@@ -2211,7 +2211,7 @@
Dissector Parameter Message compatibility information
*/
void
-dissect_isup_message_compatibility_information_parameter(tvbuff_t *parameter_tvb,
proto_tree *parameter_tree, proto_item *parameter_item)
+dissect_isup_message_compatibility_information_parameter(tvbuff_t *parameter_tvb,
proto_item *parameter_item)
{ guint length = tvb_length(parameter_tvb);
proto_tree_add_text(parameter_item, parameter_tvb, 0, length, "Message
compatibility information (refer to 3.33/Q.763 for detailed decoding)");
proto_item_set_text(parameter_item, "Message compatibility information (%u byte%s
length)", length , plurality(length, "", "s"));
@@ -2220,7 +2220,7 @@
Dissector Parameter compatibility information
*/
void
-dissect_isup_parameter_compatibility_information_parameter(tvbuff_t *parameter_tvb,
proto_tree *parameter_tree, proto_item *parameter_item)
+dissect_isup_parameter_compatibility_information_parameter(tvbuff_t *parameter_tvb,
proto_item *parameter_item)
{
guint length = tvb_length(parameter_tvb);
proto_tree_add_text(parameter_item, parameter_tvb, 0, length, "Parameter
compatibility information (refer to 3.41/Q.763 for detailed decoding)");
@@ -2229,7 +2229,7 @@
/* ------------------------------------------------------------------
Dissector Parameter MLPP precedence
*/
-void dissect_isup_mlpp_precedence_parameter(tvbuff_t *parameter_tvb, proto_tree
*parameter_tree, proto_item *parameter_item)
+void dissect_isup_mlpp_precedence_parameter(tvbuff_t *parameter_tvb, proto_item
*parameter_item)
{
char NI_digits[5]="";
guint8 indicators, digit_pair;
@@ -2253,7 +2253,7 @@
Dissector Parameter MCID request indicators
*/
void
-dissect_isup_mcid_request_indicators_parameter(tvbuff_t *parameter_tvb, proto_tree
*parameter_tree, proto_item *parameter_item)
+dissect_isup_mcid_request_indicators_parameter(tvbuff_t *parameter_tvb, proto_item
*parameter_item)
{ guint8 indicator;
indicator = tvb_get_guint8(parameter_tvb, 0);
@@ -2264,7 +2264,7 @@
Dissector Parameter MCID response indicators
*/
void
-dissect_isup_mcid_response_indicators_parameter(tvbuff_t *parameter_tvb, proto_tree
*parameter_tree, proto_item *parameter_item)
+dissect_isup_mcid_response_indicators_parameter(tvbuff_t *parameter_tvb, proto_item
*parameter_item)
{ guint8 indicator;
indicator = tvb_get_guint8(parameter_tvb, 0);
@@ -2275,7 +2275,7 @@
Dissector Parameter Hop counter
*/
void
-dissect_isup_hop_counter_parameter(tvbuff_t *parameter_tvb, proto_tree
*parameter_tree, proto_item *parameter_item)
+dissect_isup_hop_counter_parameter(tvbuff_t *parameter_tvb, proto_item
*parameter_item)
{ guint8 counter;
counter = tvb_get_guint8(parameter_tvb, 0) & EDCBA_8BIT_MASK; /* since bits H,G and
F are spare */
@@ -2355,7 +2355,7 @@
Dissector Parameter Redirection number restiriction
*/
void
-dissect_isup_redirection_number_restriction_parameter(tvbuff_t *parameter_tvb,
proto_tree *parameter_tree, proto_item *parameter_item)
+dissect_isup_redirection_number_restriction_parameter(tvbuff_t *parameter_tvb,
proto_item *parameter_item)
{
guint8 indicator;
@@ -2377,7 +2377,7 @@
Dissector Parameter Call transfer identity
*/
void
-dissect_isup_call_transfer_reference_parameter(tvbuff_t *parameter_tvb, proto_tree
*parameter_tree, proto_item *parameter_item)
+dissect_isup_call_transfer_reference_parameter(tvbuff_t *parameter_tvb, proto_item
*parameter_item)
{ guint8 id;
id = tvb_get_guint8(parameter_tvb, 0);
@@ -2388,7 +2388,7 @@
Dissector Parameter Loop prevention
*/
void
-dissect_isup_loop_prevention_indicators_parameter(tvbuff_t *parameter_tvb, proto_tree
*parameter_tree, proto_item *parameter_item)
+dissect_isup_loop_prevention_indicators_parameter(tvbuff_t *parameter_tvb, proto_item
*parameter_item)
{
guint8 indicator;
@@ -2461,7 +2461,7 @@
Dissector Parameter CCSS
*/
void
-dissect_isup_ccss_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree,
proto_item *parameter_item)
+dissect_isup_ccss_parameter(tvbuff_t *parameter_tvb, proto_item *parameter_item)
{
guint8 indicator;
@@ -2479,7 +2479,7 @@
Parameter Forward GVNS
*/
void
-dissect_isup_forward_gvns_parameter(tvbuff_t *parameter_tvb, proto_tree
*parameter_tree, proto_item *parameter_item)
+dissect_isup_forward_gvns_parameter(tvbuff_t *parameter_tvb, proto_item
*parameter_item)
{ guint length = tvb_length(parameter_tvb);
proto_tree_add_text(parameter_item, parameter_tvb, 0, length, "Forward GVNS (refer
to 3.66/Q.763 for detailed decoding)");
proto_item_set_text(parameter_item, "Forward GVNS (%u Byte%s)", length ,
plurality(length, "", "s"));
@@ -2488,7 +2488,7 @@
Parameter Redirect capability
*/
void
-dissect_isup_redirect_capability_parameter(tvbuff_t *parameter_tvb, proto_tree
*parameter_tree, proto_item *parameter_item)
+dissect_isup_redirect_capability_parameter(tvbuff_t *parameter_tvb, proto_item
*parameter_item)
{ guint length = tvb_length(parameter_tvb);
proto_tree_add_text(parameter_item, parameter_tvb, 0, length, "Redirect capability
(format is a national matter)");
proto_item_set_text(parameter_item, "Redirect Capability (%u Byte%s)", length ,
plurality(length, "", "s"));
@@ -2497,7 +2497,7 @@
Dissector Parameter Backward GVNS
*/
void
-dissect_isup_backward_gvns_parameter(tvbuff_t *parameter_tvb, proto_tree
*parameter_tree, proto_item *parameter_item)
+dissect_isup_backward_gvns_parameter(tvbuff_t *parameter_tvb, proto_item
*parameter_item)
{ guint8 indicator;
indicator = tvb_get_guint8(parameter_tvb, 0);
@@ -2508,7 +2508,7 @@
Dissector Parameter Network management controls
*/
void
-dissect_isup_network_management_controls_parameter(tvbuff_t *parameter_tvb,
proto_tree *parameter_tree, proto_item *parameter_item)
+dissect_isup_network_management_controls_parameter(tvbuff_t *parameter_tvb,
proto_item *parameter_item)
{ guint8 indicator;
indicator = tvb_get_guint8(parameter_tvb, 0);
@@ -2520,7 +2520,7 @@
Dissector Parameter Correlation id - no detailed dissection since defined in Rec.
Q.1281
*/
void
-dissect_isup_correlation_id_parameter(tvbuff_t *parameter_tvb, proto_tree
*parameter_tree, proto_item *parameter_item)
+dissect_isup_correlation_id_parameter(tvbuff_t *parameter_tvb, proto_item
*parameter_item)
{ guint length = tvb_length(parameter_tvb);
proto_tree_add_text(parameter_item, parameter_tvb, 0, length, "Correlation ID (->
Q.1281)");
proto_item_set_text(parameter_item, "Correlation ID, see Q.1281 (%u Byte%s)",
length , plurality(length, "", "s"));
@@ -2529,7 +2529,7 @@
Dissector Parameter SCF id - no detailed dissection since defined in Rec. Q.1281
*/
void
-dissect_isup_scf_id_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree,
proto_item *parameter_item)
+dissect_isup_scf_id_parameter(tvbuff_t *parameter_tvb, proto_item *parameter_item)
{ guint length = tvb_length(parameter_tvb);
proto_tree_add_text(parameter_item, parameter_tvb, 0, length, "SCF ID (->
Q.1281)");
proto_item_set_text(parameter_item, "SCF ID, see Q.1281 (%u Byte%s)", length ,
plurality(length, "", "s"));
@@ -2538,7 +2538,7 @@
Dissector Parameter Call diversion treatment indicators
*/
void
-dissect_isup_call_diversion_treatment_indicators_parameter(tvbuff_t *parameter_tvb,
proto_tree *parameter_tree, proto_item *parameter_item)
+dissect_isup_call_diversion_treatment_indicators_parameter(tvbuff_t *parameter_tvb,
proto_item *parameter_item)
{ guint8 indicator;
indicator = tvb_get_guint8(parameter_tvb, 0);
@@ -2601,7 +2601,7 @@
Dissector Parameter Call offering treatment indicators
*/
void
-dissect_isup_call_offering_treatment_indicators_parameter(tvbuff_t *parameter_tvb,
proto_tree *parameter_tree, proto_item *parameter_item)
+dissect_isup_call_offering_treatment_indicators_parameter(tvbuff_t *parameter_tvb,
proto_item *parameter_item)
{ guint8 indicator;
indicator = tvb_get_guint8(parameter_tvb, 0);
@@ -2613,7 +2613,7 @@
Parameter Charged party identification
*/
void
-dissect_isup_charged_party_identification_parameter(tvbuff_t *parameter_tvb,
proto_tree *parameter_tree, proto_item *parameter_item)
+dissect_isup_charged_party_identification_parameter(tvbuff_t *parameter_tvb,
proto_item *parameter_item)
{ guint length = tvb_length(parameter_tvb);
proto_tree_add_text(parameter_item, parameter_tvb, 0, length, "Charged party
identification (format is national network specific)");
proto_item_set_text(parameter_item, "Charged party identification (%u Byte%s)",
length , plurality(length, "", "s"));
@@ -2622,7 +2622,7 @@
Dissector Parameter Conference treatment indicators
*/
void
-dissect_isup_conference_treatment_indicators_parameter(tvbuff_t *parameter_tvb,
proto_tree *parameter_tree, proto_item *parameter_item)
+dissect_isup_conference_treatment_indicators_parameter(tvbuff_t *parameter_tvb,
proto_item *parameter_item)
{ guint8 indicator;
indicator = tvb_get_guint8(parameter_tvb, 0);
@@ -2634,7 +2634,7 @@
Dissector Parameter Display information
*/
void
-dissect_isup_display_information_parameter(tvbuff_t *parameter_tvb, proto_tree
*parameter_tree, proto_item *parameter_item)
+dissect_isup_display_information_parameter(tvbuff_t *parameter_tvb, proto_item
*parameter_item)
{ guint length = tvb_length(parameter_tvb);
proto_tree_add_text(parameter_item, parameter_tvb, 0, length, "Display information
(-> Q.931)");
proto_item_set_text(parameter_item, "Display information (%u Byte%s)", length ,
plurality(length, "", "s"));
@@ -2643,7 +2643,7 @@
Parameter UID action indicators
*/
void
-dissect_isup_uid_action_indicators_parameter(tvbuff_t *parameter_tvb, proto_tree
*parameter_tree, proto_item *parameter_item)
+dissect_isup_uid_action_indicators_parameter(tvbuff_t *parameter_tvb, proto_item
*parameter_item)
{ guint8 indicator;
indicator = tvb_get_guint8(parameter_tvb, 0);
@@ -2654,7 +2654,7 @@
Parameter UID capability indicators
*/
void
-dissect_isup_uid_capability_indicators_parameter(tvbuff_t *parameter_tvb, proto_tree
*parameter_tree, proto_item *parameter_item)
+dissect_isup_uid_capability_indicators_parameter(tvbuff_t *parameter_tvb, proto_item
*parameter_item)
{ guint8 indicator;
indicator = tvb_get_guint8(parameter_tvb, 0);
@@ -2665,7 +2665,7 @@
Parameter Redirect counter
*/
void
-dissect_isup_redirect_counter_parameter(tvbuff_t *parameter_tvb, proto_tree
*parameter_tree, proto_item *parameter_item)
+dissect_isup_redirect_counter_parameter(tvbuff_t *parameter_tvb, proto_item
*parameter_item)
{ guint length = tvb_length(parameter_tvb);
proto_tree_add_text(parameter_item, parameter_tvb, 0, length, "Redirect counter
(format is a national matter)");
proto_item_set_text(parameter_item, "Redirect counter (%u Byte%s)", length ,
plurality(length, "", "s"));
@@ -2674,7 +2674,7 @@
Dissector Parameter Collect call request
*/
void
-dissect_isup_collect_call_request_parameter(tvbuff_t *parameter_tvb, proto_tree
*parameter_tree, proto_item *parameter_item)
+dissect_isup_collect_call_request_parameter(tvbuff_t *parameter_tvb, proto_item
*parameter_item)
{ guint8 indicator;
indicator = tvb_get_guint8(parameter_tvb, 0);
@@ -2748,14 +2748,14 @@
Dissector Parameter Generic digits
*/
void
-dissect_isup_generic_digits_parameter(tvbuff_t *parameter_tvb, proto_tree
*parameter_tree, proto_item *parameter_item)
+dissect_isup_generic_digits_parameter(tvbuff_t *parameter_tvb, proto_item
*parameter_item)
{ guint length = tvb_length(parameter_tvb);
proto_tree_add_text(parameter_item, parameter_tvb, 0, length, "Generic digits
(refer to 3.24/Q.673 for detailed decoding)");
proto_item_set_text(parameter_item, "Generic digits (%u Byte%s)", length ,
plurality(length, "", "s"));
}
/* ------------------------------------------------------------------ */
void
-dissect_isup_unknown_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree,
proto_item *parameter_item)
+dissect_isup_unknown_parameter(tvbuff_t *parameter_tvb, proto_item *parameter_item)
{ guint length = tvb_length(parameter_tvb);
proto_item_set_text(parameter_item, "Parameter Type unknown/reserved (%u Byte%s)",
length , plurality(length, "", "s"));
}
@@ -2798,13 +2798,13 @@
parameter_tvb = tvb_new_subset(optional_parameters_tvb, offset,
MIN(parameter_length, actual_length), parameter_length);
switch (parameter_type) {
case PARAM_TYPE_CALL_REF:
- dissect_isup_call_reference_parameter(parameter_tvb, parameter_tree,
parameter_item);
+ dissect_isup_call_reference_parameter(parameter_tvb, parameter_item);
break;
case PARAM_TYPE_TRANSM_MEDIUM_REQU:
dissect_isup_transmission_medium_requirement_parameter(parameter_tvb,
parameter_tree, parameter_item);
break;
case PARAM_TYPE_ACC_TRANSP:
- dissect_isup_access_transport_parameter(parameter_tvb, parameter_tree,
parameter_item);
+ dissect_isup_access_transport_parameter(parameter_tvb, parameter_item);
break;
case PARAM_TYPE_CALLED_PARTY_NR:
dissect_isup_called_party_number_parameter(parameter_tvb, parameter_tree,
parameter_item);
@@ -2834,7 +2834,7 @@
dissect_isup_redirection_number_parameter(parameter_tvb, parameter_tree,
parameter_item);
break;
case PARAM_TYPE_CONNECTION_REQ:
- dissect_isup_connection_request_parameter(parameter_tvb, parameter_tree,
parameter_item);
+ dissect_isup_connection_request_parameter(parameter_tvb, parameter_item);
break;
case PARAM_TYPE_INFO_REQ_IND:
dissect_isup_information_request_indicators_parameter(parameter_tvb,
parameter_tree, parameter_item);
@@ -2849,7 +2849,7 @@
dissect_isup_backward_call_indicators_parameter(parameter_tvb,
parameter_tree, parameter_item);
break;
case PARAM_TYPE_CAUSE_INDICATORS:
- dissect_isup_cause_indicators_parameter(parameter_tvb, parameter_tree,
parameter_item);
+ dissect_isup_cause_indicators_parameter(parameter_tvb, parameter_item);
break;
case PARAM_TYPE_REDIRECTION_INFO:
dissect_isup_redirection_information_parameter(parameter_tvb,
parameter_tree, parameter_item);
@@ -2861,19 +2861,19 @@
dissect_isup_range_and_status_parameter(parameter_tvb, parameter_tree,
parameter_item);
break;
case PARAM_TYPE_FACILITY_IND:
- dissect_isup_facility_ind_parameter(parameter_tvb, parameter_tree,
parameter_item);
+ dissect_isup_facility_ind_parameter(parameter_tvb, parameter_item);
break;
case PARAM_TYPE_CLSD_USR_GRP_ILOCK_CD:
- dissect_isup_closed_user_group_interlock_code_parameter(parameter_tvb,
parameter_tree, parameter_item);
+ dissect_isup_closed_user_group_interlock_code_parameter(parameter_tvb,
parameter_item);
break;
case PARAM_TYPE_USER_SERVICE_INFO:
- dissect_isup_user_service_information_parameter(parameter_tvb,
parameter_tree, parameter_item);
+ dissect_isup_user_service_information_parameter(parameter_tvb,
parameter_item);
break;
case PARAM_TYPE_SIGNALLING_POINT_CODE:
- dissect_isup_signalling_point_code_parameter(parameter_tvb, parameter_tree,
parameter_item);
+ dissect_isup_signalling_point_code_parameter(parameter_tvb, parameter_item);
break;
case PARAM_TYPE_USER_TO_USER_INFO:
- dissect_isup_user_to_user_information_parameter(parameter_tvb,
parameter_tree, parameter_item);
+ dissect_isup_user_to_user_information_parameter(parameter_tvb,
parameter_item);
break;
case PARAM_TYPE_CONNECTED_NR:
dissect_isup_connected_number_parameter(parameter_tvb, parameter_tree,
parameter_item);
@@ -2903,64 +2903,64 @@
dissect_isup_optional_backward_call_indicators_parameter(parameter_tvb,
parameter_tree, parameter_item);
break;
case PARAM_TYPE_USER_TO_USER_IND:
- dissect_isup_user_to_user_indicators_parameter(parameter_tvb,
parameter_tree, parameter_item);
+ dissect_isup_user_to_user_indicators_parameter(parameter_tvb,
parameter_item);
break;
case PARAM_TYPE_ORIG_ISC_POINT_CODE:
- dissect_isup_original_isc_point_code_parameter(parameter_tvb,
parameter_tree, parameter_item);
+ dissect_isup_original_isc_point_code_parameter(parameter_tvb,
parameter_item);
break;
case PARAM_TYPE_GENERIC_NOTIF_IND:
- dissect_isup_generic_notification_indicator_parameter(parameter_tvb,
parameter_tree, parameter_item);
+ dissect_isup_generic_notification_indicator_parameter(parameter_tvb,
parameter_item);
break;
case PARAM_TYPE_CALL_HIST_INFO :
- dissect_isup_call_history_information_parameter(parameter_tvb,
parameter_tree, parameter_item);
+ dissect_isup_call_history_information_parameter(parameter_tvb,
parameter_item);
break;
case PARAM_TYPE_ACC_DELIV_INFO:
dissect_isup_access_delivery_information_parameter(parameter_tvb,
parameter_tree, parameter_item);
break;
case PARAM_TYPE_NETW_SPECIFIC_FACLTY:
- dissect_isup_network_specific_facility_parameter(parameter_tvb,
parameter_tree, parameter_item);
+ dissect_isup_network_specific_facility_parameter(parameter_tvb,
parameter_item);
break;
case PARAM_TYPE_USER_SERVICE_INFO_PR:
- dissect_isup_user_service_information_prime_parameter(parameter_tvb,
parameter_tree, parameter_item);
+ dissect_isup_user_service_information_prime_parameter(parameter_tvb,
parameter_item);
break;
case PARAM_TYPE_PROPAG_DELAY_COUNTER:
- dissect_isup_propagation_delay_counter_parameter(parameter_tvb,
parameter_tree, parameter_item);
+ dissect_isup_propagation_delay_counter_parameter(parameter_tvb,
parameter_item);
break;
case PARAM_TYPE_REMOTE_OPERATIONS:
- dissect_isup_remote_operations_parameter(parameter_tvb, parameter_tree,
parameter_item);
+ dissect_isup_remote_operations_parameter(parameter_tvb, parameter_item);
break;
case PARAM_TYPE_SERVICE_ACTIVATION:
- dissect_isup_service_activation_parameter(parameter_tvb, parameter_tree,
parameter_item);
+ dissect_isup_service_activation_parameter(parameter_tvb, parameter_item);
break;
case PARAM_TYPE_USER_TELESERV_INFO:
- dissect_isup_user_teleservice_information_parameter(parameter_tvb,
parameter_tree, parameter_item);
+ dissect_isup_user_teleservice_information_parameter(parameter_tvb,
parameter_item);
break;
case PARAM_TYPE_TRANSM_MEDIUM_USED:
dissect_isup_transmission_medium_used_parameter(parameter_tvb,
parameter_tree, parameter_item);
break;
case PARAM_TYPE_CALL_DIV_INFO:
- dissect_isup_call_diversion_information_parameter(parameter_tvb,
parameter_tree, parameter_item);
+ dissect_isup_call_diversion_information_parameter(parameter_tvb,
parameter_item);
break;
case PARAM_TYPE_ECHO_CTRL_INFO:
- dissect_isup_echo_control_information_parameter(parameter_tvb,
parameter_tree, parameter_item);
+ dissect_isup_echo_control_information_parameter(parameter_tvb,
parameter_item);
break;
case PARAM_TYPE_MSG_COMPAT_INFO:
- dissect_isup_message_compatibility_information_parameter(parameter_tvb,
parameter_tree, parameter_item);
+ dissect_isup_message_compatibility_information_parameter(parameter_tvb,
parameter_item);
break;
case PARAM_TYPE_PARAM_COMPAT_INFO:
- dissect_isup_parameter_compatibility_information_parameter(parameter_tvb,
parameter_tree, parameter_item);
+ dissect_isup_parameter_compatibility_information_parameter(parameter_tvb,
parameter_item);
break;
case PARAM_TYPE_MLPP_PRECEDENCE:
- dissect_isup_mlpp_precedence_parameter(parameter_tvb, parameter_tree,
parameter_item);
+ dissect_isup_mlpp_precedence_parameter(parameter_tvb, parameter_item);
break;
case PARAM_TYPE_MCID_REQ_IND:
- dissect_isup_mcid_request_indicators_parameter(parameter_tvb,
parameter_tree, parameter_item);
+ dissect_isup_mcid_request_indicators_parameter(parameter_tvb,
parameter_item);
break;
case PARAM_TYPE_MCID_RSP_IND:
- dissect_isup_mcid_response_indicators_parameter(parameter_tvb,
parameter_tree, parameter_item);
+ dissect_isup_mcid_response_indicators_parameter(parameter_tvb,
parameter_item);
break;
case PARAM_TYPE_HOP_COUNTER:
- dissect_isup_hop_counter_parameter(parameter_tvb, parameter_tree,
parameter_item);
+ dissect_isup_hop_counter_parameter(parameter_tvb, parameter_item);
break;
case PARAM_TYPE_TRANSM_MEDIUM_RQUR_PR:
dissect_isup_transmission_medium_requirement_prime_parameter(parameter_tvb,
parameter_tree, parameter_item);
@@ -2969,76 +2969,76 @@
dissect_isup_location_number_parameter(parameter_tvb, parameter_tree,
parameter_item);
break;
case PARAM_TYPE_REDIR_NR_RSTRCT:
- dissect_isup_redirection_number_restriction_parameter(parameter_tvb,
parameter_tree, parameter_item);
+ dissect_isup_redirection_number_restriction_parameter(parameter_tvb,
parameter_item);
break;
case PARAM_TYPE_CALL_TRANS_REF:
- dissect_isup_call_transfer_reference_parameter(parameter_tvb,
parameter_tree, parameter_item);
+ dissect_isup_call_transfer_reference_parameter(parameter_tvb,
parameter_item);
break;
case PARAM_TYPE_LOOP_PREV_IND:
- dissect_isup_loop_prevention_indicators_parameter(parameter_tvb,
parameter_tree, parameter_item);
+ dissect_isup_loop_prevention_indicators_parameter(parameter_tvb,
parameter_item);
break;
case PARAM_TYPE_CALL_TRANS_NR:
dissect_isup_call_transfer_number_parameter(parameter_tvb, parameter_tree,
parameter_item);
break;
case PARAM_TYPE_CCSS:
- dissect_isup_ccss_parameter(parameter_tvb, parameter_tree, parameter_item);
+ dissect_isup_ccss_parameter(parameter_tvb, parameter_item);
break;
case PARAM_TYPE_FORW_GVNS:
- dissect_isup_forward_gvns_parameter(parameter_tvb, parameter_tree,
parameter_item);
+ dissect_isup_forward_gvns_parameter(parameter_tvb, parameter_item);
break;
case PARAM_TYPE_BACKW_GVNS:
- dissect_isup_backward_gvns_parameter(parameter_tvb, parameter_tree,
parameter_item);
+ dissect_isup_backward_gvns_parameter(parameter_tvb, parameter_item);
break;
case PARAM_TYPE_REDIRECT_CAPAB:
- dissect_isup_redirect_capability_parameter(parameter_tvb, parameter_tree,
parameter_item);
+ dissect_isup_redirect_capability_parameter(parameter_tvb, parameter_item);
break;
case PARAM_TYPE_NETW_MGMT_CTRL:
- dissect_isup_network_management_controls_parameter(parameter_tvb,
parameter_tree, parameter_item);
+ dissect_isup_network_management_controls_parameter(parameter_tvb,
parameter_item);
break;
case PARAM_TYPE_CORRELATION_ID:
- dissect_isup_correlation_id_parameter(parameter_tvb, parameter_tree,
parameter_item);
+ dissect_isup_correlation_id_parameter(parameter_tvb, parameter_item);
break;
case PARAM_TYPE_SCF_ID:
- dissect_isup_scf_id_parameter(parameter_tvb, parameter_tree,
parameter_item);
+ dissect_isup_scf_id_parameter(parameter_tvb, parameter_item);
break;
case PARAM_TYPE_CALL_DIV_TREAT_IND:
- dissect_isup_call_diversion_treatment_indicators_parameter(parameter_tvb,
parameter_tree, parameter_item);
+ dissect_isup_call_diversion_treatment_indicators_parameter(parameter_tvb,
parameter_item);
break;
case PARAM_TYPE_CALLED_IN_NR:
dissect_isup_called_in_number_parameter(parameter_tvb, parameter_tree,
parameter_item);
break;
case PARAM_TYPE_CALL_OFF_TREAT_IND:
- dissect_isup_call_offering_treatment_indicators_parameter(parameter_tvb,
parameter_tree, parameter_item);
+ dissect_isup_call_offering_treatment_indicators_parameter(parameter_tvb,
parameter_item);
break;
case PARAM_TYPE_CHARGED_PARTY_IDENT:
- dissect_isup_charged_party_identification_parameter(parameter_tvb,
parameter_tree, parameter_item);
+ dissect_isup_charged_party_identification_parameter(parameter_tvb,
parameter_item);
break;
case PARAM_TYPE_CONF_TREAT_IND:
- dissect_isup_conference_treatment_indicators_parameter(parameter_tvb,
parameter_tree, parameter_item);
+ dissect_isup_conference_treatment_indicators_parameter(parameter_tvb,
parameter_item);
break;
case PARAM_TYPE_DISPLAY_INFO:
- dissect_isup_display_information_parameter(parameter_tvb, parameter_tree,
parameter_item);
+ dissect_isup_display_information_parameter(parameter_tvb, parameter_item);
break;
case PARAM_TYPE_UID_ACTION_IND:
- dissect_isup_uid_action_indicators_parameter(parameter_tvb, parameter_tree,
parameter_item);
+ dissect_isup_uid_action_indicators_parameter(parameter_tvb, parameter_item);
break;
case PARAM_TYPE_UID_CAPAB_IND:
- dissect_isup_uid_capability_indicators_parameter(parameter_tvb,
parameter_tree, parameter_item);
+ dissect_isup_uid_capability_indicators_parameter(parameter_tvb,
parameter_item);
break;
case PARAM_TYPE_REDIRECT_COUNTER:
- dissect_isup_redirect_counter_parameter(parameter_tvb, parameter_tree,
parameter_item);
+ dissect_isup_redirect_counter_parameter(parameter_tvb, parameter_item);
break;
case PARAM_TYPE_COLLECT_CALL_REQ:
- dissect_isup_collect_call_request_parameter(parameter_tvb, parameter_tree,
parameter_item);
+ dissect_isup_collect_call_request_parameter(parameter_tvb, parameter_item);
break;
case PARAM_TYPE_GENERIC_NR:
dissect_isup_generic_number_parameter(parameter_tvb, parameter_tree,
parameter_item);
break;
case PARAM_TYPE_GENERIC_DIGITS:
- dissect_isup_generic_digits_parameter(parameter_tvb, parameter_tree,
parameter_item);
+ dissect_isup_generic_digits_parameter(parameter_tvb, parameter_item);
break;
default:
- dissect_isup_unknown_parameter(parameter_tvb, parameter_tree,
parameter_item);
+ dissect_isup_unknown_parameter(parameter_tvb, parameter_item);
break;
}
offset += MIN(parameter_length, actual_length);
@@ -3316,7 +3316,7 @@
proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_length, message_tvb,
offset + parameter_pointer, PARAMETER_LENGTH_IND_LENGTH, parameter_length, "Parameter
length: %u", parameter_length);
actual_length = tvb_ensure_length_remaining(message_tvb, offset);
parameter_tvb = tvb_new_subset(message_tvb, offset + parameter_pointer +
PARAMETER_LENGTH_IND_LENGTH, MIN(parameter_length, actual_length), parameter_length );
- dissect_isup_cause_indicators_parameter(parameter_tvb, parameter_tree,
parameter_item);
+ dissect_isup_cause_indicators_parameter(parameter_tvb, parameter_item);
offset += PARAMETER_POINTER_LENGTH;
return offset;
@@ -3416,7 +3416,7 @@
proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_length, message_tvb,
offset + parameter_pointer, PARAMETER_LENGTH_IND_LENGTH, parameter_length, "Parameter
length: %u", parameter_length);
actual_length = tvb_ensure_length_remaining(message_tvb, offset);
parameter_tvb = tvb_new_subset(message_tvb, offset + parameter_pointer +
PARAMETER_LENGTH_IND_LENGTH, MIN(parameter_length, actual_length), parameter_length );
- dissect_isup_facility_ind_parameter(parameter_tvb, parameter_tree, parameter_item);
+ dissect_isup_facility_ind_parameter(parameter_tvb, parameter_item);
offset += PARAMETER_POINTER_LENGTH;
return offset;
@@ -3442,7 +3442,7 @@
proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0,
0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type,
val_to_str(parameter_type, isup_parameter_type_value,"unknown"));
actual_length = tvb_ensure_length_remaining(message_tvb, offset);
parameter_tvb = tvb_new_subset(message_tvb, offset, MIN(FACILITY_IND_LENGTH,
actual_length), FACILITY_IND_LENGTH);
- dissect_isup_facility_ind_parameter(parameter_tvb, parameter_tree, parameter_item);
+ dissect_isup_facility_ind_parameter(parameter_tvb, parameter_item);
offset += FACILITY_IND_LENGTH;
return offset;
}
@@ -3466,7 +3466,7 @@
proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0,
0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type,
val_to_str(parameter_type, isup_parameter_type_value,"unknown"));
actual_length = tvb_ensure_length_remaining(message_tvb, offset);
parameter_tvb = tvb_new_subset(message_tvb, offset, MIN(FACILITY_IND_LENGTH,
actual_length), FACILITY_IND_LENGTH);
- dissect_isup_facility_ind_parameter(parameter_tvb, parameter_tree, parameter_item);
+ dissect_isup_facility_ind_parameter(parameter_tvb, parameter_item);
offset += FACILITY_IND_LENGTH;
/* Do stuff for mandatory variable parameter Cause indicators */
@@ -3485,7 +3485,7 @@
proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_length, message_tvb,
offset + parameter_pointer, PARAMETER_LENGTH_IND_LENGTH, parameter_length, "Parameter
length: %u", parameter_length);
actual_length = tvb_ensure_length_remaining(message_tvb, offset);
parameter_tvb = tvb_new_subset(message_tvb, offset + parameter_pointer +
PARAMETER_LENGTH_IND_LENGTH, MIN(parameter_length, actual_length), parameter_length );
- dissect_isup_cause_indicators_parameter(parameter_tvb, parameter_tree,
parameter_item);
+ dissect_isup_cause_indicators_parameter(parameter_tvb, parameter_item);
offset += PARAMETER_POINTER_LENGTH;
return offset;
@@ -3624,7 +3624,7 @@
proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_length, message_tvb,
offset + parameter_pointer, PARAMETER_LENGTH_IND_LENGTH, parameter_length, "Parameter
length: %u", parameter_length);
actual_length = tvb_ensure_length_remaining(message_tvb, offset);
parameter_tvb = tvb_new_subset(message_tvb, offset + parameter_pointer +
PARAMETER_LENGTH_IND_LENGTH, MIN(parameter_length, actual_length), parameter_length );
- dissect_isup_user_to_user_information_parameter(parameter_tvb, parameter_tree,
parameter_item);
+ dissect_isup_user_to_user_information_parameter(parameter_tvb, parameter_item);
offset += PARAMETER_POINTER_LENGTH;
return offset;
@@ -3656,7 +3656,7 @@
proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_length, message_tvb,
offset + parameter_pointer, PARAMETER_LENGTH_IND_LENGTH, parameter_length, "Parameter
length: %u", parameter_length);
actual_length = tvb_ensure_length_remaining(message_tvb, offset);
parameter_tvb = tvb_new_subset(message_tvb, offset + parameter_pointer +
PARAMETER_LENGTH_IND_LENGTH, MIN(parameter_length, actual_length), parameter_length );
- dissect_isup_cause_indicators_parameter(parameter_tvb, parameter_tree,
parameter_item);
+ dissect_isup_cause_indicators_parameter(parameter_tvb, parameter_item);
offset += PARAMETER_POINTER_LENGTH;
return offset;
Changelog: <[EMAIL PROTECTED]>
- packet-isis-hello.c, packet-isis-lsp.c, packet-isis-snp.c
Mark unused parameters as such.
Index: ethereal/packet-isis-hello.c
===================================================================
RCS file: /cvsroot/ethereal/packet-isis-hello.c,v
retrieving revision 1.29
diff -u -r1.29 packet-isis-hello.c
--- packet-isis-hello.c 2002/04/07 23:39:00 1.29
+++ packet-isis-hello.c 2002/05/01 11:20:25
@@ -318,7 +318,7 @@
static void
dissect_hello_restart_clv(tvbuff_t *tvb,
- proto_tree *tree, int offset, int id_length, int length)
+ proto_tree *tree, int offset, int id_length _U_, int length _U_)
{
int restart_options;
@@ -353,7 +353,7 @@
*/
static void
dissect_hello_nlpid_clv(tvbuff_t *tvb,
- proto_tree *tree, int offset, int id_length, int length)
+ proto_tree *tree, int offset, int id_length _U_, int length)
{
isis_dissect_nlpid_clv(tvb, tree, offset, length);
}
@@ -378,7 +378,7 @@
static void
dissect_hello_mt_clv(tvbuff_t *tvb,
- proto_tree *tree, int offset, int id_length, int length)
+ proto_tree *tree, int offset, int id_length _U_, int length)
{
isis_dissect_mt_clv(tvb, tree, offset, length,
hf_isis_hello_clv_mt );
@@ -403,7 +403,7 @@
*/
static void
dissect_hello_ip_int_addr_clv(tvbuff_t *tvb,
- proto_tree *tree, int offset, int id_length, int length)
+ proto_tree *tree, int offset, int id_length _U_, int length)
{
isis_dissect_ip_int_clv(tvb, tree, offset, length,
hf_isis_hello_clv_ipv4_int_addr );
@@ -428,7 +428,7 @@
*/
static void
dissect_hello_ipv6_int_addr_clv(tvbuff_t *tvb,
- proto_tree *tree, int offset, int id_length, int length)
+ proto_tree *tree, int offset, int id_length _U_, int length)
{
isis_dissect_ipv6_int_clv(tvb, tree, offset, length,
hf_isis_hello_clv_ipv6_int_addr );
@@ -454,7 +454,7 @@
*/
static void
dissect_hello_auth_clv(tvbuff_t *tvb,
- proto_tree *tree, int offset, int id_length, int length)
+ proto_tree *tree, int offset, int id_length _U_, int length)
{
isis_dissect_authentication_clv(tvb, tree, offset,
length, "authentication" );
@@ -479,7 +479,7 @@
*/
static void
dissect_hello_area_address_clv(tvbuff_t *tvb,
- proto_tree *tree, int offset, int id_length, int length)
+ proto_tree *tree, int offset, int id_length _U_, int length)
{
isis_dissect_area_address_clv(tvb, tree, offset, length);
}
@@ -488,7 +488,7 @@
static void
dissect_hello_ptp_adj_clv(tvbuff_t *tvb,
- proto_tree *tree, int offset, int id_length, int length)
+ proto_tree *tree, int offset, int id_length _U_, int length)
{
char adj_state[20];
@@ -561,7 +561,7 @@
*/
static void
dissect_hello_is_neighbors_clv(tvbuff_t *tvb, proto_tree *tree, int offset,
- int id_length, int length)
+ int id_length _U_, int length)
{
while ( length > 0 ) {
if (length<6) {
@@ -600,8 +600,8 @@
* void
*/
static void
-dissect_hello_padding_clv(tvbuff_t *tvb, proto_tree *tree, int offset,
- int id_length, int length)
+dissect_hello_padding_clv(tvbuff_t *tvb _U_, proto_tree *tree _U_, int offset _U_,
+ int id_length _U_, int length _U_)
{
/* nothing to do here! */
}
Index: ethereal/packet-isis-lsp.c
===================================================================
RCS file: /cvsroot/ethereal/packet-isis-lsp.c,v
retrieving revision 1.29
diff -u -r1.29 packet-isis-lsp.c
--- packet-isis-lsp.c 2002/04/24 20:25:02 1.29
+++ packet-isis-lsp.c 2002/05/01 11:20:26
@@ -433,7 +433,7 @@
*/
static void
dissect_lsp_ip_reachability_clv(tvbuff_t *tvb, proto_tree *tree, int offset,
- int id_length, int length)
+ int id_length _U_, int length)
{
proto_item *ti;
proto_tree *ntree = NULL;
@@ -552,7 +552,7 @@
*/
static void
dissect_lsp_ext_ip_reachability_clv(tvbuff_t *tvb, proto_tree *tree,
- int offset, int id_length, int length)
+ int offset, int id_length _U_, int length)
{
proto_item *pi = NULL;
proto_tree *subtree = NULL;
@@ -609,7 +609,7 @@
*/
static void
dissect_lsp_ipv6_reachability_clv(tvbuff_t *tvb, proto_tree *tree, int offset,
- int id_length, int length)
+ int id_length _U_, int length)
{
proto_item *ti;
proto_tree *ntree = NULL;
@@ -678,7 +678,7 @@
*/
static void
dissect_lsp_nlpid_clv(tvbuff_t *tvb, proto_tree *tree, int offset,
- int id_length, int length)
+ int id_length _U_, int length)
{
isis_dissect_nlpid_clv(tvb, tree, offset, length);
}
@@ -702,7 +702,7 @@
*/
static void
dissect_lsp_mt_clv(tvbuff_t *tvb, proto_tree *tree, int offset,
- int id_length, int length)
+ int id_length _U_, int length)
{
isis_dissect_mt_clv(tvb, tree, offset, length, hf_isis_lsp_clv_mt );
}
@@ -726,7 +726,7 @@
*/
static void
dissect_lsp_hostname_clv(tvbuff_t *tvb, proto_tree *tree, int offset,
- int id_length, int length)
+ int id_length _U_, int length)
{
isis_dissect_hostname_clv(tvb, tree, offset, length);
}
@@ -751,7 +751,7 @@
*/
static void
dissect_lsp_te_router_id_clv(tvbuff_t *tvb, proto_tree *tree, int offset,
- int id_length, int length)
+ int id_length _U_, int length)
{
isis_dissect_te_router_id_clv(tvb, tree, offset, length,
hf_isis_lsp_clv_te_router_id );
@@ -777,7 +777,7 @@
*/
static void
dissect_lsp_ip_int_addr_clv(tvbuff_t *tvb, proto_tree *tree, int offset,
- int id_length, int length)
+ int id_length _U_, int length)
{
isis_dissect_ip_int_clv(tvb, tree, offset, length,
hf_isis_lsp_clv_ipv4_int_addr );
@@ -802,7 +802,7 @@
*/
static void
dissect_lsp_ipv6_int_addr_clv(tvbuff_t *tvb, proto_tree *tree, int offset,
- int id_length, int length)
+ int id_length _U_, int length)
{
isis_dissect_ipv6_int_clv(tvb, tree, offset, length,
hf_isis_lsp_clv_ipv6_int_addr );
@@ -827,7 +827,7 @@
*/
static void
dissect_lsp_l1_auth_clv(tvbuff_t *tvb, proto_tree *tree, int offset,
- int id_length, int length)
+ int id_length _U_, int length)
{
isis_dissect_authentication_clv(tvb, tree, offset, length,
"Per area authentication" );
@@ -852,7 +852,7 @@
*/
static void
dissect_lsp_l2_auth_clv(tvbuff_t *tvb, proto_tree *tree, int offset,
- int id_length, int length)
+ int id_length _U_, int length)
{
isis_dissect_authentication_clv(tvb, tree, offset, length,
"Per domain authentication" );
@@ -877,7 +877,7 @@
*/
static void
dissect_lsp_area_address_clv(tvbuff_t *tvb, proto_tree *tree, int offset,
- int id_length, int length)
+ int id_length _U_, int length)
{
isis_dissect_area_address_clv(tvb, tree, offset, length);
}
@@ -1214,7 +1214,7 @@
*/
static void
dissect_lsp_ext_is_reachability_clv(tvbuff_t *tvb, proto_tree *tree,
- int offset, int id_length, int length)
+ int offset, int id_length _U_, int length)
{
proto_item *ti;
proto_tree *ntree = NULL;
@@ -1301,7 +1301,7 @@
static void
dissect_lsp_mt_is_reachability_clv(tvbuff_t *tvb, proto_tree *tree, int offset,
- int id_length, int length)
+ int id_length _U_, int length)
{
proto_item *ti;
proto_tree *ntree = NULL;
@@ -1434,7 +1434,7 @@
*/
static void
dissect_lsp_prefix_neighbors_clv(tvbuff_t *tvb, proto_tree *tree, int offset,
- int id_length, int length)
+ int id_length _U_, int length)
{
char *sbuf;
int mylen;
Index: ethereal/packet-isis-snp.c
===================================================================
RCS file: /cvsroot/ethereal/packet-isis-snp.c,v
retrieving revision 1.15
diff -u -r1.15 packet-isis-snp.c
--- packet-isis-snp.c 2002/04/07 22:36:55 1.15
+++ packet-isis-snp.c 2002/05/01 11:20:26
@@ -375,7 +375,7 @@
*/
static void
dissect_l1_snp_authentication_clv(tvbuff_t *tvb, proto_tree *tree, int offset,
- int id_length, int length)
+ int id_length _U_, int length)
{
isis_dissect_authentication_clv(tvb, tree, offset, length,
"Per area authentication" );
@@ -400,7 +400,7 @@
*/
static void
dissect_l2_snp_authentication_clv(tvbuff_t *tvb, proto_tree *tree, int offset,
- int id_length, int length)
+ int id_length _U_, int length)
{
isis_dissect_authentication_clv(tvb, tree, offset, length,
"Per domain authentication" );
--- End Message ---