From 7157990f25a0f935481d1e94cb2acec1c425b388 Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Thu, 6 Jun 2013 12:36:29 +0800
Subject: [PATCH] update chn list

---
 src/main/res/values/arrays.xml                            | 3 ++-
 .../scala/com/github/shadowsocks/ShadowVpnService.scala   | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml
index 49f0baf0..d1b8de76 100644
--- a/src/main/res/values/arrays.xml
+++ b/src/main/res/values/arrays.xml
@@ -696,6 +696,7 @@
     <item>198.211</item>
     <item>198.244</item>
     <item>199.15</item>
+    <item>199.16</item>
     <item>199.27</item>
     <item>199.34</item>
     <item>199.47</item>
@@ -923,4 +924,4 @@
     <item>222.239</item>
     <item>223.27</item>
   </string-array>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/src/main/scala/com/github/shadowsocks/ShadowVpnService.scala b/src/main/scala/com/github/shadowsocks/ShadowVpnService.scala
index 1c3750ae..91f35cac 100644
--- a/src/main/scala/com/github/shadowsocks/ShadowVpnService.scala
+++ b/src/main/scala/com/github/shadowsocks/ShadowVpnService.scala
@@ -71,8 +71,8 @@ class ShadowVpnService extends VpnService {
 
   val VPN_MTU = 1500
 
-  val PRIVATE_VLAN_10 = "10.254.254.%d"
-  val PRIVATE_VLAN_172 = "172.30.254.%d"
+  val PRIVATE_VLAN_10 = "10.254.254.%s"
+  val PRIVATE_VLAN_172 = "172.30.254.%s"
 
   var conn: ParcelFileDescriptor = null
   var notificationManager: NotificationManager = null
@@ -248,7 +248,7 @@ class ShadowVpnService extends VpnService {
     builder
       .setSession(getString(R.string.app_name))
       .setMtu(VPN_MTU)
-      .addAddress(localAddress.format(1), 24)
+      .addAddress(localAddress.format("1"), 24)
       .addDnsServer("8.8.8.8")
 
     if (InetAddressUtils.isIPv6Address(config.proxy)) {
@@ -309,7 +309,7 @@ class ShadowVpnService extends VpnService {
       + "--tunmtu %d "
       + "--loglevel 3 "
       + "--pid %stun2socks.pid")
-      .format(localAddress.format(2), localAddress.format(1), config.localPort, fd, VPN_MTU, BASE)
+      .format(localAddress.format("2"), localAddress.format("1"), config.localPort, fd, VPN_MTU, BASE)
     Log.d(TAG, cmd)
     System.exec(cmd)
   }