diff options
Diffstat (limited to 'epan/dissectors/packet-ndps.c')
| -rw-r--r-- | epan/dissectors/packet-ndps.c | 622 |
1 files changed, 311 insertions, 311 deletions
diff --git a/epan/dissectors/packet-ndps.c b/epan/dissectors/packet-ndps.c index 7c27d8099c..cd0b128a28 100644 --- a/epan/dissectors/packet-ndps.c +++ b/epan/dissectors/packet-ndps.c @@ -28,6 +28,8 @@ void proto_register_ndps(void); void proto_reg_handoff_ndps(void); +static dissector_handle_t ndps_handle, ndps_tcp_handle; + /* Limit the number of items we can add to the tree. */ #define NDPS_MAX_ITEMS 100 @@ -49,305 +51,305 @@ static int dissect_ndps_request(tvbuff_t*, packet_info*, proto_tree*, guint32, g static int dissect_ndps_reply(tvbuff_t *, packet_info*, proto_tree*, int); -static int hf_ndps_segments = -1; -static int hf_ndps_segment = -1; -static int hf_ndps_segment_overlap = -1; -static int hf_ndps_segment_overlap_conflict = -1; -static int hf_ndps_segment_multiple_tails = -1; -static int hf_ndps_segment_too_long_segment = -1; -static int hf_ndps_segment_error = -1; -static int hf_ndps_segment_count = -1; -static int hf_ndps_reassembled_length = -1; - -static gint ett_ndps_segments = -1; -static gint ett_ndps_segment = -1; - -static int proto_ndps = -1; -static int hf_ndps_record_mark = -1; -static int hf_ndps_length = -1; -static int hf_ndps_xid = -1; -static int hf_ndps_packet_type = -1; -static int hf_ndps_rpc_version = -1; -/* static int hf_ndps_error = -1; */ -static int hf_ndps_num_objects = -1; -static int hf_ndps_num_attributes = -1; -/* static int hf_ndps_sbuffer = -1; */ -/* static int hf_ndps_rbuffer = -1; */ -static int hf_ndps_user_name = -1; -static int hf_ndps_broker_name = -1; -static int hf_ndps_num_results = -1; -static int hf_ndps_num_options = -1; -static int hf_ndps_num_jobs = -1; -static int hf_ndps_pa_name = -1; -static int hf_ndps_tree = -1; -static int hf_ndps_reqframe = -1; -static int hf_ndps_error_val = -1; -static int hf_ndps_ext_error = -1; -static int hf_ndps_object = -1; -static int hf_ndps_cred_type = -1; -static int hf_ndps_server_name = -1; -static int hf_ndps_connection = -1; -static int hf_ndps_auth_null = -1; -static int hf_ndps_rpc_accept = -1; -static int hf_ndps_rpc_acc_stat = -1; -static int hf_ndps_rpc_rej_stat = -1; -static int hf_ndps_rpc_acc_results = -1; -static int hf_ndps_problem_type = -1; -static int hf_security_problem_type = -1; -static int hf_service_problem_type = -1; -static int hf_access_problem_type = -1; -static int hf_printer_problem_type = -1; -static int hf_selection_problem_type = -1; -static int hf_doc_access_problem_type = -1; -static int hf_attribute_problem_type = -1; -static int hf_update_problem_type = -1; -static int hf_obj_id_type = -1; -static int hf_oid_struct_size = -1; -static int hf_object_name = -1; -static int hf_ndps_document_number = -1; -static int hf_ndps_nameorid = -1; -static int hf_ndps_local_object_name = -1; -static int hf_ndps_printer_name = -1; -static int hf_ndps_qualified_name = -1; -static int hf_ndps_item_count = -1; -static int hf_ndps_num_passwords = -1; -static int hf_ndps_num_servers = -1; -static int hf_ndps_num_locations = -1; -static int hf_ndps_num_areas = -1; -static int hf_ndps_num_address_items = -1; -static int hf_ndps_num_job_categories = -1; -static int hf_ndps_num_page_selects = -1; -static int hf_ndps_num_page_informations = -1; -static int hf_ndps_num_names = -1; -static int hf_ndps_num_categories = -1; -static int hf_ndps_num_colorants = -1; -static int hf_ndps_num_events = -1; -static int hf_ndps_num_args = -1; -static int hf_ndps_num_transfer_methods = -1; -static int hf_ndps_num_doc_types = -1; -static int hf_ndps_num_destinations = -1; -static int hf_ndps_qualifier = -1; -static int hf_ndps_lib_error = -1; -static int hf_ndps_other_error = -1; -static int hf_ndps_other_error_2 = -1; -static int hf_ndps_session = -1; -static int hf_ndps_abort_flag = -1; -static int hf_ndps_obj_attribute_type = -1; -static int hf_ndps_attribute_value = -1; -static int hf_ndps_lower_range = -1; -static int hf_ndps_upper_range = -1; -static int hf_ndps_n64 = -1; -static int hf_ndps_lower_range_n64 = -1; -static int hf_ndps_upper_range_n64 = -1; -static int hf_ndps_attrib_boolean = -1; -static int hf_ndps_realization = -1; -static int hf_ndps_xdimension_n64 = -1; -static int hf_ndps_ydimension_n64 = -1; -static int hf_ndps_dim_value = -1; -static int hf_ndps_dim_flag = -1; -static int hf_ndps_xydim_value = -1; -static int hf_ndps_location_value = -1; -static int hf_ndps_xmin_n64 = -1; -static int hf_ndps_xmax_n64 = -1; -static int hf_ndps_ymin_n64 = -1; -static int hf_ndps_ymax_n64 = -1; -static int hf_ndps_edge_value = -1; -static int hf_ndps_cardinal_or_oid = -1; -static int hf_ndps_cardinal_name_or_oid = -1; -static int hf_ndps_integer_or_oid = -1; -static int hf_ndps_profile_id = -1; -static int hf_ndps_persistence = -1; -static int hf_ndps_language_count = -1; -static int hf_ndps_language_id = -1; -static int hf_address_type = -1; -static int hf_ndps_address = -1; -static int hf_ndps_add_bytes = -1; -static int hf_ndps_event_type = -1; -static int hf_ndps_event_object_identifier = -1; -static int hf_ndps_octet_string = -1; -static int hf_ndps_scope = -1; -static int hf_address_len = -1; -static int hf_ndps_net = -1; -static int hf_ndps_node = -1; -static int hf_ndps_socket = -1; -static int hf_ndps_port = -1; -static int hf_ndps_ip = -1; -static int hf_ndps_server_type = -1; -static int hf_ndps_num_services = -1; -static int hf_ndps_service_type = -1; -static int hf_ndps_service_enabled = -1; -static int hf_ndps_method_name = -1; -static int hf_ndps_method_ver = -1; -static int hf_ndps_file_name = -1; -static int hf_ndps_admin_submit = -1; -static int hf_ndps_oid = -1; -static int hf_ndps_object_op = -1; -static int hf_answer_time = -1; -static int hf_oid_asn1_type = -1; -static int hf_ndps_item_ptr = -1; -static int hf_ndps_len = -1; -static int hf_ndps_limit_enc = -1; -static int hf_ndps_delivery_add_count = -1; -/* static int hf_ndps_qualified_name2 = -1; */ -static int hf_ndps_delivery_add_type = -1; -static int hf_ndps_criterion_type = -1; -static int hf_ndps_num_ignored_attributes = -1; -static int hf_ndps_ignored_type = -1; -static int hf_ndps_num_resources = -1; -static int hf_ndps_resource_type = -1; -static int hf_ndps_identifier_type = -1; -static int hf_ndps_page_flag = -1; -static int hf_ndps_media_type = -1; -static int hf_ndps_doc_content = -1; -static int hf_ndps_page_size = -1; -static int hf_ndps_direction = -1; -static int hf_ndps_page_order = -1; -static int hf_ndps_medium_size = -1; -static int hf_ndps_long_edge_feeds = -1; -static int hf_ndps_inc_across_feed = -1; -static int hf_ndps_size_inc_in_feed = -1; -static int hf_ndps_page_orientation = -1; -static int hf_ndps_numbers_up = -1; -static int hf_ndps_xdimension = -1; -static int hf_ndps_ydimension = -1; -static int hf_ndps_state_severity = -1; -static int hf_ndps_training = -1; -static int hf_ndps_colorant_set = -1; -static int hf_ndps_card_enum_time = -1; -static int hf_ndps_attrs_arg = -1; -static int hf_ndps_context_len = -1; -static int hf_ndps_context = -1; -static int hf_ndps_filter = -1; -/* static int hf_ndps_item_filter = -1; */ -/* static int hf_ndps_substring_match = -1; */ -static int hf_ndps_time_limit = -1; -static int hf_ndps_count_limit = -1; -static int hf_ndps_operator = -1; -static int hf_ndps_password = -1; -static int hf_ndps_retrieve_restrictions = -1; -static int hf_ndps_bind_security_option_count = -1; -static int hf_bind_security = -1; -static int hf_ndps_max_items = -1; -static int hf_ndps_status_flags = -1; -static int hf_ndps_resource_list_type = -1; -static int hf_os_count = -1; -static int hf_os_type = -1; -static int hf_ndps_printer_type_count = -1; -static int hf_ndps_printer_type = -1; -static int hf_ndps_printer_manuf = -1; -static int hf_ndps_inf_file_name = -1; -static int hf_ndps_vendor_dir = -1; -static int hf_banner_type = -1; -static int hf_font_type = -1; -static int hf_printer_id = -1; -static int hf_ndps_font_name = -1; -static int hf_ndps_return_code = -1; -/* static int hf_ndps_banner_count = -1; */ -static int hf_ndps_banner_name = -1; -static int hf_ndps_font_type_count = -1; -static int hf_font_type_name = -1; -static int hf_ndps_font_file_count = -1; -static int hf_font_file_name = -1; -static int hf_ndps_printer_def_count = -1; -static int hf_ndps_prn_file_name = -1; -static int hf_ndps_prn_dir_name = -1; -static int hf_ndps_def_file_name = -1; -static int hf_ndps_num_win31_keys = -1; -static int hf_ndps_num_win95_keys = -1; -static int hf_ndps_num_windows_keys = -1; -static int hf_ndps_windows_key = -1; -static int hf_archive_type = -1; -static int hf_archive_file_size = -1; -static int hf_ndps_data = -1; -static int hf_get_status_flag = -1; -static int hf_res_type = -1; -static int hf_file_timestamp = -1; -static int hf_sub_complete = -1; -static int hf_doc_content = -1; -/* static int hf_ndps_doc_name = -1; */ -static int hf_print_arg = -1; -static int hf_local_id = -1; -static int hf_ndps_included_doc_len = -1; -static int hf_ndps_included_doc = -1; -static int hf_ndps_ref_name = -1; -static int hf_interrupt_job_type = -1; -static int hf_pause_job_type = -1; -static int hf_ndps_force = -1; -static int hf_resubmit_op_type = -1; -static int hf_shutdown_type = -1; -static int hf_ndps_supplier_flag = -1; -static int hf_ndps_language_flag = -1; -static int hf_ndps_method_flag = -1; -static int hf_ndps_delivery_address_flag = -1; -static int hf_ndps_list_profiles_type = -1; -static int hf_ndps_list_profiles_choice_type = -1; -static int hf_ndps_list_profiles_result_type = -1; -static int hf_ndps_integer_type_flag = -1; -static int hf_ndps_integer_type_value = -1; -static int hf_ndps_continuation_option = -1; -static int hf_ndps_ds_info_type = -1; -static int hf_ndps_guid = -1; -static int hf_ndps_list_services_type = -1; -static int hf_ndps_item_bytes = -1; -static int hf_ndps_certified = -1; -static int hf_ndps_attribute_set = -1; -static int hf_ndps_data_item_type = -1; -static int hf_info_int = -1; -static int hf_info_int16 = -1; -static int hf_info_int32 = -1; -static int hf_info_boolean = -1; -static int hf_info_string = -1; -/* static int hf_info_bytes = -1; */ -static int hf_ndps_list_local_servers_type = -1; -static int hf_ndps_registry_name = -1; -static int hf_ndps_client_server_type = -1; -static int hf_ndps_session_type = -1; -static int hf_time = -1; -static int hf_ndps_supplier_name = -1; -static int hf_ndps_message = -1; -static int hf_ndps_delivery_method_count = -1; -static int hf_delivery_method_type = -1; -static int hf_ndps_get_session_type = -1; -static int hf_packet_count = -1; -static int hf_last_packet_flag = -1; -static int hf_ndps_get_resman_session_type = -1; -static int hf_problem_type = -1; -static int hf_ndps_num_values = -1; -static int hf_ndps_object_ids_7 = -1; -static int hf_ndps_object_ids_8 = -1; -static int hf_ndps_object_ids_9 = -1; -static int hf_ndps_object_ids_10 = -1; -static int hf_ndps_object_ids_11 = -1; -static int hf_ndps_object_ids_12 = -1; -static int hf_ndps_object_ids_13 = -1; -static int hf_ndps_object_ids_14 = -1; -static int hf_ndps_object_ids_15 = -1; -static int hf_ndps_object_ids_16 = -1; -/* static int hf_ndps_attribute_time = -1; */ -static int hf_print_security = -1; -static int hf_notify_time_interval = -1; -static int hf_notify_sequence_number = -1; -static int hf_notify_lease_exp_time = -1; -static int hf_notify_printer_uri = -1; -static int hf_level = -1; -static int hf_interval = -1; -static int hf_ndps_other_error_string = -1; - -static int hf_spx_ndps_program = -1; -static int hf_spx_ndps_version = -1; -static int hf_spx_ndps_func_print = -1; -static int hf_spx_ndps_func_registry = -1; -static int hf_spx_ndps_func_notify = -1; -static int hf_spx_ndps_func_resman = -1; -static int hf_spx_ndps_func_delivery = -1; -static int hf_spx_ndps_func_broker = -1; - -static gint ett_ndps = -1; - -static expert_field ei_ndps_problem_type = EI_INIT; -static expert_field ei_ndps_return_code = EI_INIT; -static expert_field ei_ndps_rpc_acc_stat = EI_INIT; -static expert_field ei_ndps_truncated = EI_INIT; +static int hf_ndps_segments; +static int hf_ndps_segment; +static int hf_ndps_segment_overlap; +static int hf_ndps_segment_overlap_conflict; +static int hf_ndps_segment_multiple_tails; +static int hf_ndps_segment_too_long_segment; +static int hf_ndps_segment_error; +static int hf_ndps_segment_count; +static int hf_ndps_reassembled_length; + +static gint ett_ndps_segments; +static gint ett_ndps_segment; + +static int proto_ndps; +static int hf_ndps_record_mark; +static int hf_ndps_length; +static int hf_ndps_xid; +static int hf_ndps_packet_type; +static int hf_ndps_rpc_version; +/* static int hf_ndps_error; */ +static int hf_ndps_num_objects; +static int hf_ndps_num_attributes; +/* static int hf_ndps_sbuffer; */ +/* static int hf_ndps_rbuffer; */ +static int hf_ndps_user_name; +static int hf_ndps_broker_name; +static int hf_ndps_num_results; +static int hf_ndps_num_options; +static int hf_ndps_num_jobs; +static int hf_ndps_pa_name; +static int hf_ndps_tree; +static int hf_ndps_reqframe; +static int hf_ndps_error_val; +static int hf_ndps_ext_error; +static int hf_ndps_object; +static int hf_ndps_cred_type; +static int hf_ndps_server_name; +static int hf_ndps_connection; +static int hf_ndps_auth_null; +static int hf_ndps_rpc_accept; +static int hf_ndps_rpc_acc_stat; +static int hf_ndps_rpc_rej_stat; +static int hf_ndps_rpc_acc_results; +static int hf_ndps_problem_type; +static int hf_security_problem_type; +static int hf_service_problem_type; +static int hf_access_problem_type; +static int hf_printer_problem_type; +static int hf_selection_problem_type; +static int hf_doc_access_problem_type; +static int hf_attribute_problem_type; +static int hf_update_problem_type; +static int hf_obj_id_type; +static int hf_oid_struct_size; +static int hf_object_name; +static int hf_ndps_document_number; +static int hf_ndps_nameorid; +static int hf_ndps_local_object_name; +static int hf_ndps_printer_name; +static int hf_ndps_qualified_name; +static int hf_ndps_item_count; +static int hf_ndps_num_passwords; +static int hf_ndps_num_servers; +static int hf_ndps_num_locations; +static int hf_ndps_num_areas; +static int hf_ndps_num_address_items; +static int hf_ndps_num_job_categories; +static int hf_ndps_num_page_selects; +static int hf_ndps_num_page_informations; +static int hf_ndps_num_names; +static int hf_ndps_num_categories; +static int hf_ndps_num_colorants; +static int hf_ndps_num_events; +static int hf_ndps_num_args; +static int hf_ndps_num_transfer_methods; +static int hf_ndps_num_doc_types; +static int hf_ndps_num_destinations; +static int hf_ndps_qualifier; +static int hf_ndps_lib_error; +static int hf_ndps_other_error; +static int hf_ndps_other_error_2; +static int hf_ndps_session; +static int hf_ndps_abort_flag; +static int hf_ndps_obj_attribute_type; +static int hf_ndps_attribute_value; +static int hf_ndps_lower_range; +static int hf_ndps_upper_range; +static int hf_ndps_n64; +static int hf_ndps_lower_range_n64; +static int hf_ndps_upper_range_n64; +static int hf_ndps_attrib_boolean; +static int hf_ndps_realization; +static int hf_ndps_xdimension_n64; +static int hf_ndps_ydimension_n64; +static int hf_ndps_dim_value; +static int hf_ndps_dim_flag; +static int hf_ndps_xydim_value; +static int hf_ndps_location_value; +static int hf_ndps_xmin_n64; +static int hf_ndps_xmax_n64; +static int hf_ndps_ymin_n64; +static int hf_ndps_ymax_n64; +static int hf_ndps_edge_value; +static int hf_ndps_cardinal_or_oid; +static int hf_ndps_cardinal_name_or_oid; +static int hf_ndps_integer_or_oid; +static int hf_ndps_profile_id; +static int hf_ndps_persistence; +static int hf_ndps_language_count; +static int hf_ndps_language_id; +static int hf_address_type; +static int hf_ndps_address; +static int hf_ndps_add_bytes; +static int hf_ndps_event_type; +static int hf_ndps_event_object_identifier; +static int hf_ndps_octet_string; +static int hf_ndps_scope; +static int hf_address_len; +static int hf_ndps_net; +static int hf_ndps_node; +static int hf_ndps_socket; +static int hf_ndps_port; +static int hf_ndps_ip; +static int hf_ndps_server_type; +static int hf_ndps_num_services; +static int hf_ndps_service_type; +static int hf_ndps_service_enabled; +static int hf_ndps_method_name; +static int hf_ndps_method_ver; +static int hf_ndps_file_name; +static int hf_ndps_admin_submit; +static int hf_ndps_oid; +static int hf_ndps_object_op; +static int hf_answer_time; +static int hf_oid_asn1_type; +static int hf_ndps_item_ptr; +static int hf_ndps_len; +static int hf_ndps_limit_enc; +static int hf_ndps_delivery_add_count; +/* static int hf_ndps_qualified_name2; */ +static int hf_ndps_delivery_add_type; +static int hf_ndps_criterion_type; +static int hf_ndps_num_ignored_attributes; +static int hf_ndps_ignored_type; +static int hf_ndps_num_resources; +static int hf_ndps_resource_type; +static int hf_ndps_identifier_type; +static int hf_ndps_page_flag; +static int hf_ndps_media_type; +static int hf_ndps_doc_content; +static int hf_ndps_page_size; +static int hf_ndps_direction; +static int hf_ndps_page_order; +static int hf_ndps_medium_size; +static int hf_ndps_long_edge_feeds; +static int hf_ndps_inc_across_feed; +static int hf_ndps_size_inc_in_feed; +static int hf_ndps_page_orientation; +static int hf_ndps_numbers_up; +static int hf_ndps_xdimension; +static int hf_ndps_ydimension; +static int hf_ndps_state_severity; +static int hf_ndps_training; +static int hf_ndps_colorant_set; +static int hf_ndps_card_enum_time; +static int hf_ndps_attrs_arg; +static int hf_ndps_context_len; +static int hf_ndps_context; +static int hf_ndps_filter; +/* static int hf_ndps_item_filter; */ +/* static int hf_ndps_substring_match; */ +static int hf_ndps_time_limit; +static int hf_ndps_count_limit; +static int hf_ndps_operator; +static int hf_ndps_password; +static int hf_ndps_retrieve_restrictions; +static int hf_ndps_bind_security_option_count; +static int hf_bind_security; +static int hf_ndps_max_items; +static int hf_ndps_status_flags; +static int hf_ndps_resource_list_type; +static int hf_os_count; +static int hf_os_type; +static int hf_ndps_printer_type_count; +static int hf_ndps_printer_type; +static int hf_ndps_printer_manuf; +static int hf_ndps_inf_file_name; +static int hf_ndps_vendor_dir; +static int hf_banner_type; +static int hf_font_type; +static int hf_printer_id; +static int hf_ndps_font_name; +static int hf_ndps_return_code; +/* static int hf_ndps_banner_count; */ +static int hf_ndps_banner_name; +static int hf_ndps_font_type_count; +static int hf_font_type_name; +static int hf_ndps_font_file_count; +static int hf_font_file_name; +static int hf_ndps_printer_def_count; +static int hf_ndps_prn_file_name; +static int hf_ndps_prn_dir_name; +static int hf_ndps_def_file_name; +static int hf_ndps_num_win31_keys; +static int hf_ndps_num_win95_keys; +static int hf_ndps_num_windows_keys; +static int hf_ndps_windows_key; +static int hf_archive_type; +static int hf_archive_file_size; +static int hf_ndps_data; +static int hf_get_status_flag; +static int hf_res_type; +static int hf_file_timestamp; +static int hf_sub_complete; +static int hf_doc_content; +/* static int hf_ndps_doc_name; */ +static int hf_print_arg; +static int hf_local_id; +static int hf_ndps_included_doc_len; +static int hf_ndps_included_doc; +static int hf_ndps_ref_name; +static int hf_interrupt_job_type; +static int hf_pause_job_type; +static int hf_ndps_force; +static int hf_resubmit_op_type; +static int hf_shutdown_type; +static int hf_ndps_supplier_flag; +static int hf_ndps_language_flag; +static int hf_ndps_method_flag; +static int hf_ndps_delivery_address_flag; +static int hf_ndps_list_profiles_type; +static int hf_ndps_list_profiles_choice_type; +static int hf_ndps_list_profiles_result_type; +static int hf_ndps_integer_type_flag; +static int hf_ndps_integer_type_value; +static int hf_ndps_continuation_option; +static int hf_ndps_ds_info_type; +static int hf_ndps_guid; +static int hf_ndps_list_services_type; +static int hf_ndps_item_bytes; +static int hf_ndps_certified; +static int hf_ndps_attribute_set; +static int hf_ndps_data_item_type; +static int hf_info_int; +static int hf_info_int16; +static int hf_info_int32; +static int hf_info_boolean; +static int hf_info_string; +/* static int hf_info_bytes; */ +static int hf_ndps_list_local_servers_type; +static int hf_ndps_registry_name; +static int hf_ndps_client_server_type; +static int hf_ndps_session_type; +static int hf_time; +static int hf_ndps_supplier_name; +static int hf_ndps_message; +static int hf_ndps_delivery_method_count; +static int hf_delivery_method_type; +static int hf_ndps_get_session_type; +static int hf_packet_count; +static int hf_last_packet_flag; +static int hf_ndps_get_resman_session_type; +static int hf_problem_type; +static int hf_ndps_num_values; +static int hf_ndps_object_ids_7; +static int hf_ndps_object_ids_8; +static int hf_ndps_object_ids_9; +static int hf_ndps_object_ids_10; +static int hf_ndps_object_ids_11; +static int hf_ndps_object_ids_12; +static int hf_ndps_object_ids_13; +static int hf_ndps_object_ids_14; +static int hf_ndps_object_ids_15; +static int hf_ndps_object_ids_16; +/* static int hf_ndps_attribute_time; */ +static int hf_print_security; +static int hf_notify_time_interval; +static int hf_notify_sequence_number; +static int hf_notify_lease_exp_time; +static int hf_notify_printer_uri; +static int hf_level; +static int hf_interval; +static int hf_ndps_other_error_string; + +static int hf_spx_ndps_program; +static int hf_spx_ndps_version; +static int hf_spx_ndps_func_print; +static int hf_spx_ndps_func_registry; +static int hf_spx_ndps_func_notify; +static int hf_spx_ndps_func_resman; +static int hf_spx_ndps_func_delivery; +static int hf_spx_ndps_func_broker; + +static gint ett_ndps; + +static expert_field ei_ndps_problem_type; +static expert_field ei_ndps_return_code; +static expert_field ei_ndps_rpc_acc_stat; +static expert_field ei_ndps_truncated; /* desegmentation of NDPS over TCP */ @@ -4262,13 +4264,13 @@ ndps_defrag(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, spx_info *spx_i { /* Lets see if this is a new conversation */ conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, - ENDPOINT_NCP, (guint32) pinfo->srcport, (guint32) pinfo->srcport, 0); + CONVERSATION_NCP, (guint32) pinfo->srcport, (guint32) pinfo->srcport, 0); if (conversation == NULL) { /* It's not part of any conversation - create a new one. */ conversation = conversation_new(pinfo->num, &pinfo->src, &pinfo->dst, - ENDPOINT_NCP, (guint32) pinfo->srcport, (guint32) pinfo->srcport, 0); + CONVERSATION_NCP, (guint32) pinfo->srcport, (guint32) pinfo->srcport, 0); } /* So now we need to get the request info for this conversation */ @@ -4454,13 +4456,13 @@ dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, g let the user select that conversation to be displayed.) */ conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, - ENDPOINT_NCP, (guint32) pinfo->srcport, (guint32) pinfo->srcport, 0); + CONVERSATION_NCP, (guint32) pinfo->srcport, (guint32) pinfo->srcport, 0); if (conversation == NULL) { /* It's not part of any conversation - create a new one. */ conversation = conversation_new(pinfo->num, &pinfo->src, &pinfo->dst, - ENDPOINT_NCP, (guint32) pinfo->srcport, (guint32) pinfo->srcport, 0); + CONVERSATION_NCP, (guint32) pinfo->srcport, (guint32) pinfo->srcport, 0); } request_value = ndps_hash_insert(conversation, (guint32) pinfo->srcport); @@ -6708,7 +6710,7 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int if (!pinfo->fd->visited) { /* Find the conversation whence the request would have come. */ conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, - ENDPOINT_NCP, (guint32) pinfo->destport, (guint32) pinfo->destport, 0); + CONVERSATION_NCP, (guint32) pinfo->destport, (guint32) pinfo->destport, 0); if (conversation != NULL) { /* find the record telling us the request made that caused this reply */ @@ -8221,7 +8223,7 @@ proto_register_ndps(void) { &hf_oid_struct_size, { "OID Struct Size", "ndps.rpc_oid_struct_size", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_object_name, @@ -8648,7 +8650,7 @@ proto_register_ndps(void) { &hf_ndps_len, { "Length", "ndps.len", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_ndps_limit_enc, @@ -9437,6 +9439,9 @@ proto_register_ndps(void) expert_ndps = expert_register_protocol(proto_ndps); expert_register_field_array(expert_ndps, ei, array_length(ei)); + ndps_handle = register_dissector("ndps.ipx", dissect_ndps_ipx, proto_ndps); + ndps_tcp_handle = register_dissector("ndps.tcp", dissect_ndps_tcp, proto_ndps); + ndps_module = prefs_register_protocol(proto_ndps, NULL); prefs_register_bool_preference(ndps_module, "desegment_tcp", "Reassemble NDPS messages spanning multiple TCP segments", @@ -9461,11 +9466,6 @@ proto_register_ndps(void) void proto_reg_handoff_ndps(void) { - dissector_handle_t ndps_handle, ndps_tcp_handle; - - ndps_handle = create_dissector_handle(dissect_ndps_ipx, proto_ndps); - ndps_tcp_handle = create_dissector_handle(dissect_ndps_tcp, proto_ndps); - dissector_add_uint("spx.socket", SPX_SOCKET_PA, ndps_handle); dissector_add_uint("spx.socket", SPX_SOCKET_BROKER, ndps_handle); dissector_add_uint("spx.socket", SPX_SOCKET_SRS, ndps_handle); |