yggdrasil-network/yggdrasil-android
1
0
Fork 0
mirror of https://github.com/yggdrasil-network/yggdrasil-android.git synced 2025-06-16 22:25:10 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added DNS configuration functionality.

Browse source
This commit is contained in:
Revertron 2022-10-29 21:57:42 +02:00
parent 80fc552603
commit dd67347cd8
14 changed files with 369 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

26
app/src/main/java/eu/neilalexander/yggdrasil/PacketTunnelProvider.kt
View file

@ -17,6 +17,8 @@ import java.util.concurrent.atomic.AtomicBoolean
import kotlin.concurrent.thread
private const val TAG = "PacketTunnelProvider"
class PacketTunnelProvider: VpnService() {
companion object {
const val RECEIVER_INTENT = "eu.neilalexander.yggdrasil.PacketTunnelProvider.MESSAGE"
@ -50,16 +52,16 @@ class PacketTunnelProvider: VpnService() {
override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
if (intent == null) {
Log.d("PacketTunnelProvider", "Intent is null")
Log.d(TAG, "Intent is null")
return START_NOT_STICKY
}
return when (intent.action ?: ACTION_STOP) {
ACTION_STOP -> {
Log.d("PacketTunnelProvider", "Stopping...")
Log.d(TAG, "Stopping...")
stop(); START_NOT_STICKY
}
else -> {
Log.d("PacketTunnelProvider", "Starting...")
Log.d(TAG, "Starting...")
start(); START_STICKY
}
}
@ -70,11 +72,11 @@ class PacketTunnelProvider: VpnService() {
return
}
Log.d("PacketTunnelProvider", config.getJSON().toString())
Log.d(TAG, config.getJSON().toString())
yggdrasil.startJSON(config.getJSONByteArray())
val address = yggdrasil.addressString
var builder = Builder()
val builder = Builder()
.addAddress(address, 7)
.addRoute("200::", 7)
// We do this to trick the DNS-resolver into thinking that we have "regular" IPv6,
@ -97,6 +99,18 @@ class PacketTunnelProvider: VpnService() {
builder.setMetered(false)
}
val preferences = androidx.preference.PreferenceManager.getDefaultSharedPreferences(this.baseContext)
val serverString = preferences.getString(KEY_DNS_SERVERS, DEFAULT_DNS_SERVERS)
if (serverString!!.isNotEmpty()) {
val servers = serverString.split(",")
if (servers.isNotEmpty()) {
servers.forEach {
Log.i(TAG, "Using DNS server $it")
builder.addDnsServer(it)
}
}
}
parcel = builder.establish()
val parcel = parcel
if (parcel == null || !parcel.fileDescriptor.valid()) {
@ -123,7 +137,7 @@ class PacketTunnelProvider: VpnService() {
intent.putExtra("ip", yggdrasil.addressString)
intent.putExtra("subnet", yggdrasil.subnetString)
intent.putExtra("coords", yggdrasil.coordsString)
intent.putExtra("peers", JSONArray(yggdrasil.peersJSON).length())
intent.putExtra("peers", yggdrasil.peersJSON)
LocalBroadcastManager.getInstance(this).sendBroadcast(intent)
}