shorten the lifespan of the route-b credential on memory

smdn · Jun 30, 2024 · e30279b · e30279b
1 parent f0d4abb
commit e30279b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 14 deletions.
diff --git a/src/PackageVersion.targets b/src/PackageVersion.targets
@@ -13,7 +13,7 @@ SPDX-License-Identifier: MIT
     <PackageReference Update="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
     <PackageReference Update="System.Text.Json" Version="6.0.0" />
     <PackageReference Update="Smdn.Devices.BP35XX" Version="[1.0.0,2.0.0)" />
-    <PackageReference Update="Smdn.Net.SkStackIP" Version="[1.0.0,2.0.0)" />
+    <PackageReference Update="Smdn.Net.SkStackIP" Version="[1.2.0,2.0.0)" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...tackIP/Smdn.Net.EchonetLite.RouteB.Transport.SkStackIP/SkStackRouteBEchonetLiteHandler.cs b/...tackIP/Smdn.Net.EchonetLite.RouteB.Transport.SkStackIP/SkStackRouteBEchonetLiteHandler.cs
@@ -141,19 +141,12 @@ CancellationToken cancellationToken
         sessionConfiguration.PaaAddress is null
       );
 
-    // TODO: reduce allocation
-    var rbidBufferWriter = new ArrayBufferWriter<byte>(initialCapacity: RouteBCredentials.AuthenticationIdLength);
-    var passwordBufferWriter = new ArrayBufferWriter<byte>(initialCapacity: RouteBCredentials.PasswordLength);
-
-    credential.WriteIdTo(rbidBufferWriter);
-    credential.WritePasswordTo(passwordBufferWriter);
-
     if (shouldPerformActiveScan) {
       // obtain PAN information by active scan prior to initialization
       return Core(
         authenticateAsPanaClientAsync: (device, ct) => device.AuthenticateAsPanaClientAsync(
-          rbid: rbidBufferWriter.WrittenMemory,
-          password: passwordBufferWriter.WrittenMemory,
+          writeRBID: writer => credential.WriteIdTo(writer),
+          writePassword: writer => credential.WritePasswordTo(writer),
           scanOptions: sessionConfiguration.ActiveScanOptions,
           cancellationToken: ct
         )
@@ -165,8 +158,8 @@ CancellationToken cancellationToken
       if (shouldResolvePaaAddress) {
         return Core(
           authenticateAsPanaClientAsync: (device, ct) => device.AuthenticateAsPanaClientAsync(
-            rbid: rbidBufferWriter.WrittenMemory,
-            password: passwordBufferWriter.WrittenMemory,
+            writeRBID: writer => credential.WriteIdTo(writer),
+            writePassword: writer => credential.WritePasswordTo(writer),
             paaMacAddress: sessionConfiguration.PaaMacAddress!,
             channel: sessionConfiguration.Channel!.Value,
             panId: sessionConfiguration.PanId!.Value,
@@ -177,8 +170,8 @@ CancellationToken cancellationToken
       else {
         return Core(
           authenticateAsPanaClientAsync: (device, ct) => device.AuthenticateAsPanaClientAsync(
-            rbid: rbidBufferWriter.WrittenMemory,
-            password: passwordBufferWriter.WrittenMemory,
+            writeRBID: writer => credential.WriteIdTo(writer),
+            writePassword: writer => credential.WritePasswordTo(writer),
             paaAddress: sessionConfiguration.PaaAddress!,
             channel: sessionConfiguration.Channel!.Value,
             panId: sessionConfiguration.PanId!.Value,