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
31a5cff9
Commit
31a5cff9
authored
Jul 25, 2014
by
Max Lv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
refine #100
parent
4e22d26e
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
28 additions
and
21 deletions
+28
-21
build-ndk.sh
build-ndk.sh
+2
-2
jni/Android.mk
jni/Android.mk
+16
-16
project/plugins.sbt
project/plugins.sbt
+1
-1
src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala
.../scala/com/github/shadowsocks/ShadowsocksNatService.scala
+4
-1
src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
.../scala/com/github/shadowsocks/ShadowsocksVpnService.scala
+5
-1
No files found.
build-ndk.sh
View file @
31a5cff9
...
@@ -16,8 +16,8 @@ do
...
@@ -16,8 +16,8 @@ do
mv
libs/armeabi-v7a/
$app
src/main/assets/armeabi-v7a/
mv
libs/armeabi-v7a/
$app
src/main/assets/armeabi-v7a/
mv
libs/x86/
$app
src/main/assets/x86/
mv
libs/x86/
$app
src/main/assets/x86/
done
done
rm
-rf
src/main/
jni
rm
-rf
src/main/
libs
mv
libs src/main/
jni
mv
libs src/main/
# Target 16
# Target 16
cp
jni/Application.mk.16 jni/Application.mk
cp
jni/Application.mk.16 jni/Application.mk
...
...
jni/Android.mk
View file @
31a5cff9
...
@@ -183,22 +183,22 @@ include $(BUILD_SHARED_LIBRARY)
...
@@ -183,22 +183,22 @@ include $(BUILD_SHARED_LIBRARY)
## shadowsocks tunnel
## shadowsocks tunnel
########################################################
########################################################
include
$(CLEAR_VARS)
#
include $(CLEAR_VARS)
#
SHADOWSOCKS_SOURCES
:=
tunnel.c cache.c udprelay.c encrypt.c utils.c json.c jconf.c
#
SHADOWSOCKS_SOURCES := tunnel.c cache.c udprelay.c encrypt.c utils.c json.c jconf.c
#
LOCAL_MODULE
:=
ss-tunnel
#
LOCAL_MODULE := ss-tunnel
LOCAL_SRC_FILES
:=
$(
addprefix
shadowsocks/src/,
$(SHADOWSOCKS_SOURCES)
)
#
LOCAL_SRC_FILES := $(addprefix shadowsocks/src/, $(SHADOWSOCKS_SOURCES))
LOCAL_CFLAGS
:=
-Wall
-O2
-fno-strict-aliasing
-DUDPRELAY_LOCAL
-DUDPRELAY_TUNNEL
\
#
LOCAL_CFLAGS := -Wall -O2 -fno-strict-aliasing -DUDPRELAY_LOCAL -DUDPRELAY_TUNNEL \
-DUSE_CRYPTO_OPENSSL
-DANDROID
-DHAVE_CONFIG_H
\
#
-DUSE_CRYPTO_OPENSSL -DANDROID -DHAVE_CONFIG_H \
-I
$(LOCAL_PATH)
/libev/
\
#
-I$(LOCAL_PATH)/libev/ \
-I
$(LOCAL_PATH)
/openssl/include
#
-I$(LOCAL_PATH)/openssl/include
#
LOCAL_STATIC_LIBRARIES
:=
libev libcrypto
#
LOCAL_STATIC_LIBRARIES := libev libcrypto
#
LOCAL_LDLIBS
:=
-llog
#
LOCAL_LDLIBS := -llog
#
include
$(BUILD_EXECUTABLE)
#
include $(BUILD_EXECUTABLE)
########################################################
########################################################
## shadowsocks tunnel library
## shadowsocks tunnel library
...
...
project/plugins.sbt
View file @
31a5cff9
resolvers
+=
Resolver
.
url
(
"scalasbt releases"
,
new
URL
(
"http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-snapshots"
))(
Resolver
.
ivyStylePatterns
)
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.
2.16
"
)
addSbtPlugin
(
"com.hanhuy.sbt"
%
"android-sdk-plugin"
%
"1.
3.3
"
)
addSbtPlugin
(
"com.github.mpeltonen"
%
"sbt-idea"
%
"1.6.0"
)
addSbtPlugin
(
"com.github.mpeltonen"
%
"sbt-idea"
%
"1.6.0"
)
src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala
View file @
31a5cff9
...
@@ -310,9 +310,12 @@ class ShadowsocksNatService extends Service with BaseService {
...
@@ -310,9 +310,12 @@ class ShadowsocksNatService extends Service with BaseService {
}
}
override
def
onStartCommand
(
intent
:
Intent
,
flags
:
Int
,
startId
:
Int
)
:
Int
=
{
override
def
onStartCommand
(
intent
:
Intent
,
flags
:
Int
,
startId
:
Int
)
:
Int
=
{
Service
.
START_
NOT_
STICKY
Service
.
START_STICKY
}
}
override
def
onTaskRemoved
(
intent
:
Intent
)
{
stopRunner
()
}
def
killProcesses
()
{
def
killProcesses
()
{
Console
.
runRootCommand
(
Utils
.
getIptables
+
" -t nat -F OUTPUT"
)
Console
.
runRootCommand
(
Utils
.
getIptables
+
" -t nat -F OUTPUT"
)
...
...
src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
View file @
31a5cff9
...
@@ -256,7 +256,11 @@ class ShadowsocksVpnService extends VpnService with BaseService {
...
@@ -256,7 +256,11 @@ class ShadowsocksVpnService extends VpnService with BaseService {
}
}
override
def
onStartCommand
(
intent
:
Intent
,
flags
:
Int
,
startId
:
Int
)
:
Int
=
{
override
def
onStartCommand
(
intent
:
Intent
,
flags
:
Int
,
startId
:
Int
)
:
Int
=
{
Service
.
START_NOT_STICKY
Service
.
START_STICKY
}
override
def
onTaskRemoved
(
intent
:
Intent
)
{
stopRunner
()
}
}
override
def
onRevoke
()
{
override
def
onRevoke
()
{
...
...
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