Commit 75720163 authored by Brickner_cp's avatar Brickner_cp

Warnings, Code Analysis and Documentation. 525 warnings left.

parent e8a62a93
......@@ -39,6 +39,7 @@
<Word>gmtp</Word>
<Word>gost</Word>
<Word>gss</Word>
<Word>gwid</Word>
<Word>hiparp</Word>
<Word>iclfxbm</Word>
<Word>icmp</Word>
......@@ -104,6 +105,7 @@
<Acronym>Ms</Acronym>
<Acronym>Nd</Acronym>
<Acronym>Ns</Acronym>
<Acronym>Os</Acronym>
<Acronym>Sm</Acronym>
</CasingExceptions>
</Acronyms>
......
......@@ -54,7 +54,7 @@ namespace PcapDotNet.Core.Test
break;
case "dns.flags.recdesired":
flagField.AssertShowDecimal(dnsDatagram.IsRecusionDesired);
flagField.AssertShowDecimal(dnsDatagram.IsRecursionDesired);
break;
case "dns.flags.recavail":
......@@ -217,9 +217,9 @@ namespace PcapDotNet.Core.Test
dataField.AssertShow("Name server: " + GetWiresharkDomainName(((DnsResourceDataDomainName)data).Data));
break;
case DnsType.Md: // 3.
case DnsType.Mf: // 4.
case DnsType.Mb: // 7.
case DnsType.Mg: // 8.
case DnsType.MailForwarder: // 4.
case DnsType.Mailbox: // 7.
case DnsType.MailGroup: // 8.
case DnsType.MailRename: // 9.
dataField.AssertName("");
dataField.AssertShow("Host: " + GetWiresharkDomainName(((DnsResourceDataDomainName)data).Data));
......@@ -352,7 +352,7 @@ namespace PcapDotNet.Core.Test
dataField.AssertShow("Text: " + txtData.Text[_txtIndex++].ToString(EncodingExtensions.Iso88591).ToWiresharkLiteral(false));
break;
case DnsType.Rp:
case DnsType.ResponsiblePerson:
dataField.AssertName("");
var rpData = (DnsResourceDataResponsiblePerson)data;
switch (dataFieldShowUntilColon)
......@@ -546,7 +546,7 @@ namespace PcapDotNet.Core.Test
break;
case DnsType.Signature: // 24.
case DnsType.RrSignature: // 46.
case DnsType.ResourceRecordSignature: // 46.
dataField.AssertName("");
var sigData = (DnsResourceDataSignature)data;
switch (dataFieldShowUntilColon)
......@@ -657,7 +657,7 @@ namespace PcapDotNet.Core.Test
throw new InvalidOperationException("Invalid DNS data field " + dataFieldShow);
}
break;
case DnsType.Nxt:
case DnsType.NextDomain:
dataField.AssertName("");
var nxtData = (DnsResourceDataNextDomain)data;
switch (dataFieldShowUntilColon)
......@@ -670,25 +670,9 @@ namespace PcapDotNet.Core.Test
DnsType actualType = nxtData.TypesExist.Skip(_nxtTypeIndex++).First();
DnsType expectedType;
if (!TryGetDnsType(dataFieldShow, out expectedType))
{
if (dataFieldShow == "RR type in bit map: Unused (unused)")
{
switch (actualType)
{
case 0:
break;
default:
throw new InvalidOperationException(actualType + " can't be unused");
}
}
else
throw new InvalidOperationException("Can't parse DNS field " + dataFieldShow);
}
throw new InvalidOperationException(string.Format("Can't parse DNS field {0} : {1}", dataFieldShow, actualType));
else
{
Assert.AreEqual(expectedType, actualType);
}
break;
default:
......@@ -910,7 +894,7 @@ namespace PcapDotNet.Core.Test
break;
case DnsType.DelegationSigner: // 43.
case DnsType.DnsSecLookasideValidation: // 32769.
case DnsType.DnsSecLookAsideValidation: // 32769.
dataField.AssertName("");
var dsData = (DnsResourceDataDelegationSigner)data;
switch (dataFieldShowUntilColon)
......@@ -1023,7 +1007,7 @@ namespace PcapDotNet.Core.Test
DnsType actualType = nSecData.TypesExist[_nSecTypeIndex++];
DnsType expectedType;
if (!TryGetDnsType(dataFieldShow, out expectedType))
throw new InvalidOperationException("Failed parsing type from " + dataFieldShow);
throw new InvalidOperationException(string.Format("Failed parsing type from {0} : {1}", dataFieldShow, actualType));
Assert.AreEqual(expectedType, actualType);
break;
......@@ -1155,7 +1139,7 @@ namespace PcapDotNet.Core.Test
else
Assert.IsTrue(
dataFieldShow.Replace("-", "").StartsWith("RR type in bit map: " + GetWiresharkDnsType(expectedType).Replace("-", "")),
GetWiresharkDnsType(expectedType));
string.Format("{0} : {1}", dataFieldShow, GetWiresharkDnsType(expectedType)));
break;
default:
......@@ -1342,12 +1326,12 @@ namespace PcapDotNet.Core.Test
case DnsType.Sink: // 40.
case DnsType.NInfo: // 56.
case DnsType.RKey: // 57.
case DnsType.TaLink: // 58.
case DnsType.TrustAnchorLink: // 58.
case DnsType.Cds: // 59.
case DnsType.UInfo: // 100.
case DnsType.Uid: // 101.
case DnsType.Gid: // 102.
case DnsType.UnSpec: // 103.
case DnsType.Unspecified: // 103.
case DnsType.Ixfr: // 251.
case DnsType.Axfr: // 252.
case DnsType.MailB: // 253.
......@@ -1355,7 +1339,7 @@ namespace PcapDotNet.Core.Test
case DnsType.Any: // 255.
case DnsType.Uri: // 256.
case DnsType.CertificationAuthorityAuthorization: // 257.
case DnsType.Ta: // 32768.
case DnsType.TrustAnchor: // 32768.
default:
dataField.AssertName("");
dataField.AssertShow("Data");
......@@ -1379,25 +1363,31 @@ namespace PcapDotNet.Core.Test
new Dictionary<string, DnsType>
{
{"Unused", DnsType.None}, // 0
{"MF", DnsType.MailForwarder}, // 4
{"SOA", DnsType.StartOfAuthority}, // 6
{"MB", DnsType.Mailbox}, // 7
{"MG", DnsType.MailGroup}, // 8
{"MR", DnsType.MailRename}, // 9
{"MX", DnsType.MailExchange}, // 15
{"RP", DnsType.ResponsiblePerson}, // 17
{"AFSDB", DnsType.AfsDatabase}, // 18
{"RT", DnsType.RouteThrough}, // 21
{"NSAP", DnsType.NetworkServiceAccessPoint}, // 22
{"NSAP-PTR", DnsType.NetworkServiceAccessPointPointer}, // 23
{"SIG", DnsType.Signature}, // 24
{"PX", DnsType.PointerX400}, // 26
{"NXT", DnsType.NextDomain}, // 30
{"NIMLOC", DnsType.NimrodLocator}, // 32
{"SRV", DnsType.ServerSelection}, // 33
{"KX", DnsType.KeyExchanger}, // 36
{"DS", DnsType.DelegationSigner}, // 43
{"SSHFP", DnsType.SshFingerprint}, // 44
{"RRSIG", DnsType.RrSignature}, // 46
{"RRSIG", DnsType.ResourceRecordSignature}, // 46
{"DHCID", DnsType.DynamicHostConfigurationId}, // 49
{"NSEC3PARAM", DnsType.NSec3Parameters}, // 51
{"UNSPEC", DnsType.Unspecified}, // 103
{"TSIG", DnsType.TransactionSignature}, // 250
{"DLV", DnsType.DnsSecLookasideValidation}, // 32769
{"DLV", DnsType.DnsSecLookAsideValidation}, // 32769
};
private static readonly Dictionary<DnsType, string> _dnsTypeToWiresharkDnsType =
......
......@@ -26,7 +26,7 @@ namespace PcapDotNet.Packets.TestUtils
dnsLayer.IsRecursionAvailable = random.NextBool();
dnsLayer.FutureUse = random.NextBool();
dnsLayer.ResponseCode = random.NextEnum(DnsResponseCode.BadVersionOrBadSignature, DnsResponseCode.BadKey, DnsResponseCode.BadTime, DnsResponseCode.BadMode,
DnsResponseCode.BadName, DnsResponseCode.BadAlgorithm, DnsResponseCode.BadTruncaction);
DnsResponseCode.BadName, DnsResponseCode.BadAlgorithm, DnsResponseCode.BadTruncation);
dnsLayer.DomainNameCompressionMode = random.NextEnum<DnsDomainNameCompressionMode>();
int numQueries = random.Next(MaxRecordsPerSection + 1);
List<DnsQueryResourceRecord> queries = new List<DnsQueryResourceRecord>();
......@@ -121,10 +121,10 @@ namespace PcapDotNet.Packets.TestUtils
case DnsType.Ns:
case DnsType.Md:
case DnsType.Mf:
case DnsType.MailForwarder:
case DnsType.CName:
case DnsType.Mb:
case DnsType.Mg:
case DnsType.Mailbox:
case DnsType.MailGroup:
case DnsType.MailRename:
case DnsType.Ptr:
case DnsType.NetworkServiceAccessPointPointer:
......@@ -155,7 +155,7 @@ namespace PcapDotNet.Packets.TestUtils
case DnsType.Spf:
return new DnsResourceDataText(((Func<DataSegment>)(() => random.NextDataSegment(random.Next(10)))).GenerateArray(10).AsReadOnly());
case DnsType.Rp:
case DnsType.ResponsiblePerson:
return new DnsResourceDataResponsiblePerson(random.NextDnsDomainName(), random.NextDnsDomainName());
case DnsType.AfsDatabase:
......@@ -176,7 +176,7 @@ namespace PcapDotNet.Packets.TestUtils
return new DnsResourceDataNetworkServiceAccessPoint(random.NextDataSegment(1 + random.Next(10)), random.NextUInt48(), random.NextByte());
case DnsType.Signature:
case DnsType.RrSignature:
case DnsType.ResourceRecordSignature:
return new DnsResourceDataSignature(random.NextEnum<DnsType>(), random.NextEnum<DnsAlgorithm>(), random.NextByte(), random.NextUInt(),
random.NextUInt(), random.NextUInt(), random.NextUShort(), random.NextDnsDomainName(),
random.NextDataSegment(random.Next(100)));
......@@ -205,7 +205,7 @@ namespace PcapDotNet.Packets.TestUtils
(ulong)(random.NextInt(0, 10) * Math.Pow(10, random.NextInt(0, 10))),
random.NextUInt(), random.NextUInt(), random.NextUInt());
case DnsType.Nxt:
case DnsType.NextDomain:
byte[] typeBitmap = random.NextBytes(random.Next(DnsResourceDataNextDomain.MaxTypeBitmapLength + 1));
if (typeBitmap.Length > 0 && typeBitmap[typeBitmap.Length - 1] == 0)
typeBitmap[typeBitmap.Length - 1] = random.NextByte(1, 256);
......@@ -262,8 +262,8 @@ namespace PcapDotNet.Packets.TestUtils
case DnsType.DelegationSigner:
case DnsType.Cds:
case DnsType.Ta:
case DnsType.DnsSecLookasideValidation:
case DnsType.TrustAnchor:
case DnsType.DnsSecLookAsideValidation:
return new DnsResourceDataDelegationSigner(random.NextUShort(), random.NextEnum<DnsAlgorithm>(), random.NextEnum<DnsDigestType>(),
random.NextDataSegment(random.Next(50)));
......@@ -302,7 +302,7 @@ namespace PcapDotNet.Packets.TestUtils
case DnsType.RKey:
return new DnsResourceDataRKey(random.NextUShort(), random.NextByte(), random.NextEnum<DnsAlgorithm>(), random.NextDataSegment(random.NextInt(0, 100)));
case DnsType.TaLink:
case DnsType.TrustAnchorLink:
return new DnsResourceDataTrustAnchorLink(random.NextDnsDomainName(), random.NextDnsDomainName());
case DnsType.TKey:
......
......@@ -147,7 +147,7 @@ namespace PcapDotNet.Packets.Dns
/// If RD is set, it directs the name server to pursue the query recursively.
/// Recursive query support is optional.
/// </summary>
public bool IsRecusionDesired
public bool IsRecursionDesired
{
get { return ReadBool(Offset.IsRecusionDesired, Mask.IsRecusionDesired); }
}
......@@ -322,7 +322,7 @@ namespace PcapDotNet.Packets.Dns
OpCode = OpCode,
IsAuthoritativeAnswer = IsAuthoritativeAnswer,
IsTruncated = IsTruncated,
IsRecursionDesired = IsRecusionDesired,
IsRecursionDesired = IsRecursionDesired,
IsRecursionAvailable = IsRecursionAvailable,
FutureUse = FutureUse,
IsAuthenticData = IsAuthenticData,
......
......@@ -52,15 +52,15 @@
/// <summary>
/// RFC 2136.
/// RR Set Exists when it should not.
/// YXRRSET - RR Set Exists when it should not.
/// </summary>
YxRrSet = 7,
YxResourceRecordSet = 7,
/// <summary>
/// RFC 2136.
/// RR Set that should exist does not (NX).
/// NXRRSET - RR Set that should exist does not (NX).
/// </summary>
NotExistRrSet = 8,
NotExistResourceRecordSet = 8,
/// <summary>
/// RFC 2136.
......@@ -114,6 +114,6 @@
/// RFC 4635.
/// BADTRUNC - Bad Truncation.
/// </summary>
BadTruncaction = 22,
BadTruncation = 22,
}
}
\ No newline at end of file
......@@ -34,10 +34,10 @@
/// <summary>
/// RFC 1035.
/// A mail forwarder (Obsolete - use MX).
/// MF - A mail forwarder (Obsolete - use MX).
/// Payload type: DnsResourceDataDomainName.
/// </summary>
Mf = 4,
MailForwarder = 4,
/// <summary>
/// RFC 1035.
......@@ -55,17 +55,17 @@
/// <summary>
/// RFC 1035.
/// A mailbox domain name (EXPERIMENTAL).
/// MB - A mailbox domain name (EXPERIMENTAL).
/// Payload type: DnsResourceDataDomainName.
/// </summary>
Mb = 7,
Mailbox = 7,
/// <summary>
/// RFC 1035.
/// A mail group member (EXPERIMENTAL).
/// MG - A mail group member (EXPERIMENTAL).
/// Payload type: DnsResourceDataDomainName.
/// </summary>
Mg = 8,
MailGroup = 8,
/// <summary>
/// RFC 1035.
......@@ -125,10 +125,10 @@
/// <summary>
/// RFC 1183.
/// For Responsible Person.
/// RP - For Responsible Person.
/// Payload type: DnsResourceDataResponsiblePerson.
/// </summary>
Rp = 17,
ResponsiblePerson = 17,
/// <summary>
/// RFCs 1183, 5864.
......@@ -217,10 +217,10 @@
/// <summary>
/// RFC 2535, 3755.
/// Next Domain - OBSOLETE.
/// NXT - Next Domain - OBSOLETE.
/// Payload type: DnsResourceDataNextDomain.
/// </summary>
Nxt = 30,
NextDomain = 30,
/// <summary>
/// Patton.
......@@ -333,7 +333,7 @@
/// RRSIG.
/// Payload type: DnsResourceDataSignature.
/// </summary>
RrSignature = 46,
ResourceRecordSignature = 46,
/// <summary>
/// RFCs 3755, 4034.
......@@ -396,10 +396,10 @@
/// <summary>
/// Wijngaards.
/// DNSSEC Trust Anchor LINK.
/// TALINK - DNSSEC Trust Anchor LINK.
/// Payload type: DnsResourceDataTrustAnchorLink.
/// </summary>
TaLink = 58,
TrustAnchorLink = 58,
/// <summary>
/// Barwood.
......@@ -435,9 +435,9 @@
/// <summary>
/// IANA-Reserved.
/// Not documented.
/// UNSPEC - Not documented.
/// </summary>
UnSpec = 103,
Unspecified = 103,
/// <summary>
/// RFC 2930.
......@@ -504,16 +504,16 @@
/// <summary>
/// Weiler. 2005-12-13.
/// DNSSEC Trust Authorities or Trust Anchor.
/// TA - DNSSEC Trust Authorities or Trust Anchor.
/// Payload type: DnsResourceDataDelegationSigner.
/// </summary>
Ta = 32768,
TrustAnchor = 32768,
/// <summary>
/// RFC 4431.
/// DLV - DNSSEC Lookaside Validation.
/// Payload type: DnsResourceDataDelegationSigner.
/// </summary>
DnsSecLookasideValidation = 32769,
DnsSecLookAsideValidation = 32769,
}
}
\ No newline at end of file
......@@ -19,8 +19,8 @@ namespace PcapDotNet.Packets.Dns
/// </summary>
[DnsTypeRegistration(Type = DnsType.DelegationSigner)]
[DnsTypeRegistration(Type = DnsType.Cds)]
[DnsTypeRegistration(Type = DnsType.Ta)]
[DnsTypeRegistration(Type = DnsType.DnsSecLookasideValidation)]
[DnsTypeRegistration(Type = DnsType.TrustAnchor)]
[DnsTypeRegistration(Type = DnsType.DnsSecLookAsideValidation)]
public sealed class DnsResourceDataDelegationSigner : DnsResourceDataSimple, IEquatable<DnsResourceDataDelegationSigner>
{
private static class Offset
......
......@@ -12,10 +12,10 @@ namespace PcapDotNet.Packets.Dns
/// </summary>
[DnsTypeRegistration(Type = DnsType.Ns)]
[DnsTypeRegistration(Type = DnsType.Md)]
[DnsTypeRegistration(Type = DnsType.Mf)]
[DnsTypeRegistration(Type = DnsType.MailForwarder)]
[DnsTypeRegistration(Type = DnsType.CName)]
[DnsTypeRegistration(Type = DnsType.Mb)]
[DnsTypeRegistration(Type = DnsType.Mg)]
[DnsTypeRegistration(Type = DnsType.Mailbox)]
[DnsTypeRegistration(Type = DnsType.MailGroup)]
[DnsTypeRegistration(Type = DnsType.MailRename)]
[DnsTypeRegistration(Type = DnsType.Ptr)]
[DnsTypeRegistration(Type = DnsType.NetworkServiceAccessPointPointer)]
......
......@@ -18,7 +18,7 @@ namespace PcapDotNet.Packets.Dns
/// +------------------+
/// </pre>
/// </summary>
[DnsTypeRegistration(Type = DnsType.Nxt)]
[DnsTypeRegistration(Type = DnsType.NextDomain)]
public sealed class DnsResourceDataNextDomain : DnsResourceData, IEquatable<DnsResourceDataNextDomain>
{
public const int MaxTypeBitmapLength = 16;
......
......@@ -10,7 +10,7 @@
/// +------------+
/// </pre>
/// </summary>
[DnsTypeRegistration(Type = DnsType.Rp)]
[DnsTypeRegistration(Type = DnsType.ResponsiblePerson)]
public sealed class DnsResourceDataResponsiblePerson : DnsResourceData2DomainNames
{
public DnsResourceDataResponsiblePerson(DnsDomainName mailbox, DnsDomainName textDomain)
......
......@@ -27,7 +27,7 @@ namespace PcapDotNet.Packets.Dns
/// </pre>
/// </summary>
[DnsTypeRegistration(Type = DnsType.Signature)]
[DnsTypeRegistration(Type = DnsType.RrSignature)]
[DnsTypeRegistration(Type = DnsType.ResourceRecordSignature)]
public sealed class DnsResourceDataSignature : DnsResourceData, IEquatable<DnsResourceDataSignature>
{
private static class Offset
......
......@@ -33,10 +33,10 @@ namespace PcapDotNet.Packets.Dns
{
}
public DnsResourceDataSink(DnsSinkCoding coding, byte subcoding, DataSegment data)
public DnsResourceDataSink(DnsSinkCoding coding, byte subCoding, DataSegment data)
{
Coding = coding;
Subcoding = subcoding;
SubCoding = subCoding;
Data = data;
}
......@@ -48,7 +48,7 @@ namespace PcapDotNet.Packets.Dns
/// <summary>
/// Provides additional information depending on the value of the coding.
/// </summary>
public byte Subcoding { get; private set; }
public byte SubCoding { get; private set; }
/// <summary>
/// Returns a combination of coding and subcoding.
......@@ -58,7 +58,7 @@ namespace PcapDotNet.Packets.Dns
{
get
{
ushort codingSubcoding = BitSequence.Merge((byte)Coding, Subcoding);
ushort codingSubcoding = BitSequence.Merge((byte)Coding, SubCoding);
return (DnsSinkCodingSubCoding)codingSubcoding;
}
}
......@@ -72,7 +72,7 @@ namespace PcapDotNet.Packets.Dns
{
return other != null &&
Coding.Equals(other.Coding) &&
Subcoding.Equals(other.Subcoding) &&
SubCoding.Equals(other.SubCoding) &&
Data.Equals(other.Data);
}
......@@ -99,7 +99,7 @@ namespace PcapDotNet.Packets.Dns
internal override void WriteDataSimple(byte[] buffer, int offset)
{
buffer.Write(offset + Offset.Coding, (byte)Coding);
buffer.Write(offset + Offset.Subcoding, Subcoding);
buffer.Write(offset + Offset.Subcoding, SubCoding);
Data.Write(buffer, offset + Offset.Data);
}
......
......@@ -10,9 +10,9 @@ namespace PcapDotNet.Packets.Dns
[DnsTypeRegistration(Type = DnsType.X25)]
public sealed class DnsResourceDataString : DnsResourceDataSimple, IEquatable<DnsResourceDataString>
{
public DnsResourceDataString(DataSegment str)
public DnsResourceDataString(DataSegment value)
{
String = str;
String = value;
}
public DataSegment String { get; private set; }
......
......@@ -13,7 +13,7 @@ namespace PcapDotNet.Packets.Dns
/// +----------------------+
/// </pre>
/// </summary>
[DnsTypeRegistration(Type = DnsType.TaLink)]
[DnsTypeRegistration(Type = DnsType.TrustAnchorLink)]
public sealed class DnsResourceDataTrustAnchorLink : DnsResourceDataNoCompression, IEquatable<DnsResourceDataTrustAnchorLink>
{
private const int MinimumLength = 2 * DnsDomainName.RootLength;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment