From 008f6f95ce4a4a40c5b947416fc6d4acebd10625 Mon Sep 17 00:00:00 2001 From: Adam Crain Date: Sat, 4 May 2024 16:31:21 -0700 Subject: [PATCH] Prepare for 1.6.0-M3 release (#360) --- CHANGELOG.md | 3 ++- Cargo.lock | 10 +++++----- conformance/pom.xml | 2 +- dnp3/Cargo.toml | 2 +- dnp3/codegen/pom.xml | 2 +- dnp3/src/tcp/master/server.rs | 1 + ffi/bindings/c/CMakeLists.txt | 2 +- ffi/bindings/dotnet/examples/master/Master.csproj | 2 +- .../dotnet/examples/outstation/Outstation.csproj | 2 +- ffi/bindings/java/examples/pom.xml | 4 ++-- ffi/bindings/java/pom.xml | 2 +- ffi/dnp3-bindings/Cargo.toml | 2 +- ffi/dnp3-ffi-java/Cargo.toml | 2 +- ffi/dnp3-ffi/Cargo.toml | 2 +- ffi/dnp3-schema/Cargo.toml | 2 +- guide/sitedata.json | 2 +- 16 files changed, 22 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 742ff4a9..9d05da46 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,10 @@ -### 1.6.0-M2 ### +### 1.6.0-M3 ### * :star: Add master station support for writing files to the outstation. See [#338](https://github.com/stepfunc/dnp3/pull/338). * :star: Add master station support for command events (groups 13 and 43). See [#332](https://github.com/stepfunc/dnp3/pull/332). * :star: Add master station support for group 102. See [#335](https://github.com/stepfunc/dnp3/pull/335). * :star: Add master and outstation support for UDP. See [#353](https://github.com/stepfunc/dnp3/pull/353). +* :star: Add master station support for acting as a TCP server. See [#358](https://github.com/stepfunc/dnp3/pull/358). * :star: Obtain TCP port from server in Rust API. [#331](https://github.com/stepfunc/dnp3/pull/331). ### 1.5.2 ### diff --git a/Cargo.lock b/Cargo.lock index ba67a29f..df9d8591 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -343,7 +343,7 @@ dependencies = [ [[package]] name = "dnp3" -version = "1.6.0-M2" +version = "1.6.0-M3" dependencies = [ "assert_matches", "chrono", @@ -367,7 +367,7 @@ dependencies = [ [[package]] name = "dnp3-bindings" -version = "1.6.0-M2" +version = "1.6.0-M3" dependencies = [ "dnp3-schema", "oo-bindgen", @@ -377,7 +377,7 @@ dependencies = [ [[package]] name = "dnp3-ffi" -version = "1.6.0-M2" +version = "1.6.0-M3" dependencies = [ "dnp3", "dnp3-schema", @@ -395,7 +395,7 @@ dependencies = [ [[package]] name = "dnp3-ffi-java" -version = "1.6.0-M2" +version = "1.6.0-M3" dependencies = [ "dnp3-ffi", "dnp3-schema", @@ -405,7 +405,7 @@ dependencies = [ [[package]] name = "dnp3-schema" -version = "1.6.0-M2" +version = "1.6.0-M3" dependencies = [ "oo-bindgen", "sfio-tokio-ffi", diff --git a/conformance/pom.xml b/conformance/pom.xml index 9af7d7cc..5c076a72 100644 --- a/conformance/pom.xml +++ b/conformance/pom.xml @@ -11,7 +11,7 @@ UTF-8 2.13.4 - 1.6.0-M2 + 1.6.0-M3 0.1.0-SNAPSHOT 4.4.0 diff --git a/dnp3/Cargo.toml b/dnp3/Cargo.toml index 0c6c8b70..a0cb85cf 100644 --- a/dnp3/Cargo.toml +++ b/dnp3/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dnp3" -version = "1.6.0-M2" +version = "1.6.0-M3" authors = ["Step Function I/O LLC "] description = "Rust implementation of DNP3 (IEEE 1815) with idiomatic bindings for C, C++, .NET, and Java" diff --git a/dnp3/codegen/pom.xml b/dnp3/codegen/pom.xml index 7627d7b0..b7032a0c 100644 --- a/dnp3/codegen/pom.xml +++ b/dnp3/codegen/pom.xml @@ -4,7 +4,7 @@ dev.gridio.dnp3 dnp3-model - 1.6.0-M2 + 1.6.0-M3 jar dnp3-rs model diff --git a/dnp3/src/tcp/master/server.rs b/dnp3/src/tcp/master/server.rs index 7832eadf..e19d7949 100644 --- a/dnp3/src/tcp/master/server.rs +++ b/dnp3/src/tcp/master/server.rs @@ -222,6 +222,7 @@ impl AcceptTask { match event { TaskEvent::Accept(stream, addr) => { tracing::info!("accepted connection from {addr:?}"); + crate::tcp::configure_server(&stream); self.handle_accept(stream, addr).await; } TaskEvent::LinkId(res) => { diff --git a/ffi/bindings/c/CMakeLists.txt b/ffi/bindings/c/CMakeLists.txt index d0509965..09449196 100644 --- a/ffi/bindings/c/CMakeLists.txt +++ b/ffi/bindings/c/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.12) project(dnp3_c LANGUAGES C CXX) -set(DNP3_BACKUP_VERSION 1.6.0-M2) +set(DNP3_BACKUP_VERSION 1.6.0-M3) # Determine the architecture if(WIN32 AND CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64|AMD64" AND CMAKE_SIZEOF_VOID_P EQUAL 8) diff --git a/ffi/bindings/dotnet/examples/master/Master.csproj b/ffi/bindings/dotnet/examples/master/Master.csproj index f7a39c39..2dd28421 100644 --- a/ffi/bindings/dotnet/examples/master/Master.csproj +++ b/ffi/bindings/dotnet/examples/master/Master.csproj @@ -13,7 +13,7 @@ - + diff --git a/ffi/bindings/dotnet/examples/outstation/Outstation.csproj b/ffi/bindings/dotnet/examples/outstation/Outstation.csproj index e3f3b2ed..9b6b4c10 100644 --- a/ffi/bindings/dotnet/examples/outstation/Outstation.csproj +++ b/ffi/bindings/dotnet/examples/outstation/Outstation.csproj @@ -13,7 +13,7 @@ - + diff --git a/ffi/bindings/java/examples/pom.xml b/ffi/bindings/java/examples/pom.xml index cc8577e2..0208c16e 100644 --- a/ffi/bindings/java/examples/pom.xml +++ b/ffi/bindings/java/examples/pom.xml @@ -4,7 +4,7 @@ io.stepfunc.dnp3 examples - 1.6.0-M2 + 1.6.0-M3 1.8 @@ -16,7 +16,7 @@ io.stepfunc dnp3 - 1.6.0-M2 + 1.6.0-M3 diff --git a/ffi/bindings/java/pom.xml b/ffi/bindings/java/pom.xml index b53d0ebe..357ff0e2 100644 --- a/ffi/bindings/java/pom.xml +++ b/ffi/bindings/java/pom.xml @@ -4,7 +4,7 @@ io.stepfunc dnp3-parent - 1.6.0-M2 + 1.6.0-M3 pom diff --git a/ffi/dnp3-bindings/Cargo.toml b/ffi/dnp3-bindings/Cargo.toml index 24aec0ec..3a395dd6 100644 --- a/ffi/dnp3-bindings/Cargo.toml +++ b/ffi/dnp3-bindings/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dnp3-bindings" -version = "1.6.0-M2" +version = "1.6.0-M3" # inherit from workspace rust-version.workspace = true diff --git a/ffi/dnp3-ffi-java/Cargo.toml b/ffi/dnp3-ffi-java/Cargo.toml index dc703676..455d493a 100644 --- a/ffi/dnp3-ffi-java/Cargo.toml +++ b/ffi/dnp3-ffi-java/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dnp3-ffi-java" -version = "1.6.0-M2" +version = "1.6.0-M3" build = "build.rs" # inherit from workspace diff --git a/ffi/dnp3-ffi/Cargo.toml b/ffi/dnp3-ffi/Cargo.toml index 70c31dde..139881e8 100644 --- a/ffi/dnp3-ffi/Cargo.toml +++ b/ffi/dnp3-ffi/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dnp3-ffi" -version = "1.6.0-M2" +version = "1.6.0-M3" # inherit from workspace rust-version.workspace = true diff --git a/ffi/dnp3-schema/Cargo.toml b/ffi/dnp3-schema/Cargo.toml index 81756090..e2a30c76 100644 --- a/ffi/dnp3-schema/Cargo.toml +++ b/ffi/dnp3-schema/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "dnp3-schema" # this version is what gets applied to the FFI libraries -version = "1.6.0-M2" +version = "1.6.0-M3" # inherit from workspace rust-version.workspace = true diff --git a/guide/sitedata.json b/guide/sitedata.json index e4f19474..566b5455 100644 --- a/guide/sitedata.json +++ b/guide/sitedata.json @@ -1,4 +1,4 @@ { - "version": "1.6.0-M2", + "version": "1.6.0-M3", "github_url": "https://github.com/stepfunc/dnp3" } \ No newline at end of file