Refine header parser

shadowsocks · Sep 9, 2016 · b76f410 · b76f410
1 parent d367853
commit b76f410
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 11 deletions.
diff --git a/src/main/assets/acl/gfwlist.acl b/src/main/assets/acl/gfwlist.acl
@@ -3,6 +3,10 @@
 [bypass_all]
 
 [white_list]
+# Telegram IPs
+91.108.4.0/22
+91.108.56.0/22
+149.154.160.0/20
 .*4tern\.com
 .*adorama\.com
 .*akiba-web\.com

diff --git a/src/main/jni/Android.mk b/src/main/jni/Android.mk
@@ -390,6 +390,7 @@ LOCAL_SRC_FILES := $(addprefix shadowsocks-libev/src/, $(SHADOWSOCKS_SOURCES))
 LOCAL_CFLAGS    := -Wall -O2 -fno-strict-aliasing -DMODULE_LOCAL \
 					-DUSE_CRYPTO_MBEDTLS -DANDROID -DHAVE_CONFIG_H \
 					-DCONNECT_IN_PROGRESS=EINPROGRESS \
+					-I$(LOCAL_PATH)/include/shadowsocks-libev \
 					-I$(LOCAL_PATH)/include \
 					-I$(LOCAL_PATH)/libancillary \
 					-I$(LOCAL_PATH)/mbedtls/include  \
@@ -399,8 +400,7 @@ LOCAL_CFLAGS    := -Wall -O2 -fno-strict-aliasing -DMODULE_LOCAL \
 					-I$(LOCAL_PATH)/shadowsocks-libev/libsodium/src/libsodium/include \
 					-I$(LOCAL_PATH)/shadowsocks-libev/libsodium/src/libsodium/include/sodium \
 					-I$(LOCAL_PATH)/shadowsocks-libev/libipset/include \
-					-I$(LOCAL_PATH)/shadowsocks-libev/libev \
-					-I$(LOCAL_PATH)/include/shadowsocks-libev
+					-I$(LOCAL_PATH)/shadowsocks-libev/libev
 
 LOCAL_STATIC_LIBRARIES := libev libmbedtls libipset libcork libudns \
 	libsodium libancillary libpcre

diff --git a/src/main/jni/include/shadowsocks-libev/config.h b/src/main/jni/include/shadowsocks-libev/config.h
@@ -417,3 +417,9 @@
 
 /* Define as `fork' if `vfork' does not work. */
 /* #undef vfork */
+
+/* Define to 1 if you have the <pcre.h> header file. */
+#define HAVE_PCRE_H 1
+
+/* Define to 1 if you have the <pcre/pcre.h> header file. */
+/* #undef HAVE_PCRE_PCRE_H */
diff --git a/src/main/jni/shadowsocks-libev b/src/main/jni/shadowsocks-libev
diff --git a/src/main/scala/com/github/shadowsocks/GuardedProcess.scala b/src/main/scala/com/github/shadowsocks/GuardedProcess.scala
@@ -97,14 +97,17 @@ class GuardedProcess(cmd: Seq[String]) {
           semaphore.release
           process.waitFor
 
-          if (isRestart) {
-            isRestart = false
-          } else {
-            if (currentTimeMillis - startTime < 1000) {
-              Log.w(TAG, "process exit too fast, stop guard: " + cmd)
-              isDestroyed = true
+          this.synchronized {
+            if (isRestart) {
+              isRestart = false
+            } else {
+              if (currentTimeMillis - startTime < 1000) {
+                Log.w(TAG, "process exit too fast, stop guard: " + cmd)
+                isDestroyed = true
+              }
             }
           }
+
         }
       } catch {
         case ignored: InterruptedException =>
@@ -134,8 +137,10 @@ class GuardedProcess(cmd: Seq[String]) {
   }
 
   def restart() {
-    isRestart = true
-    process.destroy()
+    this.synchronized {
+      isRestart = true
+      process.destroy()
+    }
   }
 
   @throws(classOf[InterruptedException])
+1 −1		.gitignore
+6 −11		Makefile.in
+1 −1,283		aclocal.m4
+7 −1		config.h.in
+204 −1,475		configure
+5 −11		configure.ac
+1 −1		debian/.gitignore
+39 −19		debian/control
+1 −1		debian/libshadowsocks-libev-dev.install
+0 −0		debian/libshadowsocks-libev2.install
+2 −2		debian/shadowsocks-libev.install
+5 −9		doc/Makefile.in
+5 −9		libcork/Makefile.in
+5 −9		libev/Makefile.in
+5 −9		libipset/Makefile.in
+5 −9		libudns/Makefile.in
+151 −0		m4/pcre.m4
+1 −1		src/Makefile.am
+7 −11		src/Makefile.in
+13 −11		src/acl.c
+3 −0		src/http.c
+1 −1		src/local.c
+10 −11		src/rule.c
+17 −10		src/rule.h