add single ip mode

doip-sim-ecu · Sep 25, 2024 · 8004759 · 8004759
1 parent 9bb6223
commit 8004759
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/.github/workflows/publish_on_tag.yml b/.github/workflows/publish_on_tag.yml
@@ -26,7 +26,7 @@ jobs:
     - name: Build and publish with Gradle
       uses: gradle/gradle-build-action@4137be6a8bf7d7133955359dbd952c0ca73b1021
       with:
-        arguments: build test publish
+        arguments: -i --stacktrace build test publish
       env:
         SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
         SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
@@ -36,7 +36,7 @@ jobs:
     - name: release
       uses: gradle/gradle-build-action@4137be6a8bf7d7133955359dbd952c0ca73b1021
       with:
-        arguments: closeAndReleaseNexusArtifact
+        arguments: -i closeAndReleaseNexusArtifact
       env:
         SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
         SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}

diff --git a/src/main/kotlin/NetworkManager.kt b/src/main/kotlin/NetworkManager.kt
@@ -10,7 +10,7 @@ public open class NetworkManager(
 ) {
     private val log = LoggerFactory.getLogger(NetworkManager::class.java)
 
-    protected fun findInterfaceByName(): NetworkInterface? {
+    protected open fun findInterfaceByName(): NetworkInterface? {
         var foundInterface: NetworkInterface? = null
         NetworkInterface.getNetworkInterfaces()?.let { netIntf ->
             while (netIntf.hasMoreElements()) {
@@ -41,27 +41,30 @@ public open class NetworkManager(
         return foundInterface
     }
 
-    protected fun getAvailableIPAddresses(): List<InetAddress> {
+    protected open fun getAvailableIPAddresses(): Set<InetAddress> {
         if (config.networkInterface.isNullOrBlank() || config.networkInterface == "0.0.0.0") {
-            return listOf(InetAddress.getByName(config.networkInterface))
+            return setOf(InetAddress.getByName("0.0.0.0"))
         }
-        val list = mutableListOf<InetAddress>()
+        val ipAddresses = mutableSetOf<InetAddress>()
         findInterfaceByName()?.let { intf ->
             intf.inetAddresses?.let { inetAddresses ->
                 while (inetAddresses.hasMoreElements()) {
                     val address = inetAddresses.nextElement()
                     if (address is Inet4Address) {
-                        list.add(address)
+                        ipAddresses.add(address)
+                    }
+                    if (config.networkMode == NetworkMode.SINGLE_IP && ipAddresses.isNotEmpty()) {
+                        break
                     }
                 }
             }
         }
-        if (list.isEmpty()) {
+        if (ipAddresses.isEmpty()) {
             InetAddress.getByName(config.networkInterface)?.let { addr ->
-                list.add(addr)
+                ipAddresses.add(addr)
             }
         }
-        return list
+        return ipAddresses
     }
 
     protected open fun buildStartupMap(): Map<String, List<DoipEntity<*>>> {