From 99ff47bd5fd1dec7d9cb7303ef201d826d6faa8a Mon Sep 17 00:00:00 2001 From: Mygod Date: Tue, 16 Aug 2016 22:15:03 +0800 Subject: [PATCH] Promote default settings to kcptun --- kcptun/kcptun | 2 +- .../scala/com/github/shadowsocks/database/DBHelper.scala | 6 ++---- .../scala/com/github/shadowsocks/database/Profile.scala | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/kcptun/kcptun b/kcptun/kcptun index e8349a30..a895d2d4 160000 --- a/kcptun/kcptun +++ b/kcptun/kcptun @@ -1 +1 @@ -Subproject commit e8349a306372700f5e5ccbda1592ced01760088c +Subproject commit a895d2d49bdc644693bfde138245c2dc105ce859 diff --git a/src/main/scala/com/github/shadowsocks/database/DBHelper.scala b/src/main/scala/com/github/shadowsocks/database/DBHelper.scala index 80e7ca5a..4411528d 100644 --- a/src/main/scala/com/github/shadowsocks/database/DBHelper.scala +++ b/src/main/scala/com/github/shadowsocks/database/DBHelper.scala @@ -129,11 +129,9 @@ class DBHelper(val context: Context) if (oldVersion < 17) { profileDao.executeRawNoArgs("ALTER TABLE `profile` ADD COLUMN kcp SMALLINT;") - profileDao.executeRawNoArgs("ALTER TABLE `profile` ADD COLUMN kcpcli VARCHAR DEFAULT " + - "'--crypt none --mode normal --mtu 1200 --nocomp --dscp 46 --parityshard 0';") + profileDao.executeRawNoArgs("ALTER TABLE `profile` ADD COLUMN kcpcli VARCHAR DEFAULT '--nocomp';") } else if (oldVersion < 20) { - profileDao.executeRawNoArgs("UPDATE `profile` SET kcpcli = '--crypt none --mode normal --mtu 1200 --nocomp " + - "--dscp 46 --parityshard 0' WHERE kcpcli IS NULL;") + profileDao.executeRawNoArgs("UPDATE `profile` SET kcpcli = '--nocomp' WHERE kcpcli IS NULL;") } if (oldVersion < 18) { diff --git a/src/main/scala/com/github/shadowsocks/database/Profile.scala b/src/main/scala/com/github/shadowsocks/database/Profile.scala index 6699dda0..e8781edd 100644 --- a/src/main/scala/com/github/shadowsocks/database/Profile.scala +++ b/src/main/scala/com/github/shadowsocks/database/Profile.scala @@ -106,7 +106,7 @@ class Profile { var kcpPort: Int = 8399 @DatabaseField - var kcpcli: String = "--crypt none --mode normal --mtu 1200 --nocomp --dscp 46 --parityshard 0" + var kcpcli: String = "--nocomp" 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)