Commit 8e6f0a36 authored by liusheng's avatar liusheng

Merge branch 'cc-dev' into 11a-dev

parents bac25eca db2460e6
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
"formatVersion": 1, "formatVersion": 1,
"database": { "database": {
"version": 29, "version": 29,
"identityHash": "c6293b758903bd4b8084f9d2f0ce9763", "identityHash": "ec1c94566e8753e5bd68c6a4274aafc4",
"entities": [ "entities": [
{ {
"tableName": "Profile", "tableName": "Profile",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT, `host` TEXT NOT NULL, `remotePort` INTEGER NOT NULL, `password` TEXT NOT NULL, `token` TEXT, `method` TEXT NOT NULL, `authTimeout` INTEGER NOT NULL, `beatsInterval` INTEGER NOT NULL, `retryLimit` INTEGER NOT NULL, `route` TEXT NOT NULL, `remoteDns` TEXT NOT NULL, `proxyApps` INTEGER NOT NULL, `bypass` INTEGER NOT NULL, `udpdns` INTEGER NOT NULL, `ipv6` INTEGER NOT NULL, `metered` INTEGER NOT NULL, `individual` TEXT NOT NULL, `plugin` TEXT, `udpFallback` INTEGER, `subscription` INTEGER NOT NULL, `tx` INTEGER NOT NULL, `rx` INTEGER NOT NULL, `userOrder` INTEGER NOT NULL)", "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT, `host` TEXT NOT NULL, `remotePort` INTEGER NOT NULL, `password` TEXT NOT NULL, `token` TEXT, `method` TEXT NOT NULL, `authTimeout` INTEGER NOT NULL, `beatsInterval` INTEGER NOT NULL, `retryLimit` INTEGER NOT NULL, `route` TEXT NOT NULL, `remoteDns` TEXT NOT NULL, `proxyApps` INTEGER NOT NULL, `bypass` INTEGER NOT NULL, `udpdns` INTEGER NOT NULL, `ipv6` INTEGER NOT NULL, `metered` INTEGER NOT NULL, `individual` TEXT NOT NULL, `plugin` TEXT, `udpFallback` INTEGER, `outboundBindInterface` TEXT, `subscription` INTEGER NOT NULL, `tx` INTEGER NOT NULL, `rx` INTEGER NOT NULL, `userOrder` INTEGER NOT NULL)",
"fields": [ "fields": [
{ {
"fieldPath": "id", "fieldPath": "id",
...@@ -128,6 +128,12 @@ ...@@ -128,6 +128,12 @@
"affinity": "INTEGER", "affinity": "INTEGER",
"notNull": false "notNull": false
}, },
{
"fieldPath": "outboundBindInterface",
"columnName": "outboundBindInterface",
"affinity": "TEXT",
"notNull": false
},
{ {
"fieldPath": "subscription", "fieldPath": "subscription",
"columnName": "subscription", "columnName": "subscription",
...@@ -198,7 +204,7 @@ ...@@ -198,7 +204,7 @@
"views": [], "views": [],
"setupQueries": [ "setupQueries": [
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)", "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'c6293b758903bd4b8084f9d2f0ce9763')" "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'ec1c94566e8753e5bd68c6a4274aafc4')"
] ]
} }
} }
\ No newline at end of file
...@@ -320,7 +320,7 @@ object BaseService { ...@@ -320,7 +320,7 @@ object BaseService {
return Service.START_NOT_STICKY return Service.START_NOT_STICKY
} }
val (profile, fallback) = expanded val (profile, fallback) = expanded
Timber.e("construct ProxyInstance with profile $profile") Timber.e("construct ProxyInstance with profile $profile, $fallback")
try { try {
data.proxy = ProxyInstance(profile) data.proxy = ProxyInstance(profile)
data.udpFallback = if (fallback == null) null else ProxyInstance(fallback, profile.route) data.udpFallback = if (fallback == null) null else ProxyInstance(fallback, profile.route)
...@@ -348,7 +348,6 @@ object BaseService { ...@@ -348,7 +348,6 @@ object BaseService {
try { try {
Executable.killAll() // clean up old processes Executable.killAll() // clean up old processes
preInit() preInit()
AuthManager.initAuthProfile(profile)
if (profile.route == Acl.CUSTOM_RULES) try { if (profile.route == Acl.CUSTOM_RULES) try {
withContext(Dispatchers.IO) { withContext(Dispatchers.IO) {
Acl.customRules.flatten(10, this@Interface::openConnection).also { Acl.customRules.flatten(10, this@Interface::openConnection).also {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment