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
383e9404
Commit
383e9404
authored
Nov 24, 2014
by
Max Lv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Run tun2socks in seprate process for now
parent
16d2cd9a
Changes
11
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
298 additions
and
318 deletions
+298
-318
.gitignore
.gitignore
+1
-0
.travis.yml
.travis.yml
+1
-0
README.md
README.md
+6
-0
build.sh
build.sh
+1
-1
project/plugins.sbt
project/plugins.sbt
+3
-1
src/main/AndroidManifest.xml
src/main/AndroidManifest.xml
+2
-3
src/main/java/com/github/shadowsocks/Tun2Socks.java
src/main/java/com/github/shadowsocks/Tun2Socks.java
+1
-1
src/main/jni/Android.mk
src/main/jni/Android.mk
+3
-3
src/main/jni/badvpn/tun2socks/tun2socks.c
src/main/jni/badvpn/tun2socks/tun2socks.c
+260
-291
src/main/scala/com/github/shadowsocks/Shadowsocks.scala
src/main/scala/com/github/shadowsocks/Shadowsocks.scala
+1
-1
src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
.../scala/com/github/shadowsocks/ShadowsocksVpnService.scala
+19
-17
No files found.
.gitignore
View file @
383e9404
...
...
@@ -23,6 +23,7 @@ local.sbt
out/
#NDK
src/main/obj
src/main/libs
src/main/assets/armeabi
src/main/assets/armeabi-v7a
...
...
.travis.yml
View file @
383e9404
...
...
@@ -18,5 +18,6 @@ install:
-
echo "y" | android update sdk --filter extra-android-m2repository --no-ui --no-https -a
script
:
-
cp local.properties.travis local.properties
-
./build.sh
-
sbt android:package-release
-
exit
0
README.md
View file @
383e9404
...
...
@@ -29,6 +29,9 @@ Help to translate shadowsocks: http://crowdin.net/project/shadowsocks/invite
```
bash
git submodule update
--init
# Build native binaries
./build.sh
# Build the App
sbt clean android:package-release
```
...
...
@@ -47,6 +50,9 @@ Help to translate shadowsocks: http://crowdin.net/project/shadowsocks/invite
```
bash
git submodule update
--init
# Build native binaries
./build.sh
# Build the apk
sbt clean android:package-release
```
...
...
build.sh
View file @
383e9404
...
...
@@ -15,7 +15,7 @@ rm -rf assets/armeabi-v7a
rm
-rf
assets/x86
mkdir
-p
assets/armeabi-v7a
mkdir
-p
assets/x86
for
app
in
pdnsd redsocks ss-local ss-tunnel
tun2socks
for
app
in
pdnsd redsocks ss-local ss-tunnel
do
try
mv
libs/armeabi-v7a/
$app
assets/armeabi-v7a/
try
mv
libs/x86/
$app
assets/x86/
...
...
project/plugins.sbt
View file @
383e9404
...
...
@@ -2,4 +2,6 @@ resolvers += Resolver.url("scalasbt releases", new URL("http://scalasbt.artifact
addSbtPlugin
(
"com.hanhuy.sbt"
%
"android-sdk-plugin"
%
"1.3.10"
)
addSbtPlugin
(
"com.github.mpeltonen"
%
"sbt-idea"
%
"1.6.0"
)
resolvers
+=
Resolver
.
sbtPluginRepo
(
"snapshots"
)
addSbtPlugin
(
"com.hanhuy.sbt"
%
"sbt-idea"
%
"1.7.0-SNAPSHOT"
)
src/main/AndroidManifest.xml
View file @
383e9404
<manifest
xmlns:android=
"http://schemas.android.com/apk/res/android"
package=
"com.github.shadowsocks"
android:versionCode=
"8
4
"
android:versionName=
"2.4.
4
"
>
android:versionCode=
"8
5
"
android:versionName=
"2.4.
5
"
>
<uses-permission
android:name=
"android.permission.INTERNET"
/>
<uses-permission
android:name=
"android.permission.ACCESS_NETWORK_STATE"
/>
...
...
@@ -18,7 +18,6 @@
<application
android:allowBackup=
"true"
android:debuggable=
"true"
android:name=
".ShadowsocksApplication"
android:hardwareAccelerated=
"true"
android:icon=
"@drawable/ic_launcher"
...
...
src/main/java/com/github/shadowsocks/Tun2Socks.java
View file @
383e9404
...
...
@@ -40,7 +40,7 @@ package com.github.shadowsocks;
public
class
Tun2Socks
{
static
{
java
.
lang
.
System
.
loadLibrary
(
"tun2socks
-jni
"
);
java
.
lang
.
System
.
loadLibrary
(
"tun2socks"
);
}
public
static
native
void
start
(
String
[]
cmd
);
...
...
src/main/jni/Android.mk
View file @
383e9404
...
...
@@ -214,7 +214,7 @@ LOCAL_CFLAGS += -DBADVPN_THREADWORK_USE_PTHREAD -DBADVPN_LINUX -DBADVPN_BREACTOR
LOCAL_CFLAGS
+=
-DBADVPN_USE_SELFPIPE
-DBADVPN_USE_EPOLL
LOCAL_CFLAGS
+=
-DBADVPN_LITTLE_ENDIAN
-DBADVPN_THREAD_SAFE
LOCAL_CFLAGS
+=
-DNDEBUG
-DANDROID
#
LOCAL_CFLAGS += -DTUN2SOCKS_JNI
LOCAL_CFLAGS
+=
-DTUN2SOCKS_JNI
LOCAL_C_INCLUDES
:=
\
$(LOCAL_PATH)
/badvpn/lwip/src/include/ipv4
\
...
...
@@ -288,9 +288,9 @@ LOCAL_MODULE := tun2socks
LOCAL_LDLIBS
:=
-ldl
-llog
LOCAL_SRC_FILES
:=
$(
addprefix
badvpn/,
$(TUN2SOCKS_SOURCES)
)
LOCAL_SRC_FILES
:=
$(
addprefix
badvpn/,
$(TUN2SOCKS_SOURCES)
)
tun2socks-jni.cpp
include
$(BUILD_
EXECUTABLE
)
include
$(BUILD_
SHARED_LIBRARY
)
# OpenSSL
openssl_subdirs
:=
$(
addprefix
$(LOCAL_PATH)
/openssl/,
$(
addsuffix
/Android.mk,
\
...
...
src/main/jni/badvpn/tun2socks/tun2socks.c
View file @
383e9404
...
...
@@ -183,8 +183,6 @@ sock_fd_write(int sock, void *buf, ssize_t buflen, int fd)
size
=
sendmsg
(
sock
,
&
msg
,
0
);
if
(
size
<
0
)
perror
(
"sendmsg"
);
return
size
;
}
...
...
@@ -213,7 +211,6 @@ sock_fd_read(int sock, void *buf, ssize_t bufsize, int *fd)
msg
.
msg_controllen
=
sizeof
(
cmsgu
.
control
);
size
=
recvmsg
(
sock
,
&
msg
,
0
);
if
(
size
<
0
)
{
perror
(
"recvmsg"
);
return
-
1
;
}
cmsg
=
CMSG_FIRSTHDR
(
&
msg
);
...
...
@@ -474,10 +471,9 @@ static void daemonize(const char* path) {
int
recv_tun_fd
(
void
)
{
int
s_fd
,
c_fd
,
fd_to_read
;
int
s_fd
,
fd_to_read
;
struct
sockaddr_un
addr
;
socklen_t
addr_len
;
char
buf
[
16
];
s_fd
=
socket
(
AF_UNIX
,
SOCK_STREAM
,
0
);
if
(
s_fd
<
0
)
{
...
...
@@ -490,42 +486,25 @@ recv_tun_fd (void)
addr_len
=
sizeof
(
struct
sockaddr_un
);
memset
(
&
addr
,
0
,
addr_len
);
addr
.
sun_family
=
AF_UNIX
;
snprintf
(
addr
.
sun_path
+
1
,
14
,
"tun2socks"
);
if
(
bind
(
s_fd
,
(
struct
sockaddr
*
)
&
addr
,
addr_len
)
!=
0
)
{
BLog
(
BLOG_ERROR
,
"Error to bind local socket"
);
close
(
s_fd
);
return
-
1
;
}
BLog
(
BLOG_NOTICE
,
"Bind socket"
);
addr
.
sun_path
[
0
]
=
'\0'
;
strcpy
(
addr
.
sun_path
+
1
,
"tun2socks"
);
if
(
listen
(
s_fd
,
5
)
!=
0
)
if
(
connect
(
s_fd
,
(
struct
sockaddr
*
)
&
addr
,
addr_len
)
!=
-
1
)
{
BLog
(
BLOG_ERROR
,
"Error to listen on local socket"
);
close
(
s_fd
);
return
-
1
;
}
BLog
(
BLOG_NOTICE
,
"Listen on socket"
);
if
((
c_fd
=
accept
(
s_fd
,
(
struct
sockaddr
*
)
&
addr
,
&
addr_len
))
!=
-
1
)
{
char
buf
[
1
];
char
buf
[
16
];
BLog
(
BLOG_NOTICE
,
"
Accept a connection
"
);
BLog
(
BLOG_NOTICE
,
"
Connected
"
);
read
(
c
_fd
,
buf
,
1
);
sock_fd_read
(
c
_fd
,
buf
,
sizeof
(
buf
),
&
fd_to_read
);
read
(
s
_fd
,
buf
,
1
);
sock_fd_read
(
s
_fd
,
buf
,
sizeof
(
buf
),
&
fd_to_read
);
buf
[
0
]
=
0
;
write
(
c
_fd
,
buf
,
1
);
close
(
c
_fd
);
write
(
s
_fd
,
buf
,
1
);
close
(
s
_fd
);
}
else
{
BLog
(
BLOG_ERROR
,
"Error to
accept socket"
);
BLog
(
BLOG_ERROR
,
"Error to
connect: %s"
,
strerror
(
errno
)
);
close
(
s_fd
);
return
-
1
;
}
...
...
@@ -598,17 +577,6 @@ int main (int argc, char **argv)
if
(
options
.
pid
)
{
daemonize
(
options
.
pid
);
}
BLog
(
BLOG_NOTICE
,
"Receiving the tun fd"
);
// Wait to recevie tun fd
if
(
recv_tun_fd
()
==
-
1
)
{
BLog
(
BLOG_ERROR
,
"Failed to recv tun fd"
);
return
-
1
;
}
BLog
(
BLOG_NOTICE
,
"Received the tun fd successfully"
);
#endif
// clear password contents pointer
...
...
@@ -759,16 +727,17 @@ int main (int argc, char **argv)
netif_remove
(
&
netif
);
}
BReactor_RemoveTimer
(
&
ss
,
&
tcp_timer
);
BFree
(
device_write_buf
);
#ifdef ANDROID
BLog
(
BLOG_NOTICE
,
"Free TCP connections"
);
tcp_remove
(
tcp_bound_pcbs
);
tcp_remove
(
tcp_active_pcbs
);
tcp_remove
(
tcp_tw_pcbs
);
free_connections
();
#endif
BReactor_RemoveTimer
(
&
ss
,
&
tcp_timer
);
BFree
(
device_write_buf
);
fail5:
BPending_Free
(
&
lwip_init_job
);
if
(
options
.
udpgw_remote_server_addr
)
{
...
...
src/main/scala/com/github/shadowsocks/Shadowsocks.scala
View file @
383e9404
...
...
@@ -123,7 +123,7 @@ object Shadowsocks {
val
FEATRUE_PREFS
=
Array
(
Key
.
route
,
Key
.
isGlobalProxy
,
Key
.
proxyedApps
,
Key
.
isUdpDns
,
Key
.
isAutoConnect
)
val
EXECUTABLES
=
Array
(
Executable
.
PDNSD
,
Executable
.
REDSOCKS
,
Executable
.
SS_TUNNEL
,
Executable
.
SS_LOCAL
,
Executable
.
TUN2SOCKS
)
val
EXECUTABLES
=
Array
(
Executable
.
PDNSD
,
Executable
.
REDSOCKS
,
Executable
.
SS_TUNNEL
,
Executable
.
SS_LOCAL
)
// Helper functions
def
updateListPreference
(
pref
:
Preference
,
value
:
String
)
{
...
...
src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
View file @
383e9404
...
...
@@ -45,7 +45,7 @@ import java.net.InetAddress
import
android.app._
import
android.content._
import
android.content.pm.
{
PackageInfo
,
PackageManager
}
import
android.net.
{
VpnService
,
LocalSocket
,
LocalSocketAddress
}
import
android.net.
{
LocalServerSocket
,
VpnService
,
LocalSocket
,
LocalSocketAddress
}
import
android.os._
import
android.support.v4.app.NotificationCompat
import
android.util.Log
...
...
@@ -322,23 +322,25 @@ class ShadowsocksVpnService extends VpnService with BaseService {
if
(
BuildConfig
.
DEBUG
)
Log
.
d
(
TAG
,
cmd
)
Console
.
runCommand
(
cmd
)
Thread
.
sleep
(
300
)
Tun2Socks
.
start
(
cmd
.
split
(
" "
))
}
// try {
val
localSocket
=
new
LocalSocket
()
def
startTunFdServer
()
{
spawn
{
val
fdServer
=
new
LocalServerSocket
(
"tun2socks"
)
try
{
val
localSocket
=
fdServer
.
accept
()
localSocket
.
setFileDescriptorsForSend
(
Array
(
conn
.
getFileDescriptor
))
val
localAddr
=
new
LocalSocketAddress
(
"tun2socks"
)
localSocket
.
connect
(
localAddr
)
val
output
=
localSocket
.
getOutputStream
output
.
write
(
1
)
output
.
flush
()
output
.
close
()
localSocket
.
close
()
// } catch {
// case ex: Exception => // Ignored
// }
fdServer
.
close
()
}
catch
{
case
ex
:
Exception
=>
Log
.
e
(
TAG
,
"Exception"
,
ex
)
// Ignored
}
}
}
/** Called when the activity is first created. */
...
...
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