Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions Source/NETworkManager.Models/Network/DNSLookup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
using DnsClient.Protocol;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Net;
using System.Net.NetworkInformation;
Expand Down Expand Up @@ -34,6 +33,7 @@ public DNSLookup(DNSLookupSettings settings, IEnumerable<ServerConnectionInfo> d
#endregion

#region Variables

/// <summary>
/// Query types that can be used.
/// </summary>
Expand Down Expand Up @@ -137,7 +137,7 @@ public void ResolveAsync(IEnumerable<string> hosts)
{
Task.Run(() =>
{
// Append dns suffix to hostname, if option is set, otherwise just copy the list
// Append dns suffix to hostname, if the option is set, otherwise copy the list
var queries = _addSuffix && _settings.QueryType != QueryType.PTR ? GetHostWithSuffix(hosts) : hosts;

// For each dns server
Expand Down Expand Up @@ -249,8 +249,10 @@ private void ProcessDnsAnswers(IEnumerable<DnsResourceRecord> answers, NameServe
// CAA
foreach (var record in dnsResourceRecords.OfType<CaaRecord>())
OnRecordReceived(new DNSLookupRecordReceivedArgs(
new DNSLookupRecordInfo(record.DomainName, record.TimeToLive, $"{record.RecordClass}", $"{record.RecordType}",
$"{record.Flags} {record.Tag} {record.Value}", $"{nameServer.Address}", nameServerHostname, nameServer.Port)));
new DNSLookupRecordInfo(
record.DomainName, record.TimeToLive, $"{record.RecordClass}", $"{record.RecordType}",
$"{record.Flags} {record.Tag} {record.Value}", $"{nameServer.Address}", nameServerHostname,
nameServer.Port)));

// CNAME
foreach (var record in dnsResourceRecords.OfType<CNameRecord>())
Expand All @@ -264,14 +266,16 @@ private void ProcessDnsAnswers(IEnumerable<DnsResourceRecord> answers, NameServe
OnRecordReceived(new DNSLookupRecordReceivedArgs(
new DNSLookupRecordInfo(
record.DomainName, record.TimeToLive, $"{record.RecordClass}", $"{record.RecordType}",
$"{record.Flags} {record.Protocol} {record.Algorithm} {Convert.ToBase64String(record.PublicKey.ToArray())}", $"{nameServer.Address}", nameServerHostname, nameServer.Port)));
$"{record.Flags} {record.Protocol} {record.Algorithm} {Convert.ToBase64String(record.PublicKey.ToArray())}",
$"{nameServer.Address}", nameServerHostname, nameServer.Port)));

// MX
foreach (var record in dnsResourceRecords.OfType<MxRecord>())
OnRecordReceived(new DNSLookupRecordReceivedArgs(
new DNSLookupRecordInfo(
record.DomainName, record.TimeToLive, $"{record.RecordClass}", $"{record.RecordType}",
record.Exchange, $"{nameServer.Address}", nameServerHostname, nameServer.Port)));
$"{record.Preference} {record.Exchange}", $"{nameServer.Address}", nameServerHostname,
nameServer.Port)));

// NS
foreach (var record in dnsResourceRecords.OfType<NsRecord>())
Expand Down Expand Up @@ -299,7 +303,8 @@ private void ProcessDnsAnswers(IEnumerable<DnsResourceRecord> answers, NameServe
OnRecordReceived(new DNSLookupRecordReceivedArgs(
new DNSLookupRecordInfo(
record.DomainName, record.TimeToLive, $"{record.RecordClass}", $"{record.RecordType}",
$"{record.Priority} {record.Weight} {record.Port} {record.Target}", $"{nameServer.Address}", nameServerHostname, nameServer.Port)));
$"{record.Priority} {record.Weight} {record.Port} {record.Target}", $"{nameServer.Address}",
nameServerHostname, nameServer.Port)));

// TXT
foreach (var record in dnsResourceRecords.OfType<TxtRecord>())
Expand All @@ -308,10 +313,8 @@ private void ProcessDnsAnswers(IEnumerable<DnsResourceRecord> answers, NameServe
record.DomainName, record.TimeToLive, $"{record.RecordClass}", $"{record.RecordType}",
string.Join(", ", record.Text), $"{nameServer.Address}", nameServerHostname, nameServer.Port)));



// ToDo: implement more
}

#endregion
}
}
1 change: 1 addition & 0 deletions Source/NETworkManager.sln.DotSettings
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
<s:Boolean x:Key="/Default/UserDictionary/Words/=Controlz/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Dccp/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=dhcpstaticipcoexistence/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=dnskey/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Dockablz/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Dragablz/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=EDNS/@EntryIndexedValue">True</s:Boolean>
Expand Down
1 change: 1 addition & 0 deletions Website/docs/changelog/next-release.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ Release date: **xx.xx.2025**
**DNS Lookup**

- Record types that are not implemented are now hidden in the user interface. [#3012](https://github.com/BornToBeRoot/NETworkManager/pull/3012)
- Added priority to MX records. The result is now shown as `10 mail.example.com.` instead of `mail.example.com.`. [#3118](https://github.com/BornToBeRoot/NETworkManager/pull/3118)

**PowerShell**

Expand Down