From c67f27b4e48e59cf3be3220451a5d89d3e0d1b4e Mon Sep 17 00:00:00 2001 From: Adam Lock Date: Thu, 24 Mar 2022 23:50:17 +0000 Subject: [PATCH] Merge from master --- Cargo.lock | 1122 +---------------- Cargo.toml | 92 +- client/Cargo.toml | 42 - client/client.iml | 17 - console-logging/Cargo.toml | 17 - core/Cargo.toml | 46 - core/core.iml | 17 - crypto/Cargo.toml | 45 - integration/src/harness.rs | 86 +- integration/src/tests.rs | 229 ++-- samples/client.conf | 2 +- samples/demo-server/src/methods.rs | 2 +- samples/server.conf | 2 +- server/Cargo.toml | 77 -- {client/src => src/client}/builder.rs | 0 {client/src => src/client}/callbacks.rs | 0 {client/src => src/client}/client.rs | 0 {client/src => src/client}/comms/mod.rs | 0 .../src => src/client}/comms/tcp_transport.rs | 0 {client/src => src/client}/comms/transport.rs | 0 {client/src => src/client}/config.rs | 0 {client/src => src/client}/message_queue.rs | 0 client/src/lib.rs => src/client/mod.rs | 8 - {client/src => src/client}/session/mod.rs | 0 .../src => src/client}/session/services.rs | 0 {client/src => src/client}/session/session.rs | 0 .../client}/session/session_state.rs | 0 .../client}/session_retry_policy.rs | 0 {client/src => src/client}/subscription.rs | 0 .../src => src/client}/subscription_state.rs | 0 {client/src => src/client}/tests/mod.rs | 0 .../src/lib.rs => src/console-logging/mod.rs | 5 - {core/src => src/core}/comms/chunker.rs | 0 {core/src => src/core}/comms/message_chunk.rs | 0 .../core}/comms/message_chunk_info.rs | 0 .../src => src/core}/comms/message_writer.rs | 0 {core/src => src/core}/comms/mod.rs | 0 .../src => src/core}/comms/secure_channel.rs | 0 .../src => src/core}/comms/security_header.rs | 0 {core/src => src/core}/comms/tcp_codec.rs | 0 {core/src => src/core}/comms/tcp_types.rs | 0 {core/src => src/core}/comms/url.rs | 0 {core/src => src/core}/config.rs | 0 {core => src/core}/fuzz/.gitignore | 0 {core => src/core}/fuzz/Cargo.lock | 0 {core => src/core}/fuzz/Cargo.toml | 0 .../core}/fuzz/fuzz_targets/fuzz_comms.rs | 0 {core/src => src/core}/handle.rs | 0 core/src/lib.rs => src/core/mod.rs | 9 - {core/src => src/core}/runtime.rs | 0 {core/src => src/core}/supported_message.rs | 0 {core/src => src/core}/tests/chunk.rs | 0 {core/src => src/core}/tests/comms.rs | 0 {core/src => src/core}/tests/hello.rs | 0 {core/src => src/core}/tests/mod.rs | 0 .../src => src/core}/tests/secure_channel.rs | 0 {core/src => src/core}/tests/services.rs | 0 .../core}/tests/supported_message.rs | 0 .../core}/tests/test_data/our_cert.der | Bin .../core}/tests/test_data/our_private.pem | 0 .../core}/tests/test_data/their_cert.der | Bin .../core}/tests/test_data/their_private.pem | 0 {core/src => src/core}/tests/url.rs | 0 {crypto/src => src/crypto}/aeskey.rs | 0 .../src => src/crypto}/certificate_store.rs | 0 {crypto/src => src/crypto}/hash.rs | 0 crypto/src/lib.rs => src/crypto/mod.rs | 5 - {crypto/src => src/crypto}/pkey.rs | 0 {crypto/src => src/crypto}/random.rs | 0 {crypto/src => src/crypto}/security_policy.rs | 0 .../crypto}/tests/authentication.rs | 0 {crypto/src => src/crypto}/tests/crypto.rs | 0 {crypto/src => src/crypto}/tests/mod.rs | 0 .../crypto}/tests/security_policy.rs | 0 {crypto/src => src/crypto}/thumbprint.rs | 0 {crypto/src => src/crypto}/user_identity.rs | 0 {crypto/src => src/crypto}/x509.rs | 0 src/lib.rs | 25 + .../server}/address_space/address_space.rs | 0 .../src => src/server}/address_space/base.rs | 0 .../server}/address_space/data_type.rs | 0 .../server}/address_space/generated/mod.rs | 0 .../address_space/generated/nodeset_10.rs | 0 .../address_space/generated/nodeset_11.rs | 0 .../address_space/generated/nodeset_12_1.rs | 0 .../address_space/generated/nodeset_12_2.rs | 0 .../address_space/generated/nodeset_12_3.rs | 0 .../address_space/generated/nodeset_12_4.rs | 0 .../address_space/generated/nodeset_13.rs | 0 .../address_space/generated/nodeset_14.rs | 0 .../address_space/generated/nodeset_14_1.rs | 0 .../address_space/generated/nodeset_14_10.rs | 0 .../address_space/generated/nodeset_14_11.rs | 0 .../address_space/generated/nodeset_14_2.rs | 0 .../address_space/generated/nodeset_14_3.rs | 0 .../address_space/generated/nodeset_14_4.rs | 0 .../address_space/generated/nodeset_14_5.rs | 0 .../address_space/generated/nodeset_14_6.rs | 0 .../address_space/generated/nodeset_14_7.rs | 0 .../address_space/generated/nodeset_14_8.rs | 0 .../address_space/generated/nodeset_14_9.rs | 0 .../address_space/generated/nodeset_3.rs | 0 .../address_space/generated/nodeset_3_1.rs | 0 .../address_space/generated/nodeset_3_2.rs | 0 .../address_space/generated/nodeset_4_1.rs | 0 .../address_space/generated/nodeset_4_2.rs | 0 .../address_space/generated/nodeset_4_3.rs | 0 .../address_space/generated/nodeset_4_4.rs | 0 .../address_space/generated/nodeset_4_5.rs | 0 .../address_space/generated/nodeset_4_6.rs | 0 .../address_space/generated/nodeset_4_7.rs | 0 .../address_space/generated/nodeset_4_8.rs | 0 .../address_space/generated/nodeset_5_1.rs | 0 .../address_space/generated/nodeset_5_10.rs | 0 .../address_space/generated/nodeset_5_11.rs | 0 .../address_space/generated/nodeset_5_12.rs | 0 .../address_space/generated/nodeset_5_13.rs | 0 .../address_space/generated/nodeset_5_14.rs | 0 .../address_space/generated/nodeset_5_15.rs | 0 .../address_space/generated/nodeset_5_16.rs | 0 .../address_space/generated/nodeset_5_2.rs | 0 .../address_space/generated/nodeset_5_3.rs | 0 .../address_space/generated/nodeset_5_4.rs | 0 .../address_space/generated/nodeset_5_5.rs | 0 .../address_space/generated/nodeset_5_6.rs | 0 .../address_space/generated/nodeset_5_7.rs | 0 .../address_space/generated/nodeset_5_8.rs | 0 .../address_space/generated/nodeset_5_9.rs | 0 .../address_space/generated/nodeset_8.rs | 0 .../address_space/generated/nodeset_999.rs | 0 .../address_space/generated/nodeset_9_1.rs | 0 .../address_space/generated/nodeset_9_2.rs | 0 .../address_space/generated/nodeset_9_3.rs | 0 .../address_space/generated/nodeset_9_4.rs | 0 .../server}/address_space/method.rs | 0 .../server}/address_space/method_impls.rs | 0 .../src => src/server}/address_space/mod.rs | 0 .../src => src/server}/address_space/node.rs | 0 .../server}/address_space/object.rs | 0 .../server}/address_space/object_type.rs | 0 .../server}/address_space/reference_type.rs | 0 .../server}/address_space/references.rs | 0 .../server}/address_space/relative_path.rs | 0 .../server}/address_space/variable.rs | 0 .../server}/address_space/variable_type.rs | 0 .../src => src/server}/address_space/view.rs | 0 .../server}/benches/address_space.rs | 0 {server/src => src/server}/builder.rs | 0 {server/src => src/server}/callbacks.rs | 0 {server/src => src/server}/comms/mod.rs | 0 .../server}/comms/secure_channel_service.rs | 0 .../src => src/server}/comms/tcp_transport.rs | 0 {server/src => src/server}/comms/transport.rs | 0 {server/src => src/server}/config.rs | 0 .../src => src/server}/continuation_point.rs | 0 {server/src => src/server}/diagnostics.rs | 0 {server/src => src/server}/discovery/mod.rs | 0 .../server}/events/audit/cancel_event.rs | 0 .../events/audit/certificate_events.rs | 0 .../src => src/server}/events/audit/event.rs | 0 .../src => src/server}/events/audit/mod.rs | 0 .../events/audit/node_management_event.rs | 0 .../server}/events/audit/security_event.rs | 0 .../server}/events/audit/session_events.rs | 0 {server/src => src/server}/events/event.rs | 0 .../src => src/server}/events/event_filter.rs | 0 {server/src => src/server}/events/mod.rs | 0 {server/src => src/server}/events/operator.rs | 0 {server/src => src/server}/historical/mod.rs | 0 {server => src/server}/html/index.html | 0 {server/src => src/server}/http/mod.rs | 0 {server/src => src/server}/identity_token.rs | 0 {server/src => src/server}/metrics.rs | 0 server/src/lib.rs => src/server/mod.rs | 14 - {server => src/server}/server.iml | 0 {server/src => src/server}/server.rs | 0 .../src => src/server}/services/attribute.rs | 0 {server/src => src/server}/services/audit.rs | 0 .../src => src/server}/services/discovery.rs | 0 .../server}/services/message_handler.rs | 0 {server/src => src/server}/services/method.rs | 0 {server/src => src/server}/services/mod.rs | 0 .../server}/services/monitored_item.rs | 0 .../server}/services/node_management.rs | 0 {server/src => src/server}/services/query.rs | 0 .../src => src/server}/services/session.rs | 0 .../server}/services/subscription.rs | 0 {server/src => src/server}/services/view.rs | 0 {server/src => src/server}/session.rs | 0 .../src => src/server}/session_diagnostics.rs | 0 {server/src => src/server}/state.rs | 0 .../src => src/server}/subscriptions/mod.rs | 0 .../server}/subscriptions/monitored_item.rs | 0 .../server}/subscriptions/subscription.rs | 0 .../server}/subscriptions/subscriptions.rs | 0 .../src => src/server}/tests/address_space.rs | 0 {server/src => src/server}/tests/events.rs | 0 {server/src => src/server}/tests/mod.rs | 0 .../server}/tests/services/attribute.rs | 0 .../server}/tests/services/discovery.rs | 0 .../server}/tests/services/method.rs | 0 .../src => src/server}/tests/services/mod.rs | 0 .../server}/tests/services/monitored_item.rs | 0 .../server}/tests/services/node_management.rs | 0 .../server}/tests/services/session.rs | 0 .../server}/tests/services/subscription.rs | 0 .../src => src/server}/tests/services/view.rs | 0 .../server}/tests/subscriptions/mod.rs | 0 .../tests/subscriptions/subscription.rs | 0 .../tests/subscriptions/subscriptions.rs | 0 {server/src => src/server}/util/mod.rs | 0 {types/src => src/types}/argument.rs | 0 {types/src => src/types}/array.rs | 0 {types/src => src/types}/attribute.rs | 0 {types/src => src/types}/basic_types.rs | 0 {types/src => src/types}/byte_string.rs | 0 {types/src => src/types}/data_types.rs | 0 {types/src => src/types}/data_value.rs | 0 {types/src => src/types}/date_time.rs | 0 {types/src => src/types}/diagnostic_info.rs | 0 {types/src => src/types}/encoding.rs | 0 {types/src => src/types}/extension_object.rs | 0 {types => src/types}/fuzz/.gitignore | 0 {types => src/types}/fuzz/Cargo.lock | 0 {types => src/types}/fuzz/Cargo.toml | 0 .../fuzz/fuzz_targets/fuzz_deserialize.rs | 0 {types/src => src/types}/guid.rs | 0 {types/src => src/types}/localized_text.rs | 0 types/src/lib.rs => src/types/mod.rs | 11 - {types/src => src/types}/node_id.rs | 0 {types/src => src/types}/node_ids.rs | 0 .../src => src/types}/notification_message.rs | 0 {types/src => src/types}/numeric_range.rs | 0 {types/src => src/types}/operand.rs | 0 {types/src => src/types}/qualified_name.rs | 0 {types/src => src/types}/relative_path.rs | 0 {types/src => src/types}/request_header.rs | 0 {types/src => src/types}/response_header.rs | 0 .../service_types/activate_session_request.rs | 0 .../activate_session_response.rs | 0 .../types}/service_types/add_nodes_item.rs | 0 .../types}/service_types/add_nodes_request.rs | 0 .../service_types/add_nodes_response.rs | 0 .../types}/service_types/add_nodes_result.rs | 0 .../service_types/add_references_item.rs | 0 .../service_types/add_references_request.rs | 0 .../service_types/add_references_response.rs | 0 .../additional_parameters_type.rs | 0 .../service_types/aggregate_configuration.rs | 0 .../types}/service_types/aggregate_filter.rs | 0 .../service_types/aggregate_filter_result.rs | 0 .../service_types/alias_name_data_type.rs | 0 .../types}/service_types/annotation.rs | 0 .../service_types/anonymous_identity_token.rs | 0 .../service_types/application_description.rs | 0 .../types}/service_types/argument.rs | 0 .../types}/service_types/attribute_operand.rs | 0 .../types}/service_types/axis_information.rs | 0 .../broker_connection_transport_data_type.rs | 0 ...ker_data_set_reader_transport_data_type.rs | 0 ...ker_data_set_writer_transport_data_type.rs | 0 ...broker_writer_group_transport_data_type.rs | 0 .../service_types/browse_description.rs | 0 .../service_types/browse_next_request.rs | 0 .../service_types/browse_next_response.rs | 0 .../types}/service_types/browse_path.rs | 0 .../service_types/browse_path_result.rs | 0 .../service_types/browse_path_target.rs | 0 .../types}/service_types/browse_request.rs | 0 .../types}/service_types/browse_response.rs | 0 .../types}/service_types/browse_result.rs | 0 .../types}/service_types/build_info.rs | 0 .../service_types/call_method_request.rs | 0 .../service_types/call_method_result.rs | 0 .../types}/service_types/call_request.rs | 0 .../types}/service_types/call_response.rs | 0 .../types}/service_types/cancel_request.rs | 0 .../types}/service_types/cancel_response.rs | 0 .../service_types/cartesian_coordinates.rs | 0 .../service_types/channel_security_token.rs | 0 .../close_secure_channel_request.rs | 0 .../close_secure_channel_response.rs | 0 .../service_types/close_session_request.rs | 0 .../service_types/close_session_response.rs | 0 .../service_types/complex_number_type.rs | 0 .../configuration_version_data_type.rs | 0 .../connection_transport_data_type.rs | 0 .../types}/service_types/content_filter.rs | 0 .../service_types/content_filter_element.rs | 0 .../content_filter_element_result.rs | 0 .../service_types/content_filter_result.rs | 0 .../create_monitored_items_request.rs | 0 .../create_monitored_items_response.rs | 0 .../service_types/create_session_request.rs | 0 .../service_types/create_session_response.rs | 0 .../create_subscription_request.rs | 0 .../create_subscription_response.rs | 0 .../service_types/currency_unit_type.rs | 0 .../service_types/data_change_filter.rs | 0 .../service_types/data_change_notification.rs | 0 .../service_types/data_set_meta_data_type.rs | 0 .../data_set_reader_data_type.rs | 0 .../data_set_reader_message_data_type.rs | 0 .../data_set_reader_transport_data_type.rs | 0 .../data_set_writer_data_type.rs | 0 .../data_set_writer_message_data_type.rs | 0 .../data_set_writer_transport_data_type.rs | 0 .../service_types/data_type_attributes.rs | 0 .../service_types/data_type_description.rs | 0 .../service_types/data_type_schema_header.rs | 0 ...datagram_connection_transport_data_type.rs | 0 ...tagram_writer_group_transport_data_type.rs | 0 .../types}/service_types/decimal_data_type.rs | 0 .../service_types/delete_at_time_details.rs | 0 .../service_types/delete_event_details.rs | 0 .../delete_monitored_items_request.rs | 0 .../delete_monitored_items_response.rs | 0 .../types}/service_types/delete_nodes_item.rs | 0 .../service_types/delete_nodes_request.rs | 0 .../service_types/delete_nodes_response.rs | 0 .../delete_raw_modified_details.rs | 0 .../service_types/delete_references_item.rs | 0 .../delete_references_request.rs | 0 .../delete_references_response.rs | 0 .../delete_subscriptions_request.rs | 0 .../delete_subscriptions_response.rs | 0 .../service_types/discovery_configuration.rs | 0 .../double_complex_number_type.rs | 0 .../types}/service_types/element_operand.rs | 0 .../service_types/endpoint_configuration.rs | 0 .../service_types/endpoint_description.rs | 0 .../types}/service_types/endpoint_type.rs | 0 .../endpoint_url_list_data_type.rs | 0 .../types}/service_types/enum_definition.rs | 0 .../types}/service_types/enum_description.rs | 0 .../types}/service_types/enum_field.rs | 0 .../types}/service_types/enum_value_type.rs | 0 .../src => src/types}/service_types/enums.rs | 0 .../service_types/ephemeral_key_type.rs | 0 .../types}/service_types/eu_information.rs | 0 .../types}/service_types/event_field_list.rs | 0 .../types}/service_types/event_filter.rs | 0 .../service_types/event_filter_result.rs | 0 .../service_types/event_notification_list.rs | 0 .../types}/service_types/field_meta_data.rs | 0 .../service_types/field_target_data_type.rs | 0 .../types}/service_types/filter_operand.rs | 0 .../find_servers_on_network_request.rs | 0 .../find_servers_on_network_response.rs | 0 .../service_types/find_servers_request.rs | 0 .../service_types/find_servers_response.rs | 0 .../src => src/types}/service_types/frame.rs | 0 .../service_types/generic_attribute_value.rs | 0 .../service_types/generic_attributes.rs | 0 .../service_types/get_endpoints_request.rs | 0 .../service_types/get_endpoints_response.rs | 0 .../types}/service_types/history_data.rs | 0 .../types}/service_types/history_event.rs | 0 .../service_types/history_event_field_list.rs | 0 .../service_types/history_modified_data.rs | 0 .../service_types/history_read_details.rs | 0 .../service_types/history_read_request.rs | 0 .../service_types/history_read_response.rs | 0 .../service_types/history_read_result.rs | 0 .../service_types/history_read_value_id.rs | 0 .../service_types/history_update_details.rs | 0 .../service_types/history_update_request.rs | 0 .../service_types/history_update_response.rs | 0 .../service_types/history_update_result.rs | 0 .../identity_mapping_rule_type.rs | 0 .../src => src/types}/service_types/impls.rs | 0 .../service_types/issued_identity_token.rs | 0 .../json_data_set_reader_message_data_type.rs | 0 .../json_data_set_writer_message_data_type.rs | 0 .../json_writer_group_message_data_type.rs | 0 .../types}/service_types/key_value_pair.rs | 0 .../types}/service_types/literal_operand.rs | 0 .../mdns_discovery_configuration.rs | 0 .../types}/service_types/method_attributes.rs | 0 {types/src => src/types}/service_types/mod.rs | 0 .../model_change_structure_data_type.rs | 0 .../types}/service_types/modification_info.rs | 0 .../modify_monitored_items_request.rs | 0 .../modify_monitored_items_response.rs | 0 .../modify_subscription_request.rs | 0 .../modify_subscription_response.rs | 0 .../monitored_item_create_request.rs | 0 .../monitored_item_create_result.rs | 0 .../monitored_item_modify_request.rs | 0 .../monitored_item_modify_result.rs | 0 .../monitored_item_notification.rs | 0 .../types}/service_types/monitoring_filter.rs | 0 .../service_types/monitoring_filter_result.rs | 0 .../service_types/monitoring_parameters.rs | 0 .../network_address_data_type.rs | 0 .../network_address_url_data_type.rs | 0 .../service_types/network_group_data_type.rs | 0 .../types}/service_types/node_attributes.rs | 0 .../types}/service_types/node_reference.rs | 0 .../service_types/node_type_description.rs | 0 .../types}/service_types/notification_data.rs | 0 .../service_types/notification_message.rs | 0 .../types}/service_types/object_attributes.rs | 0 .../service_types/object_type_attributes.rs | 0 .../open_secure_channel_request.rs | 0 .../open_secure_channel_response.rs | 0 .../types}/service_types/option_set.rs | 0 .../types}/service_types/orientation.rs | 0 .../types}/service_types/parsing_result.rs | 0 .../program_diagnostic_2_data_type.rs | 0 .../program_diagnostic_data_type.rs | 0 .../pub_sub_configuration_data_type.rs | 0 .../pub_sub_connection_data_type.rs | 0 .../service_types/pub_sub_group_data_type.rs | 0 .../types}/service_types/publish_request.rs | 0 .../types}/service_types/publish_response.rs | 0 .../published_data_items_data_type.rs | 0 .../published_data_set_data_type.rs | 0 .../published_data_set_source_data_type.rs | 0 .../published_events_data_type.rs | 0 .../published_variable_data_type.rs | 0 .../service_types/query_data_description.rs | 0 .../types}/service_types/query_data_set.rs | 0 .../service_types/query_first_request.rs | 0 .../service_types/query_first_response.rs | 0 .../service_types/query_next_request.rs | 0 .../service_types/query_next_response.rs | 0 .../src => src/types}/service_types/range.rs | 0 .../types}/service_types/rational_number.rs | 0 .../read_annotation_data_details.rs | 0 .../service_types/read_at_time_details.rs | 0 .../service_types/read_event_details.rs | 0 .../service_types/read_processed_details.rs | 0 .../read_raw_modified_details.rs | 0 .../types}/service_types/read_request.rs | 0 .../types}/service_types/read_response.rs | 0 .../types}/service_types/read_value_id.rs | 0 .../service_types/reader_group_data_type.rs | 0 .../reader_group_message_data_type.rs | 0 .../reader_group_transport_data_type.rs | 0 .../redundant_server_data_type.rs | 0 .../service_types/reference_description.rs | 0 .../reference_type_attributes.rs | 0 .../service_types/register_nodes_request.rs | 0 .../service_types/register_nodes_response.rs | 0 .../register_server_2_request.rs | 0 .../register_server_2_response.rs | 0 .../service_types/register_server_request.rs | 0 .../service_types/register_server_response.rs | 0 .../types}/service_types/registered_server.rs | 0 .../types}/service_types/relative_path.rs | 0 .../service_types/relative_path_element.rs | 0 .../types}/service_types/republish_request.rs | 0 .../service_types/republish_response.rs | 0 .../service_types/role_permission_type.rs | 0 ...sampling_interval_diagnostics_data_type.rs | 0 .../semantic_change_structure_data_type.rs | 0 .../server_diagnostics_summary_data_type.rs | 0 .../types}/service_types/server_on_network.rs | 0 .../service_types/server_status_data_type.rs | 0 .../service_counter_data_type.rs | 0 .../types}/service_types/service_fault.rs | 0 .../session_diagnostics_data_type.rs | 0 .../session_security_diagnostics_data_type.rs | 0 .../sessionless_invoke_request_type.rs | 0 .../sessionless_invoke_response_type.rs | 0 .../set_monitoring_mode_request.rs | 0 .../set_monitoring_mode_response.rs | 0 .../set_publishing_mode_request.rs | 0 .../set_publishing_mode_response.rs | 0 .../service_types/set_triggering_request.rs | 0 .../service_types/set_triggering_response.rs | 0 .../types}/service_types/signature_data.rs | 0 .../signed_software_certificate.rs | 0 .../service_types/simple_attribute_operand.rs | 0 .../service_types/simple_type_description.rs | 0 .../status_change_notification.rs | 0 .../types}/service_types/status_result.rs | 0 .../service_types/structure_definition.rs | 0 .../service_types/structure_description.rs | 0 .../types}/service_types/structure_field.rs | 0 .../subscribed_data_set_data_type.rs | 0 .../subscribed_data_set_mirror_data_type.rs | 0 .../subscription_acknowledgement.rs | 0 .../subscription_diagnostics_data_type.rs | 0 .../target_variables_data_type.rs | 0 .../three_d_cartesian_coordinates.rs | 0 .../types}/service_types/three_d_frame.rs | 0 .../service_types/three_d_orientation.rs | 0 .../types}/service_types/three_d_vector.rs | 0 .../service_types/time_zone_data_type.rs | 0 .../types}/service_types/transfer_result.rs | 0 .../transfer_subscriptions_request.rs | 0 .../transfer_subscriptions_response.rs | 0 ...nslate_browse_paths_to_node_ids_request.rs | 0 ...slate_browse_paths_to_node_ids_response.rs | 0 .../service_types/trust_list_data_type.rs | 0 .../service_types/ua_binary_file_data_type.rs | 0 .../uadp_data_set_reader_message_data_type.rs | 0 .../uadp_data_set_writer_message_data_type.rs | 0 .../uadp_writer_group_message_data_type.rs | 0 .../service_types/unregister_nodes_request.rs | 0 .../unregister_nodes_response.rs | 0 .../service_types/update_data_details.rs | 0 .../service_types/update_event_details.rs | 0 .../update_structure_data_details.rs | 0 .../service_types/user_identity_token.rs | 0 .../service_types/user_name_identity_token.rs | 0 .../types}/service_types/user_token_policy.rs | 0 .../service_types/variable_attributes.rs | 0 .../service_types/variable_type_attributes.rs | 0 .../src => src/types}/service_types/vector.rs | 0 .../types}/service_types/view_attributes.rs | 0 .../types}/service_types/view_description.rs | 0 .../types}/service_types/write_request.rs | 0 .../types}/service_types/write_response.rs | 0 .../types}/service_types/write_value.rs | 0 .../service_types/writer_group_data_type.rs | 0 .../writer_group_message_data_type.rs | 0 .../writer_group_transport_data_type.rs | 0 .../service_types/x_509_identity_token.rs | 0 .../types}/service_types/xv_type.rs | 0 {types/src => src/types}/status_code.rs | 0 {types/src => src/types}/status_codes.rs | 0 {types/src => src/types}/string.rs | 0 {types/src => src/types}/tests/date_time.rs | 0 {types/src => src/types}/tests/encoding.rs | 0 {types/src => src/types}/tests/mod.rs | 0 {types/src => src/types}/tests/node_id.rs | 0 {types/src => src/types}/tests/serde.rs | 0 {types/src => src/types}/tests/variant.rs | 0 {types/src => src/types}/variant.rs | 0 types/Cargo.toml | 27 - types/types.iml | 17 - 534 files changed, 369 insertions(+), 1548 deletions(-) delete mode 100644 client/Cargo.toml delete mode 100644 client/client.iml delete mode 100644 console-logging/Cargo.toml delete mode 100644 core/Cargo.toml delete mode 100644 core/core.iml delete mode 100644 crypto/Cargo.toml delete mode 100644 server/Cargo.toml rename {client/src => src/client}/builder.rs (100%) rename {client/src => src/client}/callbacks.rs (100%) rename {client/src => src/client}/client.rs (100%) rename {client/src => src/client}/comms/mod.rs (100%) rename {client/src => src/client}/comms/tcp_transport.rs (100%) rename {client/src => src/client}/comms/transport.rs (100%) rename {client/src => src/client}/config.rs (100%) rename {client/src => src/client}/message_queue.rs (100%) rename client/src/lib.rs => src/client/mod.rs (97%) rename {client/src => src/client}/session/mod.rs (100%) rename {client/src => src/client}/session/services.rs (100%) rename {client/src => src/client}/session/session.rs (100%) rename {client/src => src/client}/session/session_state.rs (100%) rename {client/src => src/client}/session_retry_policy.rs (100%) rename {client/src => src/client}/subscription.rs (100%) rename {client/src => src/client}/subscription_state.rs (100%) rename {client/src => src/client}/tests/mod.rs (100%) rename console-logging/src/lib.rs => src/console-logging/mod.rs (96%) rename {core/src => src/core}/comms/chunker.rs (100%) rename {core/src => src/core}/comms/message_chunk.rs (100%) rename {core/src => src/core}/comms/message_chunk_info.rs (100%) rename {core/src => src/core}/comms/message_writer.rs (100%) rename {core/src => src/core}/comms/mod.rs (100%) rename {core/src => src/core}/comms/secure_channel.rs (100%) rename {core/src => src/core}/comms/security_header.rs (100%) rename {core/src => src/core}/comms/tcp_codec.rs (100%) rename {core/src => src/core}/comms/tcp_types.rs (100%) rename {core/src => src/core}/comms/url.rs (100%) rename {core/src => src/core}/config.rs (100%) rename {core => src/core}/fuzz/.gitignore (100%) rename {core => src/core}/fuzz/Cargo.lock (100%) rename {core => src/core}/fuzz/Cargo.toml (100%) rename {core => src/core}/fuzz/fuzz_targets/fuzz_comms.rs (100%) rename {core/src => src/core}/handle.rs (100%) rename core/src/lib.rs => src/core/mod.rs (97%) rename {core/src => src/core}/runtime.rs (100%) rename {core/src => src/core}/supported_message.rs (100%) rename {core/src => src/core}/tests/chunk.rs (100%) rename {core/src => src/core}/tests/comms.rs (100%) rename {core/src => src/core}/tests/hello.rs (100%) rename {core/src => src/core}/tests/mod.rs (100%) rename {core/src => src/core}/tests/secure_channel.rs (100%) rename {core/src => src/core}/tests/services.rs (100%) rename {core/src => src/core}/tests/supported_message.rs (100%) rename {core/src => src/core}/tests/test_data/our_cert.der (100%) rename {core/src => src/core}/tests/test_data/our_private.pem (100%) rename {core/src => src/core}/tests/test_data/their_cert.der (100%) rename {core/src => src/core}/tests/test_data/their_private.pem (100%) rename {core/src => src/core}/tests/url.rs (100%) rename {crypto/src => src/crypto}/aeskey.rs (100%) rename {crypto/src => src/crypto}/certificate_store.rs (100%) rename {crypto/src => src/crypto}/hash.rs (100%) rename crypto/src/lib.rs => src/crypto/mod.rs (98%) rename {crypto/src => src/crypto}/pkey.rs (100%) rename {crypto/src => src/crypto}/random.rs (100%) rename {crypto/src => src/crypto}/security_policy.rs (100%) rename {crypto/src => src/crypto}/tests/authentication.rs (100%) rename {crypto/src => src/crypto}/tests/crypto.rs (100%) rename {crypto/src => src/crypto}/tests/mod.rs (100%) rename {crypto/src => src/crypto}/tests/security_policy.rs (100%) rename {crypto/src => src/crypto}/thumbprint.rs (100%) rename {crypto/src => src/crypto}/user_identity.rs (100%) rename {crypto/src => src/crypto}/x509.rs (100%) create mode 100644 src/lib.rs rename {server/src => src/server}/address_space/address_space.rs (100%) rename {server/src => src/server}/address_space/base.rs (100%) rename {server/src => src/server}/address_space/data_type.rs (100%) rename {server/src => src/server}/address_space/generated/mod.rs (100%) rename {server/src => src/server}/address_space/generated/nodeset_10.rs (100%) rename {server/src => src/server}/address_space/generated/nodeset_11.rs (100%) rename {server/src => src/server}/address_space/generated/nodeset_12_1.rs (100%) rename {server/src => src/server}/address_space/generated/nodeset_12_2.rs (100%) rename {server/src => src/server}/address_space/generated/nodeset_12_3.rs (100%) rename {server/src => src/server}/address_space/generated/nodeset_12_4.rs (100%) rename {server/src => src/server}/address_space/generated/nodeset_13.rs (100%) rename {server/src => src/server}/address_space/generated/nodeset_14.rs (100%) rename {server/src => src/server}/address_space/generated/nodeset_14_1.rs (100%) rename {server/src => src/server}/address_space/generated/nodeset_14_10.rs (100%) rename {server/src => src/server}/address_space/generated/nodeset_14_11.rs (100%) rename {server/src => src/server}/address_space/generated/nodeset_14_2.rs (100%) rename {server/src => src/server}/address_space/generated/nodeset_14_3.rs (100%) rename {server/src => src/server}/address_space/generated/nodeset_14_4.rs (100%) rename {server/src => src/server}/address_space/generated/nodeset_14_5.rs (100%) rename {server/src => src/server}/address_space/generated/nodeset_14_6.rs (100%) rename {server/src => src/server}/address_space/generated/nodeset_14_7.rs (100%) rename {server/src => src/server}/address_space/generated/nodeset_14_8.rs (100%) rename {server/src => src/server}/address_space/generated/nodeset_14_9.rs (100%) rename {server/src => src/server}/address_space/generated/nodeset_3.rs (100%) rename {server/src => src/server}/address_space/generated/nodeset_3_1.rs (100%) rename {server/src => src/server}/address_space/generated/nodeset_3_2.rs (100%) rename {server/src => src/server}/address_space/generated/nodeset_4_1.rs (100%) rename {server/src => src/server}/address_space/generated/nodeset_4_2.rs (100%) rename {server/src => src/server}/address_space/generated/nodeset_4_3.rs (100%) rename {server/src => src/server}/address_space/generated/nodeset_4_4.rs (100%) rename {server/src => src/server}/address_space/generated/nodeset_4_5.rs (100%) rename {server/src => src/server}/address_space/generated/nodeset_4_6.rs (100%) rename {server/src => src/server}/address_space/generated/nodeset_4_7.rs (100%) rename {server/src => src/server}/address_space/generated/nodeset_4_8.rs (100%) rename {server/src => src/server}/address_space/generated/nodeset_5_1.rs (100%) rename {server/src => src/server}/address_space/generated/nodeset_5_10.rs (100%) rename {server/src => src/server}/address_space/generated/nodeset_5_11.rs (100%) rename {server/src => src/server}/address_space/generated/nodeset_5_12.rs (100%) rename {server/src => src/server}/address_space/generated/nodeset_5_13.rs (100%) rename {server/src => src/server}/address_space/generated/nodeset_5_14.rs (100%) rename {server/src => src/server}/address_space/generated/nodeset_5_15.rs (100%) rename {server/src => src/server}/address_space/generated/nodeset_5_16.rs (100%) rename {server/src => src/server}/address_space/generated/nodeset_5_2.rs (100%) rename {server/src => src/server}/address_space/generated/nodeset_5_3.rs (100%) rename {server/src => src/server}/address_space/generated/nodeset_5_4.rs (100%) rename {server/src => src/server}/address_space/generated/nodeset_5_5.rs (100%) rename {server/src => src/server}/address_space/generated/nodeset_5_6.rs (100%) rename {server/src => src/server}/address_space/generated/nodeset_5_7.rs (100%) rename {server/src => src/server}/address_space/generated/nodeset_5_8.rs (100%) rename {server/src => src/server}/address_space/generated/nodeset_5_9.rs (100%) rename {server/src => src/server}/address_space/generated/nodeset_8.rs (100%) rename {server/src => src/server}/address_space/generated/nodeset_999.rs (100%) rename {server/src => src/server}/address_space/generated/nodeset_9_1.rs (100%) rename {server/src => src/server}/address_space/generated/nodeset_9_2.rs (100%) rename {server/src => src/server}/address_space/generated/nodeset_9_3.rs (100%) rename {server/src => src/server}/address_space/generated/nodeset_9_4.rs (100%) rename {server/src => src/server}/address_space/method.rs (100%) rename {server/src => src/server}/address_space/method_impls.rs (100%) rename {server/src => src/server}/address_space/mod.rs (100%) rename {server/src => src/server}/address_space/node.rs (100%) rename {server/src => src/server}/address_space/object.rs (100%) rename {server/src => src/server}/address_space/object_type.rs (100%) rename {server/src => src/server}/address_space/reference_type.rs (100%) rename {server/src => src/server}/address_space/references.rs (100%) rename {server/src => src/server}/address_space/relative_path.rs (100%) rename {server/src => src/server}/address_space/variable.rs (100%) rename {server/src => src/server}/address_space/variable_type.rs (100%) rename {server/src => src/server}/address_space/view.rs (100%) rename {server => src/server}/benches/address_space.rs (100%) rename {server/src => src/server}/builder.rs (100%) rename {server/src => src/server}/callbacks.rs (100%) rename {server/src => src/server}/comms/mod.rs (100%) rename {server/src => src/server}/comms/secure_channel_service.rs (100%) rename {server/src => src/server}/comms/tcp_transport.rs (100%) rename {server/src => src/server}/comms/transport.rs (100%) rename {server/src => src/server}/config.rs (100%) rename {server/src => src/server}/continuation_point.rs (100%) rename {server/src => src/server}/diagnostics.rs (100%) rename {server/src => src/server}/discovery/mod.rs (100%) rename {server/src => src/server}/events/audit/cancel_event.rs (100%) rename {server/src => src/server}/events/audit/certificate_events.rs (100%) rename {server/src => src/server}/events/audit/event.rs (100%) rename {server/src => src/server}/events/audit/mod.rs (100%) rename {server/src => src/server}/events/audit/node_management_event.rs (100%) rename {server/src => src/server}/events/audit/security_event.rs (100%) rename {server/src => src/server}/events/audit/session_events.rs (100%) rename {server/src => src/server}/events/event.rs (100%) rename {server/src => src/server}/events/event_filter.rs (100%) rename {server/src => src/server}/events/mod.rs (100%) rename {server/src => src/server}/events/operator.rs (100%) rename {server/src => src/server}/historical/mod.rs (100%) rename {server => src/server}/html/index.html (100%) rename {server/src => src/server}/http/mod.rs (100%) rename {server/src => src/server}/identity_token.rs (100%) rename {server/src => src/server}/metrics.rs (100%) rename server/src/lib.rs => src/server/mod.rs (95%) rename {server => src/server}/server.iml (100%) rename {server/src => src/server}/server.rs (100%) rename {server/src => src/server}/services/attribute.rs (100%) rename {server/src => src/server}/services/audit.rs (100%) rename {server/src => src/server}/services/discovery.rs (100%) rename {server/src => src/server}/services/message_handler.rs (100%) rename {server/src => src/server}/services/method.rs (100%) rename {server/src => src/server}/services/mod.rs (100%) rename {server/src => src/server}/services/monitored_item.rs (100%) rename {server/src => src/server}/services/node_management.rs (100%) rename {server/src => src/server}/services/query.rs (100%) rename {server/src => src/server}/services/session.rs (100%) rename {server/src => src/server}/services/subscription.rs (100%) rename {server/src => src/server}/services/view.rs (100%) rename {server/src => src/server}/session.rs (100%) rename {server/src => src/server}/session_diagnostics.rs (100%) rename {server/src => src/server}/state.rs (100%) rename {server/src => src/server}/subscriptions/mod.rs (100%) rename {server/src => src/server}/subscriptions/monitored_item.rs (100%) rename {server/src => src/server}/subscriptions/subscription.rs (100%) rename {server/src => src/server}/subscriptions/subscriptions.rs (100%) rename {server/src => src/server}/tests/address_space.rs (100%) rename {server/src => src/server}/tests/events.rs (100%) rename {server/src => src/server}/tests/mod.rs (100%) rename {server/src => src/server}/tests/services/attribute.rs (100%) rename {server/src => src/server}/tests/services/discovery.rs (100%) rename {server/src => src/server}/tests/services/method.rs (100%) rename {server/src => src/server}/tests/services/mod.rs (100%) rename {server/src => src/server}/tests/services/monitored_item.rs (100%) rename {server/src => src/server}/tests/services/node_management.rs (100%) rename {server/src => src/server}/tests/services/session.rs (100%) rename {server/src => src/server}/tests/services/subscription.rs (100%) rename {server/src => src/server}/tests/services/view.rs (100%) rename {server/src => src/server}/tests/subscriptions/mod.rs (100%) rename {server/src => src/server}/tests/subscriptions/subscription.rs (100%) rename {server/src => src/server}/tests/subscriptions/subscriptions.rs (100%) rename {server/src => src/server}/util/mod.rs (100%) rename {types/src => src/types}/argument.rs (100%) rename {types/src => src/types}/array.rs (100%) rename {types/src => src/types}/attribute.rs (100%) rename {types/src => src/types}/basic_types.rs (100%) rename {types/src => src/types}/byte_string.rs (100%) rename {types/src => src/types}/data_types.rs (100%) rename {types/src => src/types}/data_value.rs (100%) rename {types/src => src/types}/date_time.rs (100%) rename {types/src => src/types}/diagnostic_info.rs (100%) rename {types/src => src/types}/encoding.rs (100%) rename {types/src => src/types}/extension_object.rs (100%) rename {types => src/types}/fuzz/.gitignore (100%) rename {types => src/types}/fuzz/Cargo.lock (100%) rename {types => src/types}/fuzz/Cargo.toml (100%) rename {types => src/types}/fuzz/fuzz_targets/fuzz_deserialize.rs (100%) rename {types/src => src/types}/guid.rs (100%) rename {types/src => src/types}/localized_text.rs (100%) rename types/src/lib.rs => src/types/mod.rs (97%) rename {types/src => src/types}/node_id.rs (100%) rename {types/src => src/types}/node_ids.rs (100%) rename {types/src => src/types}/notification_message.rs (100%) rename {types/src => src/types}/numeric_range.rs (100%) rename {types/src => src/types}/operand.rs (100%) rename {types/src => src/types}/qualified_name.rs (100%) rename {types/src => src/types}/relative_path.rs (100%) rename {types/src => src/types}/request_header.rs (100%) rename {types/src => src/types}/response_header.rs (100%) rename {types/src => src/types}/service_types/activate_session_request.rs (100%) rename {types/src => src/types}/service_types/activate_session_response.rs (100%) rename {types/src => src/types}/service_types/add_nodes_item.rs (100%) rename {types/src => src/types}/service_types/add_nodes_request.rs (100%) rename {types/src => src/types}/service_types/add_nodes_response.rs (100%) rename {types/src => src/types}/service_types/add_nodes_result.rs (100%) rename {types/src => src/types}/service_types/add_references_item.rs (100%) rename {types/src => src/types}/service_types/add_references_request.rs (100%) rename {types/src => src/types}/service_types/add_references_response.rs (100%) rename {types/src => src/types}/service_types/additional_parameters_type.rs (100%) rename {types/src => src/types}/service_types/aggregate_configuration.rs (100%) rename {types/src => src/types}/service_types/aggregate_filter.rs (100%) rename {types/src => src/types}/service_types/aggregate_filter_result.rs (100%) rename {types/src => src/types}/service_types/alias_name_data_type.rs (100%) rename {types/src => src/types}/service_types/annotation.rs (100%) rename {types/src => src/types}/service_types/anonymous_identity_token.rs (100%) rename {types/src => src/types}/service_types/application_description.rs (100%) rename {types/src => src/types}/service_types/argument.rs (100%) rename {types/src => src/types}/service_types/attribute_operand.rs (100%) rename {types/src => src/types}/service_types/axis_information.rs (100%) rename {types/src => src/types}/service_types/broker_connection_transport_data_type.rs (100%) rename {types/src => src/types}/service_types/broker_data_set_reader_transport_data_type.rs (100%) rename {types/src => src/types}/service_types/broker_data_set_writer_transport_data_type.rs (100%) rename {types/src => src/types}/service_types/broker_writer_group_transport_data_type.rs (100%) rename {types/src => src/types}/service_types/browse_description.rs (100%) rename {types/src => src/types}/service_types/browse_next_request.rs (100%) rename {types/src => src/types}/service_types/browse_next_response.rs (100%) rename {types/src => src/types}/service_types/browse_path.rs (100%) rename {types/src => src/types}/service_types/browse_path_result.rs (100%) rename {types/src => src/types}/service_types/browse_path_target.rs (100%) rename {types/src => src/types}/service_types/browse_request.rs (100%) rename {types/src => src/types}/service_types/browse_response.rs (100%) rename {types/src => src/types}/service_types/browse_result.rs (100%) rename {types/src => src/types}/service_types/build_info.rs (100%) rename {types/src => src/types}/service_types/call_method_request.rs (100%) rename {types/src => src/types}/service_types/call_method_result.rs (100%) rename {types/src => src/types}/service_types/call_request.rs (100%) rename {types/src => src/types}/service_types/call_response.rs (100%) rename {types/src => src/types}/service_types/cancel_request.rs (100%) rename {types/src => src/types}/service_types/cancel_response.rs (100%) rename {types/src => src/types}/service_types/cartesian_coordinates.rs (100%) rename {types/src => src/types}/service_types/channel_security_token.rs (100%) rename {types/src => src/types}/service_types/close_secure_channel_request.rs (100%) rename {types/src => src/types}/service_types/close_secure_channel_response.rs (100%) rename {types/src => src/types}/service_types/close_session_request.rs (100%) rename {types/src => src/types}/service_types/close_session_response.rs (100%) rename {types/src => src/types}/service_types/complex_number_type.rs (100%) rename {types/src => src/types}/service_types/configuration_version_data_type.rs (100%) rename {types/src => src/types}/service_types/connection_transport_data_type.rs (100%) rename {types/src => src/types}/service_types/content_filter.rs (100%) rename {types/src => src/types}/service_types/content_filter_element.rs (100%) rename {types/src => src/types}/service_types/content_filter_element_result.rs (100%) rename {types/src => src/types}/service_types/content_filter_result.rs (100%) rename {types/src => src/types}/service_types/create_monitored_items_request.rs (100%) rename {types/src => src/types}/service_types/create_monitored_items_response.rs (100%) rename {types/src => src/types}/service_types/create_session_request.rs (100%) rename {types/src => src/types}/service_types/create_session_response.rs (100%) rename {types/src => src/types}/service_types/create_subscription_request.rs (100%) rename {types/src => src/types}/service_types/create_subscription_response.rs (100%) rename {types/src => src/types}/service_types/currency_unit_type.rs (100%) rename {types/src => src/types}/service_types/data_change_filter.rs (100%) rename {types/src => src/types}/service_types/data_change_notification.rs (100%) rename {types/src => src/types}/service_types/data_set_meta_data_type.rs (100%) rename {types/src => src/types}/service_types/data_set_reader_data_type.rs (100%) rename {types/src => src/types}/service_types/data_set_reader_message_data_type.rs (100%) rename {types/src => src/types}/service_types/data_set_reader_transport_data_type.rs (100%) rename {types/src => src/types}/service_types/data_set_writer_data_type.rs (100%) rename {types/src => src/types}/service_types/data_set_writer_message_data_type.rs (100%) rename {types/src => src/types}/service_types/data_set_writer_transport_data_type.rs (100%) rename {types/src => src/types}/service_types/data_type_attributes.rs (100%) rename {types/src => src/types}/service_types/data_type_description.rs (100%) rename {types/src => src/types}/service_types/data_type_schema_header.rs (100%) rename {types/src => src/types}/service_types/datagram_connection_transport_data_type.rs (100%) rename {types/src => src/types}/service_types/datagram_writer_group_transport_data_type.rs (100%) rename {types/src => src/types}/service_types/decimal_data_type.rs (100%) rename {types/src => src/types}/service_types/delete_at_time_details.rs (100%) rename {types/src => src/types}/service_types/delete_event_details.rs (100%) rename {types/src => src/types}/service_types/delete_monitored_items_request.rs (100%) rename {types/src => src/types}/service_types/delete_monitored_items_response.rs (100%) rename {types/src => src/types}/service_types/delete_nodes_item.rs (100%) rename {types/src => src/types}/service_types/delete_nodes_request.rs (100%) rename {types/src => src/types}/service_types/delete_nodes_response.rs (100%) rename {types/src => src/types}/service_types/delete_raw_modified_details.rs (100%) rename {types/src => src/types}/service_types/delete_references_item.rs (100%) rename {types/src => src/types}/service_types/delete_references_request.rs (100%) rename {types/src => src/types}/service_types/delete_references_response.rs (100%) rename {types/src => src/types}/service_types/delete_subscriptions_request.rs (100%) rename {types/src => src/types}/service_types/delete_subscriptions_response.rs (100%) rename {types/src => src/types}/service_types/discovery_configuration.rs (100%) rename {types/src => src/types}/service_types/double_complex_number_type.rs (100%) rename {types/src => src/types}/service_types/element_operand.rs (100%) rename {types/src => src/types}/service_types/endpoint_configuration.rs (100%) rename {types/src => src/types}/service_types/endpoint_description.rs (100%) rename {types/src => src/types}/service_types/endpoint_type.rs (100%) rename {types/src => src/types}/service_types/endpoint_url_list_data_type.rs (100%) rename {types/src => src/types}/service_types/enum_definition.rs (100%) rename {types/src => src/types}/service_types/enum_description.rs (100%) rename {types/src => src/types}/service_types/enum_field.rs (100%) rename {types/src => src/types}/service_types/enum_value_type.rs (100%) rename {types/src => src/types}/service_types/enums.rs (100%) rename {types/src => src/types}/service_types/ephemeral_key_type.rs (100%) rename {types/src => src/types}/service_types/eu_information.rs (100%) rename {types/src => src/types}/service_types/event_field_list.rs (100%) rename {types/src => src/types}/service_types/event_filter.rs (100%) rename {types/src => src/types}/service_types/event_filter_result.rs (100%) rename {types/src => src/types}/service_types/event_notification_list.rs (100%) rename {types/src => src/types}/service_types/field_meta_data.rs (100%) rename {types/src => src/types}/service_types/field_target_data_type.rs (100%) rename {types/src => src/types}/service_types/filter_operand.rs (100%) rename {types/src => src/types}/service_types/find_servers_on_network_request.rs (100%) rename {types/src => src/types}/service_types/find_servers_on_network_response.rs (100%) rename {types/src => src/types}/service_types/find_servers_request.rs (100%) rename {types/src => src/types}/service_types/find_servers_response.rs (100%) rename {types/src => src/types}/service_types/frame.rs (100%) rename {types/src => src/types}/service_types/generic_attribute_value.rs (100%) rename {types/src => src/types}/service_types/generic_attributes.rs (100%) rename {types/src => src/types}/service_types/get_endpoints_request.rs (100%) rename {types/src => src/types}/service_types/get_endpoints_response.rs (100%) rename {types/src => src/types}/service_types/history_data.rs (100%) rename {types/src => src/types}/service_types/history_event.rs (100%) rename {types/src => src/types}/service_types/history_event_field_list.rs (100%) rename {types/src => src/types}/service_types/history_modified_data.rs (100%) rename {types/src => src/types}/service_types/history_read_details.rs (100%) rename {types/src => src/types}/service_types/history_read_request.rs (100%) rename {types/src => src/types}/service_types/history_read_response.rs (100%) rename {types/src => src/types}/service_types/history_read_result.rs (100%) rename {types/src => src/types}/service_types/history_read_value_id.rs (100%) rename {types/src => src/types}/service_types/history_update_details.rs (100%) rename {types/src => src/types}/service_types/history_update_request.rs (100%) rename {types/src => src/types}/service_types/history_update_response.rs (100%) rename {types/src => src/types}/service_types/history_update_result.rs (100%) rename {types/src => src/types}/service_types/identity_mapping_rule_type.rs (100%) rename {types/src => src/types}/service_types/impls.rs (100%) rename {types/src => src/types}/service_types/issued_identity_token.rs (100%) rename {types/src => src/types}/service_types/json_data_set_reader_message_data_type.rs (100%) rename {types/src => src/types}/service_types/json_data_set_writer_message_data_type.rs (100%) rename {types/src => src/types}/service_types/json_writer_group_message_data_type.rs (100%) rename {types/src => src/types}/service_types/key_value_pair.rs (100%) rename {types/src => src/types}/service_types/literal_operand.rs (100%) rename {types/src => src/types}/service_types/mdns_discovery_configuration.rs (100%) rename {types/src => src/types}/service_types/method_attributes.rs (100%) rename {types/src => src/types}/service_types/mod.rs (100%) rename {types/src => src/types}/service_types/model_change_structure_data_type.rs (100%) rename {types/src => src/types}/service_types/modification_info.rs (100%) rename {types/src => src/types}/service_types/modify_monitored_items_request.rs (100%) rename {types/src => src/types}/service_types/modify_monitored_items_response.rs (100%) rename {types/src => src/types}/service_types/modify_subscription_request.rs (100%) rename {types/src => src/types}/service_types/modify_subscription_response.rs (100%) rename {types/src => src/types}/service_types/monitored_item_create_request.rs (100%) rename {types/src => src/types}/service_types/monitored_item_create_result.rs (100%) rename {types/src => src/types}/service_types/monitored_item_modify_request.rs (100%) rename {types/src => src/types}/service_types/monitored_item_modify_result.rs (100%) rename {types/src => src/types}/service_types/monitored_item_notification.rs (100%) rename {types/src => src/types}/service_types/monitoring_filter.rs (100%) rename {types/src => src/types}/service_types/monitoring_filter_result.rs (100%) rename {types/src => src/types}/service_types/monitoring_parameters.rs (100%) rename {types/src => src/types}/service_types/network_address_data_type.rs (100%) rename {types/src => src/types}/service_types/network_address_url_data_type.rs (100%) rename {types/src => src/types}/service_types/network_group_data_type.rs (100%) rename {types/src => src/types}/service_types/node_attributes.rs (100%) rename {types/src => src/types}/service_types/node_reference.rs (100%) rename {types/src => src/types}/service_types/node_type_description.rs (100%) rename {types/src => src/types}/service_types/notification_data.rs (100%) rename {types/src => src/types}/service_types/notification_message.rs (100%) rename {types/src => src/types}/service_types/object_attributes.rs (100%) rename {types/src => src/types}/service_types/object_type_attributes.rs (100%) rename {types/src => src/types}/service_types/open_secure_channel_request.rs (100%) rename {types/src => src/types}/service_types/open_secure_channel_response.rs (100%) rename {types/src => src/types}/service_types/option_set.rs (100%) rename {types/src => src/types}/service_types/orientation.rs (100%) rename {types/src => src/types}/service_types/parsing_result.rs (100%) rename {types/src => src/types}/service_types/program_diagnostic_2_data_type.rs (100%) rename {types/src => src/types}/service_types/program_diagnostic_data_type.rs (100%) rename {types/src => src/types}/service_types/pub_sub_configuration_data_type.rs (100%) rename {types/src => src/types}/service_types/pub_sub_connection_data_type.rs (100%) rename {types/src => src/types}/service_types/pub_sub_group_data_type.rs (100%) rename {types/src => src/types}/service_types/publish_request.rs (100%) rename {types/src => src/types}/service_types/publish_response.rs (100%) rename {types/src => src/types}/service_types/published_data_items_data_type.rs (100%) rename {types/src => src/types}/service_types/published_data_set_data_type.rs (100%) rename {types/src => src/types}/service_types/published_data_set_source_data_type.rs (100%) rename {types/src => src/types}/service_types/published_events_data_type.rs (100%) rename {types/src => src/types}/service_types/published_variable_data_type.rs (100%) rename {types/src => src/types}/service_types/query_data_description.rs (100%) rename {types/src => src/types}/service_types/query_data_set.rs (100%) rename {types/src => src/types}/service_types/query_first_request.rs (100%) rename {types/src => src/types}/service_types/query_first_response.rs (100%) rename {types/src => src/types}/service_types/query_next_request.rs (100%) rename {types/src => src/types}/service_types/query_next_response.rs (100%) rename {types/src => src/types}/service_types/range.rs (100%) rename {types/src => src/types}/service_types/rational_number.rs (100%) rename {types/src => src/types}/service_types/read_annotation_data_details.rs (100%) rename {types/src => src/types}/service_types/read_at_time_details.rs (100%) rename {types/src => src/types}/service_types/read_event_details.rs (100%) rename {types/src => src/types}/service_types/read_processed_details.rs (100%) rename {types/src => src/types}/service_types/read_raw_modified_details.rs (100%) rename {types/src => src/types}/service_types/read_request.rs (100%) rename {types/src => src/types}/service_types/read_response.rs (100%) rename {types/src => src/types}/service_types/read_value_id.rs (100%) rename {types/src => src/types}/service_types/reader_group_data_type.rs (100%) rename {types/src => src/types}/service_types/reader_group_message_data_type.rs (100%) rename {types/src => src/types}/service_types/reader_group_transport_data_type.rs (100%) rename {types/src => src/types}/service_types/redundant_server_data_type.rs (100%) rename {types/src => src/types}/service_types/reference_description.rs (100%) rename {types/src => src/types}/service_types/reference_type_attributes.rs (100%) rename {types/src => src/types}/service_types/register_nodes_request.rs (100%) rename {types/src => src/types}/service_types/register_nodes_response.rs (100%) rename {types/src => src/types}/service_types/register_server_2_request.rs (100%) rename {types/src => src/types}/service_types/register_server_2_response.rs (100%) rename {types/src => src/types}/service_types/register_server_request.rs (100%) rename {types/src => src/types}/service_types/register_server_response.rs (100%) rename {types/src => src/types}/service_types/registered_server.rs (100%) rename {types/src => src/types}/service_types/relative_path.rs (100%) rename {types/src => src/types}/service_types/relative_path_element.rs (100%) rename {types/src => src/types}/service_types/republish_request.rs (100%) rename {types/src => src/types}/service_types/republish_response.rs (100%) rename {types/src => src/types}/service_types/role_permission_type.rs (100%) rename {types/src => src/types}/service_types/sampling_interval_diagnostics_data_type.rs (100%) rename {types/src => src/types}/service_types/semantic_change_structure_data_type.rs (100%) rename {types/src => src/types}/service_types/server_diagnostics_summary_data_type.rs (100%) rename {types/src => src/types}/service_types/server_on_network.rs (100%) rename {types/src => src/types}/service_types/server_status_data_type.rs (100%) rename {types/src => src/types}/service_types/service_counter_data_type.rs (100%) rename {types/src => src/types}/service_types/service_fault.rs (100%) rename {types/src => src/types}/service_types/session_diagnostics_data_type.rs (100%) rename {types/src => src/types}/service_types/session_security_diagnostics_data_type.rs (100%) rename {types/src => src/types}/service_types/sessionless_invoke_request_type.rs (100%) rename {types/src => src/types}/service_types/sessionless_invoke_response_type.rs (100%) rename {types/src => src/types}/service_types/set_monitoring_mode_request.rs (100%) rename {types/src => src/types}/service_types/set_monitoring_mode_response.rs (100%) rename {types/src => src/types}/service_types/set_publishing_mode_request.rs (100%) rename {types/src => src/types}/service_types/set_publishing_mode_response.rs (100%) rename {types/src => src/types}/service_types/set_triggering_request.rs (100%) rename {types/src => src/types}/service_types/set_triggering_response.rs (100%) rename {types/src => src/types}/service_types/signature_data.rs (100%) rename {types/src => src/types}/service_types/signed_software_certificate.rs (100%) rename {types/src => src/types}/service_types/simple_attribute_operand.rs (100%) rename {types/src => src/types}/service_types/simple_type_description.rs (100%) rename {types/src => src/types}/service_types/status_change_notification.rs (100%) rename {types/src => src/types}/service_types/status_result.rs (100%) rename {types/src => src/types}/service_types/structure_definition.rs (100%) rename {types/src => src/types}/service_types/structure_description.rs (100%) rename {types/src => src/types}/service_types/structure_field.rs (100%) rename {types/src => src/types}/service_types/subscribed_data_set_data_type.rs (100%) rename {types/src => src/types}/service_types/subscribed_data_set_mirror_data_type.rs (100%) rename {types/src => src/types}/service_types/subscription_acknowledgement.rs (100%) rename {types/src => src/types}/service_types/subscription_diagnostics_data_type.rs (100%) rename {types/src => src/types}/service_types/target_variables_data_type.rs (100%) rename {types/src => src/types}/service_types/three_d_cartesian_coordinates.rs (100%) rename {types/src => src/types}/service_types/three_d_frame.rs (100%) rename {types/src => src/types}/service_types/three_d_orientation.rs (100%) rename {types/src => src/types}/service_types/three_d_vector.rs (100%) rename {types/src => src/types}/service_types/time_zone_data_type.rs (100%) rename {types/src => src/types}/service_types/transfer_result.rs (100%) rename {types/src => src/types}/service_types/transfer_subscriptions_request.rs (100%) rename {types/src => src/types}/service_types/transfer_subscriptions_response.rs (100%) rename {types/src => src/types}/service_types/translate_browse_paths_to_node_ids_request.rs (100%) rename {types/src => src/types}/service_types/translate_browse_paths_to_node_ids_response.rs (100%) rename {types/src => src/types}/service_types/trust_list_data_type.rs (100%) rename {types/src => src/types}/service_types/ua_binary_file_data_type.rs (100%) rename {types/src => src/types}/service_types/uadp_data_set_reader_message_data_type.rs (100%) rename {types/src => src/types}/service_types/uadp_data_set_writer_message_data_type.rs (100%) rename {types/src => src/types}/service_types/uadp_writer_group_message_data_type.rs (100%) rename {types/src => src/types}/service_types/unregister_nodes_request.rs (100%) rename {types/src => src/types}/service_types/unregister_nodes_response.rs (100%) rename {types/src => src/types}/service_types/update_data_details.rs (100%) rename {types/src => src/types}/service_types/update_event_details.rs (100%) rename {types/src => src/types}/service_types/update_structure_data_details.rs (100%) rename {types/src => src/types}/service_types/user_identity_token.rs (100%) rename {types/src => src/types}/service_types/user_name_identity_token.rs (100%) rename {types/src => src/types}/service_types/user_token_policy.rs (100%) rename {types/src => src/types}/service_types/variable_attributes.rs (100%) rename {types/src => src/types}/service_types/variable_type_attributes.rs (100%) rename {types/src => src/types}/service_types/vector.rs (100%) rename {types/src => src/types}/service_types/view_attributes.rs (100%) rename {types/src => src/types}/service_types/view_description.rs (100%) rename {types/src => src/types}/service_types/write_request.rs (100%) rename {types/src => src/types}/service_types/write_response.rs (100%) rename {types/src => src/types}/service_types/write_value.rs (100%) rename {types/src => src/types}/service_types/writer_group_data_type.rs (100%) rename {types/src => src/types}/service_types/writer_group_message_data_type.rs (100%) rename {types/src => src/types}/service_types/writer_group_transport_data_type.rs (100%) rename {types/src => src/types}/service_types/x_509_identity_token.rs (100%) rename {types/src => src/types}/service_types/xv_type.rs (100%) rename {types/src => src/types}/status_code.rs (100%) rename {types/src => src/types}/status_codes.rs (100%) rename {types/src => src/types}/string.rs (100%) rename {types/src => src/types}/tests/date_time.rs (100%) rename {types/src => src/types}/tests/encoding.rs (100%) rename {types/src => src/types}/tests/mod.rs (100%) rename {types/src => src/types}/tests/node_id.rs (100%) rename {types/src => src/types}/tests/serde.rs (100%) rename {types/src => src/types}/tests/variant.rs (100%) rename {types/src => src/types}/variant.rs (100%) delete mode 100644 types/Cargo.toml delete mode 100644 types/types.iml diff --git a/Cargo.lock b/Cargo.lock index b01246846..5dafbcbf7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -11,12 +11,12 @@ dependencies = [ "actix_derive", "bitflags", "bytes 0.4.12", - "crossbeam-channel 0.3.9", + "crossbeam-channel", "failure", "fnv", "futures 0.1.31", "libc", - "log 0.4.14", + "log", "parking_lot 0.7.1", "smallvec 0.6.14", "tokio 0.1.22", @@ -41,11 +41,11 @@ dependencies = [ "actix", "bytes 0.4.12", "futures 0.1.31", - "log 0.4.14", + "log", "mio 0.6.23", "net2", "num_cpus", - "slab 0.4.5", + "slab", "tokio 0.1.22", "tokio-codec", "tokio-current-thread", @@ -82,7 +82,7 @@ dependencies = [ "language-tags", "lazy_static", "lazycell", - "log 0.4.14", + "log", "mime", "mime_guess", "mio 0.6.23", @@ -96,7 +96,7 @@ dependencies = [ "serde_json", "serde_urlencoded", "sha1", - "slab 0.4.5", + "slab", "smallvec 0.6.14", "time", "tokio 0.1.22", @@ -199,27 +199,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "ansi_term" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "antidote" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34fde25430d87a9388dadbe6e34d7f72a462c8b43ac8d309b42b0a8505d7e2a5" - -[[package]] -name = "arc-swap" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc4662175ead9cd84451d5c35070517777949a2ed84551764129cedb88384841" - [[package]] name = "atty" version = "0.2.14" @@ -258,16 +237,6 @@ dependencies = [ "rustc-demangle", ] -[[package]] -name = "base64" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643" -dependencies = [ - "byteorder", - "safemem", -] - [[package]] name = "base64" version = "0.10.1" @@ -324,18 +293,6 @@ dependencies = [ "libc", ] -[[package]] -name = "bstr" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" -dependencies = [ - "lazy_static", - "memchr", - "regex-automata", - "serde", -] - [[package]] name = "byteorder" version = "1.4.3" @@ -358,15 +315,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" -[[package]] -name = "cast" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c24dab4283a142afa2fdca129b80ad2c6284e073930f964c3a1293c225ee39a" -dependencies = [ - "rustc_version 0.4.0", -] - [[package]] name = "cc" version = "1.0.72" @@ -408,17 +356,6 @@ dependencies = [ "generic-array", ] -[[package]] -name = "clap" -version = "2.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" -dependencies = [ - "bitflags", - "textwrap", - "unicode-width", -] - [[package]] name = "cloudabi" version = "0.0.3" @@ -444,22 +381,6 @@ dependencies = [ "time", ] -[[package]] -name = "core-foundation" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6888e10551bb93e424d8df1d07f1a8b4fceb0001a3a4b048bfc47554946f47b3" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" - [[package]] name = "cpufeatures" version = "0.2.1" @@ -484,44 +405,6 @@ dependencies = [ "cfg-if 1.0.0", ] -[[package]] -name = "criterion" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0363053954f3e679645fc443321ca128b7b950a6fe288cf5f9335cc22ee58394" -dependencies = [ - "atty", - "cast", - "clap", - "criterion-plot", - "csv", - "itertools", - "lazy_static", - "libc", - "num-traits", - "rand_core 0.3.1", - "rand_os", - "rand_xoshiro", - "rayon", - "rayon-core", - "serde", - "serde_derive", - "serde_json", - "tinytemplate", - "walkdir", -] - -[[package]] -name = "criterion-plot" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76f9212ddf2f4a9eb2d401635190600656a1f88a932ef53d06e7fa4c7e02fb8e" -dependencies = [ - "byteorder", - "cast", - "itertools", -] - [[package]] name = "crossbeam-channel" version = "0.3.9" @@ -531,38 +414,17 @@ dependencies = [ "crossbeam-utils 0.6.6", ] -[[package]] -name = "crossbeam-channel" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e54ea8bc3fb1ee042f5aace6e3c6e025d3874866da222930f70ce62aceba0bfa" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-utils 0.8.6", -] - [[package]] name = "crossbeam-deque" version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c20ff29ded3204c5106278a81a38f4b482636ed4fa1e6cfbeef193291beb29ed" dependencies = [ - "crossbeam-epoch 0.8.2", + "crossbeam-epoch", "crossbeam-utils 0.7.2", "maybe-uninit", ] -[[package]] -name = "crossbeam-deque" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-epoch 0.9.6", - "crossbeam-utils 0.8.6", -] - [[package]] name = "crossbeam-epoch" version = "0.8.2" @@ -574,20 +436,7 @@ dependencies = [ "crossbeam-utils 0.7.2", "lazy_static", "maybe-uninit", - "memoffset 0.5.6", - "scopeguard 1.1.0", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97242a70df9b89a65d0b6df3c4bf5b9ce03c5b7309019777fbde37e7537f8762" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-utils 0.8.6", - "lazy_static", - "memoffset 0.6.5", + "memoffset", "scopeguard 1.1.0", ] @@ -623,16 +472,6 @@ dependencies = [ "lazy_static", ] -[[package]] -name = "crossbeam-utils" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfcae03edb34f947e64acdb1c33ec169824e20657e9ecb61cef6c8c74dcb8120" -dependencies = [ - "cfg-if 1.0.0", - "lazy_static", -] - [[package]] name = "crypto-mac" version = "0.10.1" @@ -643,28 +482,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "csv" -version = "1.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1" -dependencies = [ - "bstr", - "csv-core", - "itoa 0.4.8", - "ryu", - "serde", -] - -[[package]] -name = "csv-core" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" -dependencies = [ - "memchr", -] - [[package]] name = "ctr" version = "0.6.0" @@ -685,18 +502,6 @@ dependencies = [ "syn 0.15.44", ] -[[package]] -name = "derive_more" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f57d78cf3bd45270dad4e70c21ec77a960b36c7a841ff9db76aaa775a8fb871" -dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "rustc_version 0.2.3", - "syn 0.15.44", -] - [[package]] name = "digest" version = "0.9.0" @@ -712,12 +517,6 @@ version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" -[[package]] -name = "either" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" - [[package]] name = "encoding" version = "0.2.33" @@ -790,7 +589,7 @@ checksum = "15b0a4d2e39f8420210be8b27eeda28029729e2fd4291019455016c348240c38" dependencies = [ "atty", "humantime", - "log 0.4.14", + "log", "regex", "termcolor", ] @@ -826,15 +625,6 @@ dependencies = [ "synstructure", ] -[[package]] -name = "fastrand" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "779d043b6a0b90cc4c0ed7ee380a6504394cee7efd7db050e3774eee387324b2" -dependencies = [ - "instant", -] - [[package]] name = "flate2" version = "1.0.22" @@ -993,7 +783,7 @@ dependencies = [ "memchr", "pin-project-lite", "pin-utils", - "slab 0.4.5", + "slab", ] [[package]] @@ -1016,17 +806,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - [[package]] name = "getrandom" version = "0.2.3" @@ -1035,7 +814,7 @@ checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" dependencies = [ "cfg-if 1.0.0", "libc", - "wasi 0.10.2+wasi-snapshot-preview1", + "wasi", ] [[package]] @@ -1066,8 +845,8 @@ dependencies = [ "futures 0.1.31", "http", "indexmap", - "log 0.4.14", - "slab 0.4.5", + "log", + "slab", "string", "tokio-io", ] @@ -1196,15 +975,6 @@ dependencies = [ "winreg", ] -[[package]] -name = "itertools" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484" -dependencies = [ - "either", -] - [[package]] name = "itoa" version = "0.4.8" @@ -1217,21 +987,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" -[[package]] -name = "jsonwebtoken" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d438ea707d465c230305963b67f8357a1d56fcfad9434797d7cb1c46c2e41df" -dependencies = [ - "base64 0.9.3", - "chrono", - "ring", - "serde", - "serde_derive", - "serde_json", - "untrusted", -] - [[package]] name = "kernel32-sys" version = "0.2.2" @@ -1300,15 +1055,6 @@ dependencies = [ "scopeguard 1.1.0", ] -[[package]] -name = "log" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" -dependencies = [ - "log 0.4.14", -] - [[package]] name = "log" version = "0.4.14" @@ -1316,38 +1062,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" dependencies = [ "cfg-if 1.0.0", - "serde", -] - -[[package]] -name = "log-mdc" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a94d21414c1f4a51209ad204c1776a3d0765002c76c6abcb602a6f09f1e881c7" - -[[package]] -name = "log4rs" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "100052474df98158c0738a7d3f4249c99978490178b5f9f68cd835ac57adbd1b" -dependencies = [ - "antidote", - "arc-swap", - "chrono", - "flate2", - "fnv", - "humantime", - "libc", - "log 0.4.14", - "log-mdc", - "serde", - "serde-value", - "serde_derive", - "serde_json", - "serde_yaml", - "thread-id", - "typemap", - "winapi 0.3.9", ] [[package]] @@ -1392,15 +1106,6 @@ dependencies = [ "autocfg 1.0.1", ] -[[package]] -name = "memoffset" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg 1.0.1", -] - [[package]] name = "mime" version = "0.3.16" @@ -1449,10 +1154,10 @@ dependencies = [ "iovec", "kernel32-sys", "libc", - "log 0.4.14", + "log", "miow 0.2.2", "net2", - "slab 0.4.5", + "slab", "winapi 0.2.8", ] @@ -1463,7 +1168,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" dependencies = [ "libc", - "log 0.4.14", + "log", "miow 0.3.7", "ntapi", "winapi 0.3.9", @@ -1501,34 +1206,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "mqtt311" -version = "0.2.0" -source = "git+https://github.com/tekjar/mqtt311#7566ce9df5ac31faab1989c66486d784016199a3" -dependencies = [ - "byteorder", - "derive_more", - "failure", -] - -[[package]] -name = "native-tls" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48ba9f7719b5a0f42f338907614285fb5fd70e53858141f69898a1fb7203b24d" -dependencies = [ - "lazy_static", - "libc", - "log 0.4.14", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - [[package]] name = "net2" version = "0.2.37" @@ -1610,240 +1287,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] -name = "opcua-certificate-creator" -version = "0.10.0" -dependencies = [ - "opcua-crypto", - "pico-args", -] - -[[package]] -name = "opcua-chess-server" -version = "0.10.0" -dependencies = [ - "opcua-server", - "uci", -] - -[[package]] -name = "opcua-client" -version = "0.10.0" -dependencies = [ - "chrono", - "futures 0.3.19", - "lazy_static", - "log 0.4.14", - "opcua-core", - "opcua-crypto", - "opcua-types", - "serde", - "serde_derive", - "tokio 1.15.0", - "tokio-util", -] - -[[package]] -name = "opcua-console-logging" -version = "0.10.0" -dependencies = [ - "chrono", - "env_logger", - "lazy_static", - "log 0.4.14", -] - -[[package]] -name = "opcua-core" +name = "opcua-all" version = "0.10.0" dependencies = [ + "actix-web", + "base64 0.12.3", + "bitflags", + "byteorder", "bytes 1.1.0", "chrono", + "derivative", + "env_logger", + "foreign-types", "futures 0.3.19", + "gethostname", "lazy_static", - "log 0.4.14", - "opcua-crypto", - "opcua-types", + "libc", + "log", + "openssl", + "openssl-sys", "regex", - "rustc-serialize", "serde", "serde_derive", + "serde_json", "serde_yaml", "tempdir", + "time", "tokio 1.15.0", "tokio-util", "url", -] - -[[package]] -name = "opcua-crypto" -version = "0.10.0" -dependencies = [ - "bytes 0.4.12", - "chrono", - "foreign-types", - "gethostname", - "lazy_static", - "libc", - "log 0.4.14", - "opcua-console-logging", - "opcua-types", - "openssl", - "openssl-sys", - "rustc-serialize", - "serde", - "serde_derive", - "tempdir", -] - -[[package]] -name = "opcua-demo-server" -version = "0.10.0" -dependencies = [ - "chrono", - "lazy_static", - "log 0.4.14", - "log4rs", - "opcua-console-logging", - "opcua-server", - "pico-args", - "rand 0.7.3", -] - -[[package]] -name = "opcua-discovery-client" -version = "0.10.0" -dependencies = [ - "opcua-client", - "opcua-console-logging", - "pico-args", -] - -[[package]] -name = "opcua-event-client" -version = "0.10.0" -dependencies = [ - "opcua-client", - "opcua-console-logging", - "pico-args", -] - -[[package]] -name = "opcua-integration" -version = "0.10.0" -dependencies = [ - "chrono", - "log 0.4.14", - "opcua-client", - "opcua-console-logging", - "opcua-core", - "opcua-crypto", - "opcua-server", -] - -[[package]] -name = "opcua-modbus-server" -version = "0.10.0" -dependencies = [ - "futures 0.1.31", - "opcua-console-logging", - "opcua-server", - "pico-args", - "serde", - "serde_derive", - "serde_yaml", - "tokio 0.1.22", - "tokio-core", - "tokio-modbus", - "tokio-service", - "tokio-timer", -] - -[[package]] -name = "opcua-mqtt-client" -version = "0.10.0" -dependencies = [ - "opcua-client", - "opcua-console-logging", - "pico-args", - "rumqtt", -] - -[[package]] -name = "opcua-server" -version = "0.10.0" -dependencies = [ - "actix-web", - "bitflags", - "chrono", - "criterion", - "derivative", - "futures 0.3.19", - "lazy_static", - "log 0.4.14", - "opcua-client", - "opcua-console-logging", - "opcua-core", - "opcua-crypto", - "opcua-types", - "regex", - "serde", - "serde_derive", - "serde_json", - "time", - "tokio 1.15.0", - "tokio-util", -] - -[[package]] -name = "opcua-simple-client" -version = "0.10.0" -dependencies = [ - "opcua-client", - "opcua-console-logging", - "pico-args", -] - -[[package]] -name = "opcua-simple-server" -version = "0.10.0" -dependencies = [ - "chrono", - "log 0.4.14", - "opcua-console-logging", - "opcua-server", -] - -[[package]] -name = "opcua-types" -version = "0.10.0" -dependencies = [ - "base64 0.12.3", - "bitflags", - "byteorder", - "chrono", - "lazy_static", - "log 0.4.14", - "regex", - "serde", - "serde_derive", - "serde_json", - "tempdir", - "uuid 0.8.2", -] - -[[package]] -name = "opcua-web-client" -version = "0.10.0" -dependencies = [ - "actix", - "actix-web", - "opcua-client", - "opcua-console-logging", - "pico-args", - "serde", - "serde_derive", - "serde_json", - "tokio 1.15.0", + "uuid 0.8.2", ] [[package]] @@ -1860,12 +1333,6 @@ dependencies = [ "openssl-sys", ] -[[package]] -name = "openssl-probe" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" - [[package]] name = "openssl-src" version = "111.17.0+1.1.1m" @@ -1889,15 +1356,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "ordered-float" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3305af35278dd29f46fcdd139e0b1fbfae2153f0e5928b39b035542dd31e37b7" -dependencies = [ - "num-traits", -] - [[package]] name = "owning_ref" version = "0.4.1" @@ -1925,7 +1383,7 @@ checksum = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" dependencies = [ "lock_api 0.3.4", "parking_lot_core 0.6.2", - "rustc_version 0.2.3", + "rustc_version", ] [[package]] @@ -1947,7 +1405,7 @@ checksum = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9" dependencies = [ "libc", "rand 0.6.5", - "rustc_version 0.2.3", + "rustc_version", "smallvec 0.6.14", "winapi 0.3.9", ] @@ -1962,7 +1420,7 @@ dependencies = [ "cloudabi", "libc", "redox_syscall 0.1.57", - "rustc_version 0.2.3", + "rustc_version", "smallvec 0.6.14", "winapi 0.3.9", ] @@ -1993,12 +1451,6 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" -[[package]] -name = "pico-args" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b9b4df73455c861d7cbf8be42f01d3b373ed7f02e378d55fa84eafc6f638b1" - [[package]] name = "pin-project-lite" version = "0.2.8" @@ -2034,18 +1486,6 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" -[[package]] -name = "pretty_env_logger" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed8d1e63042e889b85228620629b51c011d380eed2c7e0015f8a644def280c28" -dependencies = [ - "ansi_term", - "chrono", - "env_logger", - "log 0.4.14", -] - [[package]] name = "proc-macro2" version = "0.4.30" @@ -2088,16 +1528,6 @@ dependencies = [ "proc-macro2 1.0.36", ] -[[package]] -name = "rand" -version = "0.3.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64ac302d8f83c0c1974bf758f6b041c6c8ada916fbb44a609158ca8b064cc76c" -dependencies = [ - "libc", - "rand 0.4.6", -] - [[package]] name = "rand" version = "0.4.6" @@ -2143,19 +1573,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc 0.2.0", -] - [[package]] name = "rand" version = "0.8.4" @@ -2178,16 +1595,6 @@ dependencies = [ "rand_core 0.3.1", ] -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", -] - [[package]] name = "rand_chacha" version = "0.3.1" @@ -2213,22 +1620,13 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", -] - [[package]] name = "rand_core" version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" dependencies = [ - "getrandom 0.2.3", + "getrandom", ] [[package]] @@ -2240,15 +1638,6 @@ dependencies = [ "rand_core 0.3.1", ] -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", -] - [[package]] name = "rand_hc" version = "0.3.1" @@ -2311,41 +1700,6 @@ dependencies = [ "rand_core 0.3.1", ] -[[package]] -name = "rand_xoshiro" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03b418169fb9c46533f326efd6eed2576699c44ca92d3052a066214a8d828929" -dependencies = [ - "byteorder", - "rand_core 0.3.1", -] - -[[package]] -name = "rayon" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90" -dependencies = [ - "autocfg 1.0.1", - "crossbeam-deque 0.8.1", - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e" -dependencies = [ - "crossbeam-channel 0.5.2", - "crossbeam-deque 0.8.1", - "crossbeam-utils 0.8.6", - "lazy_static", - "num_cpus", -] - [[package]] name = "rdrand" version = "0.4.0" @@ -2381,12 +1735,6 @@ dependencies = [ "regex-syntax", ] -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" - [[package]] name = "regex-syntax" version = "0.6.25" @@ -2412,86 +1760,19 @@ dependencies = [ "quick-error", ] -[[package]] -name = "ring" -version = "0.13.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c4db68a2e35f3497146b7e4563df7d4773a2433230c5e4b448328e31740458a" -dependencies = [ - "cc", - "lazy_static", - "libc", - "untrusted", -] - -[[package]] -name = "rumqtt" -version = "0.30.0" -source = "git+https://github.com/AtherEnergy/rumqtt.git?rev=83b4694525061e2ccef617c0ac867db2044cc4e7#83b4694525061e2ccef617c0ac867db2044cc4e7" -dependencies = [ - "bytes 0.4.12", - "chrono", - "crossbeam-channel 0.3.9", - "derive_more", - "failure", - "futures 0.1.31", - "jsonwebtoken", - "log 0.4.14", - "mqtt311", - "pretty_env_logger", - "serde", - "serde_derive", - "tokio 0.1.22", - "tokio-codec", - "tokio-io", - "tokio-rustls", - "tokio-timer", - "tokio-tls", - "webpki", -] - [[package]] name = "rustc-demangle" version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" -[[package]] -name = "rustc-serialize" -version = "0.3.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" - [[package]] name = "rustc_version" version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" dependencies = [ - "semver 0.9.0", -] - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver 1.0.4", -] - -[[package]] -name = "rustls" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b7891791343c75b73ed9a18cadcafd8c8563d11a88ebe2d87f5b8a3182654d9" -dependencies = [ - "base64 0.9.3", - "log 0.4.14", - "ring", - "sct", - "untrusted", - "webpki", + "semver", ] [[package]] @@ -2500,37 +1781,6 @@ version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f" -[[package]] -name = "safemem" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "schannel" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" -dependencies = [ - "lazy_static", - "winapi 0.3.9", -] - -[[package]] -name = "scoped-tls" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "332ffa32bf586782a3efaeb58f127980944bbc8c4d6913a86107ac2a5ab24b28" - [[package]] name = "scopeguard" version = "0.3.3" @@ -2543,39 +1793,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" -[[package]] -name = "sct" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb8f61f9e6eadd062a71c380043d28036304a4706b3c4dd001ff3387ed00745a" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "security-framework" -version = "2.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525bc1abfda2e1998d152c45cf13e696f76d0a4972310b22fac1658b05df7c87" -dependencies = [ - "bitflags", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9dd14d83160b528b7bfd66439110573efcfbe281b17fc2ca9f39f550d619c7e" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "semver" version = "0.9.0" @@ -2585,12 +1802,6 @@ dependencies = [ "semver-parser", ] -[[package]] -name = "semver" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "568a8e6258aa33c13358f81fd834adb854c6f7c9468520910a9b1e8fac068012" - [[package]] name = "semver-parser" version = "0.7.0" @@ -2603,16 +1814,6 @@ version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97565067517b60e2d1ea8b268e59ce036de907ac523ad83a0475da04e818989a" -[[package]] -name = "serde-value" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a663f873dedc4eac1a559d4c6bc0d0b2c34dc5ac4702e105014b8281489e44f" -dependencies = [ - "ordered-float", - "serde", -] - [[package]] name = "serde_derive" version = "1.0.133" @@ -2687,24 +1888,12 @@ dependencies = [ "libc", ] -[[package]] -name = "slab" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17b4fcaed89ab08ef143da37bc52adbcc04d4a69014f4c1208d6b51f0c47bc23" - [[package]] name = "slab" version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" -[[package]] -name = "smallvec" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8cbcd6df1e117c2210e13ab5109635ad68a929fcbb8964dc965b76cb5ee013" - [[package]] name = "smallvec" version = "0.6.14" @@ -2786,12 +1975,6 @@ dependencies = [ "unicode-xid 0.2.2", ] -[[package]] -name = "take" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b157868d8ac1f56b64604539990685fa7611d8fa9e5476cf0c02cf34d32917c5" - [[package]] name = "tempdir" version = "0.3.7" @@ -2802,20 +1985,6 @@ dependencies = [ "remove_dir_all", ] -[[package]] -name = "tempfile" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" -dependencies = [ - "cfg-if 1.0.0", - "fastrand", - "libc", - "redox_syscall 0.2.10", - "remove_dir_all", - "winapi 0.3.9", -] - [[package]] name = "termcolor" version = "1.1.2" @@ -2825,26 +1994,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "thread-id" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7fbf4c9d56b320106cd64fd024dadfa0be7cb4706725fc44a7d7ce952d820c1" -dependencies = [ - "libc", - "redox_syscall 0.1.57", - "winapi 0.3.9", -] - [[package]] name = "time" version = "0.1.43" @@ -2855,16 +2004,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "tinytemplate" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" -dependencies = [ - "serde", - "serde_json", -] - [[package]] name = "tinyvec" version = "1.5.1" @@ -2934,25 +2073,6 @@ dependencies = [ "tokio-io", ] -[[package]] -name = "tokio-core" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87b1395334443abca552f63d4f61d0486f12377c2ba8b368e523f89e828cffd4" -dependencies = [ - "bytes 0.4.12", - "futures 0.1.31", - "iovec", - "log 0.4.14", - "mio 0.6.23", - "scoped-tls", - "tokio 0.1.22", - "tokio-executor", - "tokio-io", - "tokio-reactor", - "tokio-timer", -] - [[package]] name = "tokio-current-thread" version = "0.1.7" @@ -2992,7 +2112,7 @@ checksum = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674" dependencies = [ "bytes 0.4.12", "futures 0.1.31", - "log 0.4.14", + "log", ] [[package]] @@ -3006,42 +2126,6 @@ dependencies = [ "syn 1.0.85", ] -[[package]] -name = "tokio-modbus" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "899aea28caa629499636cab7962a3d14428daaa30daa973ea0bba4f30028a373" -dependencies = [ - "byteorder", - "bytes 0.4.12", - "futures 0.1.31", - "log 0.4.14", - "smallvec 0.6.14", - "tokio-codec", - "tokio-core", - "tokio-io", - "tokio-proto", - "tokio-service", -] - -[[package]] -name = "tokio-proto" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fbb47ae81353c63c487030659494b295f6cb6576242f907f203473b191b0389" -dependencies = [ - "futures 0.1.31", - "log 0.3.9", - "net2", - "rand 0.3.23", - "slab 0.3.0", - "smallvec 0.2.1", - "take", - "tokio-core", - "tokio-io", - "tokio-service", -] - [[package]] name = "tokio-reactor" version = "0.1.12" @@ -3051,37 +2135,16 @@ dependencies = [ "crossbeam-utils 0.7.2", "futures 0.1.31", "lazy_static", - "log 0.4.14", + "log", "mio 0.6.23", "num_cpus", "parking_lot 0.9.0", - "slab 0.4.5", + "slab", "tokio-executor", "tokio-io", "tokio-sync", ] -[[package]] -name = "tokio-rustls" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04a5c8de3797c207c574495724eb77ded1a150160a2db0936c751bf49003c84e" -dependencies = [ - "futures 0.1.31", - "rustls", - "tokio-io", - "webpki", -] - -[[package]] -name = "tokio-service" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24da22d077e0f15f55162bdbdc661228c1581892f52074fb242678d015b45162" -dependencies = [ - "futures 0.1.31", -] - [[package]] name = "tokio-signal" version = "0.2.9" @@ -3129,14 +2192,14 @@ version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df720b6581784c118f0eb4310796b12b1d242a7eb95f716a8367855325c25f89" dependencies = [ - "crossbeam-deque 0.7.4", + "crossbeam-deque", "crossbeam-queue", "crossbeam-utils 0.7.2", "futures 0.1.31", "lazy_static", - "log 0.4.14", + "log", "num_cpus", - "slab 0.4.5", + "slab", "tokio-executor", ] @@ -3148,21 +2211,10 @@ checksum = "93044f2d313c95ff1cb7809ce9a7a05735b012288a888b62d4434fd58c94f296" dependencies = [ "crossbeam-utils 0.7.2", "futures 0.1.31", - "slab 0.4.5", + "slab", "tokio-executor", ] -[[package]] -name = "tokio-tls" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "354b8cd83825b3c20217a9dc174d6a0c67441a2fae5c41bcb1ea6679f6ae0f7c" -dependencies = [ - "futures 0.1.31", - "native-tls", - "tokio-io", -] - [[package]] name = "tokio-udp" version = "0.1.6" @@ -3171,7 +2223,7 @@ checksum = "e2a0b10e610b39c38b031a2fcab08e4b82f16ece36504988dcbd81dbba650d82" dependencies = [ "bytes 0.4.12", "futures 0.1.31", - "log 0.4.14", + "log", "mio 0.6.23", "tokio-codec", "tokio-io", @@ -3188,7 +2240,7 @@ dependencies = [ "futures 0.1.31", "iovec", "libc", - "log 0.4.14", + "log", "mio 0.6.23", "mio-uds", "tokio-codec", @@ -3205,7 +2257,7 @@ dependencies = [ "bytes 1.1.0", "futures-core", "futures-sink", - "log 0.4.14", + "log", "pin-project-lite", "tokio 1.15.0", ] @@ -3219,12 +2271,6 @@ dependencies = [ "futures 0.1.31", ] -[[package]] -name = "traitobject" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079" - [[package]] name = "trust-dns-proto" version = "0.5.0" @@ -3236,7 +2282,7 @@ dependencies = [ "futures 0.1.31", "idna", "lazy_static", - "log 0.4.14", + "log", "rand 0.5.6", "smallvec 0.6.14", "socket2", @@ -3260,7 +2306,7 @@ dependencies = [ "futures 0.1.31", "idna", "lazy_static", - "log 0.4.14", + "log", "rand 0.5.6", "smallvec 0.6.14", "socket2", @@ -3284,7 +2330,7 @@ dependencies = [ "futures 0.1.31", "ipconfig", "lazy_static", - "log 0.4.14", + "log", "lru-cache", "resolv-conf", "smallvec 0.6.14", @@ -3292,30 +2338,12 @@ dependencies = [ "trust-dns-proto 0.6.3", ] -[[package]] -name = "typemap" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "653be63c80a3296da5551e1bfd2cca35227e13cdd08c6668903ae2f4f77aa1f6" -dependencies = [ - "unsafe-any", -] - [[package]] name = "typenum" version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" -[[package]] -name = "uci" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ae4b39dbf542ea3e478abdef55e9b6edcce7d3d45e06150aba21a7179d172b" -dependencies = [ - "log 0.3.9", -] - [[package]] name = "unicase" version = "2.6.0" @@ -3340,12 +2368,6 @@ dependencies = [ "tinyvec", ] -[[package]] -name = "unicode-width" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" - [[package]] name = "unicode-xid" version = "0.1.0" @@ -3368,21 +2390,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "unsafe-any" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30360d7979f5e9c6e6cea48af192ea8fab4afb3cf72597154b8f08935bc9c7f" -dependencies = [ - "traitobject", -] - -[[package]] -name = "untrusted" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55cd1f4b4e96b46aeb8d4855db4a7a9bd96eeeb5c6a1ab54593328761642ce2f" - [[package]] name = "url" version = "1.7.2" @@ -3410,7 +2417,7 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" dependencies = [ - "getrandom 0.2.3", + "getrandom", ] [[package]] @@ -3462,39 +2469,12 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" -[[package]] -name = "walkdir" -version = "2.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" -dependencies = [ - "same-file", - "winapi 0.3.9", - "winapi-util", -] - -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - [[package]] name = "wasi" version = "0.10.2+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" -[[package]] -name = "webpki" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17d7967316d8411ca3b01821ee6c332bde138ba4363becdb492f12e514daa17f" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "widestring" version = "0.2.2" diff --git a/Cargo.toml b/Cargo.toml index 2d0b8dc0a..ea1d74fb5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,23 +5,75 @@ opt-level = 'z' lto = true panic = 'abort' -[workspace] -members = [ - "console-logging", - "types", - "core", - "crypto", - "client", - "server", - "integration", - "samples/demo-server", - "samples/simple-client", - "samples/mqtt-client", - "samples/simple-server", - "samples/chess-server", - "samples/modbus-server", - "samples/discovery-client", - "samples/web-client", - "samples/event-client", - "tools/certificate-creator" -] +[package] +name = "opcua-all" +version = "0.10.0" # OPCUARustVersion +description = "OPC UA client API" +authors = ["Adam Lock "] +homepage = "https://github.com/locka99/opcua" +license = "MPL-2.0" +keywords = ["opcua","opc","ua"] +categories = ["embedded","network-programming"] +readme = "../README.md" +documentation = "https://docs.rs/opcua-client/" +edition = "2018" + +[badges] +travis-ci = { repository = "locka99/opcua" } +appveyor = { repository = "locka99/opcua" } + +[features] +default = ["server", "client"] +all = ["server", "client", "console_logging"] +server = ["generated-address-space", "discovery-server-registration"] +client = [] +console_logging = ["env_logger"] +# Includes all the code to populate the address space with the default node set. This is something that embedded +# systems may or may not require. +generated-address-space = [] +# Allows a server to register itself with a local discovery server. It does so by becoming a client to the LDS, +# which brings in a dependency to opcua-client. Omitting the feature saves some memory. +discovery-server-registration = ["client"] +# OpenSSL can be compiled and statically linked to with this feature +vendored-openssl = ["openssl/vendored"] +# Servers might want to show a web server with metric / diagnostic info +http = ["actix-web"] + +[dependencies] +log = "0.4" +chrono = { version = "0.4", features = ["serde"] } +futures = "0.3" +tokio = { version = "1", features = ["full"] } +tokio-util = { version = "0.6", features = ["codec"] } +lazy_static = "1.4.0" +regex = "1.3" +serde = "1.0" +serde_derive = "1.0" +serde_yaml = "0.8" +serde_json = "1.0" +bytes = "1.0.1" +url = "1.6" +time = "0.1" +bitflags = "1.2" +derivative = "1.0" +byteorder = "1.3" +base64 = "0.12" +uuid = { version = "0.8", features = ["v4"] } +openssl = "0.10" +openssl-sys = "0.9" +gethostname = "0.2.1" +libc = "0.2" +foreign-types = "0.3" + +[dependencies.env_logger] +env_logger = "0.5" +optional = true + + +[dependencies.actix-web] +version = "0.7" +optional = true + +[dev-dependencies] +tempdir = "0.3" +serde_json = "1.0" \ No newline at end of file diff --git a/client/Cargo.toml b/client/Cargo.toml deleted file mode 100644 index e907ff9cc..000000000 --- a/client/Cargo.toml +++ /dev/null @@ -1,42 +0,0 @@ -[package] -name = "opcua-client" -version = "0.10.0" # OPCUARustVersion -description = "OPC UA client API" -authors = ["Adam Lock "] -homepage = "https://github.com/locka99/opcua" -license = "MPL-2.0" -keywords = ["opcua","opc","ua"] -categories = ["embedded","network-programming"] -readme = "../README.md" -documentation = "https://docs.rs/opcua-client/" -edition = "2018" - -[badges] -travis-ci = { repository = "locka99/opcua" } -appveyor = { repository = "locka99/opcua" } - -[features] -default = [] -vendored-openssl = ["opcua-core/vendored-openssl"] - -[dependencies] -log = "0.4" -chrono = "0.4" -serde = "1.0" -serde_derive = "1.0" -futures = "0.3" -tokio = { version = "1", features = ["full"] } -tokio-util = { version = "0.6", features = ["codec"] } -lazy_static = "1.4.0" - -[dependencies.opcua-types] -path = "../types" -version = "0.10.0" # OPCUARustVersion - -[dependencies.opcua-crypto] -path = "../crypto" -version = "0.10.0" # OPCUARustVersion - -[dependencies.opcua-core] -path = "../core" -version = "0.10.0" # OPCUARustVersion diff --git a/client/client.iml b/client/client.iml deleted file mode 100644 index 9771586e8..000000000 --- a/client/client.iml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/console-logging/Cargo.toml b/console-logging/Cargo.toml deleted file mode 100644 index 4e7971d68..000000000 --- a/console-logging/Cargo.toml +++ /dev/null @@ -1,17 +0,0 @@ -[package] -name = "opcua-console-logging" -version = "0.10.0" # OPCUARustVersion -description = "Logging to the console for OPC UA used by client and server" -authors = ["Adam Lock "] -homepage = "https://github.com/locka99/opcua" -license = "MPL-2.0" -keywords = ["opcua","opc","ua"] -categories = ["embedded","network-programming"] -readme = "../README.md" -edition = "2018" - -[dependencies] -log = "0.4" -env_logger = "0.5" -chrono = "0.4" -lazy_static = "1.4.0" diff --git a/core/Cargo.toml b/core/Cargo.toml deleted file mode 100644 index 8a6517bd9..000000000 --- a/core/Cargo.toml +++ /dev/null @@ -1,46 +0,0 @@ -[package] -name = "opcua-core" -version = "0.10.0" # OPCUARustVersion -description = "Core components for OPC UA used by client and server" -authors = ["Adam Lock "] -homepage = "https://github.com/locka99/opcua" -license = "MPL-2.0" -keywords = ["opcua","opc","ua"] -categories = ["embedded","network-programming"] -readme = "../README.md" -documentation = "https://docs.rs/opcua-core/" -edition = "2018" - -[badges] -travis-ci = { repository = "locka99/opcua" } -appveyor = { repository = "locka99/opcua" } - -[features] -default = [] -vendored-openssl = ["opcua-crypto/vendored-openssl"] - -[dependencies] -log = "0.4" -chrono = "0.4" -regex = "1.3" -serde = "1.0" -serde_derive = "1.0" -serde_yaml = "0.8" -lazy_static = "1.4.0" -futures = "0.3" -tokio = { version = "1", features = ["full"] } -tokio-util = { version = "0.6", features = ["codec"] } -bytes = "1.0.1" -url = "1.6" - -[dependencies.opcua-types] -path = "../types" -version = "0.10.0" # OPCUARustVersion - -[dependencies.opcua-crypto] -path = "../crypto" -version = "0.10.0" # OPCUARustVersion - -[dev-dependencies] -tempdir = "0.3" -rustc-serialize = "0.3.24" \ No newline at end of file diff --git a/core/core.iml b/core/core.iml deleted file mode 100644 index c382356c3..000000000 --- a/core/core.iml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/crypto/Cargo.toml b/crypto/Cargo.toml deleted file mode 100644 index a93db0ef7..000000000 --- a/crypto/Cargo.toml +++ /dev/null @@ -1,45 +0,0 @@ -[package] -name = "opcua-crypto" -version = "0.10.0" # OPCUARustVersion -description = "Encryption / decryption used by OPC UA client and server" -authors = ["Adam Lock "] -homepage = "https://github.com/locka99/opcua" -license = "MPL-2.0" -keywords = ["opcua","opc","ua"] -categories = ["embedded","network-programming"] -readme = "../README.md" -documentation = "https://docs.rs/opcua-core/" -edition = "2018" - -[badges] -travis-ci = { repository = "locka99/opcua" } -appveyor = { repository = "locka99/opcua" } - -[features] -default = [] -vendored-openssl = ["openssl/vendored"] - -[dependencies] -log = "0.4" -chrono = "0.4" -openssl = "0.10" -openssl-sys = "0.9" -lazy_static = "1.4.0" -bytes = "0.4" -serde = "1.0" -serde_derive = "1.0" -gethostname = "0.2.1" -libc = "0.2" -foreign-types = "0.3" - -[dependencies.opcua-types] -path = "../types" -version = "0.10.0" # OPCUARustVersion - -[dev-dependencies.opcua-console-logging] -path = "../console-logging" -version = "0.10.0" # OPCUARustVersion - -[dev-dependencies] -tempdir = "0.3" -rustc-serialize = "0.3.24" \ No newline at end of file diff --git a/integration/src/harness.rs b/integration/src/harness.rs index 763e62485..a9979d820 100644 --- a/integration/src/harness.rs +++ b/integration/src/harness.rs @@ -15,12 +15,23 @@ use log::*; use opcua_client::prelude::*; use opcua_console_logging; use opcua_core::{self, runtime_components}; -use opcua_server::{self, builder::ServerBuilder, config::ServerEndpoint, prelude::*}; +use opcua_server::{ + self, builder::ServerBuilder, callbacks, config::ServerEndpoint, prelude::*, + session::SessionManager, +}; use crate::*; const TEST_TIMEOUT: i64 = 30000; +pub fn functions_object_id() -> NodeId { + NodeId::new(2, "Functions") +} + +pub fn hellox_method_id() -> NodeId { + NodeId::new(2, "HelloX") +} + static NEXT_PORT_OFFSET: AtomicUsize = AtomicUsize::new(0); pub fn next_port() -> u16 { @@ -46,9 +57,9 @@ fn port_from_offset(port_offset: u16) -> u16 { 4855u16 + port_offset } -pub fn endpoint_url(port: u16, path: &str) -> String { +pub fn endpoint_url(port: u16, path: &str) -> UAString { // To avoid certificate trouble, use the computer's own name for tne endpoint - format!("opc.tcp://{}:{}{}", hostname(), port, path) + format!("opc.tcp://{}:{}{}", hostname(), port, path).into() } fn v1_node_id() -> NodeId { @@ -103,7 +114,7 @@ pub fn new_server(port: u16) -> Server { let server = ServerBuilder::new() .application_name("integration_server") .application_uri("urn:integration_server") - .discovery_urls(vec![endpoint_url(port, endpoint_path)]) + .discovery_urls(vec![endpoint_url(port, endpoint_path).to_string()]) .create_sample_keypair(true) .pki_dir("./pki-server") .discovery_server_url(None) @@ -254,11 +265,72 @@ pub fn new_server(port: u16) -> Server { .organized_by(&folder_id) .insert(&mut address_space); }); + + let functions_object_id = functions_object_id(); + ObjectBuilder::new(&functions_object_id, "Functions", "Functions") + .event_notifier(EventNotifier::SUBSCRIBE_TO_EVENTS) + .organized_by(ObjectId::ObjectsFolder) + .insert(&mut address_space); + + MethodBuilder::new(&hellox_method_id(), "HelloX", "HelloX") + .component_of(functions_object_id) + .input_args( + &mut address_space, + &[("YourName", DataTypeId::String).into()], + ) + .output_args(&mut address_space, &[("Result", DataTypeId::String).into()]) + .callback(Box::new(HelloX)) + .insert(&mut address_space); } server } +struct HelloX; + +impl callbacks::Method for HelloX { + fn call( + &mut self, + _session_id: &NodeId, + _session_map: Arc>, + request: &CallMethodRequest, + ) -> Result { + debug!("HelloX method called"); + // Validate input to be a string + let mut out1 = Variant::Empty; + let in1_status = if let Some(ref input_arguments) = request.input_arguments { + if let Some(in1) = input_arguments.get(0) { + if let Variant::String(in1) = in1 { + out1 = Variant::from(format!("Hello {}!", &in1)); + StatusCode::Good + } else { + StatusCode::BadTypeMismatch + } + } else if input_arguments.len() == 0 { + return Err(StatusCode::BadArgumentsMissing); + } else { + // Shouldn't get here because there is 1 argument + return Err(StatusCode::BadTooManyArguments); + } + } else { + return Err(StatusCode::BadArgumentsMissing); + }; + + let status_code = if in1_status.is_good() { + StatusCode::Good + } else { + StatusCode::BadInvalidArgument + }; + + Ok(CallMethodResult { + status_code, + input_argument_results: Some(vec![in1_status]), + input_argument_diagnostic_infos: None, + output_arguments: Some(vec![out1]), + }) + } +} + fn new_client(_port: u16) -> Client { ClientBuilder::new() .application_name("integration_client") @@ -599,7 +671,7 @@ pub fn connect_with_get_endpoints(port: u16) { port, move |rx_client_command: mpsc::Receiver, client: Client| { get_endpoints_client_test( - &endpoint_url(port, "/"), + &endpoint_url(port, "/").as_ref(), IdentityToken::Anonymous, rx_client_command, client, @@ -613,8 +685,6 @@ pub fn connect_with_invalid_token( mut client_endpoint: EndpointDescription, identity_token: IdentityToken, ) { - client_endpoint.endpoint_url = - UAString::from(endpoint_url(port, client_endpoint.endpoint_url.as_ref())); connect_with_client_test( port, move |rx_client_command: mpsc::Receiver, client: Client| { @@ -628,8 +698,6 @@ pub fn connect_with( mut client_endpoint: EndpointDescription, identity_token: IdentityToken, ) { - client_endpoint.endpoint_url = - UAString::from(endpoint_url(port, client_endpoint.endpoint_url.as_ref())); connect_with_client_test( port, move |rx_client_command: mpsc::Receiver, client: Client| { diff --git a/integration/src/tests.rs b/integration/src/tests.rs index 4a5955edb..0429949a6 100644 --- a/integration/src/tests.rs +++ b/integration/src/tests.rs @@ -1,112 +1,120 @@ +use std::{ + sync::{mpsc, mpsc::channel, Arc, RwLock}, + thread, +}; + use chrono::Utc; use log::*; use opcua_client::prelude::*; use opcua_console_logging; use opcua_server::{self, prelude::*}; -use std::{ - sync::{mpsc, mpsc::channel, Arc, RwLock}, - thread, -}; use crate::harness::*; -fn endpoint_none() -> EndpointDescription { - ( - "/", - SecurityPolicy::None.to_str(), - MessageSecurityMode::None, - ) - .into() +fn endpoint( + port: u16, + path: &str, + security_policy: SecurityPolicy, + message_security_mode: MessageSecurityMode, +) -> EndpointDescription { + let mut endpoint = + EndpointDescription::from(("", SecurityPolicy::None.to_str(), MessageSecurityMode::None)); + endpoint.endpoint_url = endpoint_url(port, path); + endpoint +} + +fn endpoint_none(port: u16) -> EndpointDescription { + endpoint(port, "/", SecurityPolicy::None, MessageSecurityMode::None) } -fn endpoint_basic128rsa15_sign() -> EndpointDescription { - ( +fn endpoint_basic128rsa15_sign(port: u16) -> EndpointDescription { + endpoint( + port, "/", - SecurityPolicy::Basic128Rsa15.to_str(), + SecurityPolicy::Basic128Rsa15, MessageSecurityMode::Sign, ) - .into() } -fn endpoint_basic128rsa15_sign_encrypt() -> EndpointDescription { - ( +fn endpoint_basic128rsa15_sign_encrypt(port: u16) -> EndpointDescription { + endpoint( + port, "/", - SecurityPolicy::Basic128Rsa15.to_str(), + SecurityPolicy::Basic128Rsa15, MessageSecurityMode::SignAndEncrypt, ) - .into() } -fn endpoint_basic256_sign() -> EndpointDescription { - ( +fn endpoint_basic256_sign(port: u16) -> EndpointDescription { + endpoint( + port, "/", - SecurityPolicy::Basic256.to_str(), + SecurityPolicy::Basic256, MessageSecurityMode::Sign, ) - .into() } -fn endpoint_basic256_sign_encrypt() -> EndpointDescription { - ( +fn endpoint_basic256_sign_encrypt(port: u16) -> EndpointDescription { + endpoint( + port, "/", - SecurityPolicy::Basic256.to_str(), + SecurityPolicy::Basic256, MessageSecurityMode::SignAndEncrypt, ) - .into() } -fn endpoint_basic256sha256_sign() -> EndpointDescription { - ( +fn endpoint_basic256sha256_sign(port: u16) -> EndpointDescription { + endpoint( + port, "/", - SecurityPolicy::Basic256Sha256.to_str(), + SecurityPolicy::Basic256Sha256, MessageSecurityMode::Sign, ) - .into() } -fn endpoint_basic256sha256_sign_encrypt() -> EndpointDescription { - ( +fn endpoint_basic256sha256_sign_encrypt(port: u16) -> EndpointDescription { + endpoint( + port, "/", - SecurityPolicy::Basic256Sha256.to_str(), + SecurityPolicy::Basic256Sha256, MessageSecurityMode::SignAndEncrypt, ) - .into() } -fn endpoint_aes128sha256rsaoaep_sign() -> EndpointDescription { - ( +fn endpoint_aes128sha256rsaoaep_sign(port: u16) -> EndpointDescription { + endpoint( + port, "/", - SecurityPolicy::Aes128Sha256RsaOaep.to_str(), + SecurityPolicy::Aes128Sha256RsaOaep, MessageSecurityMode::Sign, ) - .into() } -fn endpoint_aes128sha256rsaoaep_sign_encrypt() -> EndpointDescription { - ( +fn endpoint_aes128sha256rsaoaep_sign_encrypt(port: u16) -> EndpointDescription { + endpoint( + port, "/", - SecurityPolicy::Aes128Sha256RsaOaep.to_str(), + SecurityPolicy::Aes128Sha256RsaOaep, MessageSecurityMode::SignAndEncrypt, ) - .into() } -fn endpoint_aes256sha256rsapss_sign() -> EndpointDescription { - ( +fn endpoint_aes256sha256rsapss_sign(port: u16) -> EndpointDescription { + endpoint( + port, "/", - SecurityPolicy::Aes256Sha256RsaPss.to_str(), + SecurityPolicy::Aes256Sha256RsaPss, MessageSecurityMode::Sign, ) - .into() } -fn endpoint_aes256sha256rsapss_sign_encrypt() -> EndpointDescription { - ( +fn endpoint_aes256sha256rsapss_sign_encrypt(port: u16) -> EndpointDescription { + endpoint( + port, "/", - SecurityPolicy::Aes256Sha256RsaPss.to_str(), + SecurityPolicy::Aes256Sha256RsaPss, MessageSecurityMode::SignAndEncrypt, ) - .into() } /// This is the most basic integration test starting the server on a thread, setting an abort flag @@ -231,7 +239,8 @@ fn get_endpoints() { #[ignore] fn connect_none() { // Connect a session using None security policy and anonymous token. - connect_with(next_port(), endpoint_none(), IdentityToken::Anonymous); + let port = next_port(); + connect_with(port, endpoint_none(port), IdentityToken::Anonymous); } /// Connect to the server using Basic128Rsa15 + Sign @@ -239,9 +248,10 @@ fn connect_none() { #[ignore] fn connect_basic128rsa15_sign() { // Connect a session with Basic128Rsa and Sign + let port = next_port(); connect_with( - next_port(), - endpoint_basic128rsa15_sign(), + port, + endpoint_basic128rsa15_sign(port), IdentityToken::Anonymous, ); } @@ -251,9 +261,10 @@ fn connect_basic128rsa15_sign() { #[ignore] fn connect_basic128rsa15_sign_and_encrypt() { // Connect a session with Basic128Rsa and SignAndEncrypt + let port = next_port(); connect_with( - next_port(), - endpoint_basic128rsa15_sign_encrypt(), + port, + endpoint_basic128rsa15_sign_encrypt(port), IdentityToken::Anonymous, ); } @@ -263,11 +274,8 @@ fn connect_basic128rsa15_sign_and_encrypt() { #[ignore] fn connect_basic256_sign() { // Connect a session with Basic256 and Sign - connect_with( - next_port(), - endpoint_basic256_sign(), - IdentityToken::Anonymous, - ); + let port = next_port(); + connect_with(port, endpoint_basic256_sign(port), IdentityToken::Anonymous); } /// Connect to the server using Basic256 + SignEncrypt @@ -275,9 +283,10 @@ fn connect_basic256_sign() { #[ignore] fn connect_basic256_sign_and_encrypt() { // Connect a session with Basic256 and SignAndEncrypt + let port = next_port(); connect_with( - next_port(), - endpoint_basic256_sign_encrypt(), + port, + endpoint_basic256_sign_encrypt(port), IdentityToken::Anonymous, ); } @@ -287,9 +296,10 @@ fn connect_basic256_sign_and_encrypt() { #[ignore] fn connect_basic256sha256_sign() { // Connect a session with Basic256Sha256 and Sign + let port = next_port(); connect_with( - next_port(), - endpoint_basic256sha256_sign(), + port, + endpoint_basic256sha256_sign(port), IdentityToken::Anonymous, ); } @@ -298,9 +308,10 @@ fn connect_basic256sha256_sign() { #[test] #[ignore] fn connect_basic256sha256_sign_and_encrypt() { + let port = next_port(); connect_with( - next_port(), - endpoint_basic256sha256_sign_encrypt(), + port, + endpoint_basic256sha256_sign_encrypt(port), IdentityToken::Anonymous, ); } @@ -309,9 +320,10 @@ fn connect_basic256sha256_sign_and_encrypt() { #[test] #[ignore] fn connect_aes128sha256rsaoaep_sign() { + let port = next_port(); connect_with( - next_port(), - endpoint_aes128sha256rsaoaep_sign(), + port, + endpoint_aes128sha256rsaoaep_sign(port), IdentityToken::Anonymous, ); } @@ -320,9 +332,10 @@ fn connect_aes128sha256rsaoaep_sign() { #[test] #[ignore] fn connect_aes128sha256rsaoaep_sign_encrypt() { + let port = next_port(); connect_with( - next_port(), - endpoint_aes128sha256rsaoaep_sign_encrypt(), + port, + endpoint_aes128sha256rsaoaep_sign_encrypt(port), IdentityToken::Anonymous, ); } @@ -331,9 +344,10 @@ fn connect_aes128sha256rsaoaep_sign_encrypt() { #[test] #[ignore] fn connect_aes256sha256rsapss_sign() { + let port = next_port(); connect_with( - next_port(), - endpoint_aes256sha256rsapss_sign(), + port, + endpoint_aes256sha256rsapss_sign(port), IdentityToken::Anonymous, ); } @@ -342,9 +356,10 @@ fn connect_aes256sha256rsapss_sign() { #[test] #[ignore] fn connect_aes256sha256rsapss_sign_encrypt() { + let port = next_port(); connect_with( - next_port(), - endpoint_aes256sha256rsapss_sign_encrypt(), + port, + endpoint_aes256sha256rsapss_sign_encrypt(port), IdentityToken::Anonymous, ); } @@ -354,9 +369,10 @@ fn connect_aes256sha256rsapss_sign_encrypt() { #[ignore] fn connect_basic128rsa15_with_username_password() { // Connect a session using username/password token + let port = next_port(); connect_with( - next_port(), - endpoint_basic128rsa15_sign_encrypt(), + port, + endpoint_basic128rsa15_sign_encrypt(port), client_user_token(), ); } @@ -365,9 +381,10 @@ fn connect_basic128rsa15_with_username_password() { #[test] #[ignore] fn connect_basic128rsa15_with_invalid_username_password() { + let port = next_port(); connect_with_invalid_token( - next_port(), - endpoint_basic128rsa15_sign_encrypt(), + port, + endpoint_basic128rsa15_sign_encrypt(port), client_invalid_user_token(), ); } @@ -376,9 +393,10 @@ fn connect_basic128rsa15_with_invalid_username_password() { #[test] #[ignore] fn connect_basic128rsa15_with_x509_token() { + let port = next_port(); connect_with( - next_port(), - endpoint_basic128rsa15_sign_encrypt(), + port, + endpoint_basic128rsa15_sign_encrypt(port), client_x509_token(), ); } @@ -387,12 +405,9 @@ fn connect_basic128rsa15_with_x509_token() { #[test] #[ignore] fn read_write_read() { - let mut client_endpoint = endpoint_basic128rsa15_sign_encrypt(); let port = next_port(); + let client_endpoint = endpoint_basic128rsa15_sign_encrypt(port); let identity_token = client_x509_token(); - - client_endpoint.endpoint_url = - UAString::from(endpoint_url(port, client_endpoint.endpoint_url.as_ref())); connect_with_client_test( port, move |_rx_client_command: mpsc::Receiver, mut client: Client| { @@ -452,12 +467,10 @@ fn read_write_read() { #[test] #[ignore] fn subscribe_1000() { - let mut client_endpoint = endpoint_basic128rsa15_sign_encrypt(); let port = next_port(); + let client_endpoint = endpoint_basic128rsa15_sign_encrypt(port); let identity_token = client_x509_token(); - client_endpoint.endpoint_url = - UAString::from(endpoint_url(port, client_endpoint.endpoint_url.as_ref())); connect_with_client_test( port, move |_rx_client_command: mpsc::Receiver, mut client: Client| { @@ -527,3 +540,43 @@ fn subscribe_1000() { }, ); } + +#[test] +#[ignore] +fn method_call() { + // Call a method on the server, one exercising some parameters in and out + let port = next_port(); + let client_endpoint = endpoint_none(port); + + connect_with_client_test( + port, + move |_rx_client_command: mpsc::Receiver, mut client: Client| { + info!( + "Client will try to connect to endpoint {:?}", + client_endpoint + ); + let session = client + .connect_to_endpoint(client_endpoint, IdentityToken::Anonymous) + .unwrap(); + let session = session.read().unwrap(); + + // Call the method + let input_arguments = Some(vec![Variant::from("Foo")]); + let method = CallMethodRequest { + object_id: functions_object_id(), + method_id: hellox_method_id(), + input_arguments, + }; + let result = session.call(method).unwrap(); + + // Result should say "Hello Foo" + assert!(result.status_code.is_good()); + let output_args = result.output_arguments.unwrap(); + assert_eq!(output_args.len(), 1); + let msg = output_args.get(0).unwrap(); + assert_eq!(msg.to_string(), "Hello Foo!"); + + session.disconnect(); + }, + ); +} diff --git a/samples/client.conf b/samples/client.conf index c6dad7beb..5617ecffc 100644 --- a/samples/client.conf +++ b/samples/client.conf @@ -49,4 +49,4 @@ session_timeout: 0 performance: ignore_clock_skew: false single_threaded_executor: true -session_name: Rust OPC UA Client \ No newline at end of file +session_name: Rust OPC UA Client diff --git a/samples/demo-server/src/methods.rs b/samples/demo-server/src/methods.rs index 89cc757f3..cce971db8 100644 --- a/samples/demo-server/src/methods.rs +++ b/samples/demo-server/src/methods.rs @@ -52,7 +52,7 @@ pub fn add_methods(server: &mut Server, ns: u16) { MethodBuilder::new(&fn_node_id, "Boop", "Boop") .component_of(object_id.clone()) .input_args(&mut address_space, &[("Ping", DataTypeId::String).into()]) - .callback(Box::new(HelloX)) + .callback(Box::new(Boop)) .insert(&mut address_space); } diff --git a/samples/server.conf b/samples/server.conf index 28174648e..f8f188716 100644 --- a/samples/server.conf +++ b/samples/server.conf @@ -158,4 +158,4 @@ endpoints: user_token_ids: - ANONYMOUS - sample_password_user - - sample_x509_user \ No newline at end of file + - sample_x509_user diff --git a/server/Cargo.toml b/server/Cargo.toml deleted file mode 100644 index eebdb4ebe..000000000 --- a/server/Cargo.toml +++ /dev/null @@ -1,77 +0,0 @@ -[package] -name = "opcua-server" -version = "0.10.0" # OPCUARustVersion -description = "OPC UA server API" -authors = ["Adam Lock "] -homepage = "https://github.com/locka99/opcua" -license = "MPL-2.0" -keywords = ["opcua","opc","ua"] -categories = ["embedded","network-programming"] -readme = "../README.md" -documentation = "https://docs.rs/opcua-server/" -edition = "2018" - -[badges] -travis-ci = { repository = "locka99/opcua" } -appveyor = { repository = "locka99/opcua" } - -[features] -default = ["generated-address-space"] - -# Includes all the code to populate the address space with the default node set. This is something that embedded -# systems may or may not require. -generated-address-space = [] -# Allows a server to register itself with a local discovery server. It does so by becoming a client to the LDS, -# which brings in a dependency to opcua-client. Omitting the feature saves some memory. -discovery-server-registration = ["opcua-client"] -# Servers might want to show a web server with metric / diagnostic info -http = ["actix-web"] -# OpenSSL can be compiled and statically linked to with this feature -vendored-openssl = ["opcua-core/vendored-openssl", "opcua-client/vendored-openssl"] - -[dependencies] -log = "0.4" -time = "0.1" -chrono = { version = "0.4", features = ["serde"] } -serde = "1.0" -serde_derive = "1.0" -serde_json = "1.0" -lazy_static = "1.4.0" -tokio = { version = "1", features = ["full"] } -tokio-util = { version = "0.6", features = ["codec"] } -futures = "0.3" -bitflags = "1.2" -derivative = "1.0" -regex = "1.3" - -[dev-dependencies] -criterion = "0.2" - -[[bench]] -name = "address_space" -harness = false - -[dependencies.actix-web] -version = "0.7" -optional = true - -[dependencies.opcua-types] -path = "../types" -version = "0.10.0" # OPCUARustVersion - -[dependencies.opcua-crypto] -path = "../crypto" -version = "0.10.0" # OPCUARustVersion - -[dependencies.opcua-core] -path = "../core" -version = "0.10.0" # OPCUARustVersion - -[dependencies.opcua-client] -path = "../client" -version = "0.10.0" # OPCUARustVersion -optional = true - -[dev-dependencies.opcua-console-logging] -path = "../console-logging" -version = "0.10.0" # OPCUARustVersion diff --git a/client/src/builder.rs b/src/client/builder.rs similarity index 100% rename from client/src/builder.rs rename to src/client/builder.rs diff --git a/client/src/callbacks.rs b/src/client/callbacks.rs similarity index 100% rename from client/src/callbacks.rs rename to src/client/callbacks.rs diff --git a/client/src/client.rs b/src/client/client.rs similarity index 100% rename from client/src/client.rs rename to src/client/client.rs diff --git a/client/src/comms/mod.rs b/src/client/comms/mod.rs similarity index 100% rename from client/src/comms/mod.rs rename to src/client/comms/mod.rs diff --git a/client/src/comms/tcp_transport.rs b/src/client/comms/tcp_transport.rs similarity index 100% rename from client/src/comms/tcp_transport.rs rename to src/client/comms/tcp_transport.rs diff --git a/client/src/comms/transport.rs b/src/client/comms/transport.rs similarity index 100% rename from client/src/comms/transport.rs rename to src/client/comms/transport.rs diff --git a/client/src/config.rs b/src/client/config.rs similarity index 100% rename from client/src/config.rs rename to src/client/config.rs diff --git a/client/src/message_queue.rs b/src/client/message_queue.rs similarity index 100% rename from client/src/message_queue.rs rename to src/client/message_queue.rs diff --git a/client/src/lib.rs b/src/client/mod.rs similarity index 97% rename from client/src/lib.rs rename to src/client/mod.rs index 75073df9b..ae42d00fc 100644 --- a/client/src/lib.rs +++ b/src/client/mod.rs @@ -92,14 +92,6 @@ //! [`ClientConfig`]: ./config/struct.ClientConfig.html //! [`ClientBuilder`]: ./client_builder/struct.ClientBuilder.html //! [`Session`]: ./session/struct.Session.html -#[macro_use] -extern crate lazy_static; -#[macro_use] -extern crate log; -#[macro_use] -extern crate opcua_core; -#[macro_use] -extern crate serde_derive; use opcua_core::supported_message::SupportedMessage; use opcua_types::{response_header::ResponseHeader, status_code::StatusCode}; diff --git a/client/src/session/mod.rs b/src/client/session/mod.rs similarity index 100% rename from client/src/session/mod.rs rename to src/client/session/mod.rs diff --git a/client/src/session/services.rs b/src/client/session/services.rs similarity index 100% rename from client/src/session/services.rs rename to src/client/session/services.rs diff --git a/client/src/session/session.rs b/src/client/session/session.rs similarity index 100% rename from client/src/session/session.rs rename to src/client/session/session.rs diff --git a/client/src/session/session_state.rs b/src/client/session/session_state.rs similarity index 100% rename from client/src/session/session_state.rs rename to src/client/session/session_state.rs diff --git a/client/src/session_retry_policy.rs b/src/client/session_retry_policy.rs similarity index 100% rename from client/src/session_retry_policy.rs rename to src/client/session_retry_policy.rs diff --git a/client/src/subscription.rs b/src/client/subscription.rs similarity index 100% rename from client/src/subscription.rs rename to src/client/subscription.rs diff --git a/client/src/subscription_state.rs b/src/client/subscription_state.rs similarity index 100% rename from client/src/subscription_state.rs rename to src/client/subscription_state.rs diff --git a/client/src/tests/mod.rs b/src/client/tests/mod.rs similarity index 100% rename from client/src/tests/mod.rs rename to src/client/tests/mod.rs diff --git a/console-logging/src/lib.rs b/src/console-logging/mod.rs similarity index 96% rename from console-logging/src/lib.rs rename to src/console-logging/mod.rs index 4584fa24f..017737adf 100644 --- a/console-logging/src/lib.rs +++ b/src/console-logging/mod.rs @@ -2,11 +2,6 @@ // SPDX-License-Identifier: MPL-2.0 // Copyright (C) 2017-2022 Adam Lock -#[macro_use] -extern crate log; -#[macro_use] -extern crate lazy_static; - use std::io::Write; use std::sync::atomic::{AtomicBool, Ordering}; diff --git a/core/src/comms/chunker.rs b/src/core/comms/chunker.rs similarity index 100% rename from core/src/comms/chunker.rs rename to src/core/comms/chunker.rs diff --git a/core/src/comms/message_chunk.rs b/src/core/comms/message_chunk.rs similarity index 100% rename from core/src/comms/message_chunk.rs rename to src/core/comms/message_chunk.rs diff --git a/core/src/comms/message_chunk_info.rs b/src/core/comms/message_chunk_info.rs similarity index 100% rename from core/src/comms/message_chunk_info.rs rename to src/core/comms/message_chunk_info.rs diff --git a/core/src/comms/message_writer.rs b/src/core/comms/message_writer.rs similarity index 100% rename from core/src/comms/message_writer.rs rename to src/core/comms/message_writer.rs diff --git a/core/src/comms/mod.rs b/src/core/comms/mod.rs similarity index 100% rename from core/src/comms/mod.rs rename to src/core/comms/mod.rs diff --git a/core/src/comms/secure_channel.rs b/src/core/comms/secure_channel.rs similarity index 100% rename from core/src/comms/secure_channel.rs rename to src/core/comms/secure_channel.rs diff --git a/core/src/comms/security_header.rs b/src/core/comms/security_header.rs similarity index 100% rename from core/src/comms/security_header.rs rename to src/core/comms/security_header.rs diff --git a/core/src/comms/tcp_codec.rs b/src/core/comms/tcp_codec.rs similarity index 100% rename from core/src/comms/tcp_codec.rs rename to src/core/comms/tcp_codec.rs diff --git a/core/src/comms/tcp_types.rs b/src/core/comms/tcp_types.rs similarity index 100% rename from core/src/comms/tcp_types.rs rename to src/core/comms/tcp_types.rs diff --git a/core/src/comms/url.rs b/src/core/comms/url.rs similarity index 100% rename from core/src/comms/url.rs rename to src/core/comms/url.rs diff --git a/core/src/config.rs b/src/core/config.rs similarity index 100% rename from core/src/config.rs rename to src/core/config.rs diff --git a/core/fuzz/.gitignore b/src/core/fuzz/.gitignore similarity index 100% rename from core/fuzz/.gitignore rename to src/core/fuzz/.gitignore diff --git a/core/fuzz/Cargo.lock b/src/core/fuzz/Cargo.lock similarity index 100% rename from core/fuzz/Cargo.lock rename to src/core/fuzz/Cargo.lock diff --git a/core/fuzz/Cargo.toml b/src/core/fuzz/Cargo.toml similarity index 100% rename from core/fuzz/Cargo.toml rename to src/core/fuzz/Cargo.toml diff --git a/core/fuzz/fuzz_targets/fuzz_comms.rs b/src/core/fuzz/fuzz_targets/fuzz_comms.rs similarity index 100% rename from core/fuzz/fuzz_targets/fuzz_comms.rs rename to src/core/fuzz/fuzz_targets/fuzz_comms.rs diff --git a/core/src/handle.rs b/src/core/handle.rs similarity index 100% rename from core/src/handle.rs rename to src/core/handle.rs diff --git a/core/src/lib.rs b/src/core/mod.rs similarity index 97% rename from core/src/lib.rs rename to src/core/mod.rs index e1410e63f..e1b725e1b 100644 --- a/core/src/lib.rs +++ b/src/core/mod.rs @@ -5,15 +5,6 @@ //! The OPC UA Core module holds functionality that is common to server and clients that make use of OPC UA. //! It contains message chunking, cryptography / pki, communications and standard handshake messages. -#[macro_use] -extern crate lazy_static; -#[macro_use] -extern crate log; -#[macro_use] -extern crate serde_derive; -#[cfg(test)] -extern crate tempdir; - #[macro_export] macro_rules! supported_message_as { ($v: expr, $i: ident) => { diff --git a/core/src/runtime.rs b/src/core/runtime.rs similarity index 100% rename from core/src/runtime.rs rename to src/core/runtime.rs diff --git a/core/src/supported_message.rs b/src/core/supported_message.rs similarity index 100% rename from core/src/supported_message.rs rename to src/core/supported_message.rs diff --git a/core/src/tests/chunk.rs b/src/core/tests/chunk.rs similarity index 100% rename from core/src/tests/chunk.rs rename to src/core/tests/chunk.rs diff --git a/core/src/tests/comms.rs b/src/core/tests/comms.rs similarity index 100% rename from core/src/tests/comms.rs rename to src/core/tests/comms.rs diff --git a/core/src/tests/hello.rs b/src/core/tests/hello.rs similarity index 100% rename from core/src/tests/hello.rs rename to src/core/tests/hello.rs diff --git a/core/src/tests/mod.rs b/src/core/tests/mod.rs similarity index 100% rename from core/src/tests/mod.rs rename to src/core/tests/mod.rs diff --git a/core/src/tests/secure_channel.rs b/src/core/tests/secure_channel.rs similarity index 100% rename from core/src/tests/secure_channel.rs rename to src/core/tests/secure_channel.rs diff --git a/core/src/tests/services.rs b/src/core/tests/services.rs similarity index 100% rename from core/src/tests/services.rs rename to src/core/tests/services.rs diff --git a/core/src/tests/supported_message.rs b/src/core/tests/supported_message.rs similarity index 100% rename from core/src/tests/supported_message.rs rename to src/core/tests/supported_message.rs diff --git a/core/src/tests/test_data/our_cert.der b/src/core/tests/test_data/our_cert.der similarity index 100% rename from core/src/tests/test_data/our_cert.der rename to src/core/tests/test_data/our_cert.der diff --git a/core/src/tests/test_data/our_private.pem b/src/core/tests/test_data/our_private.pem similarity index 100% rename from core/src/tests/test_data/our_private.pem rename to src/core/tests/test_data/our_private.pem diff --git a/core/src/tests/test_data/their_cert.der b/src/core/tests/test_data/their_cert.der similarity index 100% rename from core/src/tests/test_data/their_cert.der rename to src/core/tests/test_data/their_cert.der diff --git a/core/src/tests/test_data/their_private.pem b/src/core/tests/test_data/their_private.pem similarity index 100% rename from core/src/tests/test_data/their_private.pem rename to src/core/tests/test_data/their_private.pem diff --git a/core/src/tests/url.rs b/src/core/tests/url.rs similarity index 100% rename from core/src/tests/url.rs rename to src/core/tests/url.rs diff --git a/crypto/src/aeskey.rs b/src/crypto/aeskey.rs similarity index 100% rename from crypto/src/aeskey.rs rename to src/crypto/aeskey.rs diff --git a/crypto/src/certificate_store.rs b/src/crypto/certificate_store.rs similarity index 100% rename from crypto/src/certificate_store.rs rename to src/crypto/certificate_store.rs diff --git a/crypto/src/hash.rs b/src/crypto/hash.rs similarity index 100% rename from crypto/src/hash.rs rename to src/crypto/hash.rs diff --git a/crypto/src/lib.rs b/src/crypto/mod.rs similarity index 98% rename from crypto/src/lib.rs rename to src/crypto/mod.rs index 278a7bb8d..e1cc3207b 100644 --- a/crypto/src/lib.rs +++ b/src/crypto/mod.rs @@ -6,11 +6,6 @@ //! trust between a client and server via certificate exchange and validation. It also used for //! encrypting / decrypting messages and signing messages. -#[macro_use] -extern crate log; -#[macro_use] -extern crate serde_derive; - use std::fmt; use opcua_types::{service_types::SignatureData, status_code::StatusCode, ByteString, UAString}; diff --git a/crypto/src/pkey.rs b/src/crypto/pkey.rs similarity index 100% rename from crypto/src/pkey.rs rename to src/crypto/pkey.rs diff --git a/crypto/src/random.rs b/src/crypto/random.rs similarity index 100% rename from crypto/src/random.rs rename to src/crypto/random.rs diff --git a/crypto/src/security_policy.rs b/src/crypto/security_policy.rs similarity index 100% rename from crypto/src/security_policy.rs rename to src/crypto/security_policy.rs diff --git a/crypto/src/tests/authentication.rs b/src/crypto/tests/authentication.rs similarity index 100% rename from crypto/src/tests/authentication.rs rename to src/crypto/tests/authentication.rs diff --git a/crypto/src/tests/crypto.rs b/src/crypto/tests/crypto.rs similarity index 100% rename from crypto/src/tests/crypto.rs rename to src/crypto/tests/crypto.rs diff --git a/crypto/src/tests/mod.rs b/src/crypto/tests/mod.rs similarity index 100% rename from crypto/src/tests/mod.rs rename to src/crypto/tests/mod.rs diff --git a/crypto/src/tests/security_policy.rs b/src/crypto/tests/security_policy.rs similarity index 100% rename from crypto/src/tests/security_policy.rs rename to src/crypto/tests/security_policy.rs diff --git a/crypto/src/thumbprint.rs b/src/crypto/thumbprint.rs similarity index 100% rename from crypto/src/thumbprint.rs rename to src/crypto/thumbprint.rs diff --git a/crypto/src/user_identity.rs b/src/crypto/user_identity.rs similarity index 100% rename from crypto/src/user_identity.rs rename to src/crypto/user_identity.rs diff --git a/crypto/src/x509.rs b/src/crypto/x509.rs similarity index 100% rename from crypto/src/x509.rs rename to src/crypto/x509.rs diff --git a/src/lib.rs b/src/lib.rs new file mode 100644 index 000000000..87bcd2b48 --- /dev/null +++ b/src/lib.rs @@ -0,0 +1,25 @@ +#[macro_use] +extern crate lazy_static; +#[macro_use] +extern crate log; +#[cfg(test)] +extern crate tempdir; +#[macro_use] +extern crate bitflags; +#[macro_use] +extern crate serde_derive; +#[cfg(feature = "http")] +extern crate actix_web; +#[cfg(test)] +extern crate serde_json; +#[macro_use] +extern crate derivative; + +#[cfg(feature = "client")] +mod client; +#[cfg(feature = "console_logging")] +mod console_logging; +mod core; +mod crypto; +#[cfg(feature = "server")] +mod server; diff --git a/server/src/address_space/address_space.rs b/src/server/address_space/address_space.rs similarity index 100% rename from server/src/address_space/address_space.rs rename to src/server/address_space/address_space.rs diff --git a/server/src/address_space/base.rs b/src/server/address_space/base.rs similarity index 100% rename from server/src/address_space/base.rs rename to src/server/address_space/base.rs diff --git a/server/src/address_space/data_type.rs b/src/server/address_space/data_type.rs similarity index 100% rename from server/src/address_space/data_type.rs rename to src/server/address_space/data_type.rs diff --git a/server/src/address_space/generated/mod.rs b/src/server/address_space/generated/mod.rs similarity index 100% rename from server/src/address_space/generated/mod.rs rename to src/server/address_space/generated/mod.rs diff --git a/server/src/address_space/generated/nodeset_10.rs b/src/server/address_space/generated/nodeset_10.rs similarity index 100% rename from server/src/address_space/generated/nodeset_10.rs rename to src/server/address_space/generated/nodeset_10.rs diff --git a/server/src/address_space/generated/nodeset_11.rs b/src/server/address_space/generated/nodeset_11.rs similarity index 100% rename from server/src/address_space/generated/nodeset_11.rs rename to src/server/address_space/generated/nodeset_11.rs diff --git a/server/src/address_space/generated/nodeset_12_1.rs b/src/server/address_space/generated/nodeset_12_1.rs similarity index 100% rename from server/src/address_space/generated/nodeset_12_1.rs rename to src/server/address_space/generated/nodeset_12_1.rs diff --git a/server/src/address_space/generated/nodeset_12_2.rs b/src/server/address_space/generated/nodeset_12_2.rs similarity index 100% rename from server/src/address_space/generated/nodeset_12_2.rs rename to src/server/address_space/generated/nodeset_12_2.rs diff --git a/server/src/address_space/generated/nodeset_12_3.rs b/src/server/address_space/generated/nodeset_12_3.rs similarity index 100% rename from server/src/address_space/generated/nodeset_12_3.rs rename to src/server/address_space/generated/nodeset_12_3.rs diff --git a/server/src/address_space/generated/nodeset_12_4.rs b/src/server/address_space/generated/nodeset_12_4.rs similarity index 100% rename from server/src/address_space/generated/nodeset_12_4.rs rename to src/server/address_space/generated/nodeset_12_4.rs diff --git a/server/src/address_space/generated/nodeset_13.rs b/src/server/address_space/generated/nodeset_13.rs similarity index 100% rename from server/src/address_space/generated/nodeset_13.rs rename to src/server/address_space/generated/nodeset_13.rs diff --git a/server/src/address_space/generated/nodeset_14.rs b/src/server/address_space/generated/nodeset_14.rs similarity index 100% rename from server/src/address_space/generated/nodeset_14.rs rename to src/server/address_space/generated/nodeset_14.rs diff --git a/server/src/address_space/generated/nodeset_14_1.rs b/src/server/address_space/generated/nodeset_14_1.rs similarity index 100% rename from server/src/address_space/generated/nodeset_14_1.rs rename to src/server/address_space/generated/nodeset_14_1.rs diff --git a/server/src/address_space/generated/nodeset_14_10.rs b/src/server/address_space/generated/nodeset_14_10.rs similarity index 100% rename from server/src/address_space/generated/nodeset_14_10.rs rename to src/server/address_space/generated/nodeset_14_10.rs diff --git a/server/src/address_space/generated/nodeset_14_11.rs b/src/server/address_space/generated/nodeset_14_11.rs similarity index 100% rename from server/src/address_space/generated/nodeset_14_11.rs rename to src/server/address_space/generated/nodeset_14_11.rs diff --git a/server/src/address_space/generated/nodeset_14_2.rs b/src/server/address_space/generated/nodeset_14_2.rs similarity index 100% rename from server/src/address_space/generated/nodeset_14_2.rs rename to src/server/address_space/generated/nodeset_14_2.rs diff --git a/server/src/address_space/generated/nodeset_14_3.rs b/src/server/address_space/generated/nodeset_14_3.rs similarity index 100% rename from server/src/address_space/generated/nodeset_14_3.rs rename to src/server/address_space/generated/nodeset_14_3.rs diff --git a/server/src/address_space/generated/nodeset_14_4.rs b/src/server/address_space/generated/nodeset_14_4.rs similarity index 100% rename from server/src/address_space/generated/nodeset_14_4.rs rename to src/server/address_space/generated/nodeset_14_4.rs diff --git a/server/src/address_space/generated/nodeset_14_5.rs b/src/server/address_space/generated/nodeset_14_5.rs similarity index 100% rename from server/src/address_space/generated/nodeset_14_5.rs rename to src/server/address_space/generated/nodeset_14_5.rs diff --git a/server/src/address_space/generated/nodeset_14_6.rs b/src/server/address_space/generated/nodeset_14_6.rs similarity index 100% rename from server/src/address_space/generated/nodeset_14_6.rs rename to src/server/address_space/generated/nodeset_14_6.rs diff --git a/server/src/address_space/generated/nodeset_14_7.rs b/src/server/address_space/generated/nodeset_14_7.rs similarity index 100% rename from server/src/address_space/generated/nodeset_14_7.rs rename to src/server/address_space/generated/nodeset_14_7.rs diff --git a/server/src/address_space/generated/nodeset_14_8.rs b/src/server/address_space/generated/nodeset_14_8.rs similarity index 100% rename from server/src/address_space/generated/nodeset_14_8.rs rename to src/server/address_space/generated/nodeset_14_8.rs diff --git a/server/src/address_space/generated/nodeset_14_9.rs b/src/server/address_space/generated/nodeset_14_9.rs similarity index 100% rename from server/src/address_space/generated/nodeset_14_9.rs rename to src/server/address_space/generated/nodeset_14_9.rs diff --git a/server/src/address_space/generated/nodeset_3.rs b/src/server/address_space/generated/nodeset_3.rs similarity index 100% rename from server/src/address_space/generated/nodeset_3.rs rename to src/server/address_space/generated/nodeset_3.rs diff --git a/server/src/address_space/generated/nodeset_3_1.rs b/src/server/address_space/generated/nodeset_3_1.rs similarity index 100% rename from server/src/address_space/generated/nodeset_3_1.rs rename to src/server/address_space/generated/nodeset_3_1.rs diff --git a/server/src/address_space/generated/nodeset_3_2.rs b/src/server/address_space/generated/nodeset_3_2.rs similarity index 100% rename from server/src/address_space/generated/nodeset_3_2.rs rename to src/server/address_space/generated/nodeset_3_2.rs diff --git a/server/src/address_space/generated/nodeset_4_1.rs b/src/server/address_space/generated/nodeset_4_1.rs similarity index 100% rename from server/src/address_space/generated/nodeset_4_1.rs rename to src/server/address_space/generated/nodeset_4_1.rs diff --git a/server/src/address_space/generated/nodeset_4_2.rs b/src/server/address_space/generated/nodeset_4_2.rs similarity index 100% rename from server/src/address_space/generated/nodeset_4_2.rs rename to src/server/address_space/generated/nodeset_4_2.rs diff --git a/server/src/address_space/generated/nodeset_4_3.rs b/src/server/address_space/generated/nodeset_4_3.rs similarity index 100% rename from server/src/address_space/generated/nodeset_4_3.rs rename to src/server/address_space/generated/nodeset_4_3.rs diff --git a/server/src/address_space/generated/nodeset_4_4.rs b/src/server/address_space/generated/nodeset_4_4.rs similarity index 100% rename from server/src/address_space/generated/nodeset_4_4.rs rename to src/server/address_space/generated/nodeset_4_4.rs diff --git a/server/src/address_space/generated/nodeset_4_5.rs b/src/server/address_space/generated/nodeset_4_5.rs similarity index 100% rename from server/src/address_space/generated/nodeset_4_5.rs rename to src/server/address_space/generated/nodeset_4_5.rs diff --git a/server/src/address_space/generated/nodeset_4_6.rs b/src/server/address_space/generated/nodeset_4_6.rs similarity index 100% rename from server/src/address_space/generated/nodeset_4_6.rs rename to src/server/address_space/generated/nodeset_4_6.rs diff --git a/server/src/address_space/generated/nodeset_4_7.rs b/src/server/address_space/generated/nodeset_4_7.rs similarity index 100% rename from server/src/address_space/generated/nodeset_4_7.rs rename to src/server/address_space/generated/nodeset_4_7.rs diff --git a/server/src/address_space/generated/nodeset_4_8.rs b/src/server/address_space/generated/nodeset_4_8.rs similarity index 100% rename from server/src/address_space/generated/nodeset_4_8.rs rename to src/server/address_space/generated/nodeset_4_8.rs diff --git a/server/src/address_space/generated/nodeset_5_1.rs b/src/server/address_space/generated/nodeset_5_1.rs similarity index 100% rename from server/src/address_space/generated/nodeset_5_1.rs rename to src/server/address_space/generated/nodeset_5_1.rs diff --git a/server/src/address_space/generated/nodeset_5_10.rs b/src/server/address_space/generated/nodeset_5_10.rs similarity index 100% rename from server/src/address_space/generated/nodeset_5_10.rs rename to src/server/address_space/generated/nodeset_5_10.rs diff --git a/server/src/address_space/generated/nodeset_5_11.rs b/src/server/address_space/generated/nodeset_5_11.rs similarity index 100% rename from server/src/address_space/generated/nodeset_5_11.rs rename to src/server/address_space/generated/nodeset_5_11.rs diff --git a/server/src/address_space/generated/nodeset_5_12.rs b/src/server/address_space/generated/nodeset_5_12.rs similarity index 100% rename from server/src/address_space/generated/nodeset_5_12.rs rename to src/server/address_space/generated/nodeset_5_12.rs diff --git a/server/src/address_space/generated/nodeset_5_13.rs b/src/server/address_space/generated/nodeset_5_13.rs similarity index 100% rename from server/src/address_space/generated/nodeset_5_13.rs rename to src/server/address_space/generated/nodeset_5_13.rs diff --git a/server/src/address_space/generated/nodeset_5_14.rs b/src/server/address_space/generated/nodeset_5_14.rs similarity index 100% rename from server/src/address_space/generated/nodeset_5_14.rs rename to src/server/address_space/generated/nodeset_5_14.rs diff --git a/server/src/address_space/generated/nodeset_5_15.rs b/src/server/address_space/generated/nodeset_5_15.rs similarity index 100% rename from server/src/address_space/generated/nodeset_5_15.rs rename to src/server/address_space/generated/nodeset_5_15.rs diff --git a/server/src/address_space/generated/nodeset_5_16.rs b/src/server/address_space/generated/nodeset_5_16.rs similarity index 100% rename from server/src/address_space/generated/nodeset_5_16.rs rename to src/server/address_space/generated/nodeset_5_16.rs diff --git a/server/src/address_space/generated/nodeset_5_2.rs b/src/server/address_space/generated/nodeset_5_2.rs similarity index 100% rename from server/src/address_space/generated/nodeset_5_2.rs rename to src/server/address_space/generated/nodeset_5_2.rs diff --git a/server/src/address_space/generated/nodeset_5_3.rs b/src/server/address_space/generated/nodeset_5_3.rs similarity index 100% rename from server/src/address_space/generated/nodeset_5_3.rs rename to src/server/address_space/generated/nodeset_5_3.rs diff --git a/server/src/address_space/generated/nodeset_5_4.rs b/src/server/address_space/generated/nodeset_5_4.rs similarity index 100% rename from server/src/address_space/generated/nodeset_5_4.rs rename to src/server/address_space/generated/nodeset_5_4.rs diff --git a/server/src/address_space/generated/nodeset_5_5.rs b/src/server/address_space/generated/nodeset_5_5.rs similarity index 100% rename from server/src/address_space/generated/nodeset_5_5.rs rename to src/server/address_space/generated/nodeset_5_5.rs diff --git a/server/src/address_space/generated/nodeset_5_6.rs b/src/server/address_space/generated/nodeset_5_6.rs similarity index 100% rename from server/src/address_space/generated/nodeset_5_6.rs rename to src/server/address_space/generated/nodeset_5_6.rs diff --git a/server/src/address_space/generated/nodeset_5_7.rs b/src/server/address_space/generated/nodeset_5_7.rs similarity index 100% rename from server/src/address_space/generated/nodeset_5_7.rs rename to src/server/address_space/generated/nodeset_5_7.rs diff --git a/server/src/address_space/generated/nodeset_5_8.rs b/src/server/address_space/generated/nodeset_5_8.rs similarity index 100% rename from server/src/address_space/generated/nodeset_5_8.rs rename to src/server/address_space/generated/nodeset_5_8.rs diff --git a/server/src/address_space/generated/nodeset_5_9.rs b/src/server/address_space/generated/nodeset_5_9.rs similarity index 100% rename from server/src/address_space/generated/nodeset_5_9.rs rename to src/server/address_space/generated/nodeset_5_9.rs diff --git a/server/src/address_space/generated/nodeset_8.rs b/src/server/address_space/generated/nodeset_8.rs similarity index 100% rename from server/src/address_space/generated/nodeset_8.rs rename to src/server/address_space/generated/nodeset_8.rs diff --git a/server/src/address_space/generated/nodeset_999.rs b/src/server/address_space/generated/nodeset_999.rs similarity index 100% rename from server/src/address_space/generated/nodeset_999.rs rename to src/server/address_space/generated/nodeset_999.rs diff --git a/server/src/address_space/generated/nodeset_9_1.rs b/src/server/address_space/generated/nodeset_9_1.rs similarity index 100% rename from server/src/address_space/generated/nodeset_9_1.rs rename to src/server/address_space/generated/nodeset_9_1.rs diff --git a/server/src/address_space/generated/nodeset_9_2.rs b/src/server/address_space/generated/nodeset_9_2.rs similarity index 100% rename from server/src/address_space/generated/nodeset_9_2.rs rename to src/server/address_space/generated/nodeset_9_2.rs diff --git a/server/src/address_space/generated/nodeset_9_3.rs b/src/server/address_space/generated/nodeset_9_3.rs similarity index 100% rename from server/src/address_space/generated/nodeset_9_3.rs rename to src/server/address_space/generated/nodeset_9_3.rs diff --git a/server/src/address_space/generated/nodeset_9_4.rs b/src/server/address_space/generated/nodeset_9_4.rs similarity index 100% rename from server/src/address_space/generated/nodeset_9_4.rs rename to src/server/address_space/generated/nodeset_9_4.rs diff --git a/server/src/address_space/method.rs b/src/server/address_space/method.rs similarity index 100% rename from server/src/address_space/method.rs rename to src/server/address_space/method.rs diff --git a/server/src/address_space/method_impls.rs b/src/server/address_space/method_impls.rs similarity index 100% rename from server/src/address_space/method_impls.rs rename to src/server/address_space/method_impls.rs diff --git a/server/src/address_space/mod.rs b/src/server/address_space/mod.rs similarity index 100% rename from server/src/address_space/mod.rs rename to src/server/address_space/mod.rs diff --git a/server/src/address_space/node.rs b/src/server/address_space/node.rs similarity index 100% rename from server/src/address_space/node.rs rename to src/server/address_space/node.rs diff --git a/server/src/address_space/object.rs b/src/server/address_space/object.rs similarity index 100% rename from server/src/address_space/object.rs rename to src/server/address_space/object.rs diff --git a/server/src/address_space/object_type.rs b/src/server/address_space/object_type.rs similarity index 100% rename from server/src/address_space/object_type.rs rename to src/server/address_space/object_type.rs diff --git a/server/src/address_space/reference_type.rs b/src/server/address_space/reference_type.rs similarity index 100% rename from server/src/address_space/reference_type.rs rename to src/server/address_space/reference_type.rs diff --git a/server/src/address_space/references.rs b/src/server/address_space/references.rs similarity index 100% rename from server/src/address_space/references.rs rename to src/server/address_space/references.rs diff --git a/server/src/address_space/relative_path.rs b/src/server/address_space/relative_path.rs similarity index 100% rename from server/src/address_space/relative_path.rs rename to src/server/address_space/relative_path.rs diff --git a/server/src/address_space/variable.rs b/src/server/address_space/variable.rs similarity index 100% rename from server/src/address_space/variable.rs rename to src/server/address_space/variable.rs diff --git a/server/src/address_space/variable_type.rs b/src/server/address_space/variable_type.rs similarity index 100% rename from server/src/address_space/variable_type.rs rename to src/server/address_space/variable_type.rs diff --git a/server/src/address_space/view.rs b/src/server/address_space/view.rs similarity index 100% rename from server/src/address_space/view.rs rename to src/server/address_space/view.rs diff --git a/server/benches/address_space.rs b/src/server/benches/address_space.rs similarity index 100% rename from server/benches/address_space.rs rename to src/server/benches/address_space.rs diff --git a/server/src/builder.rs b/src/server/builder.rs similarity index 100% rename from server/src/builder.rs rename to src/server/builder.rs diff --git a/server/src/callbacks.rs b/src/server/callbacks.rs similarity index 100% rename from server/src/callbacks.rs rename to src/server/callbacks.rs diff --git a/server/src/comms/mod.rs b/src/server/comms/mod.rs similarity index 100% rename from server/src/comms/mod.rs rename to src/server/comms/mod.rs diff --git a/server/src/comms/secure_channel_service.rs b/src/server/comms/secure_channel_service.rs similarity index 100% rename from server/src/comms/secure_channel_service.rs rename to src/server/comms/secure_channel_service.rs diff --git a/server/src/comms/tcp_transport.rs b/src/server/comms/tcp_transport.rs similarity index 100% rename from server/src/comms/tcp_transport.rs rename to src/server/comms/tcp_transport.rs diff --git a/server/src/comms/transport.rs b/src/server/comms/transport.rs similarity index 100% rename from server/src/comms/transport.rs rename to src/server/comms/transport.rs diff --git a/server/src/config.rs b/src/server/config.rs similarity index 100% rename from server/src/config.rs rename to src/server/config.rs diff --git a/server/src/continuation_point.rs b/src/server/continuation_point.rs similarity index 100% rename from server/src/continuation_point.rs rename to src/server/continuation_point.rs diff --git a/server/src/diagnostics.rs b/src/server/diagnostics.rs similarity index 100% rename from server/src/diagnostics.rs rename to src/server/diagnostics.rs diff --git a/server/src/discovery/mod.rs b/src/server/discovery/mod.rs similarity index 100% rename from server/src/discovery/mod.rs rename to src/server/discovery/mod.rs diff --git a/server/src/events/audit/cancel_event.rs b/src/server/events/audit/cancel_event.rs similarity index 100% rename from server/src/events/audit/cancel_event.rs rename to src/server/events/audit/cancel_event.rs diff --git a/server/src/events/audit/certificate_events.rs b/src/server/events/audit/certificate_events.rs similarity index 100% rename from server/src/events/audit/certificate_events.rs rename to src/server/events/audit/certificate_events.rs diff --git a/server/src/events/audit/event.rs b/src/server/events/audit/event.rs similarity index 100% rename from server/src/events/audit/event.rs rename to src/server/events/audit/event.rs diff --git a/server/src/events/audit/mod.rs b/src/server/events/audit/mod.rs similarity index 100% rename from server/src/events/audit/mod.rs rename to src/server/events/audit/mod.rs diff --git a/server/src/events/audit/node_management_event.rs b/src/server/events/audit/node_management_event.rs similarity index 100% rename from server/src/events/audit/node_management_event.rs rename to src/server/events/audit/node_management_event.rs diff --git a/server/src/events/audit/security_event.rs b/src/server/events/audit/security_event.rs similarity index 100% rename from server/src/events/audit/security_event.rs rename to src/server/events/audit/security_event.rs diff --git a/server/src/events/audit/session_events.rs b/src/server/events/audit/session_events.rs similarity index 100% rename from server/src/events/audit/session_events.rs rename to src/server/events/audit/session_events.rs diff --git a/server/src/events/event.rs b/src/server/events/event.rs similarity index 100% rename from server/src/events/event.rs rename to src/server/events/event.rs diff --git a/server/src/events/event_filter.rs b/src/server/events/event_filter.rs similarity index 100% rename from server/src/events/event_filter.rs rename to src/server/events/event_filter.rs diff --git a/server/src/events/mod.rs b/src/server/events/mod.rs similarity index 100% rename from server/src/events/mod.rs rename to src/server/events/mod.rs diff --git a/server/src/events/operator.rs b/src/server/events/operator.rs similarity index 100% rename from server/src/events/operator.rs rename to src/server/events/operator.rs diff --git a/server/src/historical/mod.rs b/src/server/historical/mod.rs similarity index 100% rename from server/src/historical/mod.rs rename to src/server/historical/mod.rs diff --git a/server/html/index.html b/src/server/html/index.html similarity index 100% rename from server/html/index.html rename to src/server/html/index.html diff --git a/server/src/http/mod.rs b/src/server/http/mod.rs similarity index 100% rename from server/src/http/mod.rs rename to src/server/http/mod.rs diff --git a/server/src/identity_token.rs b/src/server/identity_token.rs similarity index 100% rename from server/src/identity_token.rs rename to src/server/identity_token.rs diff --git a/server/src/metrics.rs b/src/server/metrics.rs similarity index 100% rename from server/src/metrics.rs rename to src/server/metrics.rs diff --git a/server/src/lib.rs b/src/server/mod.rs similarity index 95% rename from server/src/lib.rs rename to src/server/mod.rs index c66a64d57..6ebb2d344 100644 --- a/server/src/lib.rs +++ b/src/server/mod.rs @@ -26,20 +26,6 @@ //! server.run(); //! } //! ``` -#[cfg(feature = "http")] -extern crate actix_web; -#[macro_use] -extern crate lazy_static; -#[macro_use] -extern crate log; -#[macro_use] -extern crate bitflags; -#[macro_use] -extern crate serde_derive; -#[macro_use] -extern crate derivative; -#[macro_use] -extern crate opcua_core; /// Returns true of the Option> is None or the vec inside is empty. This is particularly /// used by services where the spec says "All Services with arrays of operations in the request diff --git a/server/server.iml b/src/server/server.iml similarity index 100% rename from server/server.iml rename to src/server/server.iml diff --git a/server/src/server.rs b/src/server/server.rs similarity index 100% rename from server/src/server.rs rename to src/server/server.rs diff --git a/server/src/services/attribute.rs b/src/server/services/attribute.rs similarity index 100% rename from server/src/services/attribute.rs rename to src/server/services/attribute.rs diff --git a/server/src/services/audit.rs b/src/server/services/audit.rs similarity index 100% rename from server/src/services/audit.rs rename to src/server/services/audit.rs diff --git a/server/src/services/discovery.rs b/src/server/services/discovery.rs similarity index 100% rename from server/src/services/discovery.rs rename to src/server/services/discovery.rs diff --git a/server/src/services/message_handler.rs b/src/server/services/message_handler.rs similarity index 100% rename from server/src/services/message_handler.rs rename to src/server/services/message_handler.rs diff --git a/server/src/services/method.rs b/src/server/services/method.rs similarity index 100% rename from server/src/services/method.rs rename to src/server/services/method.rs diff --git a/server/src/services/mod.rs b/src/server/services/mod.rs similarity index 100% rename from server/src/services/mod.rs rename to src/server/services/mod.rs diff --git a/server/src/services/monitored_item.rs b/src/server/services/monitored_item.rs similarity index 100% rename from server/src/services/monitored_item.rs rename to src/server/services/monitored_item.rs diff --git a/server/src/services/node_management.rs b/src/server/services/node_management.rs similarity index 100% rename from server/src/services/node_management.rs rename to src/server/services/node_management.rs diff --git a/server/src/services/query.rs b/src/server/services/query.rs similarity index 100% rename from server/src/services/query.rs rename to src/server/services/query.rs diff --git a/server/src/services/session.rs b/src/server/services/session.rs similarity index 100% rename from server/src/services/session.rs rename to src/server/services/session.rs diff --git a/server/src/services/subscription.rs b/src/server/services/subscription.rs similarity index 100% rename from server/src/services/subscription.rs rename to src/server/services/subscription.rs diff --git a/server/src/services/view.rs b/src/server/services/view.rs similarity index 100% rename from server/src/services/view.rs rename to src/server/services/view.rs diff --git a/server/src/session.rs b/src/server/session.rs similarity index 100% rename from server/src/session.rs rename to src/server/session.rs diff --git a/server/src/session_diagnostics.rs b/src/server/session_diagnostics.rs similarity index 100% rename from server/src/session_diagnostics.rs rename to src/server/session_diagnostics.rs diff --git a/server/src/state.rs b/src/server/state.rs similarity index 100% rename from server/src/state.rs rename to src/server/state.rs diff --git a/server/src/subscriptions/mod.rs b/src/server/subscriptions/mod.rs similarity index 100% rename from server/src/subscriptions/mod.rs rename to src/server/subscriptions/mod.rs diff --git a/server/src/subscriptions/monitored_item.rs b/src/server/subscriptions/monitored_item.rs similarity index 100% rename from server/src/subscriptions/monitored_item.rs rename to src/server/subscriptions/monitored_item.rs diff --git a/server/src/subscriptions/subscription.rs b/src/server/subscriptions/subscription.rs similarity index 100% rename from server/src/subscriptions/subscription.rs rename to src/server/subscriptions/subscription.rs diff --git a/server/src/subscriptions/subscriptions.rs b/src/server/subscriptions/subscriptions.rs similarity index 100% rename from server/src/subscriptions/subscriptions.rs rename to src/server/subscriptions/subscriptions.rs diff --git a/server/src/tests/address_space.rs b/src/server/tests/address_space.rs similarity index 100% rename from server/src/tests/address_space.rs rename to src/server/tests/address_space.rs diff --git a/server/src/tests/events.rs b/src/server/tests/events.rs similarity index 100% rename from server/src/tests/events.rs rename to src/server/tests/events.rs diff --git a/server/src/tests/mod.rs b/src/server/tests/mod.rs similarity index 100% rename from server/src/tests/mod.rs rename to src/server/tests/mod.rs diff --git a/server/src/tests/services/attribute.rs b/src/server/tests/services/attribute.rs similarity index 100% rename from server/src/tests/services/attribute.rs rename to src/server/tests/services/attribute.rs diff --git a/server/src/tests/services/discovery.rs b/src/server/tests/services/discovery.rs similarity index 100% rename from server/src/tests/services/discovery.rs rename to src/server/tests/services/discovery.rs diff --git a/server/src/tests/services/method.rs b/src/server/tests/services/method.rs similarity index 100% rename from server/src/tests/services/method.rs rename to src/server/tests/services/method.rs diff --git a/server/src/tests/services/mod.rs b/src/server/tests/services/mod.rs similarity index 100% rename from server/src/tests/services/mod.rs rename to src/server/tests/services/mod.rs diff --git a/server/src/tests/services/monitored_item.rs b/src/server/tests/services/monitored_item.rs similarity index 100% rename from server/src/tests/services/monitored_item.rs rename to src/server/tests/services/monitored_item.rs diff --git a/server/src/tests/services/node_management.rs b/src/server/tests/services/node_management.rs similarity index 100% rename from server/src/tests/services/node_management.rs rename to src/server/tests/services/node_management.rs diff --git a/server/src/tests/services/session.rs b/src/server/tests/services/session.rs similarity index 100% rename from server/src/tests/services/session.rs rename to src/server/tests/services/session.rs diff --git a/server/src/tests/services/subscription.rs b/src/server/tests/services/subscription.rs similarity index 100% rename from server/src/tests/services/subscription.rs rename to src/server/tests/services/subscription.rs diff --git a/server/src/tests/services/view.rs b/src/server/tests/services/view.rs similarity index 100% rename from server/src/tests/services/view.rs rename to src/server/tests/services/view.rs diff --git a/server/src/tests/subscriptions/mod.rs b/src/server/tests/subscriptions/mod.rs similarity index 100% rename from server/src/tests/subscriptions/mod.rs rename to src/server/tests/subscriptions/mod.rs diff --git a/server/src/tests/subscriptions/subscription.rs b/src/server/tests/subscriptions/subscription.rs similarity index 100% rename from server/src/tests/subscriptions/subscription.rs rename to src/server/tests/subscriptions/subscription.rs diff --git a/server/src/tests/subscriptions/subscriptions.rs b/src/server/tests/subscriptions/subscriptions.rs similarity index 100% rename from server/src/tests/subscriptions/subscriptions.rs rename to src/server/tests/subscriptions/subscriptions.rs diff --git a/server/src/util/mod.rs b/src/server/util/mod.rs similarity index 100% rename from server/src/util/mod.rs rename to src/server/util/mod.rs diff --git a/types/src/argument.rs b/src/types/argument.rs similarity index 100% rename from types/src/argument.rs rename to src/types/argument.rs diff --git a/types/src/array.rs b/src/types/array.rs similarity index 100% rename from types/src/array.rs rename to src/types/array.rs diff --git a/types/src/attribute.rs b/src/types/attribute.rs similarity index 100% rename from types/src/attribute.rs rename to src/types/attribute.rs diff --git a/types/src/basic_types.rs b/src/types/basic_types.rs similarity index 100% rename from types/src/basic_types.rs rename to src/types/basic_types.rs diff --git a/types/src/byte_string.rs b/src/types/byte_string.rs similarity index 100% rename from types/src/byte_string.rs rename to src/types/byte_string.rs diff --git a/types/src/data_types.rs b/src/types/data_types.rs similarity index 100% rename from types/src/data_types.rs rename to src/types/data_types.rs diff --git a/types/src/data_value.rs b/src/types/data_value.rs similarity index 100% rename from types/src/data_value.rs rename to src/types/data_value.rs diff --git a/types/src/date_time.rs b/src/types/date_time.rs similarity index 100% rename from types/src/date_time.rs rename to src/types/date_time.rs diff --git a/types/src/diagnostic_info.rs b/src/types/diagnostic_info.rs similarity index 100% rename from types/src/diagnostic_info.rs rename to src/types/diagnostic_info.rs diff --git a/types/src/encoding.rs b/src/types/encoding.rs similarity index 100% rename from types/src/encoding.rs rename to src/types/encoding.rs diff --git a/types/src/extension_object.rs b/src/types/extension_object.rs similarity index 100% rename from types/src/extension_object.rs rename to src/types/extension_object.rs diff --git a/types/fuzz/.gitignore b/src/types/fuzz/.gitignore similarity index 100% rename from types/fuzz/.gitignore rename to src/types/fuzz/.gitignore diff --git a/types/fuzz/Cargo.lock b/src/types/fuzz/Cargo.lock similarity index 100% rename from types/fuzz/Cargo.lock rename to src/types/fuzz/Cargo.lock diff --git a/types/fuzz/Cargo.toml b/src/types/fuzz/Cargo.toml similarity index 100% rename from types/fuzz/Cargo.toml rename to src/types/fuzz/Cargo.toml diff --git a/types/fuzz/fuzz_targets/fuzz_deserialize.rs b/src/types/fuzz/fuzz_targets/fuzz_deserialize.rs similarity index 100% rename from types/fuzz/fuzz_targets/fuzz_deserialize.rs rename to src/types/fuzz/fuzz_targets/fuzz_deserialize.rs diff --git a/types/src/guid.rs b/src/types/guid.rs similarity index 100% rename from types/src/guid.rs rename to src/types/guid.rs diff --git a/types/src/localized_text.rs b/src/types/localized_text.rs similarity index 100% rename from types/src/localized_text.rs rename to src/types/localized_text.rs diff --git a/types/src/lib.rs b/src/types/mod.rs similarity index 97% rename from types/src/lib.rs rename to src/types/mod.rs index d4fd2f3c0..6d09351ae 100644 --- a/types/src/lib.rs +++ b/src/types/mod.rs @@ -12,17 +12,6 @@ //! //! For the built-in data types, the module provides functions -#[macro_use] -extern crate log; -#[macro_use] -extern crate lazy_static; -#[macro_use] -extern crate bitflags; -#[macro_use] -extern crate serde_derive; -#[cfg(test)] -extern crate serde_json; - ///Contains constants recognized by OPC UA clients and servers to describe various protocols and /// profiles used during communication and encryption. pub mod profiles { diff --git a/types/src/node_id.rs b/src/types/node_id.rs similarity index 100% rename from types/src/node_id.rs rename to src/types/node_id.rs diff --git a/types/src/node_ids.rs b/src/types/node_ids.rs similarity index 100% rename from types/src/node_ids.rs rename to src/types/node_ids.rs diff --git a/types/src/notification_message.rs b/src/types/notification_message.rs similarity index 100% rename from types/src/notification_message.rs rename to src/types/notification_message.rs diff --git a/types/src/numeric_range.rs b/src/types/numeric_range.rs similarity index 100% rename from types/src/numeric_range.rs rename to src/types/numeric_range.rs diff --git a/types/src/operand.rs b/src/types/operand.rs similarity index 100% rename from types/src/operand.rs rename to src/types/operand.rs diff --git a/types/src/qualified_name.rs b/src/types/qualified_name.rs similarity index 100% rename from types/src/qualified_name.rs rename to src/types/qualified_name.rs diff --git a/types/src/relative_path.rs b/src/types/relative_path.rs similarity index 100% rename from types/src/relative_path.rs rename to src/types/relative_path.rs diff --git a/types/src/request_header.rs b/src/types/request_header.rs similarity index 100% rename from types/src/request_header.rs rename to src/types/request_header.rs diff --git a/types/src/response_header.rs b/src/types/response_header.rs similarity index 100% rename from types/src/response_header.rs rename to src/types/response_header.rs diff --git a/types/src/service_types/activate_session_request.rs b/src/types/service_types/activate_session_request.rs similarity index 100% rename from types/src/service_types/activate_session_request.rs rename to src/types/service_types/activate_session_request.rs diff --git a/types/src/service_types/activate_session_response.rs b/src/types/service_types/activate_session_response.rs similarity index 100% rename from types/src/service_types/activate_session_response.rs rename to src/types/service_types/activate_session_response.rs diff --git a/types/src/service_types/add_nodes_item.rs b/src/types/service_types/add_nodes_item.rs similarity index 100% rename from types/src/service_types/add_nodes_item.rs rename to src/types/service_types/add_nodes_item.rs diff --git a/types/src/service_types/add_nodes_request.rs b/src/types/service_types/add_nodes_request.rs similarity index 100% rename from types/src/service_types/add_nodes_request.rs rename to src/types/service_types/add_nodes_request.rs diff --git a/types/src/service_types/add_nodes_response.rs b/src/types/service_types/add_nodes_response.rs similarity index 100% rename from types/src/service_types/add_nodes_response.rs rename to src/types/service_types/add_nodes_response.rs diff --git a/types/src/service_types/add_nodes_result.rs b/src/types/service_types/add_nodes_result.rs similarity index 100% rename from types/src/service_types/add_nodes_result.rs rename to src/types/service_types/add_nodes_result.rs diff --git a/types/src/service_types/add_references_item.rs b/src/types/service_types/add_references_item.rs similarity index 100% rename from types/src/service_types/add_references_item.rs rename to src/types/service_types/add_references_item.rs diff --git a/types/src/service_types/add_references_request.rs b/src/types/service_types/add_references_request.rs similarity index 100% rename from types/src/service_types/add_references_request.rs rename to src/types/service_types/add_references_request.rs diff --git a/types/src/service_types/add_references_response.rs b/src/types/service_types/add_references_response.rs similarity index 100% rename from types/src/service_types/add_references_response.rs rename to src/types/service_types/add_references_response.rs diff --git a/types/src/service_types/additional_parameters_type.rs b/src/types/service_types/additional_parameters_type.rs similarity index 100% rename from types/src/service_types/additional_parameters_type.rs rename to src/types/service_types/additional_parameters_type.rs diff --git a/types/src/service_types/aggregate_configuration.rs b/src/types/service_types/aggregate_configuration.rs similarity index 100% rename from types/src/service_types/aggregate_configuration.rs rename to src/types/service_types/aggregate_configuration.rs diff --git a/types/src/service_types/aggregate_filter.rs b/src/types/service_types/aggregate_filter.rs similarity index 100% rename from types/src/service_types/aggregate_filter.rs rename to src/types/service_types/aggregate_filter.rs diff --git a/types/src/service_types/aggregate_filter_result.rs b/src/types/service_types/aggregate_filter_result.rs similarity index 100% rename from types/src/service_types/aggregate_filter_result.rs rename to src/types/service_types/aggregate_filter_result.rs diff --git a/types/src/service_types/alias_name_data_type.rs b/src/types/service_types/alias_name_data_type.rs similarity index 100% rename from types/src/service_types/alias_name_data_type.rs rename to src/types/service_types/alias_name_data_type.rs diff --git a/types/src/service_types/annotation.rs b/src/types/service_types/annotation.rs similarity index 100% rename from types/src/service_types/annotation.rs rename to src/types/service_types/annotation.rs diff --git a/types/src/service_types/anonymous_identity_token.rs b/src/types/service_types/anonymous_identity_token.rs similarity index 100% rename from types/src/service_types/anonymous_identity_token.rs rename to src/types/service_types/anonymous_identity_token.rs diff --git a/types/src/service_types/application_description.rs b/src/types/service_types/application_description.rs similarity index 100% rename from types/src/service_types/application_description.rs rename to src/types/service_types/application_description.rs diff --git a/types/src/service_types/argument.rs b/src/types/service_types/argument.rs similarity index 100% rename from types/src/service_types/argument.rs rename to src/types/service_types/argument.rs diff --git a/types/src/service_types/attribute_operand.rs b/src/types/service_types/attribute_operand.rs similarity index 100% rename from types/src/service_types/attribute_operand.rs rename to src/types/service_types/attribute_operand.rs diff --git a/types/src/service_types/axis_information.rs b/src/types/service_types/axis_information.rs similarity index 100% rename from types/src/service_types/axis_information.rs rename to src/types/service_types/axis_information.rs diff --git a/types/src/service_types/broker_connection_transport_data_type.rs b/src/types/service_types/broker_connection_transport_data_type.rs similarity index 100% rename from types/src/service_types/broker_connection_transport_data_type.rs rename to src/types/service_types/broker_connection_transport_data_type.rs diff --git a/types/src/service_types/broker_data_set_reader_transport_data_type.rs b/src/types/service_types/broker_data_set_reader_transport_data_type.rs similarity index 100% rename from types/src/service_types/broker_data_set_reader_transport_data_type.rs rename to src/types/service_types/broker_data_set_reader_transport_data_type.rs diff --git a/types/src/service_types/broker_data_set_writer_transport_data_type.rs b/src/types/service_types/broker_data_set_writer_transport_data_type.rs similarity index 100% rename from types/src/service_types/broker_data_set_writer_transport_data_type.rs rename to src/types/service_types/broker_data_set_writer_transport_data_type.rs diff --git a/types/src/service_types/broker_writer_group_transport_data_type.rs b/src/types/service_types/broker_writer_group_transport_data_type.rs similarity index 100% rename from types/src/service_types/broker_writer_group_transport_data_type.rs rename to src/types/service_types/broker_writer_group_transport_data_type.rs diff --git a/types/src/service_types/browse_description.rs b/src/types/service_types/browse_description.rs similarity index 100% rename from types/src/service_types/browse_description.rs rename to src/types/service_types/browse_description.rs diff --git a/types/src/service_types/browse_next_request.rs b/src/types/service_types/browse_next_request.rs similarity index 100% rename from types/src/service_types/browse_next_request.rs rename to src/types/service_types/browse_next_request.rs diff --git a/types/src/service_types/browse_next_response.rs b/src/types/service_types/browse_next_response.rs similarity index 100% rename from types/src/service_types/browse_next_response.rs rename to src/types/service_types/browse_next_response.rs diff --git a/types/src/service_types/browse_path.rs b/src/types/service_types/browse_path.rs similarity index 100% rename from types/src/service_types/browse_path.rs rename to src/types/service_types/browse_path.rs diff --git a/types/src/service_types/browse_path_result.rs b/src/types/service_types/browse_path_result.rs similarity index 100% rename from types/src/service_types/browse_path_result.rs rename to src/types/service_types/browse_path_result.rs diff --git a/types/src/service_types/browse_path_target.rs b/src/types/service_types/browse_path_target.rs similarity index 100% rename from types/src/service_types/browse_path_target.rs rename to src/types/service_types/browse_path_target.rs diff --git a/types/src/service_types/browse_request.rs b/src/types/service_types/browse_request.rs similarity index 100% rename from types/src/service_types/browse_request.rs rename to src/types/service_types/browse_request.rs diff --git a/types/src/service_types/browse_response.rs b/src/types/service_types/browse_response.rs similarity index 100% rename from types/src/service_types/browse_response.rs rename to src/types/service_types/browse_response.rs diff --git a/types/src/service_types/browse_result.rs b/src/types/service_types/browse_result.rs similarity index 100% rename from types/src/service_types/browse_result.rs rename to src/types/service_types/browse_result.rs diff --git a/types/src/service_types/build_info.rs b/src/types/service_types/build_info.rs similarity index 100% rename from types/src/service_types/build_info.rs rename to src/types/service_types/build_info.rs diff --git a/types/src/service_types/call_method_request.rs b/src/types/service_types/call_method_request.rs similarity index 100% rename from types/src/service_types/call_method_request.rs rename to src/types/service_types/call_method_request.rs diff --git a/types/src/service_types/call_method_result.rs b/src/types/service_types/call_method_result.rs similarity index 100% rename from types/src/service_types/call_method_result.rs rename to src/types/service_types/call_method_result.rs diff --git a/types/src/service_types/call_request.rs b/src/types/service_types/call_request.rs similarity index 100% rename from types/src/service_types/call_request.rs rename to src/types/service_types/call_request.rs diff --git a/types/src/service_types/call_response.rs b/src/types/service_types/call_response.rs similarity index 100% rename from types/src/service_types/call_response.rs rename to src/types/service_types/call_response.rs diff --git a/types/src/service_types/cancel_request.rs b/src/types/service_types/cancel_request.rs similarity index 100% rename from types/src/service_types/cancel_request.rs rename to src/types/service_types/cancel_request.rs diff --git a/types/src/service_types/cancel_response.rs b/src/types/service_types/cancel_response.rs similarity index 100% rename from types/src/service_types/cancel_response.rs rename to src/types/service_types/cancel_response.rs diff --git a/types/src/service_types/cartesian_coordinates.rs b/src/types/service_types/cartesian_coordinates.rs similarity index 100% rename from types/src/service_types/cartesian_coordinates.rs rename to src/types/service_types/cartesian_coordinates.rs diff --git a/types/src/service_types/channel_security_token.rs b/src/types/service_types/channel_security_token.rs similarity index 100% rename from types/src/service_types/channel_security_token.rs rename to src/types/service_types/channel_security_token.rs diff --git a/types/src/service_types/close_secure_channel_request.rs b/src/types/service_types/close_secure_channel_request.rs similarity index 100% rename from types/src/service_types/close_secure_channel_request.rs rename to src/types/service_types/close_secure_channel_request.rs diff --git a/types/src/service_types/close_secure_channel_response.rs b/src/types/service_types/close_secure_channel_response.rs similarity index 100% rename from types/src/service_types/close_secure_channel_response.rs rename to src/types/service_types/close_secure_channel_response.rs diff --git a/types/src/service_types/close_session_request.rs b/src/types/service_types/close_session_request.rs similarity index 100% rename from types/src/service_types/close_session_request.rs rename to src/types/service_types/close_session_request.rs diff --git a/types/src/service_types/close_session_response.rs b/src/types/service_types/close_session_response.rs similarity index 100% rename from types/src/service_types/close_session_response.rs rename to src/types/service_types/close_session_response.rs diff --git a/types/src/service_types/complex_number_type.rs b/src/types/service_types/complex_number_type.rs similarity index 100% rename from types/src/service_types/complex_number_type.rs rename to src/types/service_types/complex_number_type.rs diff --git a/types/src/service_types/configuration_version_data_type.rs b/src/types/service_types/configuration_version_data_type.rs similarity index 100% rename from types/src/service_types/configuration_version_data_type.rs rename to src/types/service_types/configuration_version_data_type.rs diff --git a/types/src/service_types/connection_transport_data_type.rs b/src/types/service_types/connection_transport_data_type.rs similarity index 100% rename from types/src/service_types/connection_transport_data_type.rs rename to src/types/service_types/connection_transport_data_type.rs diff --git a/types/src/service_types/content_filter.rs b/src/types/service_types/content_filter.rs similarity index 100% rename from types/src/service_types/content_filter.rs rename to src/types/service_types/content_filter.rs diff --git a/types/src/service_types/content_filter_element.rs b/src/types/service_types/content_filter_element.rs similarity index 100% rename from types/src/service_types/content_filter_element.rs rename to src/types/service_types/content_filter_element.rs diff --git a/types/src/service_types/content_filter_element_result.rs b/src/types/service_types/content_filter_element_result.rs similarity index 100% rename from types/src/service_types/content_filter_element_result.rs rename to src/types/service_types/content_filter_element_result.rs diff --git a/types/src/service_types/content_filter_result.rs b/src/types/service_types/content_filter_result.rs similarity index 100% rename from types/src/service_types/content_filter_result.rs rename to src/types/service_types/content_filter_result.rs diff --git a/types/src/service_types/create_monitored_items_request.rs b/src/types/service_types/create_monitored_items_request.rs similarity index 100% rename from types/src/service_types/create_monitored_items_request.rs rename to src/types/service_types/create_monitored_items_request.rs diff --git a/types/src/service_types/create_monitored_items_response.rs b/src/types/service_types/create_monitored_items_response.rs similarity index 100% rename from types/src/service_types/create_monitored_items_response.rs rename to src/types/service_types/create_monitored_items_response.rs diff --git a/types/src/service_types/create_session_request.rs b/src/types/service_types/create_session_request.rs similarity index 100% rename from types/src/service_types/create_session_request.rs rename to src/types/service_types/create_session_request.rs diff --git a/types/src/service_types/create_session_response.rs b/src/types/service_types/create_session_response.rs similarity index 100% rename from types/src/service_types/create_session_response.rs rename to src/types/service_types/create_session_response.rs diff --git a/types/src/service_types/create_subscription_request.rs b/src/types/service_types/create_subscription_request.rs similarity index 100% rename from types/src/service_types/create_subscription_request.rs rename to src/types/service_types/create_subscription_request.rs diff --git a/types/src/service_types/create_subscription_response.rs b/src/types/service_types/create_subscription_response.rs similarity index 100% rename from types/src/service_types/create_subscription_response.rs rename to src/types/service_types/create_subscription_response.rs diff --git a/types/src/service_types/currency_unit_type.rs b/src/types/service_types/currency_unit_type.rs similarity index 100% rename from types/src/service_types/currency_unit_type.rs rename to src/types/service_types/currency_unit_type.rs diff --git a/types/src/service_types/data_change_filter.rs b/src/types/service_types/data_change_filter.rs similarity index 100% rename from types/src/service_types/data_change_filter.rs rename to src/types/service_types/data_change_filter.rs diff --git a/types/src/service_types/data_change_notification.rs b/src/types/service_types/data_change_notification.rs similarity index 100% rename from types/src/service_types/data_change_notification.rs rename to src/types/service_types/data_change_notification.rs diff --git a/types/src/service_types/data_set_meta_data_type.rs b/src/types/service_types/data_set_meta_data_type.rs similarity index 100% rename from types/src/service_types/data_set_meta_data_type.rs rename to src/types/service_types/data_set_meta_data_type.rs diff --git a/types/src/service_types/data_set_reader_data_type.rs b/src/types/service_types/data_set_reader_data_type.rs similarity index 100% rename from types/src/service_types/data_set_reader_data_type.rs rename to src/types/service_types/data_set_reader_data_type.rs diff --git a/types/src/service_types/data_set_reader_message_data_type.rs b/src/types/service_types/data_set_reader_message_data_type.rs similarity index 100% rename from types/src/service_types/data_set_reader_message_data_type.rs rename to src/types/service_types/data_set_reader_message_data_type.rs diff --git a/types/src/service_types/data_set_reader_transport_data_type.rs b/src/types/service_types/data_set_reader_transport_data_type.rs similarity index 100% rename from types/src/service_types/data_set_reader_transport_data_type.rs rename to src/types/service_types/data_set_reader_transport_data_type.rs diff --git a/types/src/service_types/data_set_writer_data_type.rs b/src/types/service_types/data_set_writer_data_type.rs similarity index 100% rename from types/src/service_types/data_set_writer_data_type.rs rename to src/types/service_types/data_set_writer_data_type.rs diff --git a/types/src/service_types/data_set_writer_message_data_type.rs b/src/types/service_types/data_set_writer_message_data_type.rs similarity index 100% rename from types/src/service_types/data_set_writer_message_data_type.rs rename to src/types/service_types/data_set_writer_message_data_type.rs diff --git a/types/src/service_types/data_set_writer_transport_data_type.rs b/src/types/service_types/data_set_writer_transport_data_type.rs similarity index 100% rename from types/src/service_types/data_set_writer_transport_data_type.rs rename to src/types/service_types/data_set_writer_transport_data_type.rs diff --git a/types/src/service_types/data_type_attributes.rs b/src/types/service_types/data_type_attributes.rs similarity index 100% rename from types/src/service_types/data_type_attributes.rs rename to src/types/service_types/data_type_attributes.rs diff --git a/types/src/service_types/data_type_description.rs b/src/types/service_types/data_type_description.rs similarity index 100% rename from types/src/service_types/data_type_description.rs rename to src/types/service_types/data_type_description.rs diff --git a/types/src/service_types/data_type_schema_header.rs b/src/types/service_types/data_type_schema_header.rs similarity index 100% rename from types/src/service_types/data_type_schema_header.rs rename to src/types/service_types/data_type_schema_header.rs diff --git a/types/src/service_types/datagram_connection_transport_data_type.rs b/src/types/service_types/datagram_connection_transport_data_type.rs similarity index 100% rename from types/src/service_types/datagram_connection_transport_data_type.rs rename to src/types/service_types/datagram_connection_transport_data_type.rs diff --git a/types/src/service_types/datagram_writer_group_transport_data_type.rs b/src/types/service_types/datagram_writer_group_transport_data_type.rs similarity index 100% rename from types/src/service_types/datagram_writer_group_transport_data_type.rs rename to src/types/service_types/datagram_writer_group_transport_data_type.rs diff --git a/types/src/service_types/decimal_data_type.rs b/src/types/service_types/decimal_data_type.rs similarity index 100% rename from types/src/service_types/decimal_data_type.rs rename to src/types/service_types/decimal_data_type.rs diff --git a/types/src/service_types/delete_at_time_details.rs b/src/types/service_types/delete_at_time_details.rs similarity index 100% rename from types/src/service_types/delete_at_time_details.rs rename to src/types/service_types/delete_at_time_details.rs diff --git a/types/src/service_types/delete_event_details.rs b/src/types/service_types/delete_event_details.rs similarity index 100% rename from types/src/service_types/delete_event_details.rs rename to src/types/service_types/delete_event_details.rs diff --git a/types/src/service_types/delete_monitored_items_request.rs b/src/types/service_types/delete_monitored_items_request.rs similarity index 100% rename from types/src/service_types/delete_monitored_items_request.rs rename to src/types/service_types/delete_monitored_items_request.rs diff --git a/types/src/service_types/delete_monitored_items_response.rs b/src/types/service_types/delete_monitored_items_response.rs similarity index 100% rename from types/src/service_types/delete_monitored_items_response.rs rename to src/types/service_types/delete_monitored_items_response.rs diff --git a/types/src/service_types/delete_nodes_item.rs b/src/types/service_types/delete_nodes_item.rs similarity index 100% rename from types/src/service_types/delete_nodes_item.rs rename to src/types/service_types/delete_nodes_item.rs diff --git a/types/src/service_types/delete_nodes_request.rs b/src/types/service_types/delete_nodes_request.rs similarity index 100% rename from types/src/service_types/delete_nodes_request.rs rename to src/types/service_types/delete_nodes_request.rs diff --git a/types/src/service_types/delete_nodes_response.rs b/src/types/service_types/delete_nodes_response.rs similarity index 100% rename from types/src/service_types/delete_nodes_response.rs rename to src/types/service_types/delete_nodes_response.rs diff --git a/types/src/service_types/delete_raw_modified_details.rs b/src/types/service_types/delete_raw_modified_details.rs similarity index 100% rename from types/src/service_types/delete_raw_modified_details.rs rename to src/types/service_types/delete_raw_modified_details.rs diff --git a/types/src/service_types/delete_references_item.rs b/src/types/service_types/delete_references_item.rs similarity index 100% rename from types/src/service_types/delete_references_item.rs rename to src/types/service_types/delete_references_item.rs diff --git a/types/src/service_types/delete_references_request.rs b/src/types/service_types/delete_references_request.rs similarity index 100% rename from types/src/service_types/delete_references_request.rs rename to src/types/service_types/delete_references_request.rs diff --git a/types/src/service_types/delete_references_response.rs b/src/types/service_types/delete_references_response.rs similarity index 100% rename from types/src/service_types/delete_references_response.rs rename to src/types/service_types/delete_references_response.rs diff --git a/types/src/service_types/delete_subscriptions_request.rs b/src/types/service_types/delete_subscriptions_request.rs similarity index 100% rename from types/src/service_types/delete_subscriptions_request.rs rename to src/types/service_types/delete_subscriptions_request.rs diff --git a/types/src/service_types/delete_subscriptions_response.rs b/src/types/service_types/delete_subscriptions_response.rs similarity index 100% rename from types/src/service_types/delete_subscriptions_response.rs rename to src/types/service_types/delete_subscriptions_response.rs diff --git a/types/src/service_types/discovery_configuration.rs b/src/types/service_types/discovery_configuration.rs similarity index 100% rename from types/src/service_types/discovery_configuration.rs rename to src/types/service_types/discovery_configuration.rs diff --git a/types/src/service_types/double_complex_number_type.rs b/src/types/service_types/double_complex_number_type.rs similarity index 100% rename from types/src/service_types/double_complex_number_type.rs rename to src/types/service_types/double_complex_number_type.rs diff --git a/types/src/service_types/element_operand.rs b/src/types/service_types/element_operand.rs similarity index 100% rename from types/src/service_types/element_operand.rs rename to src/types/service_types/element_operand.rs diff --git a/types/src/service_types/endpoint_configuration.rs b/src/types/service_types/endpoint_configuration.rs similarity index 100% rename from types/src/service_types/endpoint_configuration.rs rename to src/types/service_types/endpoint_configuration.rs diff --git a/types/src/service_types/endpoint_description.rs b/src/types/service_types/endpoint_description.rs similarity index 100% rename from types/src/service_types/endpoint_description.rs rename to src/types/service_types/endpoint_description.rs diff --git a/types/src/service_types/endpoint_type.rs b/src/types/service_types/endpoint_type.rs similarity index 100% rename from types/src/service_types/endpoint_type.rs rename to src/types/service_types/endpoint_type.rs diff --git a/types/src/service_types/endpoint_url_list_data_type.rs b/src/types/service_types/endpoint_url_list_data_type.rs similarity index 100% rename from types/src/service_types/endpoint_url_list_data_type.rs rename to src/types/service_types/endpoint_url_list_data_type.rs diff --git a/types/src/service_types/enum_definition.rs b/src/types/service_types/enum_definition.rs similarity index 100% rename from types/src/service_types/enum_definition.rs rename to src/types/service_types/enum_definition.rs diff --git a/types/src/service_types/enum_description.rs b/src/types/service_types/enum_description.rs similarity index 100% rename from types/src/service_types/enum_description.rs rename to src/types/service_types/enum_description.rs diff --git a/types/src/service_types/enum_field.rs b/src/types/service_types/enum_field.rs similarity index 100% rename from types/src/service_types/enum_field.rs rename to src/types/service_types/enum_field.rs diff --git a/types/src/service_types/enum_value_type.rs b/src/types/service_types/enum_value_type.rs similarity index 100% rename from types/src/service_types/enum_value_type.rs rename to src/types/service_types/enum_value_type.rs diff --git a/types/src/service_types/enums.rs b/src/types/service_types/enums.rs similarity index 100% rename from types/src/service_types/enums.rs rename to src/types/service_types/enums.rs diff --git a/types/src/service_types/ephemeral_key_type.rs b/src/types/service_types/ephemeral_key_type.rs similarity index 100% rename from types/src/service_types/ephemeral_key_type.rs rename to src/types/service_types/ephemeral_key_type.rs diff --git a/types/src/service_types/eu_information.rs b/src/types/service_types/eu_information.rs similarity index 100% rename from types/src/service_types/eu_information.rs rename to src/types/service_types/eu_information.rs diff --git a/types/src/service_types/event_field_list.rs b/src/types/service_types/event_field_list.rs similarity index 100% rename from types/src/service_types/event_field_list.rs rename to src/types/service_types/event_field_list.rs diff --git a/types/src/service_types/event_filter.rs b/src/types/service_types/event_filter.rs similarity index 100% rename from types/src/service_types/event_filter.rs rename to src/types/service_types/event_filter.rs diff --git a/types/src/service_types/event_filter_result.rs b/src/types/service_types/event_filter_result.rs similarity index 100% rename from types/src/service_types/event_filter_result.rs rename to src/types/service_types/event_filter_result.rs diff --git a/types/src/service_types/event_notification_list.rs b/src/types/service_types/event_notification_list.rs similarity index 100% rename from types/src/service_types/event_notification_list.rs rename to src/types/service_types/event_notification_list.rs diff --git a/types/src/service_types/field_meta_data.rs b/src/types/service_types/field_meta_data.rs similarity index 100% rename from types/src/service_types/field_meta_data.rs rename to src/types/service_types/field_meta_data.rs diff --git a/types/src/service_types/field_target_data_type.rs b/src/types/service_types/field_target_data_type.rs similarity index 100% rename from types/src/service_types/field_target_data_type.rs rename to src/types/service_types/field_target_data_type.rs diff --git a/types/src/service_types/filter_operand.rs b/src/types/service_types/filter_operand.rs similarity index 100% rename from types/src/service_types/filter_operand.rs rename to src/types/service_types/filter_operand.rs diff --git a/types/src/service_types/find_servers_on_network_request.rs b/src/types/service_types/find_servers_on_network_request.rs similarity index 100% rename from types/src/service_types/find_servers_on_network_request.rs rename to src/types/service_types/find_servers_on_network_request.rs diff --git a/types/src/service_types/find_servers_on_network_response.rs b/src/types/service_types/find_servers_on_network_response.rs similarity index 100% rename from types/src/service_types/find_servers_on_network_response.rs rename to src/types/service_types/find_servers_on_network_response.rs diff --git a/types/src/service_types/find_servers_request.rs b/src/types/service_types/find_servers_request.rs similarity index 100% rename from types/src/service_types/find_servers_request.rs rename to src/types/service_types/find_servers_request.rs diff --git a/types/src/service_types/find_servers_response.rs b/src/types/service_types/find_servers_response.rs similarity index 100% rename from types/src/service_types/find_servers_response.rs rename to src/types/service_types/find_servers_response.rs diff --git a/types/src/service_types/frame.rs b/src/types/service_types/frame.rs similarity index 100% rename from types/src/service_types/frame.rs rename to src/types/service_types/frame.rs diff --git a/types/src/service_types/generic_attribute_value.rs b/src/types/service_types/generic_attribute_value.rs similarity index 100% rename from types/src/service_types/generic_attribute_value.rs rename to src/types/service_types/generic_attribute_value.rs diff --git a/types/src/service_types/generic_attributes.rs b/src/types/service_types/generic_attributes.rs similarity index 100% rename from types/src/service_types/generic_attributes.rs rename to src/types/service_types/generic_attributes.rs diff --git a/types/src/service_types/get_endpoints_request.rs b/src/types/service_types/get_endpoints_request.rs similarity index 100% rename from types/src/service_types/get_endpoints_request.rs rename to src/types/service_types/get_endpoints_request.rs diff --git a/types/src/service_types/get_endpoints_response.rs b/src/types/service_types/get_endpoints_response.rs similarity index 100% rename from types/src/service_types/get_endpoints_response.rs rename to src/types/service_types/get_endpoints_response.rs diff --git a/types/src/service_types/history_data.rs b/src/types/service_types/history_data.rs similarity index 100% rename from types/src/service_types/history_data.rs rename to src/types/service_types/history_data.rs diff --git a/types/src/service_types/history_event.rs b/src/types/service_types/history_event.rs similarity index 100% rename from types/src/service_types/history_event.rs rename to src/types/service_types/history_event.rs diff --git a/types/src/service_types/history_event_field_list.rs b/src/types/service_types/history_event_field_list.rs similarity index 100% rename from types/src/service_types/history_event_field_list.rs rename to src/types/service_types/history_event_field_list.rs diff --git a/types/src/service_types/history_modified_data.rs b/src/types/service_types/history_modified_data.rs similarity index 100% rename from types/src/service_types/history_modified_data.rs rename to src/types/service_types/history_modified_data.rs diff --git a/types/src/service_types/history_read_details.rs b/src/types/service_types/history_read_details.rs similarity index 100% rename from types/src/service_types/history_read_details.rs rename to src/types/service_types/history_read_details.rs diff --git a/types/src/service_types/history_read_request.rs b/src/types/service_types/history_read_request.rs similarity index 100% rename from types/src/service_types/history_read_request.rs rename to src/types/service_types/history_read_request.rs diff --git a/types/src/service_types/history_read_response.rs b/src/types/service_types/history_read_response.rs similarity index 100% rename from types/src/service_types/history_read_response.rs rename to src/types/service_types/history_read_response.rs diff --git a/types/src/service_types/history_read_result.rs b/src/types/service_types/history_read_result.rs similarity index 100% rename from types/src/service_types/history_read_result.rs rename to src/types/service_types/history_read_result.rs diff --git a/types/src/service_types/history_read_value_id.rs b/src/types/service_types/history_read_value_id.rs similarity index 100% rename from types/src/service_types/history_read_value_id.rs rename to src/types/service_types/history_read_value_id.rs diff --git a/types/src/service_types/history_update_details.rs b/src/types/service_types/history_update_details.rs similarity index 100% rename from types/src/service_types/history_update_details.rs rename to src/types/service_types/history_update_details.rs diff --git a/types/src/service_types/history_update_request.rs b/src/types/service_types/history_update_request.rs similarity index 100% rename from types/src/service_types/history_update_request.rs rename to src/types/service_types/history_update_request.rs diff --git a/types/src/service_types/history_update_response.rs b/src/types/service_types/history_update_response.rs similarity index 100% rename from types/src/service_types/history_update_response.rs rename to src/types/service_types/history_update_response.rs diff --git a/types/src/service_types/history_update_result.rs b/src/types/service_types/history_update_result.rs similarity index 100% rename from types/src/service_types/history_update_result.rs rename to src/types/service_types/history_update_result.rs diff --git a/types/src/service_types/identity_mapping_rule_type.rs b/src/types/service_types/identity_mapping_rule_type.rs similarity index 100% rename from types/src/service_types/identity_mapping_rule_type.rs rename to src/types/service_types/identity_mapping_rule_type.rs diff --git a/types/src/service_types/impls.rs b/src/types/service_types/impls.rs similarity index 100% rename from types/src/service_types/impls.rs rename to src/types/service_types/impls.rs diff --git a/types/src/service_types/issued_identity_token.rs b/src/types/service_types/issued_identity_token.rs similarity index 100% rename from types/src/service_types/issued_identity_token.rs rename to src/types/service_types/issued_identity_token.rs diff --git a/types/src/service_types/json_data_set_reader_message_data_type.rs b/src/types/service_types/json_data_set_reader_message_data_type.rs similarity index 100% rename from types/src/service_types/json_data_set_reader_message_data_type.rs rename to src/types/service_types/json_data_set_reader_message_data_type.rs diff --git a/types/src/service_types/json_data_set_writer_message_data_type.rs b/src/types/service_types/json_data_set_writer_message_data_type.rs similarity index 100% rename from types/src/service_types/json_data_set_writer_message_data_type.rs rename to src/types/service_types/json_data_set_writer_message_data_type.rs diff --git a/types/src/service_types/json_writer_group_message_data_type.rs b/src/types/service_types/json_writer_group_message_data_type.rs similarity index 100% rename from types/src/service_types/json_writer_group_message_data_type.rs rename to src/types/service_types/json_writer_group_message_data_type.rs diff --git a/types/src/service_types/key_value_pair.rs b/src/types/service_types/key_value_pair.rs similarity index 100% rename from types/src/service_types/key_value_pair.rs rename to src/types/service_types/key_value_pair.rs diff --git a/types/src/service_types/literal_operand.rs b/src/types/service_types/literal_operand.rs similarity index 100% rename from types/src/service_types/literal_operand.rs rename to src/types/service_types/literal_operand.rs diff --git a/types/src/service_types/mdns_discovery_configuration.rs b/src/types/service_types/mdns_discovery_configuration.rs similarity index 100% rename from types/src/service_types/mdns_discovery_configuration.rs rename to src/types/service_types/mdns_discovery_configuration.rs diff --git a/types/src/service_types/method_attributes.rs b/src/types/service_types/method_attributes.rs similarity index 100% rename from types/src/service_types/method_attributes.rs rename to src/types/service_types/method_attributes.rs diff --git a/types/src/service_types/mod.rs b/src/types/service_types/mod.rs similarity index 100% rename from types/src/service_types/mod.rs rename to src/types/service_types/mod.rs diff --git a/types/src/service_types/model_change_structure_data_type.rs b/src/types/service_types/model_change_structure_data_type.rs similarity index 100% rename from types/src/service_types/model_change_structure_data_type.rs rename to src/types/service_types/model_change_structure_data_type.rs diff --git a/types/src/service_types/modification_info.rs b/src/types/service_types/modification_info.rs similarity index 100% rename from types/src/service_types/modification_info.rs rename to src/types/service_types/modification_info.rs diff --git a/types/src/service_types/modify_monitored_items_request.rs b/src/types/service_types/modify_monitored_items_request.rs similarity index 100% rename from types/src/service_types/modify_monitored_items_request.rs rename to src/types/service_types/modify_monitored_items_request.rs diff --git a/types/src/service_types/modify_monitored_items_response.rs b/src/types/service_types/modify_monitored_items_response.rs similarity index 100% rename from types/src/service_types/modify_monitored_items_response.rs rename to src/types/service_types/modify_monitored_items_response.rs diff --git a/types/src/service_types/modify_subscription_request.rs b/src/types/service_types/modify_subscription_request.rs similarity index 100% rename from types/src/service_types/modify_subscription_request.rs rename to src/types/service_types/modify_subscription_request.rs diff --git a/types/src/service_types/modify_subscription_response.rs b/src/types/service_types/modify_subscription_response.rs similarity index 100% rename from types/src/service_types/modify_subscription_response.rs rename to src/types/service_types/modify_subscription_response.rs diff --git a/types/src/service_types/monitored_item_create_request.rs b/src/types/service_types/monitored_item_create_request.rs similarity index 100% rename from types/src/service_types/monitored_item_create_request.rs rename to src/types/service_types/monitored_item_create_request.rs diff --git a/types/src/service_types/monitored_item_create_result.rs b/src/types/service_types/monitored_item_create_result.rs similarity index 100% rename from types/src/service_types/monitored_item_create_result.rs rename to src/types/service_types/monitored_item_create_result.rs diff --git a/types/src/service_types/monitored_item_modify_request.rs b/src/types/service_types/monitored_item_modify_request.rs similarity index 100% rename from types/src/service_types/monitored_item_modify_request.rs rename to src/types/service_types/monitored_item_modify_request.rs diff --git a/types/src/service_types/monitored_item_modify_result.rs b/src/types/service_types/monitored_item_modify_result.rs similarity index 100% rename from types/src/service_types/monitored_item_modify_result.rs rename to src/types/service_types/monitored_item_modify_result.rs diff --git a/types/src/service_types/monitored_item_notification.rs b/src/types/service_types/monitored_item_notification.rs similarity index 100% rename from types/src/service_types/monitored_item_notification.rs rename to src/types/service_types/monitored_item_notification.rs diff --git a/types/src/service_types/monitoring_filter.rs b/src/types/service_types/monitoring_filter.rs similarity index 100% rename from types/src/service_types/monitoring_filter.rs rename to src/types/service_types/monitoring_filter.rs diff --git a/types/src/service_types/monitoring_filter_result.rs b/src/types/service_types/monitoring_filter_result.rs similarity index 100% rename from types/src/service_types/monitoring_filter_result.rs rename to src/types/service_types/monitoring_filter_result.rs diff --git a/types/src/service_types/monitoring_parameters.rs b/src/types/service_types/monitoring_parameters.rs similarity index 100% rename from types/src/service_types/monitoring_parameters.rs rename to src/types/service_types/monitoring_parameters.rs diff --git a/types/src/service_types/network_address_data_type.rs b/src/types/service_types/network_address_data_type.rs similarity index 100% rename from types/src/service_types/network_address_data_type.rs rename to src/types/service_types/network_address_data_type.rs diff --git a/types/src/service_types/network_address_url_data_type.rs b/src/types/service_types/network_address_url_data_type.rs similarity index 100% rename from types/src/service_types/network_address_url_data_type.rs rename to src/types/service_types/network_address_url_data_type.rs diff --git a/types/src/service_types/network_group_data_type.rs b/src/types/service_types/network_group_data_type.rs similarity index 100% rename from types/src/service_types/network_group_data_type.rs rename to src/types/service_types/network_group_data_type.rs diff --git a/types/src/service_types/node_attributes.rs b/src/types/service_types/node_attributes.rs similarity index 100% rename from types/src/service_types/node_attributes.rs rename to src/types/service_types/node_attributes.rs diff --git a/types/src/service_types/node_reference.rs b/src/types/service_types/node_reference.rs similarity index 100% rename from types/src/service_types/node_reference.rs rename to src/types/service_types/node_reference.rs diff --git a/types/src/service_types/node_type_description.rs b/src/types/service_types/node_type_description.rs similarity index 100% rename from types/src/service_types/node_type_description.rs rename to src/types/service_types/node_type_description.rs diff --git a/types/src/service_types/notification_data.rs b/src/types/service_types/notification_data.rs similarity index 100% rename from types/src/service_types/notification_data.rs rename to src/types/service_types/notification_data.rs diff --git a/types/src/service_types/notification_message.rs b/src/types/service_types/notification_message.rs similarity index 100% rename from types/src/service_types/notification_message.rs rename to src/types/service_types/notification_message.rs diff --git a/types/src/service_types/object_attributes.rs b/src/types/service_types/object_attributes.rs similarity index 100% rename from types/src/service_types/object_attributes.rs rename to src/types/service_types/object_attributes.rs diff --git a/types/src/service_types/object_type_attributes.rs b/src/types/service_types/object_type_attributes.rs similarity index 100% rename from types/src/service_types/object_type_attributes.rs rename to src/types/service_types/object_type_attributes.rs diff --git a/types/src/service_types/open_secure_channel_request.rs b/src/types/service_types/open_secure_channel_request.rs similarity index 100% rename from types/src/service_types/open_secure_channel_request.rs rename to src/types/service_types/open_secure_channel_request.rs diff --git a/types/src/service_types/open_secure_channel_response.rs b/src/types/service_types/open_secure_channel_response.rs similarity index 100% rename from types/src/service_types/open_secure_channel_response.rs rename to src/types/service_types/open_secure_channel_response.rs diff --git a/types/src/service_types/option_set.rs b/src/types/service_types/option_set.rs similarity index 100% rename from types/src/service_types/option_set.rs rename to src/types/service_types/option_set.rs diff --git a/types/src/service_types/orientation.rs b/src/types/service_types/orientation.rs similarity index 100% rename from types/src/service_types/orientation.rs rename to src/types/service_types/orientation.rs diff --git a/types/src/service_types/parsing_result.rs b/src/types/service_types/parsing_result.rs similarity index 100% rename from types/src/service_types/parsing_result.rs rename to src/types/service_types/parsing_result.rs diff --git a/types/src/service_types/program_diagnostic_2_data_type.rs b/src/types/service_types/program_diagnostic_2_data_type.rs similarity index 100% rename from types/src/service_types/program_diagnostic_2_data_type.rs rename to src/types/service_types/program_diagnostic_2_data_type.rs diff --git a/types/src/service_types/program_diagnostic_data_type.rs b/src/types/service_types/program_diagnostic_data_type.rs similarity index 100% rename from types/src/service_types/program_diagnostic_data_type.rs rename to src/types/service_types/program_diagnostic_data_type.rs diff --git a/types/src/service_types/pub_sub_configuration_data_type.rs b/src/types/service_types/pub_sub_configuration_data_type.rs similarity index 100% rename from types/src/service_types/pub_sub_configuration_data_type.rs rename to src/types/service_types/pub_sub_configuration_data_type.rs diff --git a/types/src/service_types/pub_sub_connection_data_type.rs b/src/types/service_types/pub_sub_connection_data_type.rs similarity index 100% rename from types/src/service_types/pub_sub_connection_data_type.rs rename to src/types/service_types/pub_sub_connection_data_type.rs diff --git a/types/src/service_types/pub_sub_group_data_type.rs b/src/types/service_types/pub_sub_group_data_type.rs similarity index 100% rename from types/src/service_types/pub_sub_group_data_type.rs rename to src/types/service_types/pub_sub_group_data_type.rs diff --git a/types/src/service_types/publish_request.rs b/src/types/service_types/publish_request.rs similarity index 100% rename from types/src/service_types/publish_request.rs rename to src/types/service_types/publish_request.rs diff --git a/types/src/service_types/publish_response.rs b/src/types/service_types/publish_response.rs similarity index 100% rename from types/src/service_types/publish_response.rs rename to src/types/service_types/publish_response.rs diff --git a/types/src/service_types/published_data_items_data_type.rs b/src/types/service_types/published_data_items_data_type.rs similarity index 100% rename from types/src/service_types/published_data_items_data_type.rs rename to src/types/service_types/published_data_items_data_type.rs diff --git a/types/src/service_types/published_data_set_data_type.rs b/src/types/service_types/published_data_set_data_type.rs similarity index 100% rename from types/src/service_types/published_data_set_data_type.rs rename to src/types/service_types/published_data_set_data_type.rs diff --git a/types/src/service_types/published_data_set_source_data_type.rs b/src/types/service_types/published_data_set_source_data_type.rs similarity index 100% rename from types/src/service_types/published_data_set_source_data_type.rs rename to src/types/service_types/published_data_set_source_data_type.rs diff --git a/types/src/service_types/published_events_data_type.rs b/src/types/service_types/published_events_data_type.rs similarity index 100% rename from types/src/service_types/published_events_data_type.rs rename to src/types/service_types/published_events_data_type.rs diff --git a/types/src/service_types/published_variable_data_type.rs b/src/types/service_types/published_variable_data_type.rs similarity index 100% rename from types/src/service_types/published_variable_data_type.rs rename to src/types/service_types/published_variable_data_type.rs diff --git a/types/src/service_types/query_data_description.rs b/src/types/service_types/query_data_description.rs similarity index 100% rename from types/src/service_types/query_data_description.rs rename to src/types/service_types/query_data_description.rs diff --git a/types/src/service_types/query_data_set.rs b/src/types/service_types/query_data_set.rs similarity index 100% rename from types/src/service_types/query_data_set.rs rename to src/types/service_types/query_data_set.rs diff --git a/types/src/service_types/query_first_request.rs b/src/types/service_types/query_first_request.rs similarity index 100% rename from types/src/service_types/query_first_request.rs rename to src/types/service_types/query_first_request.rs diff --git a/types/src/service_types/query_first_response.rs b/src/types/service_types/query_first_response.rs similarity index 100% rename from types/src/service_types/query_first_response.rs rename to src/types/service_types/query_first_response.rs diff --git a/types/src/service_types/query_next_request.rs b/src/types/service_types/query_next_request.rs similarity index 100% rename from types/src/service_types/query_next_request.rs rename to src/types/service_types/query_next_request.rs diff --git a/types/src/service_types/query_next_response.rs b/src/types/service_types/query_next_response.rs similarity index 100% rename from types/src/service_types/query_next_response.rs rename to src/types/service_types/query_next_response.rs diff --git a/types/src/service_types/range.rs b/src/types/service_types/range.rs similarity index 100% rename from types/src/service_types/range.rs rename to src/types/service_types/range.rs diff --git a/types/src/service_types/rational_number.rs b/src/types/service_types/rational_number.rs similarity index 100% rename from types/src/service_types/rational_number.rs rename to src/types/service_types/rational_number.rs diff --git a/types/src/service_types/read_annotation_data_details.rs b/src/types/service_types/read_annotation_data_details.rs similarity index 100% rename from types/src/service_types/read_annotation_data_details.rs rename to src/types/service_types/read_annotation_data_details.rs diff --git a/types/src/service_types/read_at_time_details.rs b/src/types/service_types/read_at_time_details.rs similarity index 100% rename from types/src/service_types/read_at_time_details.rs rename to src/types/service_types/read_at_time_details.rs diff --git a/types/src/service_types/read_event_details.rs b/src/types/service_types/read_event_details.rs similarity index 100% rename from types/src/service_types/read_event_details.rs rename to src/types/service_types/read_event_details.rs diff --git a/types/src/service_types/read_processed_details.rs b/src/types/service_types/read_processed_details.rs similarity index 100% rename from types/src/service_types/read_processed_details.rs rename to src/types/service_types/read_processed_details.rs diff --git a/types/src/service_types/read_raw_modified_details.rs b/src/types/service_types/read_raw_modified_details.rs similarity index 100% rename from types/src/service_types/read_raw_modified_details.rs rename to src/types/service_types/read_raw_modified_details.rs diff --git a/types/src/service_types/read_request.rs b/src/types/service_types/read_request.rs similarity index 100% rename from types/src/service_types/read_request.rs rename to src/types/service_types/read_request.rs diff --git a/types/src/service_types/read_response.rs b/src/types/service_types/read_response.rs similarity index 100% rename from types/src/service_types/read_response.rs rename to src/types/service_types/read_response.rs diff --git a/types/src/service_types/read_value_id.rs b/src/types/service_types/read_value_id.rs similarity index 100% rename from types/src/service_types/read_value_id.rs rename to src/types/service_types/read_value_id.rs diff --git a/types/src/service_types/reader_group_data_type.rs b/src/types/service_types/reader_group_data_type.rs similarity index 100% rename from types/src/service_types/reader_group_data_type.rs rename to src/types/service_types/reader_group_data_type.rs diff --git a/types/src/service_types/reader_group_message_data_type.rs b/src/types/service_types/reader_group_message_data_type.rs similarity index 100% rename from types/src/service_types/reader_group_message_data_type.rs rename to src/types/service_types/reader_group_message_data_type.rs diff --git a/types/src/service_types/reader_group_transport_data_type.rs b/src/types/service_types/reader_group_transport_data_type.rs similarity index 100% rename from types/src/service_types/reader_group_transport_data_type.rs rename to src/types/service_types/reader_group_transport_data_type.rs diff --git a/types/src/service_types/redundant_server_data_type.rs b/src/types/service_types/redundant_server_data_type.rs similarity index 100% rename from types/src/service_types/redundant_server_data_type.rs rename to src/types/service_types/redundant_server_data_type.rs diff --git a/types/src/service_types/reference_description.rs b/src/types/service_types/reference_description.rs similarity index 100% rename from types/src/service_types/reference_description.rs rename to src/types/service_types/reference_description.rs diff --git a/types/src/service_types/reference_type_attributes.rs b/src/types/service_types/reference_type_attributes.rs similarity index 100% rename from types/src/service_types/reference_type_attributes.rs rename to src/types/service_types/reference_type_attributes.rs diff --git a/types/src/service_types/register_nodes_request.rs b/src/types/service_types/register_nodes_request.rs similarity index 100% rename from types/src/service_types/register_nodes_request.rs rename to src/types/service_types/register_nodes_request.rs diff --git a/types/src/service_types/register_nodes_response.rs b/src/types/service_types/register_nodes_response.rs similarity index 100% rename from types/src/service_types/register_nodes_response.rs rename to src/types/service_types/register_nodes_response.rs diff --git a/types/src/service_types/register_server_2_request.rs b/src/types/service_types/register_server_2_request.rs similarity index 100% rename from types/src/service_types/register_server_2_request.rs rename to src/types/service_types/register_server_2_request.rs diff --git a/types/src/service_types/register_server_2_response.rs b/src/types/service_types/register_server_2_response.rs similarity index 100% rename from types/src/service_types/register_server_2_response.rs rename to src/types/service_types/register_server_2_response.rs diff --git a/types/src/service_types/register_server_request.rs b/src/types/service_types/register_server_request.rs similarity index 100% rename from types/src/service_types/register_server_request.rs rename to src/types/service_types/register_server_request.rs diff --git a/types/src/service_types/register_server_response.rs b/src/types/service_types/register_server_response.rs similarity index 100% rename from types/src/service_types/register_server_response.rs rename to src/types/service_types/register_server_response.rs diff --git a/types/src/service_types/registered_server.rs b/src/types/service_types/registered_server.rs similarity index 100% rename from types/src/service_types/registered_server.rs rename to src/types/service_types/registered_server.rs diff --git a/types/src/service_types/relative_path.rs b/src/types/service_types/relative_path.rs similarity index 100% rename from types/src/service_types/relative_path.rs rename to src/types/service_types/relative_path.rs diff --git a/types/src/service_types/relative_path_element.rs b/src/types/service_types/relative_path_element.rs similarity index 100% rename from types/src/service_types/relative_path_element.rs rename to src/types/service_types/relative_path_element.rs diff --git a/types/src/service_types/republish_request.rs b/src/types/service_types/republish_request.rs similarity index 100% rename from types/src/service_types/republish_request.rs rename to src/types/service_types/republish_request.rs diff --git a/types/src/service_types/republish_response.rs b/src/types/service_types/republish_response.rs similarity index 100% rename from types/src/service_types/republish_response.rs rename to src/types/service_types/republish_response.rs diff --git a/types/src/service_types/role_permission_type.rs b/src/types/service_types/role_permission_type.rs similarity index 100% rename from types/src/service_types/role_permission_type.rs rename to src/types/service_types/role_permission_type.rs diff --git a/types/src/service_types/sampling_interval_diagnostics_data_type.rs b/src/types/service_types/sampling_interval_diagnostics_data_type.rs similarity index 100% rename from types/src/service_types/sampling_interval_diagnostics_data_type.rs rename to src/types/service_types/sampling_interval_diagnostics_data_type.rs diff --git a/types/src/service_types/semantic_change_structure_data_type.rs b/src/types/service_types/semantic_change_structure_data_type.rs similarity index 100% rename from types/src/service_types/semantic_change_structure_data_type.rs rename to src/types/service_types/semantic_change_structure_data_type.rs diff --git a/types/src/service_types/server_diagnostics_summary_data_type.rs b/src/types/service_types/server_diagnostics_summary_data_type.rs similarity index 100% rename from types/src/service_types/server_diagnostics_summary_data_type.rs rename to src/types/service_types/server_diagnostics_summary_data_type.rs diff --git a/types/src/service_types/server_on_network.rs b/src/types/service_types/server_on_network.rs similarity index 100% rename from types/src/service_types/server_on_network.rs rename to src/types/service_types/server_on_network.rs diff --git a/types/src/service_types/server_status_data_type.rs b/src/types/service_types/server_status_data_type.rs similarity index 100% rename from types/src/service_types/server_status_data_type.rs rename to src/types/service_types/server_status_data_type.rs diff --git a/types/src/service_types/service_counter_data_type.rs b/src/types/service_types/service_counter_data_type.rs similarity index 100% rename from types/src/service_types/service_counter_data_type.rs rename to src/types/service_types/service_counter_data_type.rs diff --git a/types/src/service_types/service_fault.rs b/src/types/service_types/service_fault.rs similarity index 100% rename from types/src/service_types/service_fault.rs rename to src/types/service_types/service_fault.rs diff --git a/types/src/service_types/session_diagnostics_data_type.rs b/src/types/service_types/session_diagnostics_data_type.rs similarity index 100% rename from types/src/service_types/session_diagnostics_data_type.rs rename to src/types/service_types/session_diagnostics_data_type.rs diff --git a/types/src/service_types/session_security_diagnostics_data_type.rs b/src/types/service_types/session_security_diagnostics_data_type.rs similarity index 100% rename from types/src/service_types/session_security_diagnostics_data_type.rs rename to src/types/service_types/session_security_diagnostics_data_type.rs diff --git a/types/src/service_types/sessionless_invoke_request_type.rs b/src/types/service_types/sessionless_invoke_request_type.rs similarity index 100% rename from types/src/service_types/sessionless_invoke_request_type.rs rename to src/types/service_types/sessionless_invoke_request_type.rs diff --git a/types/src/service_types/sessionless_invoke_response_type.rs b/src/types/service_types/sessionless_invoke_response_type.rs similarity index 100% rename from types/src/service_types/sessionless_invoke_response_type.rs rename to src/types/service_types/sessionless_invoke_response_type.rs diff --git a/types/src/service_types/set_monitoring_mode_request.rs b/src/types/service_types/set_monitoring_mode_request.rs similarity index 100% rename from types/src/service_types/set_monitoring_mode_request.rs rename to src/types/service_types/set_monitoring_mode_request.rs diff --git a/types/src/service_types/set_monitoring_mode_response.rs b/src/types/service_types/set_monitoring_mode_response.rs similarity index 100% rename from types/src/service_types/set_monitoring_mode_response.rs rename to src/types/service_types/set_monitoring_mode_response.rs diff --git a/types/src/service_types/set_publishing_mode_request.rs b/src/types/service_types/set_publishing_mode_request.rs similarity index 100% rename from types/src/service_types/set_publishing_mode_request.rs rename to src/types/service_types/set_publishing_mode_request.rs diff --git a/types/src/service_types/set_publishing_mode_response.rs b/src/types/service_types/set_publishing_mode_response.rs similarity index 100% rename from types/src/service_types/set_publishing_mode_response.rs rename to src/types/service_types/set_publishing_mode_response.rs diff --git a/types/src/service_types/set_triggering_request.rs b/src/types/service_types/set_triggering_request.rs similarity index 100% rename from types/src/service_types/set_triggering_request.rs rename to src/types/service_types/set_triggering_request.rs diff --git a/types/src/service_types/set_triggering_response.rs b/src/types/service_types/set_triggering_response.rs similarity index 100% rename from types/src/service_types/set_triggering_response.rs rename to src/types/service_types/set_triggering_response.rs diff --git a/types/src/service_types/signature_data.rs b/src/types/service_types/signature_data.rs similarity index 100% rename from types/src/service_types/signature_data.rs rename to src/types/service_types/signature_data.rs diff --git a/types/src/service_types/signed_software_certificate.rs b/src/types/service_types/signed_software_certificate.rs similarity index 100% rename from types/src/service_types/signed_software_certificate.rs rename to src/types/service_types/signed_software_certificate.rs diff --git a/types/src/service_types/simple_attribute_operand.rs b/src/types/service_types/simple_attribute_operand.rs similarity index 100% rename from types/src/service_types/simple_attribute_operand.rs rename to src/types/service_types/simple_attribute_operand.rs diff --git a/types/src/service_types/simple_type_description.rs b/src/types/service_types/simple_type_description.rs similarity index 100% rename from types/src/service_types/simple_type_description.rs rename to src/types/service_types/simple_type_description.rs diff --git a/types/src/service_types/status_change_notification.rs b/src/types/service_types/status_change_notification.rs similarity index 100% rename from types/src/service_types/status_change_notification.rs rename to src/types/service_types/status_change_notification.rs diff --git a/types/src/service_types/status_result.rs b/src/types/service_types/status_result.rs similarity index 100% rename from types/src/service_types/status_result.rs rename to src/types/service_types/status_result.rs diff --git a/types/src/service_types/structure_definition.rs b/src/types/service_types/structure_definition.rs similarity index 100% rename from types/src/service_types/structure_definition.rs rename to src/types/service_types/structure_definition.rs diff --git a/types/src/service_types/structure_description.rs b/src/types/service_types/structure_description.rs similarity index 100% rename from types/src/service_types/structure_description.rs rename to src/types/service_types/structure_description.rs diff --git a/types/src/service_types/structure_field.rs b/src/types/service_types/structure_field.rs similarity index 100% rename from types/src/service_types/structure_field.rs rename to src/types/service_types/structure_field.rs diff --git a/types/src/service_types/subscribed_data_set_data_type.rs b/src/types/service_types/subscribed_data_set_data_type.rs similarity index 100% rename from types/src/service_types/subscribed_data_set_data_type.rs rename to src/types/service_types/subscribed_data_set_data_type.rs diff --git a/types/src/service_types/subscribed_data_set_mirror_data_type.rs b/src/types/service_types/subscribed_data_set_mirror_data_type.rs similarity index 100% rename from types/src/service_types/subscribed_data_set_mirror_data_type.rs rename to src/types/service_types/subscribed_data_set_mirror_data_type.rs diff --git a/types/src/service_types/subscription_acknowledgement.rs b/src/types/service_types/subscription_acknowledgement.rs similarity index 100% rename from types/src/service_types/subscription_acknowledgement.rs rename to src/types/service_types/subscription_acknowledgement.rs diff --git a/types/src/service_types/subscription_diagnostics_data_type.rs b/src/types/service_types/subscription_diagnostics_data_type.rs similarity index 100% rename from types/src/service_types/subscription_diagnostics_data_type.rs rename to src/types/service_types/subscription_diagnostics_data_type.rs diff --git a/types/src/service_types/target_variables_data_type.rs b/src/types/service_types/target_variables_data_type.rs similarity index 100% rename from types/src/service_types/target_variables_data_type.rs rename to src/types/service_types/target_variables_data_type.rs diff --git a/types/src/service_types/three_d_cartesian_coordinates.rs b/src/types/service_types/three_d_cartesian_coordinates.rs similarity index 100% rename from types/src/service_types/three_d_cartesian_coordinates.rs rename to src/types/service_types/three_d_cartesian_coordinates.rs diff --git a/types/src/service_types/three_d_frame.rs b/src/types/service_types/three_d_frame.rs similarity index 100% rename from types/src/service_types/three_d_frame.rs rename to src/types/service_types/three_d_frame.rs diff --git a/types/src/service_types/three_d_orientation.rs b/src/types/service_types/three_d_orientation.rs similarity index 100% rename from types/src/service_types/three_d_orientation.rs rename to src/types/service_types/three_d_orientation.rs diff --git a/types/src/service_types/three_d_vector.rs b/src/types/service_types/three_d_vector.rs similarity index 100% rename from types/src/service_types/three_d_vector.rs rename to src/types/service_types/three_d_vector.rs diff --git a/types/src/service_types/time_zone_data_type.rs b/src/types/service_types/time_zone_data_type.rs similarity index 100% rename from types/src/service_types/time_zone_data_type.rs rename to src/types/service_types/time_zone_data_type.rs diff --git a/types/src/service_types/transfer_result.rs b/src/types/service_types/transfer_result.rs similarity index 100% rename from types/src/service_types/transfer_result.rs rename to src/types/service_types/transfer_result.rs diff --git a/types/src/service_types/transfer_subscriptions_request.rs b/src/types/service_types/transfer_subscriptions_request.rs similarity index 100% rename from types/src/service_types/transfer_subscriptions_request.rs rename to src/types/service_types/transfer_subscriptions_request.rs diff --git a/types/src/service_types/transfer_subscriptions_response.rs b/src/types/service_types/transfer_subscriptions_response.rs similarity index 100% rename from types/src/service_types/transfer_subscriptions_response.rs rename to src/types/service_types/transfer_subscriptions_response.rs diff --git a/types/src/service_types/translate_browse_paths_to_node_ids_request.rs b/src/types/service_types/translate_browse_paths_to_node_ids_request.rs similarity index 100% rename from types/src/service_types/translate_browse_paths_to_node_ids_request.rs rename to src/types/service_types/translate_browse_paths_to_node_ids_request.rs diff --git a/types/src/service_types/translate_browse_paths_to_node_ids_response.rs b/src/types/service_types/translate_browse_paths_to_node_ids_response.rs similarity index 100% rename from types/src/service_types/translate_browse_paths_to_node_ids_response.rs rename to src/types/service_types/translate_browse_paths_to_node_ids_response.rs diff --git a/types/src/service_types/trust_list_data_type.rs b/src/types/service_types/trust_list_data_type.rs similarity index 100% rename from types/src/service_types/trust_list_data_type.rs rename to src/types/service_types/trust_list_data_type.rs diff --git a/types/src/service_types/ua_binary_file_data_type.rs b/src/types/service_types/ua_binary_file_data_type.rs similarity index 100% rename from types/src/service_types/ua_binary_file_data_type.rs rename to src/types/service_types/ua_binary_file_data_type.rs diff --git a/types/src/service_types/uadp_data_set_reader_message_data_type.rs b/src/types/service_types/uadp_data_set_reader_message_data_type.rs similarity index 100% rename from types/src/service_types/uadp_data_set_reader_message_data_type.rs rename to src/types/service_types/uadp_data_set_reader_message_data_type.rs diff --git a/types/src/service_types/uadp_data_set_writer_message_data_type.rs b/src/types/service_types/uadp_data_set_writer_message_data_type.rs similarity index 100% rename from types/src/service_types/uadp_data_set_writer_message_data_type.rs rename to src/types/service_types/uadp_data_set_writer_message_data_type.rs diff --git a/types/src/service_types/uadp_writer_group_message_data_type.rs b/src/types/service_types/uadp_writer_group_message_data_type.rs similarity index 100% rename from types/src/service_types/uadp_writer_group_message_data_type.rs rename to src/types/service_types/uadp_writer_group_message_data_type.rs diff --git a/types/src/service_types/unregister_nodes_request.rs b/src/types/service_types/unregister_nodes_request.rs similarity index 100% rename from types/src/service_types/unregister_nodes_request.rs rename to src/types/service_types/unregister_nodes_request.rs diff --git a/types/src/service_types/unregister_nodes_response.rs b/src/types/service_types/unregister_nodes_response.rs similarity index 100% rename from types/src/service_types/unregister_nodes_response.rs rename to src/types/service_types/unregister_nodes_response.rs diff --git a/types/src/service_types/update_data_details.rs b/src/types/service_types/update_data_details.rs similarity index 100% rename from types/src/service_types/update_data_details.rs rename to src/types/service_types/update_data_details.rs diff --git a/types/src/service_types/update_event_details.rs b/src/types/service_types/update_event_details.rs similarity index 100% rename from types/src/service_types/update_event_details.rs rename to src/types/service_types/update_event_details.rs diff --git a/types/src/service_types/update_structure_data_details.rs b/src/types/service_types/update_structure_data_details.rs similarity index 100% rename from types/src/service_types/update_structure_data_details.rs rename to src/types/service_types/update_structure_data_details.rs diff --git a/types/src/service_types/user_identity_token.rs b/src/types/service_types/user_identity_token.rs similarity index 100% rename from types/src/service_types/user_identity_token.rs rename to src/types/service_types/user_identity_token.rs diff --git a/types/src/service_types/user_name_identity_token.rs b/src/types/service_types/user_name_identity_token.rs similarity index 100% rename from types/src/service_types/user_name_identity_token.rs rename to src/types/service_types/user_name_identity_token.rs diff --git a/types/src/service_types/user_token_policy.rs b/src/types/service_types/user_token_policy.rs similarity index 100% rename from types/src/service_types/user_token_policy.rs rename to src/types/service_types/user_token_policy.rs diff --git a/types/src/service_types/variable_attributes.rs b/src/types/service_types/variable_attributes.rs similarity index 100% rename from types/src/service_types/variable_attributes.rs rename to src/types/service_types/variable_attributes.rs diff --git a/types/src/service_types/variable_type_attributes.rs b/src/types/service_types/variable_type_attributes.rs similarity index 100% rename from types/src/service_types/variable_type_attributes.rs rename to src/types/service_types/variable_type_attributes.rs diff --git a/types/src/service_types/vector.rs b/src/types/service_types/vector.rs similarity index 100% rename from types/src/service_types/vector.rs rename to src/types/service_types/vector.rs diff --git a/types/src/service_types/view_attributes.rs b/src/types/service_types/view_attributes.rs similarity index 100% rename from types/src/service_types/view_attributes.rs rename to src/types/service_types/view_attributes.rs diff --git a/types/src/service_types/view_description.rs b/src/types/service_types/view_description.rs similarity index 100% rename from types/src/service_types/view_description.rs rename to src/types/service_types/view_description.rs diff --git a/types/src/service_types/write_request.rs b/src/types/service_types/write_request.rs similarity index 100% rename from types/src/service_types/write_request.rs rename to src/types/service_types/write_request.rs diff --git a/types/src/service_types/write_response.rs b/src/types/service_types/write_response.rs similarity index 100% rename from types/src/service_types/write_response.rs rename to src/types/service_types/write_response.rs diff --git a/types/src/service_types/write_value.rs b/src/types/service_types/write_value.rs similarity index 100% rename from types/src/service_types/write_value.rs rename to src/types/service_types/write_value.rs diff --git a/types/src/service_types/writer_group_data_type.rs b/src/types/service_types/writer_group_data_type.rs similarity index 100% rename from types/src/service_types/writer_group_data_type.rs rename to src/types/service_types/writer_group_data_type.rs diff --git a/types/src/service_types/writer_group_message_data_type.rs b/src/types/service_types/writer_group_message_data_type.rs similarity index 100% rename from types/src/service_types/writer_group_message_data_type.rs rename to src/types/service_types/writer_group_message_data_type.rs diff --git a/types/src/service_types/writer_group_transport_data_type.rs b/src/types/service_types/writer_group_transport_data_type.rs similarity index 100% rename from types/src/service_types/writer_group_transport_data_type.rs rename to src/types/service_types/writer_group_transport_data_type.rs diff --git a/types/src/service_types/x_509_identity_token.rs b/src/types/service_types/x_509_identity_token.rs similarity index 100% rename from types/src/service_types/x_509_identity_token.rs rename to src/types/service_types/x_509_identity_token.rs diff --git a/types/src/service_types/xv_type.rs b/src/types/service_types/xv_type.rs similarity index 100% rename from types/src/service_types/xv_type.rs rename to src/types/service_types/xv_type.rs diff --git a/types/src/status_code.rs b/src/types/status_code.rs similarity index 100% rename from types/src/status_code.rs rename to src/types/status_code.rs diff --git a/types/src/status_codes.rs b/src/types/status_codes.rs similarity index 100% rename from types/src/status_codes.rs rename to src/types/status_codes.rs diff --git a/types/src/string.rs b/src/types/string.rs similarity index 100% rename from types/src/string.rs rename to src/types/string.rs diff --git a/types/src/tests/date_time.rs b/src/types/tests/date_time.rs similarity index 100% rename from types/src/tests/date_time.rs rename to src/types/tests/date_time.rs diff --git a/types/src/tests/encoding.rs b/src/types/tests/encoding.rs similarity index 100% rename from types/src/tests/encoding.rs rename to src/types/tests/encoding.rs diff --git a/types/src/tests/mod.rs b/src/types/tests/mod.rs similarity index 100% rename from types/src/tests/mod.rs rename to src/types/tests/mod.rs diff --git a/types/src/tests/node_id.rs b/src/types/tests/node_id.rs similarity index 100% rename from types/src/tests/node_id.rs rename to src/types/tests/node_id.rs diff --git a/types/src/tests/serde.rs b/src/types/tests/serde.rs similarity index 100% rename from types/src/tests/serde.rs rename to src/types/tests/serde.rs diff --git a/types/src/tests/variant.rs b/src/types/tests/variant.rs similarity index 100% rename from types/src/tests/variant.rs rename to src/types/tests/variant.rs diff --git a/types/src/variant.rs b/src/types/variant.rs similarity index 100% rename from types/src/variant.rs rename to src/types/variant.rs diff --git a/types/Cargo.toml b/types/Cargo.toml deleted file mode 100644 index d4da4e96a..000000000 --- a/types/Cargo.toml +++ /dev/null @@ -1,27 +0,0 @@ -[package] -name = "opcua-types" -version = "0.10.0" # OPCUARustVersion -description = "OPC UA types and constants" -authors = ["Adam Lock "] -homepage = "https://github.com/locka99/opcua" -license = "MPL-2.0" -keywords = ["opcua","opc","ua"] -categories = ["embedded","network-programming"] -documentation = "https://docs.rs/opcua-types/" -edition = "2018" - -[dependencies] -log = "0.4" -byteorder = "1.3" -chrono = "0.4" -serde = "1.0" -serde_derive = "1.0" -regex = "1.3" -lazy_static = "1.4.0" -base64 = "0.12" -uuid = { version = "0.8", features = ["v4"] } -bitflags = "1.2" - -[dev-dependencies] -tempdir = "0.3" -serde_json = "1.0" diff --git a/types/types.iml b/types/types.iml deleted file mode 100644 index 1a12aa6f3..000000000 --- a/types/types.iml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file