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
97bd714b
Commit
97bd714b
authored
Aug 07, 2015
by
Max Lv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drop abstract domain socket
parent
9a841e90
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
38 additions
and
35 deletions
+38
-35
src/main/AndroidManifest.xml
src/main/AndroidManifest.xml
+2
-2
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
+1
-2
src/main/scala/com/github/shadowsocks/Shadowsocks.scala
src/main/scala/com/github/shadowsocks/Shadowsocks.scala
+5
-5
src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
.../scala/com/github/shadowsocks/ShadowsocksVpnService.scala
+2
-5
src/main/scala/com/github/shadowsocks/ShadowsocksVpnThread.scala
...n/scala/com/github/shadowsocks/ShadowsocksVpnThread.scala
+25
-18
No files found.
src/main/AndroidManifest.xml
View file @
97bd714b
<manifest
xmlns:android=
"http://schemas.android.com/apk/res/android"
package=
"com.github.shadowsocks"
android:versionCode=
"11
4
"
android:versionName=
"2.7.
6
"
>
android:versionCode=
"11
5
"
android:versionName=
"2.7.
7
"
>
<uses-permission
android:name=
"android.permission.INTERNET"
/>
<uses-permission
android:name=
"android.permission.ACCESS_NETWORK_STATE"
/>
...
...
src/main/jni/badvpn/tun2socks/tun2socks.c
View file @
97bd714b
...
...
@@ -502,11 +502,11 @@ int main (int argc, char **argv)
goto
fail2
;
}
char
*
path
=
"#shadowsocks_tunfd"
;
char
*
path
=
"/data/data/com.github.shadowsocks/sock_path"
;
unlink
(
path
);
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
@
e3ed2223
Subproject commit
5d4db4f093de1256bcb25e1958a76a03102dc77d
Subproject commit
e3ed22236012728d0cf7304ef27eb1c96cc063bb
src/main/jni/system.cpp
View file @
97bd714b
...
...
@@ -58,8 +58,7 @@ 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
,
"#shadowsocks_tunfd"
,
sizeof
(
addr
.
sun_path
)
-
1
);
addr
.
sun_path
[
0
]
=
0
;
strncpy
(
addr
.
sun_path
,
"/data/data/com.github.shadowsocks/sock_path"
,
sizeof
(
addr
.
sun_path
)
-
1
);
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/Shadowsocks.scala
View file @
97bd714b
...
...
@@ -219,6 +219,11 @@ class Shadowsocks
state
=
bgService
.
getState
// set the listener
switchButton
.
setOnCheckedChangeListener
(
Shadowsocks
.
this
)
if
(!
status
.
getBoolean
(
getVersionName
,
false
))
{
status
.
edit
.
putBoolean
(
getVersionName
,
true
).
commit
()
recovery
();
}
}
override
def
onServiceDisconnected
(
name
:
ComponentName
)
{
...
...
@@ -401,11 +406,6 @@ class Shadowsocks
def
prepareStartService
()
{
showProgress
(
R
.
string
.
connecting
)
spawn
{
if
(!
status
.
getBoolean
(
getVersionName
,
false
))
{
status
.
edit
.
putBoolean
(
getVersionName
,
true
).
commit
()
install
()
}
if
(
isVpnEnabled
)
{
val
intent
=
VpnService
.
prepare
(
this
)
if
(
intent
!=
null
)
{
...
...
src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
View file @
97bd714b
...
...
@@ -104,12 +104,14 @@ class ShadowsocksVpnService extends VpnService with BaseService {
}
override
def
onCreate
()
{
super
.
onCreate
()
ConfigUtils
.
refresh
(
this
)
notificationManager
=
getSystemService
(
Context
.
NOTIFICATION_SERVICE
)
.
asInstanceOf
[
NotificationManager
]
}
override
def
onRevoke
()
{
...
...
@@ -182,11 +184,6 @@ class ShadowsocksVpnService extends VpnService with BaseService {
override
def
startRunner
(
c
:
Config
)
{
if
(
vpnThread
!=
null
)
{
vpnThread
.
stopThread
()
vpnThread
=
null
}
vpnThread
=
new
ShadowsocksVpnThread
(
this
)
vpnThread
.
start
()
...
...
src/main/scala/com/github/shadowsocks/ShadowsocksVpnThread.scala
View file @
97bd714b
...
...
@@ -45,27 +45,42 @@ import java.util.concurrent.Executors
import
android.net.
{
LocalServerSocket
,
LocalSocket
,
LocalSocketAddress
}
import
android.util.Log
object
ShadowsocksVpn
{
@volatile
var
serverSocket
:
LocalServerSocket
=
null
}
class
ShadowsocksVpnThread
(
vpnService
:
ShadowsocksVpnService
)
extends
Thread
{
val
TAG
=
"ShadowsocksVpnService"
val
PATH
=
"
shadowsocks_protect
"
val
PATH
=
"
/data/data/com.github.shadowsocks/protect_path
"
var
isRunning
:
Boolean
=
true
@volatile
var
isRunning
:
Boolean
=
true
@volatile
var
serverSocket
:
LocalServerSocket
=
null
def
closeServerSocket
()
{
if
(
serverSocket
!=
null
)
{
try
{
serverSocket
.
close
()
}
catch
{
case
_:
Exception
=>
// ignore
}
serverSocket
=
null
}
}
def
stopThread
()
{
isRunning
=
false
closeServerSocket
()
}
override
def
run
()
:
Unit
=
{
try
{
if
(
ShadowsocksVpn
.
serverSocket
==
null
)
{
ShadowsocksVpn
.
serverSocket
=
new
LocalServerSocket
(
PATH
)
}
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
)
}
catch
{
case
e
:
IOException
=>
Log
.
e
(
TAG
,
"unable to bind"
,
e
)
...
...
@@ -76,7 +91,7 @@ class ShadowsocksVpnThread(vpnService: ShadowsocksVpnService) extends Thread {
while
(
isRunning
)
{
try
{
val
socket
=
ShadowsocksVpn
.
serverSocket
.
accept
()
val
socket
=
serverSocket
.
accept
()
pool
.
execute
(
new
Runnable
{
override
def
run
()
{
...
...
@@ -123,14 +138,6 @@ class ShadowsocksVpnThread(vpnService: ShadowsocksVpnService) extends Thread {
}
catch
{
case
e
:
IOException
=>
{
Log
.
e
(
TAG
,
"Error when accept socket"
,
e
)
if
(
ShadowsocksVpn
.
serverSocket
!=
null
)
{
try
{
ShadowsocksVpn
.
serverSocket
.
close
()
}
catch
{
case
_:
Exception
=>
// ignore
}
ShadowsocksVpn
.
serverSocket
=
null
}
return
}
}
...
...
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