Commit f7303e15 authored by Mygod's avatar Mygod

Revert "Promote default settings to kcptun"

This reverts commit 99ff47bd.

See discussion at: https://github.com/shadowsocks/kcptun/pull/1
parent 99ff47bd
Subproject commit a895d2d49bdc644693bfde138245c2dc105ce859 Subproject commit e8349a306372700f5e5ccbda1592ced01760088c
...@@ -129,9 +129,11 @@ class DBHelper(val context: Context) ...@@ -129,9 +129,11 @@ class DBHelper(val context: Context)
if (oldVersion < 17) { if (oldVersion < 17) {
profileDao.executeRawNoArgs("ALTER TABLE `profile` ADD COLUMN kcp SMALLINT;") profileDao.executeRawNoArgs("ALTER TABLE `profile` ADD COLUMN kcp SMALLINT;")
profileDao.executeRawNoArgs("ALTER TABLE `profile` ADD COLUMN kcpcli VARCHAR DEFAULT '--nocomp';") profileDao.executeRawNoArgs("ALTER TABLE `profile` ADD COLUMN kcpcli VARCHAR DEFAULT " +
"'--crypt none --mode normal --mtu 1200 --nocomp --dscp 46 --parityshard 0';")
} else if (oldVersion < 20) { } else if (oldVersion < 20) {
profileDao.executeRawNoArgs("UPDATE `profile` SET kcpcli = '--nocomp' WHERE kcpcli IS NULL;") profileDao.executeRawNoArgs("UPDATE `profile` SET kcpcli = '--crypt none --mode normal --mtu 1200 --nocomp " +
"--dscp 46 --parityshard 0' WHERE kcpcli IS NULL;")
} }
if (oldVersion < 18) { if (oldVersion < 18) {
......
...@@ -106,7 +106,7 @@ class Profile { ...@@ -106,7 +106,7 @@ class Profile {
var kcpPort: Int = 8399 var kcpPort: Int = 8399
@DatabaseField @DatabaseField
var kcpcli: String = "--nocomp" var kcpcli: String = "--crypt none --mode normal --mtu 1200 --nocomp --dscp 46 --parityshard 0"
override def toString = "ss://" + Base64.encodeToString("%s%s:%s@%s:%d".formatLocal(Locale.ENGLISH, override def toString = "ss://" + Base64.encodeToString("%s%s:%s@%s:%d".formatLocal(Locale.ENGLISH,
method, if (auth) "-auth" else "", password, host, remotePort).getBytes, Base64.NO_PADDING | Base64.NO_WRAP) method, if (auth) "-auth" else "", password, host, remotePort).getBytes, Base64.NO_PADDING | Base64.NO_WRAP)
......
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