Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Wade
DnsChanger
Commits
09822702
Commit
09822702
authored
Apr 14, 2018
by
Daniel Wolf
Browse files
Refined the logging a bit
parent
7c818da6
Changes
2
Show whitespace changes
Inline
Side-by-side
app/src/main/java/com/frostnerd/dnschanger/util/dnsproxy/DNSTCPProxy.java
View file @
09822702
...
...
@@ -65,7 +65,7 @@ import de.measite.minidns.record.Data;
*/
@RequiresApi
(
api
=
Build
.
VERSION_CODES
.
LOLLIPOP
)
public
class
DNSTCPProxy
extends
DNSProxy
{
private
static
final
String
LOG_TAG
=
"[DNS
UD
PProxy]"
;
private
static
final
String
LOG_TAG
=
"[DNS
TC
PProxy]"
;
private
FileDescriptor
interruptedDescriptor
=
null
;
private
FileDescriptor
blockingDescriptor
=
null
;
private
ParcelFileDescriptor
parcelFileDescriptor
;
...
...
@@ -256,10 +256,12 @@ public class DNSTCPProxy extends DNSProxy{
}
private
void
sendPacketToUpstreamDNSServer
(
DatagramPacket
outgoingPacket
,
IpPacket
ipPacket
){
LogFactory
.
writeMessage
(
vpnService
,
LOG_TAG
,
"Writing packet to upstream: "
+
outgoingPacket
);
try
{
Socket
socket
=
SocketChannel
.
open
().
socket
();
vpnService
.
protect
(
socket
);
//The sent packets shouldn't be handled by this class
outgoingPacket
.
setPort
(
upstreamServers
.
get
(
outgoingPacket
.
getAddress
().
getHostAddress
()));
LogFactory
.
writeMessage
(
vpnService
,
LOG_TAG
,
"Connecting to "
+
outgoingPacket
+
"(PORT: "
+
outgoingPacket
.
getPort
()
+
")"
);
socket
.
connect
(
outgoingPacket
.
getSocketAddress
(),
timeout
);
byte
[]
data
=
ipPacket
==
null
?
new
byte
[
0
]
:
outgoingPacket
.
getData
();
DataOutputStream
outputStream
=
new
DataOutputStream
(
socket
.
getOutputStream
());
...
...
@@ -271,8 +273,10 @@ public class DNSTCPProxy extends DNSProxy{
outputStream
.
close
();
//Closes the associated socket
}
}
catch
(
IOException
exception
){
if
(!(
exception
instanceof
SocketTimeoutException
))
handleUpstreamDNSResponse
(
ipPacket
,
outgoingPacket
.
getData
());
if
(!(
exception
instanceof
SocketTimeoutException
))
{
LogFactory
.
writeStackTrace
(
vpnService
,
LOG_TAG
,
exception
);
handleUpstreamDNSResponse
(
ipPacket
,
outgoingPacket
.
getData
());
}
}
}
...
...
app/src/main/java/com/frostnerd/dnschanger/util/dnsproxy/DNSUDPProxy.java
View file @
09822702
...
...
@@ -323,6 +323,7 @@ public class DNSUDPProxy extends DNSProxy{
}
upstreamServers
.
clear
();
writeToDevice
.
clear
();
if
(
resolver
!=
null
)
resolver
.
destroy
();
if
(
queryLogger
!=
null
)
queryLogger
.
destroy
();
LogFactory
.
writeMessage
(
vpnService
,
LOG_TAG
,
"Everything was destructed."
);
...
...
Write
Preview
Supports
Markdown
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