Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
com.ccwangluo.accelerator
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
sheteng
com.ccwangluo.accelerator
Commits
b76f410c
Commit
b76f410c
authored
Sep 09, 2016
by
Max Lv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refine header parser
parent
d3678531
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
26 additions
and
11 deletions
+26
-11
src/main/assets/acl/gfwlist.acl
src/main/assets/acl/gfwlist.acl
+4
-0
src/main/jni/Android.mk
src/main/jni/Android.mk
+2
-2
src/main/jni/include/shadowsocks-libev/config.h
src/main/jni/include/shadowsocks-libev/config.h
+6
-0
src/main/jni/shadowsocks-libev
src/main/jni/shadowsocks-libev
+1
-1
src/main/scala/com/github/shadowsocks/GuardedProcess.scala
src/main/scala/com/github/shadowsocks/GuardedProcess.scala
+13
-8
No files found.
src/main/assets/acl/gfwlist.acl
View file @
b76f410c
...
@@ -3,6 +3,10 @@
...
@@ -3,6 +3,10 @@
[bypass_all]
[bypass_all]
[white_list]
[white_list]
# Telegram IPs
91.108.4.0/22
91.108.56.0/22
149.154.160.0/20
.*4tern\.com
.*4tern\.com
.*adorama\.com
.*adorama\.com
.*akiba-web\.com
.*akiba-web\.com
...
...
src/main/jni/Android.mk
View file @
b76f410c
...
@@ -390,6 +390,7 @@ LOCAL_SRC_FILES := $(addprefix shadowsocks-libev/src/, $(SHADOWSOCKS_SOURCES))
...
@@ -390,6 +390,7 @@ LOCAL_SRC_FILES := $(addprefix shadowsocks-libev/src/, $(SHADOWSOCKS_SOURCES))
LOCAL_CFLAGS
:=
-Wall
-O2
-fno-strict-aliasing
-DMODULE_LOCAL
\
LOCAL_CFLAGS
:=
-Wall
-O2
-fno-strict-aliasing
-DMODULE_LOCAL
\
-DUSE_CRYPTO_MBEDTLS
-DANDROID
-DHAVE_CONFIG_H
\
-DUSE_CRYPTO_MBEDTLS
-DANDROID
-DHAVE_CONFIG_H
\
-DCONNECT_IN_PROGRESS
=
EINPROGRESS
\
-DCONNECT_IN_PROGRESS
=
EINPROGRESS
\
-I
$(LOCAL_PATH)
/include/shadowsocks-libev
\
-I
$(LOCAL_PATH)
/include
\
-I
$(LOCAL_PATH)
/include
\
-I
$(LOCAL_PATH)
/libancillary
\
-I
$(LOCAL_PATH)
/libancillary
\
-I
$(LOCAL_PATH)
/mbedtls/include
\
-I
$(LOCAL_PATH)
/mbedtls/include
\
...
@@ -399,8 +400,7 @@ LOCAL_CFLAGS := -Wall -O2 -fno-strict-aliasing -DMODULE_LOCAL \
...
@@ -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
\
-I
$(LOCAL_PATH)
/shadowsocks-libev/libsodium/src/libsodium/include/sodium
\
-I
$(LOCAL_PATH)
/shadowsocks-libev/libsodium/src/libsodium/include/sodium
\
-I
$(LOCAL_PATH)
/shadowsocks-libev/libipset/include
\
-I
$(LOCAL_PATH)
/shadowsocks-libev/libipset/include
\
-I
$(LOCAL_PATH)
/shadowsocks-libev/libev
\
-I
$(LOCAL_PATH)
/shadowsocks-libev/libev
-I
$(LOCAL_PATH)
/include/shadowsocks-libev
LOCAL_STATIC_LIBRARIES
:=
libev libmbedtls libipset libcork libudns
\
LOCAL_STATIC_LIBRARIES
:=
libev libmbedtls libipset libcork libudns
\
libsodium libancillary libpcre
libsodium libancillary libpcre
...
...
src/main/jni/include/shadowsocks-libev/config.h
View file @
b76f410c
...
@@ -417,3 +417,9 @@
...
@@ -417,3 +417,9 @@
/* Define as `fork' if `vfork' does not work. */
/* Define as `fork' if `vfork' does not work. */
/* #undef vfork */
/* #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 */
shadowsocks-libev
@
e5c32544
Subproject commit
42d9b68dcc1c6ccd9d766b3755e674c2d0c45a57
Subproject commit
e5c325445092dc80d3c8bba2d8ab07beee6e4d4d
src/main/scala/com/github/shadowsocks/GuardedProcess.scala
View file @
b76f410c
...
@@ -97,14 +97,17 @@ class GuardedProcess(cmd: Seq[String]) {
...
@@ -97,14 +97,17 @@ class GuardedProcess(cmd: Seq[String]) {
semaphore
.
release
semaphore
.
release
process
.
waitFor
process
.
waitFor
if
(
isRestart
)
{
this
.
synchronized
{
isRestart
=
false
if
(
isRestart
)
{
}
else
{
isRestart
=
false
if
(
currentTimeMillis
-
startTime
<
1000
)
{
}
else
{
Log
.
w
(
TAG
,
"process exit too fast, stop guard: "
+
cmd
)
if
(
currentTimeMillis
-
startTime
<
1000
)
{
isDestroyed
=
true
Log
.
w
(
TAG
,
"process exit too fast, stop guard: "
+
cmd
)
isDestroyed
=
true
}
}
}
}
}
}
}
}
catch
{
}
catch
{
case
ignored
:
InterruptedException
=>
case
ignored
:
InterruptedException
=>
...
@@ -134,8 +137,10 @@ class GuardedProcess(cmd: Seq[String]) {
...
@@ -134,8 +137,10 @@ class GuardedProcess(cmd: Seq[String]) {
}
}
def
restart
()
{
def
restart
()
{
isRestart
=
true
this
.
synchronized
{
process
.
destroy
()
isRestart
=
true
process
.
destroy
()
}
}
}
@throws
(
classOf
[
InterruptedException
])
@throws
(
classOf
[
InterruptedException
])
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment