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
177510e2
Commit
177510e2
authored
Mar 21, 2022
by
chenhuaqing
Committed by
hanakeichen
Mar 21, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove unused code and fix packet loss rate
parent
608e9032
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
101 additions
and
138 deletions
+101
-138
app/src/main/java/com/ccwangluo/accelerator/model/NetState.kt
...src/main/java/com/ccwangluo/accelerator/model/NetState.kt
+3
-0
app/src/main/java/com/ccwangluo/accelerator/utils/AcceleratorUtils.kt
.../java/com/ccwangluo/accelerator/utils/AcceleratorUtils.kt
+62
-51
app/src/main/java/com/ccwangluo/accelerator/utils/NetUtils.kt
...src/main/java/com/ccwangluo/accelerator/utils/NetUtils.kt
+4
-23
core/src/main/java/com/github/shadowsocks/bg/VpnService.kt
core/src/main/java/com/github/shadowsocks/bg/VpnService.kt
+31
-63
core/src/main/java/com/github/shadowsocks/preference/DataStore.kt
.../main/java/com/github/shadowsocks/preference/DataStore.kt
+1
-1
No files found.
app/src/main/java/com/ccwangluo/accelerator/model/NetState.kt
View file @
177510e2
...
@@ -9,6 +9,9 @@ data class NetState(
...
@@ -9,6 +9,9 @@ data class NetState(
//丢包率
//丢包率
var
lossRate
:
String
,
var
lossRate
:
String
,
var
accNetTotal
:
Int
=
0
,
var
accNetLoss
:
Int
=
0
,
var
pingWifiLatency
:
Int
=
-
1
,
var
pingWifiLatency
:
Int
=
-
1
,
var
pingWifiTotal
:
Int
=
-
1
,
var
pingWifiTotal
:
Int
=
-
1
,
var
pingWifiLoss
:
Int
=
-
1
,
var
pingWifiLoss
:
Int
=
-
1
,
...
...
app/src/main/java/com/ccwangluo/accelerator/utils/AcceleratorUtils.kt
View file @
177510e2
...
@@ -2,20 +2,16 @@ package com.ccwangluo.accelerator.utils
...
@@ -2,20 +2,16 @@ package com.ccwangluo.accelerator.utils
import
android.annotation.SuppressLint
import
android.annotation.SuppressLint
import
android.content.Context
import
android.content.Context
import
android.net.Network
import
android.os.RemoteException
import
android.os.RemoteException
import
androidx.activity.result.ActivityResultLauncher
import
androidx.activity.result.ActivityResultLauncher
import
androidx.lifecycle.lifecycleScope
import
androidx.lifecycle.lifecycleScope
import
com.ccnet.acc.NetworkAdapter
import
com.ccnet.acc.NetworkAdapter
import
com.ccnet.acc.aidl.NetworkMode
import
com.ccwangluo.accelerator.model.Game
import
com.ccwangluo.accelerator.model.Game
import
com.ccwangluo.accelerator.model.GameInfo
import
com.ccwangluo.accelerator.model.GameInfo
import
com.ccwangluo.accelerator.model.NetState
import
com.ccwangluo.accelerator.model.NetState
import
com.ccwangluo.accelerator.ui.dialog.CommonDialog
import
com.ccwangluo.accelerator.ui.dialog.CommonDialog
import
com.ccwangluo.accelerator.ui.home.AcceleratorFragment
import
com.ccwangluo.accelerator.utils.datareport.DataRePortUtils
import
com.ccwangluo.accelerator.utils.datareport.DataRePortUtils
import
com.ccwangluo.accelerator.utils.http.HttpGo
import
com.ccwangluo.accelerator.utils.http.HttpGo
import
com.ccwangluo.cc_quickly.utils.SettingSPUtils
import
com.github.shadowsocks.Core
import
com.github.shadowsocks.Core
import
com.github.shadowsocks.acl.Acl
import
com.github.shadowsocks.acl.Acl
import
com.github.shadowsocks.aidl.IShadowsocksService
import
com.github.shadowsocks.aidl.IShadowsocksService
...
@@ -31,12 +27,12 @@ import com.hjq.toast.ToastUtils
...
@@ -31,12 +27,12 @@ import com.hjq.toast.ToastUtils
import
com.xuexiang.xpage.base.XPageActivity
import
com.xuexiang.xpage.base.XPageActivity
import
com.xuexiang.xpage.base.XPageFragment
import
com.xuexiang.xpage.base.XPageFragment
import
com.xuexiang.xutil.common.StringUtils
import
com.xuexiang.xutil.common.StringUtils
import
kotlinx.coroutines.*
import
kotlinx.coroutines.Dispatchers
import
kotlinx.coroutines.delay
import
kotlinx.coroutines.launch
import
kotlinx.coroutines.withContext
import
timber.log.Timber
import
timber.log.Timber
import
java.net.InetSocketAddress
import
kotlin.math.roundToInt
import
java.net.Socket
import
java.net.SocketAddress
import
java.util.concurrent.TimeUnit
/**
/**
...
@@ -58,7 +54,42 @@ object AcceleratorUtils {
...
@@ -58,7 +54,42 @@ object AcceleratorUtils {
//游戏
//游戏
var
game
:
GameInfo
?
=
null
var
game
:
GameInfo
?
=
null
private
var
stateListener
:
(
BaseService
.
State
,
Long
,
NetState
?)
->
Unit
=
{
state
,
l
,
s
->
private
val
stateListener
:
(
BaseService
.
State
)
->
Unit
=
{
state
->
networkStatsListener
(
state
,
getAccTime
(),
netState
)
if
(
state
==
BaseService
.
State
.
Connected
)
{
context
.
lifecycleScope
.
launch
(
Dispatchers
.
IO
)
{
while
(
AcceleratorUtils
.
state
==
BaseService
.
State
.
Connected
)
{
netState
.
preNetDelay
=
NetUtils
.
tcpPing
(
DataStore
.
pingAccHost
,
DataStore
.
pingAccPort
)
.
toInt
()
Timber
.
d
(
"pre acc ping : ${netState}"
)
LoginUtils
.
getUserHasTimer
{
haveTime
->
if
(!
haveTime
)
{
//没有加速时长关闭服务
stopAccelerator
()
}
}
netState
.
accNetDelay
=
if
(
netState
.
accNetDelay
>
netState
.
preNetDelay
&&
netState
.
preNetDelay
!=
-
1
)
{
netState
.
preNetDelay
}
else
{
netState
.
accNetDelay
}
netState
.
lossRate
=
if
(
netState
.
accNetTotal
!=
0
)
{
(
netState
.
accNetLoss
.
toFloat
()
/
netState
.
accNetTotal
*
100
).
roundToInt
().
toString
()
}
else
{
"0"
}
// netState.lossRate = if (netState.accNetDelay == -1) "100" else "0"
networkStatsListener
(
state
,
getAccTime
(),
netState
)
delay
(
1000
)
}
}
}
}
private
var
networkStatsListener
:
(
BaseService
.
State
,
Long
,
NetState
?)
->
Unit
=
{
_
,
_
,
_
->
}
}
var
vipExpireListener
:
()
->
Unit
=
{
->
var
vipExpireListener
:
()
->
Unit
=
{
->
...
@@ -107,11 +138,11 @@ object AcceleratorUtils {
...
@@ -107,11 +138,11 @@ object AcceleratorUtils {
AuthManager
.
Last_ACC_TIme
=
0L
AuthManager
.
Last_ACC_TIme
=
0L
CommonDialog
(
context
).
setTitle
(
"VPN被挤占"
)
CommonDialog
(
context
).
setTitle
(
"VPN被挤占"
)
.
setContent
(
"请确保已关闭其他加速器,并未开起任何游戏空间等类似功能"
)
.
setContent
(
"请确保已关闭其他加速器,并未开起任何游戏空间等类似功能"
)
.
setBtnLeft
(
"取消"
,
{
.
setBtnLeft
(
"取消"
)
{
}).
setBtnRight
(
"我知道了"
,
{
}.
setBtnRight
(
"我知道了"
)
{
})
.
show
<
CommonDialog
>()
}
.
show
<
CommonDialog
>()
return
return
}
}
}
}
...
@@ -121,30 +152,8 @@ object AcceleratorUtils {
...
@@ -121,30 +152,8 @@ object AcceleratorUtils {
initAuthProfile
(
xPageFragment
)
initAuthProfile
(
xPageFragment
)
val
serverPort
=
it
.
boosterServer
.
split
(
":"
)
val
serverPort
=
it
.
boosterServer
.
split
(
":"
)
DataStore
.
pingAccHost
=
serverPort
[
0
]
DataStore
.
pingAccHost
=
serverPort
[
0
]
DataStore
.
pingAccHost
=
"104.26.1.233"
DataStore
.
pingAccPort
=
serverPort
[
1
].
toInt
()
DataStore
.
pingAccPort
=
serverPort
[
1
].
toInt
()
xPageFragment
.
lifecycleScope
.
launch
(
Dispatchers
.
IO
)
{
while
(
true
)
{
if
(
state
==
BaseService
.
State
.
Connected
)
{
netState
.
preNetDelay
=
NetUtils
.
tcpPing
(
serverPort
[
0
],
serverPort
[
1
].
toInt
())
.
toInt
()
LoginUtils
.
getUserHasTimer
{
haveTime
->
if
(!
haveTime
)
{
//没有加速时长关闭服务
stopAccelerator
()
}
}
netState
.
accNetDelay
=
if
(
netState
.
accNetDelay
>
netState
.
preNetDelay
&&
netState
.
preNetDelay
!=
-
1
)
{
netState
.
preNetDelay
}
else
{
netState
.
accNetDelay
}
netState
.
lossRate
=
if
(
netState
.
accNetDelay
==
-
1
)
"100"
else
"0"
}
stateListener
(
state
,
getAccTime
(),
netState
)
delay
(
1000
)
}
}
}
}
}
}
...
@@ -185,14 +194,12 @@ object AcceleratorUtils {
...
@@ -185,14 +194,12 @@ object AcceleratorUtils {
}
}
fun
registerStateListener
(
listener
:
(
BaseService
.
State
,
Long
,
NetState
?)
->
Unit
)
{
fun
registerStateListener
(
listener
:
(
BaseService
.
State
,
Long
,
NetState
?)
->
Unit
)
{
state
Listener
=
listener
networkStats
Listener
=
listener
state
Listener
(
state
,
getAccTime
(),
null
)
networkStats
Listener
(
state
,
getAccTime
(),
null
)
}
}
fun
unRegisterStateListener
()
{
fun
unRegisterStateListener
()
{
stateListener
=
{
state
,
l
,
net
->
networkStatsListener
=
{
_
,
_
,
_
->
}
}
}
}
fun
registerVipExpireListener
(
listener
:
()
->
Unit
)
{
fun
registerVipExpireListener
(
listener
:
()
->
Unit
)
{
...
@@ -213,7 +220,7 @@ object AcceleratorUtils {
...
@@ -213,7 +220,7 @@ object AcceleratorUtils {
private
val
shadowsocksConnection
=
object
:
ShadowsocksConnection
.
Callback
{
private
val
shadowsocksConnection
=
object
:
ShadowsocksConnection
.
Callback
{
override
fun
stateChanged
(
state
:
BaseService
.
State
,
profileName
:
String
?,
msg
:
String
?)
{
override
fun
stateChanged
(
state
:
BaseService
.
State
,
profileName
:
String
?,
msg
:
String
?)
{
AcceleratorUtils
.
state
=
state
AcceleratorUtils
.
state
=
state
stateListener
(
state
,
getAccTime
(),
netState
)
stateListener
(
state
)
if
(
state
==
BaseService
.
State
.
Stopped
&&
!
msg
.
isNullOrBlank
())
{
if
(
state
==
BaseService
.
State
.
Stopped
&&
!
msg
.
isNullOrBlank
())
{
DataRePortUtils
.
report
(
DataRePortUtils
.
report
(
"st_speed_result"
,
"st_speed_result"
,
...
@@ -238,7 +245,7 @@ object AcceleratorUtils {
...
@@ -238,7 +245,7 @@ object AcceleratorUtils {
}
catch
(
_
:
RemoteException
)
{
}
catch
(
_
:
RemoteException
)
{
BaseService
.
State
.
Idle
BaseService
.
State
.
Idle
}
}
stateListener
(
state
,
getAccTime
(),
netState
)
stateListener
(
state
)
}
}
override
fun
onBinderDied
()
{
override
fun
onBinderDied
()
{
...
@@ -248,6 +255,10 @@ object AcceleratorUtils {
...
@@ -248,6 +255,10 @@ object AcceleratorUtils {
override
fun
trafficUpdated
(
profileId
:
Long
,
stats
:
TrafficStats
)
{
override
fun
trafficUpdated
(
profileId
:
Long
,
stats
:
TrafficStats
)
{
netState
.
accNetDelay
=
stats
.
latency
netState
.
accNetDelay
=
stats
.
latency
netState
.
accNetTotal
++
if
(
stats
.
latency
==
-
1
)
{
netState
.
accNetLoss
++
}
}
}
}
}
...
...
app/src/main/java/com/ccwangluo/accelerator/utils/NetUtils.kt
View file @
177510e2
package
com.ccwangluo.accelerator.utils
package
com.ccwangluo.accelerator.utils
import
android.net.Network
import
com.github.shadowsocks.net.DefaultNetworkListener
import
kotlinx.coroutines.isActive
import
kotlinx.coroutines.isActive
import
timber.log.Timber
import
timber.log.Timber
import
java.io.IOException
import
java.io.IOException
...
@@ -11,20 +9,10 @@ import java.net.UnknownHostException
...
@@ -11,20 +9,10 @@ import java.net.UnknownHostException
import
kotlin.coroutines.coroutineContext
import
kotlin.coroutines.coroutineContext
object
NetUtils
{
object
NetUtils
{
suspend
fun
tcpPing
(
url
:
String
,
port
:
Int
):
Long
{
@Volatile
private
var
underlyingNetwork
:
Network
?
=
null
suspend
fun
init
()
{
DefaultNetworkListener
.
start
(
this
)
{
underlyingNetwork
=
it
}
}
suspend
fun
tcpPing
(
url
:
String
,
port
:
Int
,
proxyPort
:
Int
=
0
):
Long
{
var
time
=
-
1L
var
time
=
-
1L
for
(
k
in
0
until
2
)
{
for
(
k
in
0
until
2
)
{
val
one
=
socketConnectTime
(
url
,
port
,
proxyPort
)
val
one
=
socketConnectTime
(
url
,
port
)
if
(!
coroutineContext
.
isActive
)
{
if
(!
coroutineContext
.
isActive
)
{
break
break
}
}
...
@@ -35,17 +23,10 @@ object NetUtils {
...
@@ -35,17 +23,10 @@ object NetUtils {
return
time
return
time
}
}
private
suspend
fun
socketConnectTime
(
url
:
String
,
port
:
Int
,
proxyPort
:
Int
):
Long
{
private
suspend
fun
socketConnectTime
(
url
:
String
,
port
:
Int
):
Long
{
try
{
try
{
val
socket
=
if
(
proxyPort
==
0
)
{
Socket
()
}
else
{
val
socket
=
Socket
()
val
socket
=
Socket
()
DefaultNetworkListener
.
get
().
bindSocket
(
socket
)
socket
// Socket(Proxy(Proxy.Type.SOCKS, InetSocketAddress("127.0.0.1", proxyPort)))
}
val
start
=
System
.
currentTimeMillis
()
val
start
=
System
.
currentTimeMillis
()
socket
.
connect
(
InetSocketAddress
(
url
,
port
))
socket
.
connect
(
InetSocketAddress
(
url
,
port
))
val
time
=
System
.
currentTimeMillis
()
-
start
val
time
=
System
.
currentTimeMillis
()
-
start
...
...
core/src/main/java/com/github/shadowsocks/bg/VpnService.kt
View file @
177510e2
...
@@ -23,9 +23,7 @@ package com.github.shadowsocks.bg
...
@@ -23,9 +23,7 @@ package com.github.shadowsocks.bg
import
android.app.Service
import
android.app.Service
import
android.content.Intent
import
android.content.Intent
import
android.content.pm.PackageManager
import
android.content.pm.PackageManager
import
android.net.LocalServerSocket
import
android.net.LocalSocket
import
android.net.LocalSocket
import
android.net.LocalSocketAddress
import
android.net.Network
import
android.net.Network
import
android.os.Build
import
android.os.Build
import
android.os.ParcelFileDescriptor
import
android.os.ParcelFileDescriptor
...
@@ -51,7 +49,6 @@ import java.io.File
...
@@ -51,7 +49,6 @@ import java.io.File
import
java.io.FileDescriptor
import
java.io.FileDescriptor
import
java.io.IOException
import
java.io.IOException
import
java.net.URL
import
java.net.URL
import
java.nio.ByteBuffer
import
kotlin.concurrent.thread
import
kotlin.concurrent.thread
import
android.net.VpnService
as
BaseVpnService
import
android.net.VpnService
as
BaseVpnService
...
@@ -114,7 +111,7 @@ class VpnService : BaseVpnService(), BaseService.Interface {
...
@@ -114,7 +111,7 @@ class VpnService : BaseVpnService(), BaseService.Interface {
private
var
conn
:
ParcelFileDescriptor
?
=
null
private
var
conn
:
ParcelFileDescriptor
?
=
null
private
var
worker
:
ProtectWorker
?
=
null
private
var
worker
:
ProtectWorker
?
=
null
private
var
protectJob
:
Job
?
=
null
private
var
protectJob
:
ProtectWorker
?
=
null
private
var
active
=
false
private
var
active
=
false
private
var
metered
=
false
private
var
metered
=
false
...
@@ -174,7 +171,8 @@ class VpnService : BaseVpnService(), BaseService.Interface {
...
@@ -174,7 +171,8 @@ class VpnService : BaseVpnService(), BaseService.Interface {
override
suspend
fun
rawResolver
(
query
:
ByteArray
)
=
override
suspend
fun
rawResolver
(
query
:
ByteArray
)
=
// no need to listen for network here as this is only used for forwarding local DNS queries.
// no need to listen for network here as this is only used for forwarding local DNS queries.
// retries should be attempted by client.
// retries should be attempted by client.
DnsResolverCompat
.
resolveRaw
(
underlyingNetwork
?:
throw
IOException
(
"no network"
),
query
)
DnsResolverCompat
.
resolveRaw
(
underlyingNetwork
?:
throw
IOException
(
"no network"
),
query
)
override
suspend
fun
openConnection
(
url
:
URL
)
=
DefaultNetworkListener
.
get
().
openConnection
(
url
)
override
suspend
fun
openConnection
(
url
:
URL
)
=
DefaultNetworkListener
.
get
().
openConnection
(
url
)
...
@@ -240,37 +238,7 @@ class VpnService : BaseVpnService(), BaseService.Interface {
...
@@ -240,37 +238,7 @@ class VpnService : BaseVpnService(), BaseService.Interface {
this
.
conn
=
conn
this
.
conn
=
conn
data
.
tunFd
=
conn
.
fd
data
.
tunFd
=
conn
.
fd
val
protectPath
=
val
protectPath
=
""
File
.
createTempFile
(
"leaf_vpn_socket_protect"
,
".sock"
,
cacheDir
).
absolutePath
protectJob
=
GlobalScope
.
launch
(
Dispatchers
.
IO
)
{
val
localSocket
=
LocalSocket
()
localSocket
.
bind
(
LocalSocketAddress
(
protectPath
,
LocalSocketAddress
.
Namespace
.
FILESYSTEM
)
)
val
socket
=
LocalServerSocket
(
localSocket
.
fileDescriptor
)
val
buffer
=
ByteBuffer
.
allocate
(
4
)
while
(
true
)
{
val
stream
=
socket
.
accept
()
buffer
.
clear
()
val
n
=
stream
.
inputStream
.
read
(
buffer
.
array
())
if
(
n
==
4
)
{
val
fd
=
buffer
.
int
if
(!
super
.
protect
(
fd
))
{
println
(
"protect failed"
)
}
buffer
.
clear
()
buffer
.
putInt
(
0
)
}
else
{
buffer
.
clear
()
buffer
.
putInt
(
1
)
}
stream
.
outputStream
.
write
(
buffer
.
array
())
}
}
AccVpn
.
writeConfig
(
this
,
conn
.
fd
,
profile
)
AccVpn
.
writeConfig
(
this
,
conn
.
fd
,
profile
)
thread
(
start
=
true
)
{
thread
(
start
=
true
)
{
...
...
core/src/main/java/com/github/shadowsocks/preference/DataStore.kt
View file @
177510e2
...
@@ -117,7 +117,7 @@ object DataStore : OnPreferenceDataStoreChangeListener {
...
@@ -117,7 +117,7 @@ object DataStore : OnPreferenceDataStoreChangeListener {
get
()
=
privateStore
.
getInt
(
Key
.
pingProxyPort
)
?:
0
get
()
=
privateStore
.
getInt
(
Key
.
pingProxyPort
)
?:
0
set
(
value
)
=
privateStore
.
putInt
(
Key
.
pingProxyPort
,
value
)
set
(
value
)
=
privateStore
.
putInt
(
Key
.
pingProxyPort
,
value
)
var
pingIntervalSec
:
Int
var
pingIntervalSec
:
Int
get
()
=
privateStore
.
getInt
(
Key
.
pingIntervalSec
)
?:
3
get
()
=
privateStore
.
getInt
(
Key
.
pingIntervalSec
)
?:
1
set
(
value
)
=
privateStore
.
putInt
(
Key
.
pingIntervalSec
,
value
)
set
(
value
)
=
privateStore
.
putInt
(
Key
.
pingIntervalSec
,
value
)
var
pingTimeoutMillis
:
Int
var
pingTimeoutMillis
:
Int
get
()
=
privateStore
.
getInt
(
Key
.
pingTimeoutMillis
)
?:
200
get
()
=
privateStore
.
getInt
(
Key
.
pingTimeoutMillis
)
?:
200
...
...
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