respond to function requests with the physical address

doip-sim-ecu · Jun 27, 2024 · f2c51d3 · f2c51d3
1 parent e58e6d5
commit f2c51d3
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 5 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -14,7 +14,7 @@ plugins {
 apply<NexusReleasePlugin>()
 
 group = "io.github.doip-sim-ecu"
-version = "0.12.2"
+version = "0.13.0"
 
 repositories {
     gradlePluginPortal()

diff --git a/src/main/kotlin/SimDsl.kt b/src/main/kotlin/SimDsl.kt
@@ -104,6 +104,7 @@ public class RequestMessage(udsMessage: UdsMessage, public val isBusy: Boolean)
         udsMessage.sourceAddress,
         udsMessage.targetAddress,
         udsMessage.targetAddressType,
+        udsMessage.targetAddressPhysical,
         udsMessage.message,
         udsMessage.output
     )

diff --git a/src/main/kotlin/library/DoipEntity.kt b/src/main/kotlin/library/DoipEntity.kt
@@ -179,7 +179,7 @@ public abstract class DoipEntity<out T : SimulatedEcu>(
             runBlocking {
                 MDC.put("ecu", ecu.name)
                 launch(MDCContext()) {
-                    onIncomingUdsMessage(diagMessage.toUdsMessage(UdsMessage.PHYSICAL, output))
+                    onIncomingUdsMessage(diagMessage.toUdsMessage(UdsMessage.PHYSICAL, output, ecu.config.logicalAddress))
                 }
             }
             // Exit if the target ecu was found by physical
@@ -191,7 +191,7 @@ public abstract class DoipEntity<out T : SimulatedEcu>(
             runBlocking {
                 MDC.put("ecu", it.name)
                 launch(MDCContext()) {
-                    it.onIncomingUdsMessage(diagMessage.toUdsMessage(UdsMessage.FUNCTIONAL, output))
+                    it.onIncomingUdsMessage(diagMessage.toUdsMessage(UdsMessage.FUNCTIONAL, output, it.config.logicalAddress))
                 }
             }
         }

diff --git a/src/main/kotlin/library/UdsMessage.kt b/src/main/kotlin/library/UdsMessage.kt
@@ -7,6 +7,7 @@ public open class UdsMessage(
     public val sourceAddress: Short,
     public val targetAddress: Short,
     public val targetAddressType: Int,
+    public val targetAddressPhysical: Short,
     public val message: ByteArray,
     public val output: ByteWriteChannel
 ) {
@@ -16,19 +17,20 @@ public open class UdsMessage(
     }
 
     public fun respond(data: ByteArray) {
-        val response = DoipTcpDiagMessage(targetAddress, sourceAddress, data)
+        val response = DoipTcpDiagMessage(targetAddressPhysical, sourceAddress, data)
 
         runBlocking {
             output.writeFully(response.asByteArray)
         }
     }
 }
 
-public fun DoipTcpDiagMessage.toUdsMessage(addressType: Int, output: ByteWriteChannel): UdsMessage =
+public fun DoipTcpDiagMessage.toUdsMessage(addressType: Int, output: ByteWriteChannel, targetAddressPhysical: Short): UdsMessage =
     UdsMessage(
         sourceAddress = this.sourceAddress,
         targetAddress = this.targetAddress,
         targetAddressType = addressType,
+        targetAddressPhysical = targetAddressPhysical,
         message = this.payload,
         output = output
     )
diff --git a/src/test/kotlin/SimDslTest.kt b/src/test/kotlin/SimDslTest.kt
@@ -72,6 +72,7 @@ class SimDslTest {
             0x1,
             0x2,
             UdsMessage.PHYSICAL,
+            0x2,
             byteArrayOf(0x22, 0x10, 0x20),
             Mockito.mock(ByteWriteChannel::class.java)
         )

diff --git a/src/test/kotlin/SimEcuTest.kt b/src/test/kotlin/SimEcuTest.kt
@@ -511,6 +511,7 @@ class SimEcuTest {
             sourceAddress = sourceAddress,
             targetAddress = targetAddress,
             targetAddressType = targetAddressType,
+            targetAddressPhysical = targetAddress,
             message = data,
             output = Mockito.mock(ByteWriteChannel::class.java)
         )
-Original file line number
+Diff line change
@@ Expand Up / @@ -72,6 +72,7 @@ class SimDslTest { @@
 x1,
 x2,
                 UdsMessage.PHYSICAL,
+x2,
                 byteArrayOf(0x22, 0x10, 0x20),
                 Mockito.mock(ByteWriteChannel::class.java)
             )
@@ Expand Down @@