Merge branch 'main' into release/1.1.2

.github/workflows/checks.yaml

@@ -73,11 +73,11 @@ jobs:
           toolchain: "${TARGET_RUST_VERSION}"
           targets: "${{ matrix.target }}"
       - name: Install cross-compilation tools
-        uses: taiki-e/setup-cross-toolchain-action@e0fdbe18d70a8bbed8a44d3319a1842949a63671
+        uses: taiki-e/setup-cross-toolchain-action@c31d54d08f2ab1b6c35447b32b3f0dcb829a5b4f
         with:
           target: ${{ matrix.target }}
       - name: Install cargo-llvm-cov
-        uses: taiki-e/install-action@8984d603c208823d3c1a1b796f4081736f3ae3f9
+        uses: taiki-e/install-action@bee85d7ea77c01f7a403c22ac2c802b431b093df
         with:
           tool: cargo-llvm-cov
       - name: Rust cache
@@ -91,7 +91,7 @@ jobs:
         env:
           RUST_BACKTRACE: 1
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d
+        uses: codecov/codecov-action@4fe8c5f003fae66aa5ebb77cfd3e7bfbbda0b6b0
         with:
           files: lcov.info
           fail_ci_if_error: false
@@ -109,7 +109,7 @@ jobs:
         with:
           toolchain: nightly
       - name: Install udeps
-        uses: taiki-e/install-action@8984d603c208823d3c1a1b796f4081736f3ae3f9
+        uses: taiki-e/install-action@bee85d7ea77c01f7a403c22ac2c802b431b093df
         with:
           tool: cargo-udeps
       - name: cargo udeps
@@ -213,7 +213,7 @@ jobs:
           version: 0.9.0
         if: ${{matrix.use_zig}}
       - name: Install cargo-zigbuild
-        uses: taiki-e/install-action@8984d603c208823d3c1a1b796f4081736f3ae3f9
+        uses: taiki-e/install-action@bee85d7ea77c01f7a403c22ac2c802b431b093df
         with:
           tool: cargo-zigbuild
         if: ${{matrix.use_zig}}
@@ -254,7 +254,7 @@ jobs:
         with:
           toolchain: nightly
       - name: Install cargo fuzz
-        uses: taiki-e/install-action@8984d603c208823d3c1a1b796f4081736f3ae3f9
+        uses: taiki-e/install-action@bee85d7ea77c01f7a403c22ac2c802b431b093df
         with:
           tool: cargo-fuzz
       - name: Smoke-test fuzz targets
@@ -269,9 +269,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
-    - uses: EmbarkStudios/cargo-deny-action@2fad0807be2b6f4402fd9dd4225aa4e91b9ad879
+    - uses: EmbarkStudios/cargo-deny-action@748857f070c53667b2b8de8bdf468ac75a6b757c
       with:
         arguments: --workspace --all-features
-    - uses: EmbarkStudios/cargo-deny-action@2fad0807be2b6f4402fd9dd4225aa4e91b9ad879
+    - uses: EmbarkStudios/cargo-deny-action@748857f070c53667b2b8de8bdf468ac75a6b757c
       with:
         arguments: --manifest-path ./fuzz/Cargo.toml --all-features

.github/workflows/nightly.yaml

@@ -21,7 +21,7 @@ jobs:
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - name: test on freebsd
-        uses: vmactions/freebsd-vm@d139f0eaa5d47d9fcc44f7ab1748574475d89565
+        uses: vmactions/freebsd-vm@35a5b20a98476a681c7576a344775be7e7f77f06
         with:
           usesh: true
           mem: 4096

.github/workflows/scorecard.yaml

@@ -52,14 +52,14 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@694cdabd8bdb0f10b2cea11669e1bf5453eed0a6 # v4.2.0
+        uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0
         with:
           name: SARIF file
           path: results.sarif
           retention-days: 5
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@0b21cf2492b6b02c465a3e5d7c473717ad7721ba # v3.23.1
+        uses: github/codeql-action/upload-sarif@b7bf0a3ed3ecfa44160715d7c442788f65f0f923 # v3.23.2
         with:
           sarif_file: results.sarif

Cargo.toml

@@ -1,8 +1,6 @@
 [workspace]
 members = [
     "ntp-proto",
-    "ntp-os-clock",
-    "ntp-udp",
     "nts-pool-ke",
     "ntpd"
 ]
@@ -45,6 +43,8 @@ libc = "0.2.145"
 tokio = "1.32"
 toml = ">=0.5.0,<0.9.0"
 async-trait = "0.1.22"
+timestamped-socket = "0.2.0"
+clock-steering = "0.2.0"
 
 # TLS
 rustls = "0.21.0"
@@ -61,6 +61,4 @@ zeroize = "1.5"
 
 # our own crates used as dependencies, same version as the workspace version
 # NOTE: keep this part at the bottom of the file, do not change this line
-ntp-os-clock = { version = "1.1.2", path = "./ntp-os-clock" }
 ntp-proto = { version = "1.1.2", path = "./ntp-proto", features = ["__internal-api"] }
-ntp-udp = { version = "1.1.2", path = "./ntp-udp" }