Skip to content
GitLab
About GitLab
GitLab: the DevOps platform
Explore GitLab
Install GitLab
How GitLab compares
Get started
GitLab docs
GitLab Learn
Pricing
Talk to an expert
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Projects
Groups
Snippets
Sign up now
Login
Sign in / Register
Toggle navigation
Menu
Open sidebar
PublicAndroidApps
Nebulo
Commits
9e0e0917
Commit
9e0e0917
authored
Jul 03, 2019
by
Daniel Wolf
Browse files
Use target "0" as shortcut for "0.0.0.0" (less bytes)
parent
6bd4522e
Changes
2
Hide whitespace changes
Inline
Side-by-side
app/src/main/java/com/frostnerd/smokescreen/service/DnsVpnService.kt
View file @
9e0e0917
...
...
@@ -945,8 +945,9 @@ class DnsVpnService : VpnService(), Runnable {
false
}
else
{
val
uniformQuestion
=
question
.
name
.
toString
().
replace
(
wwwRegex
,
""
)
va
l
resolveResult
=
dao
.
findRuleTarget
(
uniformQuestion
,
question
.
type
,
useUserRules
)
va
r
resolveResult
=
dao
.
findRuleTarget
(
uniformQuestion
,
question
.
type
,
useUserRules
)
if
(
resolveResult
!=
null
)
{
if
(
resolveResult
==
"0"
)
resolveResult
=
"0.0.0.0"
resolveResults
[
question
]
=
resolveResult
true
}
else
false
...
...
app/src/main/java/com/frostnerd/smokescreen/service/RuleImportService.kt
View file @
9e0e0917
...
...
@@ -272,16 +272,22 @@ class RuleImportService : Service() {
when
{
matcher
.
groupCount
()
==
1
->
{
val
host
=
matcher
.
group
(
1
).
replace
(
wwwRegex
,
""
)
return
DnsRule
(
Record
.
TYPE
.
ANY
,
host
,
"0
.0.0.0
"
,
"::1"
,
importedFrom
=
sourceId
)
return
DnsRule
(
Record
.
TYPE
.
ANY
,
host
,
"0"
,
"::1"
,
importedFrom
=
sourceId
)
}
matcher
==
DNSMASQ_MATCHER
->
{
val
host
=
matcher
.
group
(
1
).
replace
(
wwwRegex
,
""
)
val
target
=
matcher
.
group
(
2
)
val
target
=
matcher
.
group
(
2
).
let
{
if
(
it
==
"0.0.0.0"
)
"0"
else
it
}
return
DnsRule
(
if
(
target
.
contains
(
":"
))
Record
.
TYPE
.
AAAA
else
Record
.
TYPE
.
A
,
host
,
target
,
importedFrom
=
sourceId
)
}
matcher
==
HOSTS_MATCHER
->
{
val
target
=
matcher
.
group
(
1
)
val
host
=
matcher
.
group
(
2
).
replace
(
wwwRegex
,
""
)
val
host
=
matcher
.
group
(
2
).
replace
(
wwwRegex
,
""
).
let
{
if
(
it
==
"0.0.0.0"
)
"0"
else
it
}
return
DnsRule
(
if
(
target
.
contains
(
":"
))
Record
.
TYPE
.
AAAA
else
Record
.
TYPE
.
A
,
host
,
target
,
importedFrom
=
sourceId
)
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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