fergalmoran/DnsServer
1
0
Fork 0
mirror of https://github.com/fergalmoran/DnsServer.git synced 2026-05-20 10:06:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added tcp protocol indication when logging with end points.

Browse Source
This commit is contained in:
Shreyas Zare
2019-01-05 15:23:11 +05:30
parent 569b00dbe1
commit 3ae358e892
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
DnsServerCore/DnsServer.cs
View File

@@ -202,7 +202,7 @@ namespace DnsServerCore
{
LogManager log = _log;
if (log != null)
log.Write(remoteEP as IPEndPoint, ex);
log.Write(remoteEP as IPEndPoint, false, ex);
}
}
}
@@ -214,7 +214,7 @@ namespace DnsServerCore
LogManager log = _log;
if (log != null)
log.Write(remoteEP as IPEndPoint, ex);
log.Write(remoteEP as IPEndPoint, false, ex);
throw;
}
@@ -230,7 +230,7 @@ namespace DnsServerCore
try
{
DnsDatagram response = ProcessQuery(request, remoteEP);
DnsDatagram response = ProcessQuery(request, remoteEP, false);
//send response
if (response != null)
@@ -274,7 +274,7 @@ namespace DnsServerCore
LogManager log = _log;
if (log != null)
log.Write(remoteEP as IPEndPoint, ex);
log.Write(remoteEP as IPEndPoint, false, ex);
}
}
@@ -302,7 +302,7 @@ namespace DnsServerCore
LogManager log = _log;
if (log != null)
log.Write(localEP, ex);
log.Write(localEP, true, ex);
throw;
}
@@ -351,7 +351,7 @@ namespace DnsServerCore
LogManager log = _log;
if (log != null)
log.Write(remoteEP as IPEndPoint, ex);
log.Write(remoteEP as IPEndPoint, true, ex);
}
finally
{
@@ -371,7 +371,7 @@ namespace DnsServerCore
try
{
DnsDatagram response = ProcessQuery(request, remoteEP);
DnsDatagram response = ProcessQuery(request, remoteEP, true);
//send response
if (response != null)
@@ -416,7 +416,7 @@ namespace DnsServerCore
LogManager log = _log;
if (log != null)
log.Write(remoteEP as IPEndPoint, ex);
log.Write(remoteEP as IPEndPoint, true, ex);
}
}
@@ -441,7 +441,7 @@ namespace DnsServerCore
return true;
}
private DnsDatagram ProcessQuery(DnsDatagram request, EndPoint remoteEP)
private DnsDatagram ProcessQuery(DnsDatagram request, EndPoint remoteEP, bool tcp)
{
if (request.Header.IsResponse)
return null;
@@ -522,7 +522,7 @@ namespace DnsServerCore
{
LogManager log = _log;
if (log != null)
log.Write(remoteEP as IPEndPoint, ex);
log.Write(remoteEP as IPEndPoint, tcp, ex);
return new DnsDatagram(new DnsHeader(request.Header.Identifier, true, DnsOpcode.StandardQuery, false, false, request.Header.RecursionDesired, isRecursionAllowed, false, false, DnsResponseCode.ServerFailure, request.Header.QDCOUNT, 0, 0, 0), request.Question, null, null, null);
}
@@ -814,7 +814,7 @@ namespace DnsServerCore
{
LogManager log = _log;
if (log != null)
log.Write(_localEPs[i], ex);
log.Write(_localEPs[i], false, ex);
udpListener.Dispose();
}
@@ -832,7 +832,7 @@ namespace DnsServerCore
{
LogManager log = _log;
if (log != null)
log.Write(_localEPs[i], ex);
log.Write(_localEPs[i], true, ex);
tcpListener.Dispose();
}

4
DnsServerCore/DnsWebService.cs
View File

@@ -366,7 +366,7 @@ namespace DnsServerCore
}
catch (Exception ex)
{
_log.Write(GetRequestRemoteEndPoint(request), ex);
_log.Write(GetRequestRemoteEndPoint(request), true, ex);
jsonWriter.WritePropertyName("status");
jsonWriter.WriteValue("error");
@@ -445,7 +445,7 @@ namespace DnsServerCore
if ((_state == ServiceState.Stopping) || (_state == ServiceState.Stopped))
return; //web service stopping
_log.Write(GetRequestRemoteEndPoint(request), ex);
_log.Write(GetRequestRemoteEndPoint(request), true, ex);
try
{

4
DnsServerCore/LogManager.cs
View File

@@ -144,9 +144,9 @@ namespace DnsServerCore
Write(null, ex.ToString());
}
public void Write(IPEndPoint ep, Exception ex)
public void Write(IPEndPoint ep, bool tcp, Exception ex)
{
Write(ep, ex.ToString());
Write(ep, (tcp ? "[TCP] " : "") + ex.ToString());
}
public void Write(IPEndPoint ep, bool tcp, DnsDatagram request, DnsDatagram response)