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
c31a5c19
Commit
c31a5c19
authored
Aug 04, 2015
by
Max Lv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use abstract namespace
parent
6c47c361
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
16 deletions
+12
-16
project/plugins.sbt
project/plugins.sbt
+1
-1
src/main/jni/badvpn/tun2socks/tun2socks.c
src/main/jni/badvpn/tun2socks/tun2socks.c
+2
-2
src/main/jni/shadowsocks-libev
src/main/jni/shadowsocks-libev
+1
-1
src/main/jni/system.cpp
src/main/jni/system.cpp
+2
-1
src/main/scala/com/github/shadowsocks/ShadowsocksVpnThread.scala
...n/scala/com/github/shadowsocks/ShadowsocksVpnThread.scala
+6
-11
No files found.
project/plugins.sbt
View file @
c31a5c19
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.4.
7
"
)
addSbtPlugin
(
"com.hanhuy.sbt"
%
"android-sdk-plugin"
%
"1.4.
8
"
)
resolvers
+=
"Sonatype snapshots"
at
"https://oss.sonatype.org/content/repositories/snapshots/"
...
...
src/main/jni/badvpn/tun2socks/tun2socks.c
View file @
c31a5c19
...
...
@@ -502,11 +502,11 @@ int main (int argc, char **argv)
goto
fail2
;
}
char
*
path
=
"/data/data/com.github.shadowsocks/sock_path"
;
unlink
(
path
);
char
*
path
=
"#shadowsocks_tunfd"
;
memset
(
&
addr
,
0
,
sizeof
(
addr
));
addr
.
sun_family
=
AF_UNIX
;
strncpy
(
addr
.
sun_path
,
path
,
sizeof
(
addr
.
sun_path
)
-
1
);
addr
.
sun_path
[
0
]
=
0
;
if
(
bind
(
sock
,
(
struct
sockaddr
*
)
&
addr
,
sizeof
(
addr
))
==
-
1
)
{
BLog
(
BLOG_ERROR
,
"bind() failed: %s (sock = %d)
\n
"
,
strerror
(
errno
),
sock
);
...
...
shadowsocks-libev
@
5d4db4f0
Subproject commit
35297b6c228e398344d35246f0e961180d89b786
Subproject commit
5d4db4f093de1256bcb25e1958a76a03102dc77d
src/main/jni/system.cpp
View file @
c31a5c19
...
...
@@ -58,7 +58,8 @@ jint Java_com_github_shadowsocks_system_sendfd(JNIEnv *env, jobject thiz, jint t
memset
(
&
addr
,
0
,
sizeof
(
addr
));
addr
.
sun_family
=
AF_UNIX
;
strncpy
(
addr
.
sun_path
,
"/data/data/com.github.shadowsocks/sock_path"
,
sizeof
(
addr
.
sun_path
)
-
1
);
strncpy
(
addr
.
sun_path
,
"#shadowsocks_tunfd"
,
sizeof
(
addr
.
sun_path
)
-
1
);
addr
.
sun_path
[
0
]
=
0
;
if
(
connect
(
fd
,
(
struct
sockaddr
*
)
&
addr
,
sizeof
(
addr
))
==
-
1
)
{
LOGE
(
"connect() failed: %s (fd = %d)
\n
"
,
strerror
(
errno
),
fd
);
...
...
src/main/scala/com/github/shadowsocks/ShadowsocksVpnThread.scala
View file @
c31a5c19
...
...
@@ -48,7 +48,7 @@ import android.util.Log
class
ShadowsocksVpnThread
(
vpnService
:
ShadowsocksVpnService
)
extends
Thread
{
val
TAG
=
"ShadowsocksVpnService"
val
PATH
=
"
/data/data/com.github.shadowsocks/protect_path
"
val
PATH
=
"
shadowsocks_protect
"
var
isRunning
:
Boolean
=
true
var
serverSocket
:
LocalServerSocket
=
null
...
...
@@ -64,16 +64,11 @@ class ShadowsocksVpnThread(vpnService: ShadowsocksVpnService) extends Thread {
override
def
run
()
:
Unit
=
{
try
{
new
File
(
PATH
).
delete
()
}
catch
{
case
_:
Exception
=>
// ignore
}
try
{
val
localSocket
=
new
LocalSocket
localSocket
.
bind
(
new
LocalSocketAddress
(
PATH
,
LocalSocketAddress
.
Namespace
.
FILESYSTEM
))
serverSocket
=
new
LocalServerSocket
(
localSocket
.
getFileDescriptor
)
if
(
serverSocket
!=
null
)
{
serverSocket
.
close
()
serverSocket
=
null
}
serverSocket
=
new
LocalServerSocket
(
PATH
)
}
catch
{
case
e
:
IOException
=>
Log
.
e
(
TAG
,
"unable to bind"
,
e
)
...
...
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