ProtocolApi refactoring, move network classes to NetworkUtils.kt

client/android/protocolApi/src/main/kotlin/ProtocolConfig.kt

@@ -1,16 +1,18 @@
 package org.amnezia.vpn.protocol
 
-import android.net.InetAddresses
-import android.os.Build
-import androidx.annotation.RequiresApi
+import android.net.ProxyInfo
 import java.net.InetAddress
+import org.amnezia.vpn.util.InetNetwork
 
 open class ProtocolConfig protected constructor(
     val addresses: Set<InetNetwork>,
     val dnsServers: Set<InetAddress>,
+    val searchDomain: String?,
     val routes: Set<InetNetwork>,
     val excludedRoutes: Set<InetNetwork>,
     val excludedApplications: Set<String>,
+    val httpProxy: ProxyInfo?,
+    val allowAllAF: Boolean,
     val blockingMode: Boolean,
     val mtu: Int
 ) {
@@ -18,25 +20,37 @@ open class ProtocolConfig protected constructor(
     protected constructor(builder: Builder) : this(
         builder.addresses,
         builder.dnsServers,
+        builder.searchDomain,
         builder.routes,
         builder.excludedRoutes,
         builder.excludedApplications,
+        builder.httpProxy,
+        builder.allowAllAF,
         builder.blockingMode,
         builder.mtu
     )
 
-    class Builder(blockingMode: Boolean) {
+    open class Builder(blockingMode: Boolean) {
         internal val addresses: MutableSet<InetNetwork> = hashSetOf()
         internal val dnsServers: MutableSet<InetAddress> = hashSetOf()
         internal val routes: MutableSet<InetNetwork> = hashSetOf()
         internal val excludedRoutes: MutableSet<InetNetwork> = hashSetOf()
         internal val excludedApplications: MutableSet<String> = hashSetOf()
 
+        internal var searchDomain: String? = null
+            private set
+
+        internal var httpProxy: ProxyInfo? = null
+            private set
+
+        internal var allowAllAF: Boolean = false
+            private set
+
         internal var blockingMode: Boolean = blockingMode
             private set
 
-        internal var mtu: Int = 0
-            private set
+        open var mtu: Int = 0
+            protected set
 
         fun addAddress(addr: InetNetwork) = apply { this.addresses += addr }
         fun addAddresses(addresses: List<InetNetwork>) = apply { this.addresses += addresses }
@@ -44,18 +58,21 @@ open class ProtocolConfig protected constructor(
         fun addDnsServer(dnsServer: InetAddress) = apply { this.dnsServers += dnsServer }
         fun addDnsServers(dnsServers: List<InetAddress>) = apply { this.dnsServers += dnsServers }
 
+        fun setSearchDomain(domain: String) = apply { this.searchDomain = domain }
+
         fun addRoute(route: InetNetwork) = apply { this.routes += route }
         fun addRoutes(routes: List<InetNetwork>) = apply { this.routes += routes }
 
-        @RequiresApi(Build.VERSION_CODES.TIRAMISU)
         fun excludeRoute(route: InetNetwork) = apply { this.excludedRoutes += route }
-
-        @RequiresApi(Build.VERSION_CODES.TIRAMISU)
         fun excludeRoutes(routes: List<InetNetwork>) = apply { this.excludedRoutes += routes }
 
         fun excludeApplication(application: String) = apply { this.excludedApplications += application }
         fun excludeApplications(applications: List<String>) = apply { this.excludedApplications += applications }
 
+        fun setHttpProxy(httpProxy: ProxyInfo) = apply { this.httpProxy = httpProxy }
+
+        fun setAllowAllAF(allowAllAF: Boolean) = apply { this.allowAllAF = allowAllAF }
+
         fun setBlockingMode(blockingMode: Boolean) = apply { this.blockingMode = blockingMode }
 
         fun setMtu(mtu: Int) = apply { this.mtu = mtu }
@@ -72,7 +89,7 @@ open class ProtocolConfig protected constructor(
             if (errorMessage.isNotEmpty()) throw BadConfigException(errorMessage.toString())
         }
 
-        fun build(): ProtocolConfig = validate().run { ProtocolConfig(this@Builder) }
+        open fun build(): ProtocolConfig = validate().run { ProtocolConfig(this@Builder) }
     }
 
     companion object {
@@ -80,43 +97,3 @@ open class ProtocolConfig protected constructor(
             Builder(blockingMode).apply(block).build()
     }
 }
-
-data class InetNetwork(val address: InetAddress, val mask: Int) {
-
-    override fun toString(): String = "${address.hostAddress}/$mask"
-
-    companion object {
-        fun parse(data: String): InetNetwork {
-            val split = data.split("/")
-            val address = parseInetAddress(split.first())
-            val mask = split.last().toInt()
-            return InetNetwork(address, mask)
-        }
-    }
-}
-
-data class InetEndpoint(val address: InetAddress, val port: Int) {
-
-    override fun toString(): String = "${address.hostAddress}:$port"
-
-    companion object {
-        fun parse(data: String): InetEndpoint {
-            val split = data.split(":")
-            val address = parseInetAddress(split.first())
-            val port = split.last().toInt()
-            return InetEndpoint(address, port)
-        }
-    }
-}
-
-fun parseInetAddress(address: String): InetAddress = parseNumericAddressCompat(address)
-
-private val parseNumericAddressCompat: (String) -> InetAddress =
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-        InetAddresses::parseNumericAddress
-    } else {
-        val m = InetAddress::class.java.getMethod("parseNumericAddress", String::class.java)
-        fun(address: String): InetAddress {
-            return m.invoke(null, address) as InetAddress
-        }
-    }