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
76108ec4
Commit
76108ec4
authored
Feb 26, 2016
by
Max Lv
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #585 from JLLK/master
Fix a issue in ProcessUtils
parents
6558f275
5b9a0d06
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
19 deletions
+17
-19
src/main/scala/com/github/shadowsocks/ShadowsocksDeathRecipient.scala
...la/com/github/shadowsocks/ShadowsocksDeathRecipient.scala
+1
-1
src/main/scala/com/github/shadowsocks/utils/ProcessUtils.scala
...ain/scala/com/github/shadowsocks/utils/ProcessUtils.scala
+16
-18
No files found.
src/main/scala/com/github/shadowsocks/ShadowsocksDeathRecipient.scala
View file @
76108ec4
...
...
@@ -17,7 +17,7 @@ class ShadowsocksDeathRecipient(val mContext: ServiceBoundContext)
mContext
match
{
case
ss
:
Shadowsocks
=>
inShadowsocks
{
inShadowsocks
(
mContext
)
{
ss
.
unregisterCallback
ss
.
bindToService
()
}
...
...
src/main/scala/com/github/shadowsocks/utils/ProcessUtils.scala
View file @
76108ec4
...
...
@@ -2,6 +2,7 @@ package com.github.shadowsocks.utils
import
java.io.
{
BufferedReader
,
FileInputStream
,
InputStreamReader
}
import
android.content.Context
import
com.github.shadowsocks.utils.IOUtils._
/**
...
...
@@ -9,23 +10,16 @@ import com.github.shadowsocks.utils.IOUtils._
*/
object
ProcessUtils
{
val
SHADOWNSOCKS
=
"com.github.shadowsocks"
val
SHADOWNSOCKS_VPN
=
"com.github.shadowsocks:vpn"
val
SHADOWNSOCKS_NAT
=
"com.github.shadowsocks:nat"
val
TUN2SOCKS
=
"/data/data/com.github.shadowsocks/tun2socks"
val
SS_LOCAL
=
"/data/data/com.github.shadowsocks/ss-local"
val
SS_TUNNEL
=
"/data/data/com.github.shadowsocks/ss-tunnel"
val
PDNSD
=
"/data/data/com.github.shadowsocks/pdnsd"
def
getCurrentProcessName
:
String
=
{
inSafe
{
val
inputStream
=
new
FileInputStream
(
"/proc/self/cmdline"
)
val
reader
=
new
BufferedReader
(
new
InputStreamReader
(
inputStream
))
autoClose
(
reader
)
{
reader
.
readLine
()
match
{
case
name
:
String
=>
name
case
_
=>
""
}
val
sb
=
new
StringBuilder
var
c
:
Int
=
0
while
({
c
=
reader
.
read
();
c
>
0
})
sb
.
append
(
c
.
asInstanceOf
[
Char
])
sb
.
toString
()
}
}
match
{
case
Some
(
name
:
String
)
=>
name
...
...
@@ -33,14 +27,18 @@ object ProcessUtils {
}
}
def
inShadowsocks
[
A
](
fun
:
=>
A
)
:
Unit
=
if
(
getCurrentProcessName
startsWith
SHADOWNSOCKS
)
fun
def
inShadowsocks
[
A
](
context
:
Context
)(
fun
:
=>
A
)
:
Unit
=
{
if
(
context
!=
null
&&
getCurrentProcessName
.
equals
(
context
.
getPackageName
))
fun
}
def
inVpn
[
A
](
fun
:
=>
A
)
:
Unit
=
if
(
getCurrentProcessName
startsWith
SHADOWNSOCKS_VPN
)
fun
def
inVpn
[
A
](
context
:
Context
)(
fun
:
=>
A
)
:
Unit
=
{
if
(
context
!=
null
&&
getCurrentProcessName
.
equals
(
context
.
getPackageName
+
":vpn"
))
fun
}
def
inNat
[
A
](
fun
:
=>
A
)
:
Unit
=
if
(
getCurrentProcessName
startsWith
SHADOWNSOCKS_NAT
)
fun
def
inNat
[
A
](
context
:
Context
)(
fun
:
=>
A
)
:
Unit
=
{
if
(
context
!=
null
&&
getCurrentProcessName
.
equals
(
context
.
getPackageName
+
":nat"
))
fun
}
}
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