Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
AndroidUtils
VPNTunnelProxy
Commits
6c290e9b
Commit
6c290e9b
authored
Sep 13, 2020
by
Daniel Wolf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove the logger when stopping completely
parent
a508e312
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
library/src/main/java/com/frostnerd/vpntunnelproxy/ForwardedPacketStore.kt
...java/com/frostnerd/vpntunnelproxy/ForwardedPacketStore.kt
+2
-1
library/src/main/java/com/frostnerd/vpntunnelproxy/VPNTunnelProxy.kt
.../main/java/com/frostnerd/vpntunnelproxy/VPNTunnelProxy.kt
+2
-2
No files found.
library/src/main/java/com/frostnerd/vpntunnelproxy/ForwardedPacketStore.kt
View file @
6c290e9b
...
...
@@ -90,7 +90,7 @@ class ForwardedPacketStore(var logger: Logger?) {
}
@Throws
(
IOException
::
class
)
fun
clear
()
{
fun
clear
(
completely
:
Boolean
=
false
)
{
logger
?.
fine
(
"Clearing ForwardedPacketStore"
)
forwardedPollablePackets
.
forEach
{
cleanup
(
it
)
...
...
@@ -108,6 +108,7 @@ class ForwardedPacketStore(var logger: Logger?) {
_forwardedPollablePackets
.
clear
()
newlyForwardedPackets
.
clear
()
newlyForwardedNonPollablePackets
.
clear
()
if
(
completely
)
logger
=
null
}
}
...
...
library/src/main/java/com/frostnerd/vpntunnelproxy/VPNTunnelProxy.kt
View file @
6c290e9b
...
...
@@ -240,7 +240,7 @@ open class VPNTunnelProxy(val packetProxy: PacketProxy,
packetProxy
.
stop
()
cleanup
()
if
(!
wasThreadRunning
)
{
forwardedPacketStore
?.
clear
()
forwardedPacketStore
?.
clear
(
true
)
forwardedPacketStore
=
null
}
tunnelHandle
?.
clear
(
true
)
...
...
@@ -265,7 +265,7 @@ open class VPNTunnelProxy(val packetProxy: PacketProxy,
fileDescriptor
.
tryClosing
()
}
pipesToClose
.
clear
()
forwardedPacketStore
?.
clear
()
forwardedPacketStore
?.
clear
(
proxyStopped
)
tunnelHandle
?.
clear
(
false
)
}
...
...
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