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
9b51f91e
Commit
9b51f91e
authored
May 16, 2020
by
Mygod
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add support for PTR queries
parent
41405f91
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
4 deletions
+16
-4
core/build.gradle.kts
core/build.gradle.kts
+1
-1
core/src/main/java/com/github/shadowsocks/net/DnsResolverCompat.kt
...main/java/com/github/shadowsocks/net/DnsResolverCompat.kt
+13
-1
core/src/main/rust/shadowsocks-rust
core/src/main/rust/shadowsocks-rust
+1
-1
mobile/build.gradle.kts
mobile/build.gradle.kts
+1
-1
No files found.
core/build.gradle.kts
View file @
9b51f91e
...
...
@@ -87,7 +87,7 @@ dependencies {
api
(
"com.google.firebase:firebase-config-ktx:19.1.4"
)
api
(
"com.google.firebase:firebase-crashlytics:17.0.0"
)
api
(
"com.jakewharton.timber:timber:4.7.1"
)
api
(
"dnsjava:dnsjava:3.
0.2
"
)
api
(
"dnsjava:dnsjava:3.
1.0
"
)
api
(
"org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
)
api
(
"org.jetbrains.kotlinx:kotlinx-coroutines-play-services:$coroutinesVersion"
)
kapt
(
"androidx.room:room-compiler:$roomVersion"
)
...
...
core/src/main/java/com/github/shadowsocks/net/DnsResolverCompat.kt
View file @
9b51f91e
...
...
@@ -70,6 +70,7 @@ sealed class DnsResolverCompat {
fun
prepareDnsResponse
(
request
:
Message
)
=
Message
(
request
.
header
.
id
).
apply
{
header
.
setFlag
(
Flags
.
QR
.
toInt
())
// this is a response
header
.
setFlag
(
Flags
.
RA
.
toInt
())
// recursion available
if
(
request
.
header
.
getFlag
(
Flags
.
RD
.
toInt
()))
header
.
setFlag
(
Flags
.
RD
.
toInt
())
request
.
question
?.
also
{
addRecord
(
it
,
Section
.
QUESTION
)
}
}
...
...
@@ -135,11 +136,22 @@ sealed class DnsResolverCompat {
val
isIpv6
=
when
(
val
type
=
question
?.
type
)
{
Type
.
A
->
false
Type
.
AAAA
->
true
Type
.
PTR
->
{
val
ip
=
try
{
ReverseMap
.
fromName
(
question
.
name
)
}
catch
(
e
:
IOException
)
{
throw
UnsupportedOperationException
(
e
)
// unrecognized PTR name
}
// Android does not provide a PTR lookup API for Network prior to Android 10
val
hostname
=
Name
.
fromString
(
GlobalScope
.
async
(
unboundedIO
)
{
ip
.
hostName
}.
await
())
return
prepareDnsResponse
(
request
).
apply
{
addRecord
(
PTRRecord
(
question
.
name
,
DClass
.
IN
,
TTL
,
hostname
),
Section
.
ANSWER
)
}.
toWire
()
}
else
->
throw
UnsupportedOperationException
(
"Unsupported query type $type"
)
}
val
host
=
question
.
name
.
canonicalize
().
toString
(
true
)
return
prepareDnsResponse
(
request
).
apply
{
header
.
setFlag
(
Flags
.
RA
.
toInt
())
// recursion available
for
(
address
in
hostResolver
(
host
).
asIterable
().
run
{
if
(
isIpv6
)
filterIsInstance
<
Inet6Address
>()
else
filterIsInstance
<
Inet4Address
>()
})
addRecord
(
when
(
address
)
{
...
...
shadowsocks-rust
@
ce1e5864
Subproject commit
ea24418ffcbb01ebb88fd3af9e161a5f93fe0a27
Subproject commit
ce1e58641d502ec128806efa898ebf2716461132
mobile/build.gradle.kts
View file @
9b51f91e
...
...
@@ -14,7 +14,7 @@ androidExtensions.isExperimental = true
dependencies
{
implementation
(
"androidx.browser:browser:1.2.0"
)
implementation
(
"androidx.constraintlayout:constraintlayout:2.0.0-beta
5
"
)
implementation
(
"androidx.constraintlayout:constraintlayout:2.0.0-beta
6
"
)
implementation
(
"androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion"
)
implementation
(
"com.google.android.gms:play-services-vision:20.0.0"
)
implementation
(
"com.google.firebase:firebase-ads:19.1.0"
)
...
...
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