ChronosXYZ/crispa-android
1
0
Fork 0
mirror of https://github.com/yggdrasil-network/crispa-android.git synced 2024-09-19 19:41:27 +00:00
Code Issues Projects Releases Wiki Activity

1. fixed local missing route after yagg interface is up

Browse Source
This commit is contained in:
vadym 2020-06-12 06:43:43 -07:00
parent ff7336f23f
commit ae9f154dca
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/src/main/java/io/github/chronosx88/yggdrasil/YggdrasilTunService.kt
View File

@ -15,11 +15,16 @@ import java.io.FileInputStream
import java.io.FileOutputStream import java.io.FileOutputStream
import java.io.InputStream import java.io.InputStream
import java.io.OutputStream import java.io.OutputStream
import java.nio.ByteBuffer
import kotlin.coroutines.CoroutineContext import kotlin.coroutines.CoroutineContext
import kotlin.experimental.or import kotlin.experimental.or
class YggdrasilTunService : VpnService() { class YggdrasilTunService : VpnService() {
/** Maximum packet size is constrained by the MTU, which is given as a signed short. */
private val MAX_PACKET_SIZE = Short.MAX_VALUE.toInt()
companion object { companion object {
private var isRunning: Boolean = false private var isRunning: Boolean = false
} }
@ -56,8 +61,9 @@ class YggdrasilTunService : VpnService() {
tunInterface = builder tunInterface = builder
.addAddress(address, 7) .addAddress(address, 7)
.addRoute("::", 0) .addRoute("10.0.2.0", 24)
//.addRoute("0.0.0.0", 0) .addRoute("0200::", 7)
.setMtu(MAX_PACKET_SIZE)
.establish() .establish()
tunInputStream = FileInputStream(tunInterface!!.fileDescriptor) tunInputStream = FileInputStream(tunInterface!!.fileDescriptor)
@ -99,7 +105,7 @@ class YggdrasilTunService : VpnService() {
//(config["SessionFirewall"] as MutableMap<Any, Any>)["WhitelistEncryptionPublicKeys"] = whiteList //(config["SessionFirewall"] as MutableMap<Any, Any>)["WhitelistEncryptionPublicKeys"] = whiteList
//(config["SessionFirewall"] as MutableMap<Any, Any>)["BlacklistEncryptionPublicKeys"] = blackList //(config["SessionFirewall"] as MutableMap<Any, Any>)["BlacklistEncryptionPublicKeys"] = blackList
(config["SwitchOptions"] as MutableMap<Any, Any>)["MaxTotalQueueSize"] = 1048576 (config["SwitchOptions"] as MutableMap<Any, Any>)["MaxTotalQueueSize"] = 4194304
if (config["AutoStart"] == null) { if (config["AutoStart"] == null) {
val tmpMap = emptyMap<String, Boolean>().toMutableMap() val tmpMap = emptyMap<String, Boolean>().toMutableMap()
tmpMap["WiFi"] = false tmpMap["WiFi"] = false
@ -111,10 +117,17 @@ class YggdrasilTunService : VpnService() {
private fun readPacketsFromTun() { private fun readPacketsFromTun() {
if(tunInputStream != null) { if(tunInputStream != null) {
val buffer = ByteArray(1024) var packet: ByteArray = ByteArray(MAX_PACKET_SIZE)
tunInputStream!!.read(buffer) // Read the outgoing packet from the input stream.
if (!isBufferEmpty(buffer)) { var length = tunInputStream!!.read(packet)
yggConduitEndpoint.send(buffer)
//System.out.println("packet size:"+packet.size+" "+byteArrayToHex(packet))
//System.out.println("buffer size:"+buffer.array().size+" "+byteArrayToHex(buffer.array()))
if (length > 0) {
var buffer = ByteBuffer.allocate(length);
buffer.put(packet, 0, length)
buffer.limit(length)
yggConduitEndpoint.send(buffer.array())
} }
} }
} }