Skip to content

Commit 52d0c5c

Browse files
authored
Fix: DNS Lookup - Add MX priority (#3120)
* Fix: DNS Lookup - Add MX priority * Docs: #3118
1 parent 3495215 commit 52d0c5c

File tree

3 files changed

+15
-10
lines changed

3 files changed

+15
-10
lines changed

Source/NETworkManager.Models/Network/DNSLookup.cs

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using DnsClient.Protocol;
33
using System;
44
using System.Collections.Generic;
5-
using System.Diagnostics;
65
using System.Linq;
76
using System.Net;
87
using System.Net.NetworkInformation;
@@ -34,6 +33,7 @@ public DNSLookup(DNSLookupSettings settings, IEnumerable<ServerConnectionInfo> d
3433
#endregion
3534

3635
#region Variables
36+
3737
/// <summary>
3838
/// Query types that can be used.
3939
/// </summary>
@@ -137,7 +137,7 @@ public void ResolveAsync(IEnumerable<string> hosts)
137137
{
138138
Task.Run(() =>
139139
{
140-
// Append dns suffix to hostname, if option is set, otherwise just copy the list
140+
// Append dns suffix to hostname, if the option is set, otherwise copy the list
141141
var queries = _addSuffix && _settings.QueryType != QueryType.PTR ? GetHostWithSuffix(hosts) : hosts;
142142

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

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

269272
// MX
270273
foreach (var record in dnsResourceRecords.OfType<MxRecord>())
271274
OnRecordReceived(new DNSLookupRecordReceivedArgs(
272275
new DNSLookupRecordInfo(
273276
record.DomainName, record.TimeToLive, $"{record.RecordClass}", $"{record.RecordType}",
274-
record.Exchange, $"{nameServer.Address}", nameServerHostname, nameServer.Port)));
277+
$"{record.Preference} {record.Exchange}", $"{nameServer.Address}", nameServerHostname,
278+
nameServer.Port)));
275279

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

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

311-
312-
313316
// ToDo: implement more
314317
}
315318

316319
#endregion
317-
}
320+
}

Source/NETworkManager.sln.DotSettings

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
<s:Boolean x:Key="/Default/UserDictionary/Words/=Controlz/@EntryIndexedValue">True</s:Boolean>
5252
<s:Boolean x:Key="/Default/UserDictionary/Words/=Dccp/@EntryIndexedValue">True</s:Boolean>
5353
<s:Boolean x:Key="/Default/UserDictionary/Words/=dhcpstaticipcoexistence/@EntryIndexedValue">True</s:Boolean>
54+
<s:Boolean x:Key="/Default/UserDictionary/Words/=dnskey/@EntryIndexedValue">True</s:Boolean>
5455
<s:Boolean x:Key="/Default/UserDictionary/Words/=Dockablz/@EntryIndexedValue">True</s:Boolean>
5556
<s:Boolean x:Key="/Default/UserDictionary/Words/=Dragablz/@EntryIndexedValue">True</s:Boolean>
5657
<s:Boolean x:Key="/Default/UserDictionary/Words/=EDNS/@EntryIndexedValue">True</s:Boolean>

Website/docs/changelog/next-release.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ Release date: **xx.xx.2025**
5757
**DNS Lookup**
5858

5959
- Record types that are not implemented are now hidden in the user interface. [#3012](https://github.com/BornToBeRoot/NETworkManager/pull/3012)
60+
- 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)
6061

6162
**PowerShell**
6263

0 commit comments

Comments
 (0)