drop abstract domain socket

gfwlist/gen.py

@@ -10,20 +10,22 @@ import IPy
 
 def main():
     china_list_set = IPy.IPSet()
-    for line in sys.stdin:
-        line_params = line.split("|")
-        if len(line_params) < 5 or line_params[2] != "ipv4" or line_params[1] != "CN":
-            continue
-        ip_addr = line_params[3]
-        ip_length = float(line_params[4])
-        ip_mask = 32 - int(math.ceil(math.log(ip_length, 2)))
-        china_list_set.add(IPy.IP("%s/%d" % (ip_addr, ip_mask)))
+    # for line in sys.stdin:
+    #     line_params = line.split("|")
+    #     if len(line_params) < 5 or line_params[2] != "ipv4" or line_params[1] != "CN":
+    #         continue
+    #     ip_addr = line_params[3]
+    #     ip_length = float(line_params[4])
+    #     ip_mask = 32 - int(math.ceil(math.log(ip_length, 2)))
+    #     china_list_set.add(IPy.IP("%s/%d" % (ip_addr, ip_mask)))
 
     # 添加内网地址
     internal_list = IPy.IPSet(map(IPy.IP, [
         "0.0.0.0/8",
         "10.0.0.0/8",
         "100.64.0.0/10",
+        "112.124.47.0/24",
+        "114.114.114.0/24",
         "127.0.0.0/8",
         "169.254.0.0/16",
         "172.16.0.0/12",
@@ -45,10 +47,10 @@ def main():
     for ip in china_list_set:
         all.discard(ip)
 
-    filter = itertools.ifilter(lambda x: len(x) <= 65536, all)
-    for ip in filter:
-        all.discard(ip)
-        all.add(IPy.IP(ip.strNormal(0)).make_net('255.255.0.0'))
+    # filter = itertools.ifilter(lambda x: len(x) <= 65536, all)
+    # for ip in filter:
+    #     all.discard(ip)
+    #     all.add(IPy.IP(ip.strNormal(0)).make_net('255.255.0.0'))
 
     # 输出结果
     for ip in all:

project/plugins.sbt

@@ -1,7 +1,7 @@
 resolvers += Resolver.url("scalasbt releases", new URL("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-snapshots"))(Resolver.ivyStylePatterns)
 
-addSbtPlugin("com.hanhuy.sbt" % "android-sdk-plugin" % "1.4.6")
+addSbtPlugin("com.hanhuy.sbt" % "android-sdk-plugin" % "1.4.8")
 
-resolvers += Resolver.sbtPluginRepo("snapshots")
+resolvers += "Sonatype snapshots" at "https://oss.sonatype.org/content/repositories/snapshots/"
 
-addSbtPlugin("com.hanhuy.sbt" % "sbt-idea" % "1.7.0-SNAPSHOT")
+addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.7.0-SNAPSHOT")

src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.github.shadowsocks"
-    android:versionCode="110"
-    android:versionName="2.7.2">
+    android:versionCode="115"
+    android:versionName="2.7.7">
 
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>

src/main/res/values/arrays.xml

@@ -85,7 +85,41 @@
         <item>101.0.0.0/8</item>
         <item>102.0.0.0/7</item>
         <item>104.0.0.0/5</item>
-        <item>112.0.0.0/5</item>
+        <item>112.0.0.0/10</item>
+        <item>112.64.0.0/11</item>
+        <item>112.96.0.0/12</item>
+        <item>112.112.0.0/13</item>
+        <item>112.120.0.0/14</item>
+        <item>112.124.0.0/19</item>
+        <item>112.124.32.0/21</item>
+        <item>112.124.40.0/22</item>
+        <item>112.124.44.0/23</item>
+        <item>112.124.46.0/24</item>
+        <item>112.124.48.0/20</item>
+        <item>112.124.64.0/18</item>
+        <item>112.124.128.0/17</item>
+        <item>112.125.0.0/16</item>
+        <item>112.126.0.0/15</item>
+        <item>112.128.0.0/9</item>
+        <item>113.0.0.0/8</item>
+        <item>114.0.0.0/10</item>
+        <item>114.64.0.0/11</item>
+        <item>114.96.0.0/12</item>
+        <item>114.112.0.0/15</item>
+        <item>114.114.0.0/18</item>
+        <item>114.114.64.0/19</item>
+        <item>114.114.96.0/20</item>
+        <item>114.114.112.0/23</item>
+        <item>114.114.115.0/24</item>
+        <item>114.114.116.0/22</item>
+        <item>114.114.120.0/21</item>
+        <item>114.114.128.0/17</item>
+        <item>114.115.0.0/16</item>
+        <item>114.116.0.0/14</item>
+        <item>114.120.0.0/13</item>
+        <item>114.128.0.0/9</item>
+        <item>115.0.0.0/8</item>
+        <item>116.0.0.0/6</item>
         <item>120.0.0.0/6</item>
         <item>124.0.0.0/7</item>
         <item>126.0.0.0/8</item>

src/main/scala/com/github/shadowsocks/Shadowsocks.scala

@@ -185,6 +185,7 @@ class Shadowsocks
   // Variables
   var switchButton: Switch = null
   var progressDialog: ProgressDialog = null
+  var progressTag = -1
   var state = State.INIT
   var prepared = false
   var currentProfile = new Profile
@@ -218,6 +219,11 @@ class Shadowsocks
       state = bgService.getState
       // set the listener
       switchButton.setOnCheckedChangeListener(Shadowsocks.this)
+
+      if (!status.getBoolean(getVersionName, false)) {
+        status.edit.putBoolean(getVersionName, true).commit()
+        recovery();
+      }
     }
 
     override def onServiceDisconnected(name: ComponentName) {
@@ -271,9 +277,10 @@ class Shadowsocks
     switchButton.setOnCheckedChangeListener(this)
   }
 
-  private def showProgress(msg: String): Handler = {
+  private def showProgress(msg: Int): Handler = {
     clearDialog()
-    progressDialog = ProgressDialog.show(this, "", msg, true, false)
+    progressDialog = ProgressDialog.show(this, "", getString(msg), true, false)
+    progressTag = msg
     new Handler {
       override def handleMessage(msg: Message) {
         clearDialog()
@@ -397,7 +404,7 @@ class Shadowsocks
   }
 
   def prepareStartService() {
-    showProgress(getString(R.string.connecting))
+    showProgress(R.string.connecting)
     spawn {
       if (isVpnEnabled) {
         val intent = VpnService.prepare(this)
@@ -474,22 +481,16 @@ class Shadowsocks
 
     addPreferencesFromResource(R.xml.pref_all)
 
+    // Update the profile
+    if (!status.getBoolean(getVersionName, false)) {
+      currentProfile = profileManager.create()
+    }
+
     // Initialize the profile
     currentProfile = {
       profileManager.getProfile(settings.getInt(Key.profileId, -1)) getOrElse currentProfile
     }
 
-    // Update the profile
-    if (!status.getBoolean(getVersionName, false)) {
-      val h = showProgress(getString(R.string.initializing))
-      status.edit.putBoolean(getVersionName, true).apply()
-      spawn {
-        reset()
-        currentProfile = profileManager.create()
-        h.sendEmptyMessage(0)
-      }
-    }
-
     // Initialize drawer
     menuAdapter.setActiveId(settings.getInt(Key.profileId, -1))
     menuAdapter.setListener(this)
@@ -617,7 +618,7 @@ class Shadowsocks
         which match {
           case 0 =>
             dialog.dismiss()
-            val h = showProgress(getString(R.string.loading))
+            val h = showProgress(R.string.loading)
             h.postDelayed(new Runnable() {
               def run() {
                 val integrator = new IntentIntegrator(Shadowsocks.this)
@@ -641,7 +642,7 @@ class Shadowsocks
   def reloadProfile() {
     drawer.closeMenu(true)
 
-    val h = showProgress(getString(R.string.loading))
+    val h = showProgress(R.string.loading)
 
     handler.postDelayed(new Runnable {
       def run() {
@@ -660,7 +661,7 @@ class Shadowsocks
   def addProfile(profile: Profile) {
     drawer.closeMenu(true)
 
-    val h = showProgress(getString(R.string.loading))
+    val h = showProgress(R.string.loading)
 
     handler.postDelayed(new Runnable {
       def run() {
@@ -679,7 +680,7 @@ class Shadowsocks
   def addProfile(id: Int) {
     drawer.closeMenu(true)
 
-    val h = showProgress(getString(R.string.loading))
+    val h = showProgress(R.string.loading)
 
     handler.postDelayed(new Runnable {
       def run() {
@@ -697,7 +698,7 @@ class Shadowsocks
   def updateProfile(id: Int) {
     drawer.closeMenu(true)
 
-    val h = showProgress(getString(R.string.loading))
+    val h = showProgress(R.string.loading)
 
     handler.postDelayed(new Runnable {
       def run() {
@@ -916,10 +917,7 @@ class Shadowsocks
     Console.runRootCommand(ab.toArray)
   }
 
-  def reset() {
-
-    crashRecovery()
-
+  def install() {
     copyAssets(System.getABI)
 
     val ab = new ArrayBuffer[String]
@@ -927,19 +925,21 @@ class Shadowsocks
       ab.append("chmod 755 " + Path.BASE + executable)
     }
     Console.runCommand(ab.toArray)
+  }
 
+  def reset() {
+
+    crashRecovery()
+
+    install()
   }
 
   private def recovery() {
-    val h = showProgress(getString(R.string.recovering))
+    serviceStop()
+    val h = showProgress(R.string.recovering)
     spawn {
       reset()
-      handler.post(new Runnable {
-        override def run() {
-          serviceStop
-          h.sendEmptyMessage(0)
-        }
-      })
+      h.sendEmptyMessage(0)
     }
   }
 
@@ -969,7 +969,7 @@ class Shadowsocks
   }
 
   private def flushDnsCache() {
-    val h = showProgress(getString(R.string.flushing))
+    val h = showProgress(R.string.flushing)
     spawn {
       Utils.toggleAirplaneMode(getBaseContext)
       h.sendEmptyMessage(0)
@@ -1087,6 +1087,7 @@ class Shadowsocks
     if (progressDialog != null) {
       progressDialog.dismiss()
       progressDialog = null
+      progressTag = -1
     }
   }
 
@@ -1100,14 +1101,19 @@ class Shadowsocks
               if (progressDialog == null) {
                 progressDialog = ProgressDialog
                   .show(Shadowsocks.this, "", getString(R.string.connecting), true, true)
+                progressTag = R.string.connecting
               }
               setPreferenceEnabled(enabled = false)
             case State.CONNECTED =>
-              clearDialog()
+              if (progressTag == R.string.connecting) {
+                clearDialog()
+              }
               changeSwitch(checked = true)
               setPreferenceEnabled(enabled = false)
             case State.STOPPED =>
-              clearDialog()
+              if (progressTag == R.string.stopping) {
+                clearDialog()
+              }
               changeSwitch(checked = false)
               if (m != null) {
                 new SnackBar.Builder(Shadowsocks.this)
@@ -1122,6 +1128,7 @@ class Shadowsocks
               if (progressDialog == null) {
                 progressDialog = ProgressDialog
                   .show(Shadowsocks.this, "", getString(R.string.stopping), true, true)
+                progressTag = R.string.stopping
               }
           }
         }

src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala

@@ -103,12 +103,8 @@ class ShadowsocksVpnService extends VpnService with BaseService {
     null
   }
 
-  override def onDestroy() {
-    super.onDestroy()
-    if (vpnThread != null) vpnThread.stopThread()
-  }
-
   override def onCreate() {
+
     super.onCreate()
 
     ConfigUtils.refresh(this)
@@ -116,8 +112,6 @@ class ShadowsocksVpnService extends VpnService with BaseService {
     notificationManager = getSystemService(Context.NOTIFICATION_SERVICE)
       .asInstanceOf[NotificationManager]
 
-    vpnThread = new ShadowsocksVpnThread(this)
-    vpnThread.start()
   }
 
   override def onRevoke() {
@@ -126,6 +120,11 @@ class ShadowsocksVpnService extends VpnService with BaseService {
 
   override def stopRunner() {
 
+    if (vpnThread != null) {
+      vpnThread.stopThread()
+      vpnThread = null
+    }
+
     // channge the state
     changeState(State.STOPPING)
 
@@ -185,6 +184,9 @@ class ShadowsocksVpnService extends VpnService with BaseService {
 
   override def startRunner(c: Config) {
 
+    vpnThread = new ShadowsocksVpnThread(this)
+    vpnThread.start()
+
     config = c
 
     // ensure the VPNService is prepared
@@ -266,17 +268,18 @@ class ShadowsocksVpnService extends VpnService with BaseService {
     }
 
     val fd = startVpn()
-    if (fd == -1) {
-      false
-    } else {
-      Thread.sleep(1000)
-      if (System.sendfd(fd) == -1) {
-        false
-      } else {
-        true
+
+    if (fd != -1) {
+      var tries = 1
+      while (tries < 5) {
+        Thread.sleep(1000 * tries)
+        if (System.sendfd(fd) != -1) {
+          return true
+        }
+        tries += 1
       }
     }
-
+    false
   }
 
   def startShadowsocksDaemon() {

src/main/scala/com/github/shadowsocks/ShadowsocksVpnThread.scala

@@ -50,15 +50,23 @@ class ShadowsocksVpnThread(vpnService: ShadowsocksVpnService) extends Thread {
   val TAG = "ShadowsocksVpnService"
   val PATH = "/data/data/com.github.shadowsocks/protect_path"
 
-  var isRunning: Boolean = true
-  var serverSocket: LocalServerSocket = null
+  @volatile var isRunning: Boolean = true
+  @volatile var serverSocket: LocalServerSocket = null
+
+  def closeServerSocket() {
+    if (serverSocket != null) {
+      try {
+        serverSocket.close()
+      } catch {
+        case _: Exception => // ignore
+      }
+      serverSocket = null
+      }
+  }
 
   def stopThread() {
     isRunning = false
-    if (serverSocket != null) {
-      serverSocket.close()
-      serverSocket = null
-    }
+    closeServerSocket()
   }
 
   override def run(): Unit = {
@@ -71,20 +79,17 @@ class ShadowsocksVpnThread(vpnService: ShadowsocksVpnService) extends Thread {
 
     try {
       val localSocket = new LocalSocket
-
       localSocket.bind(new LocalSocketAddress(PATH, LocalSocketAddress.Namespace.FILESYSTEM))
       serverSocket = new LocalServerSocket(localSocket.getFileDescriptor)
     } catch {
       case e: IOException =>
         Log.e(TAG, "unable to bind", e)
-        vpnService.stopBackgroundService()
         return
     }
 
     val pool = Executors.newFixedThreadPool(4)
 
     while (isRunning) {
-
       try {
         val socket = serverSocket.accept()
 
@@ -131,7 +136,10 @@ class ShadowsocksVpnThread(vpnService: ShadowsocksVpnService) extends Thread {
 
         }})
       } catch {
-        case e: IOException => Log.e(TAG, "Error when accept socket", e)
+        case e: IOException => {
+          Log.e(TAG, "Error when accept socket", e)
+          return
+        }
       }
     }
   }

src/main/scala/com/github/shadowsocks/utils/ConfigUtils.scala

@@ -159,8 +159,8 @@ object ConfigUtils {
       |
       |server {
       | label = "china-servers";
-      | ip = 223.5.5.5, 114.114.114.114;
-      | timeout = 2;
+      | ip = 114.114.114.114, 112.124.47.27;
+      | timeout = 4;
       | reject = %s;
       | reject_policy = fail;
       | reject_recursively = on;