Commit 2977e24b authored by Boaz Brickner's avatar Boaz Brickner

Fix naming warnings.

9 Code Analysis warnings left.

Potentially breaking renames:
ArpHardwareType.MilStd188Hyphen220 -> ArpHardwareType.MilStandard188Hyphen220
ArpOperation.NegativeAtmReply -> ArpOperation.NegativeAsynchronousTransferModeReply
DataLinkKind::PppWithDirection -> DataLinkKind::PointToPointProtocolWithDirection
DnsAtmAddressFormat -> DnsAsynchronousTransferModeAddressFormat
DnsAtmAddressFormat.AtmEndSystemAddress -> DnsAsynchronousTransferModeAddressFormat.AsynchronousTransferModeEndSystemAddress
DnsKeyProtocol.Tls -> DnsKeyProtocol.TransportLayerSecurity
DnsResourceDataAtmAddress -> DnsResourceDataAsynchronousTransferModeAddress
DnsResourceDataHostInformation.Os -> DnsResourceDataHostInformation.OperatingSystem
DnsResponseCode.NotAuth -> DnsResponseCode.NotAuthoritative
DnsSinkCoding.Asn1Snmp -> DnsSinkCoding.Asn1SimpleNetworkManagementProtocol
DnsSinkCodingSubCoding.Asn1SnmpBasicEncodingRules -> DnsSinkCodingSubCoding.Asn1SimpleNetworkManagementProtocolBasicEncodingRules
DnsSinkCodingSubCoding.Asn1SnmpCanonicalEncodingRules -> DnsSinkCodingSubCoding.Asn1SimpleNetworkManagementProtocolCanonicalEncodingRules
DnsSinkCodingSubCoding.Asn1SnmpDistinguishedEncodingRules -> Asn1SimpleNetworkManagementProtocolDistinguishedEncodingRules
DnsSinkCodingSubCoding.Asn1SnmpPer -> DnsSinkCodingSubCoding.Asn1SimpleNetworkManagementProtocolPer
DnsSinkCodingSubCoding.Asn1SnmpPerUnaligned -> DnsSinkCodingSubCoding.Asn1SimpleNetworkManagementProtocolPerUnaligned
DnsSinkCodingSubCoding.Asn1SnmpPrivate -> DnsSinkCodingSubCoding.Asn1SimpleNetworkManagementProtocolPrivate
DnsType.Apl -> DnsType.AddressPrefixList
DnsType.AtmA -> DnsType.AsynchronousTransferModeAddress
DnsType.Cds -> DnsType.ChildDelegationSigner
DnsType.GPos -> DnsType.GeographicalPosition
DnsType.Loc -> DnsType.Location
DnsType.Spf -> DnsType.SenderPolicyFramework
DnsType.Wks -> DnsType.WellKnownService
IpV4Protocol.Bna -> IpV4Protocol.BurroughsNetworkArchitecture
IpV4Protocol.IsIsOverIpV4 -> IpV4Protocol.IntermediateSystemToIntermediateSystemOverIpV4
IpV4Protocol.Sm -> IpV4Protocol.SimpleMulticast
IpV4Protocol.SunNd -> IpV4Protocol.SunNetworkDisk
IpV6BindingAcknowledgementStatus.BceProxyBindingUpdatePrefixSetDoNotMatch -> IpV6BindingAcknowledgementStatus.BindingCacheEntryProxyBindingUpdatePrefixSetDoNotMatch
IpV6BindingAcknowledgementStatus.MIpV6AuthFail -> IpV6BindingAcknowledgementStatus.MobileIpV6AuthenticationFailed
Ipv6MobilityBindingRevocationTrigger.PossibleOutOfSyncBceState -> Ipv6MobilityBindingRevocationTrigger.PossibleOutOfSyncBindingCacheEntryState
PppFrameCheckSequenceCalculator -> PointToPointProtocolFrameCheckSequenceCalculator
SocketAddressFamily.Atm -> SocketAddressFamily.AsynchronousTransferMode
SocketAddressFamily.DECnet -> DigitalEquipmentCorporationNet
SocketAddressFamily.Irda -> SocketAddressFamily.InfraredDataAssociation
parent 5711eaf0
......@@ -10,8 +10,10 @@
<Word>additionals</Word>
<Word>afi</Word>
<Word>afs</Word>
<Word>api</Word>
<Word>aris</Word>
<Word>arp</Word>
<Word>ascii</Word>
<Word>asn</Word>
<Word>autonet</Word>
<Word>avb</Word>
......@@ -22,6 +24,7 @@
<Word>cbt</Word>
<Word>ccitt</Word>
<Word>cftp</Word> <!-- maybe Configurable Fault Tolerant Processor -->
<Word>cpu</Word>
<Word>codings</Word>
<Word>datagrams</Word>
<Word>datakit</Word>
......@@ -41,22 +44,28 @@
<Word>gid</Word>
<Word>gmtp</Word>
<Word>gost</Word>
<Word>gre</Word>
<Word>gss</Word>
<Word>gwid</Word>
<Word>hiparp</Word>
<Word>iclfxbm</Word>
<Word>icmp</Word>
<Word>ieee</Word>
<Word>igmp</Word>
<Word>infini</Word>
<Word>internetwork</Word>
<Word>internodal</Word>
<Word>ip</Word>
<Word>ipgp</Word>
<Word>iplt</Word>
<Word>ipsilon</Word> <!-- As in Ipsilon Networks -->
<Word>ipx</Word>
<Word>iso</Word>
<Word>ixfr</Word>
<Word>keygen</Word>
<Word>kryptolan</Word>
<Word>lat</Word>
<Word>lan</Word>
<Word>lite</Word>
<Word>llq</Word>
<Word>lossy</Word>
......@@ -72,12 +81,14 @@
<Word>pcap</Word>
<Word>pgp</Word>
<Word>pkix</Word>
<Word>pnp</Word>
<Word>prespecified</Word>
<Word>proteon</Word>
<Word>qnx</Word> <!-- www.qnx.com -->
<Word>rcc</Word>
<Word>rpcap</Word>
<Word>satnet</Word>
<Word>scsi</Word>
<Word>sha</Word>
<Word>sitara</Word>
<Word>sll</Word>
......@@ -91,6 +102,7 @@
<Word>uid</Word>
<Word>unicast</Word>
<Word>uti</Word>
<Word>veritas</Word>
<Word>vpn</Word>
<Word>wi</Word>
<Word>wiegand</Word>
......
......@@ -370,7 +370,7 @@ namespace PcapDotNet.Core.Test
}
break;
case DnsType.Wks:
case DnsType.WellKnownService:
var wksData = (DnsResourceDataWellKnownService)data;
dataField.AssertNoFields();
switch (dataField.Name())
......@@ -414,11 +414,11 @@ namespace PcapDotNet.Core.Test
break;
case "dns.hinfo.os_length":
dataField.AssertShowDecimal(hInfoData.Os.Length);
dataField.AssertShowDecimal(hInfoData.OperatingSystem.Length);
break;
case "dns.hinfo.os":
dataField.AssertValue(hInfoData.Os);
dataField.AssertValue(hInfoData.OperatingSystem);
break;
default:
......@@ -481,7 +481,7 @@ namespace PcapDotNet.Core.Test
}
break;
case DnsType.Spf: // 99.
case DnsType.SenderPolicyFramework: // 99.
var spfData = (DnsResourceDataText)data;
dataField.AssertNoFields();
switch (dataField.Name())
......@@ -776,7 +776,7 @@ namespace PcapDotNet.Core.Test
dataField.AssertNoFields();
break;
case DnsType.GPos:
case DnsType.GeographicalPosition:
dataField.AssertNoFields();
var gposData = (DnsResourceDataGeographicalPosition)data;
switch (dataFieldName)
......@@ -816,7 +816,7 @@ namespace PcapDotNet.Core.Test
dataField.AssertNoFields();
break;
case DnsType.Loc:
case DnsType.Location:
var locData = (DnsResourceDataLocationInformation)data;
dataField.AssertNoFields();
switch (dataFieldName)
......@@ -1183,7 +1183,7 @@ namespace PcapDotNet.Core.Test
}
break;
case DnsType.Apl:
case DnsType.AddressPrefixList:
var aplData = (DnsResourceDataAddressPrefixList)data;
switch (dataFieldName)
{
......@@ -1713,12 +1713,12 @@ namespace PcapDotNet.Core.Test
case DnsType.EId: // 31.
case DnsType.NimrodLocator: // 32.
case DnsType.AtmA: // 34.
case DnsType.AsynchronousTransferModeAddress: // 34.
case DnsType.Sink: // 40.
case DnsType.NInfo: // 56.
case DnsType.RKey: // 57.
case DnsType.TrustAnchorLink: // 58.
case DnsType.Cds: // 59.
case DnsType.ChildDelegationSigner: // 59.
case DnsType.UInfo: // 100.
case DnsType.Uid: // 101.
case DnsType.Gid: // 102.
......@@ -1766,6 +1766,7 @@ namespace PcapDotNet.Core.Test
{"MB", DnsType.Mailbox}, // 7
{"MG", DnsType.MailGroup}, // 8
{"MR", DnsType.MailRename}, // 9
{"WKS", DnsType.WellKnownService}, // 11
{"MX", DnsType.MailExchange}, // 15
{"RP", DnsType.ResponsiblePerson}, // 17
{"AFSDB", DnsType.AfsDatabase}, // 18
......@@ -1774,16 +1775,22 @@ namespace PcapDotNet.Core.Test
{"NSAP-PTR", DnsType.NetworkServiceAccessPointPointer}, // 23
{"SIG", DnsType.Signature}, // 24
{"PX", DnsType.PointerX400}, // 26
{"GPOS", DnsType.GeographicalPosition}, // 27
{"LOC", DnsType.Location}, // 29
{"NXT", DnsType.NextDomain}, // 30
{"NIMLOC", DnsType.NimrodLocator}, // 32
{"SRV", DnsType.ServerSelection}, // 33
{"ATMA", DnsType.AsynchronousTransferModeAddress}, // 34
{"KX", DnsType.KeyExchanger}, // 36
{"APL", DnsType.AddressPrefixList}, // 42
{"DS", DnsType.DelegationSigner}, // 43
{"SSHFP", DnsType.SshFingerprint}, // 44
{"RRSIG", DnsType.ResourceRecordSignature}, // 46
{"DHCID", DnsType.DynamicHostConfigurationId}, // 49
{"NSEC3PARAM", DnsType.NSec3Parameters}, // 51
{"TALINK", DnsType.TrustAnchorLink}, // 58
{"CDS", DnsType.ChildDelegationSigner}, // 59
{"SPF", DnsType.SenderPolicyFramework}, // 99
{"UNSPEC", DnsType.Unspecified}, // 103
{"TSIG", DnsType.TransactionSignature}, // 250
{"*", DnsType.Any}, // 255
......
......@@ -31,7 +31,7 @@ namespace PcapDotNet.Core.Test
// TODO: Remove after https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9996 is fixed.
if (ipV6Datagram.ExtensionHeaders.Select(extensionHeader => extensionHeader.NextHeader).Concat(ipV6Datagram.NextHeader).Any(
protocol => protocol == IpV4Protocol.WidebandMonitoring ||
protocol == IpV4Protocol.SunNd ||
protocol == IpV4Protocol.SunNetworkDisk ||
protocol == IpV4Protocol.Swipe ||
protocol == IpV4Protocol.AnyHostInternal ||
protocol == IpV4Protocol.SourceDemandRoutingProtocol ||
......@@ -96,7 +96,7 @@ namespace PcapDotNet.Core.Test
protocol == IpV4Protocol.InteractiveAgentTransferProtocol ||
protocol == IpV4Protocol.InternetPluribusPacketCore ||
protocol == IpV4Protocol.InternetworkPacketExchangeInIp ||
protocol == IpV4Protocol.IsIsOverIpV4 ||
protocol == IpV4Protocol.IntermediateSystemToIntermediateSystemOverIpV4 ||
protocol == IpV4Protocol.ComputerProtocolNetworkExecutive ||
protocol == IpV4Protocol.EncapsulationHeader ||
protocol == IpV4Protocol.GatewayToGateway ||
......@@ -106,7 +106,7 @@ namespace PcapDotNet.Core.Test
protocol == IpV4Protocol.InternetReliableTransactionProtocol ||
protocol == IpV4Protocol.MeritInternodalProtocol ||
protocol == IpV4Protocol.Skip ||
protocol == IpV4Protocol.Bna ||
protocol == IpV4Protocol.BurroughsNetworkArchitecture ||
protocol == IpV4Protocol.InterDomainRoutingProtocol ||
protocol == IpV4Protocol.ActiveNetworks ||
protocol == IpV4Protocol.SpectraLinkRadioProtocol ||
......
......@@ -56,7 +56,7 @@ DataLinkKind PcapDataLink::Kind::get()
return DataLinkKind::Docsis;
case DLT_PPP_WITH_DIR:
return DataLinkKind::PppWithDirection;
return DataLinkKind::PointToPointProtocolWithDirection;
case DLT_LINUX_SLL:
return DataLinkKind::LinuxSll;
......@@ -155,7 +155,7 @@ int PcapDataLink::KindToValue(DataLinkKind kind)
case DataLinkKind::Docsis:
return DLT_DOCSIS;
case DataLinkKind::PppWithDirection:
case DataLinkKind::PointToPointProtocolWithDirection:
return DLT_PPP_WITH_DIR;
case DataLinkKind::LinuxSll:
......
......@@ -4,22 +4,22 @@
using namespace System;
using namespace PcapDotNet::Core;
SamplingMethodFirstAfterInterval::SamplingMethodFirstAfterInterval(int intervalInMs)
SamplingMethodFirstAfterInterval::SamplingMethodFirstAfterInterval(int intervalInMilliseconds)
{
if (intervalInMs < 0)
throw gcnew ArgumentOutOfRangeException("intervalInMs", intervalInMs, "Must be non negative");
_intervalInMs = intervalInMs;
if (intervalInMilliseconds < 0)
throw gcnew ArgumentOutOfRangeException("intervalInMilliseconds", intervalInMilliseconds, "Must be non negative");
_intervalInMilliseconds = intervalInMilliseconds;
}
SamplingMethodFirstAfterInterval::SamplingMethodFirstAfterInterval(TimeSpan interval)
{
double intervalInMs = interval.TotalMilliseconds;
if (intervalInMs > Int32::MaxValue)
double intervalInMilliseconds = interval.TotalMilliseconds;
if (intervalInMilliseconds > Int32::MaxValue)
throw gcnew ArgumentOutOfRangeException("interval", interval, "Must be smaller than " + TimeSpan::FromMilliseconds(Int32::MaxValue).ToString());
if (intervalInMs < 0)
if (intervalInMilliseconds < 0)
throw gcnew ArgumentOutOfRangeException("interval", interval, "Must be non negative");
_intervalInMs = (int)intervalInMs;
_intervalInMilliseconds = (int)intervalInMilliseconds;
}
int SamplingMethodFirstAfterInterval::Method::get()
......@@ -29,5 +29,5 @@ int SamplingMethodFirstAfterInterval::Method::get()
int SamplingMethodFirstAfterInterval::Value::get()
{
return _intervalInMs;
return _intervalInMilliseconds;
}
......@@ -14,9 +14,9 @@ namespace PcapDotNet { namespace Core
/// <summary>
/// Constructs by giving an interval in milliseconds.
/// </summary>
/// <param name="intervalInMs">The number of milliseconds to wait between packets sampled.</param>
/// <param name="intervalInMilliseconds">The number of milliseconds to wait between packets sampled.</param>
/// <exception cref="System::ArgumentOutOfRangeException">The given number of milliseconds is negative.</exception>
SamplingMethodFirstAfterInterval(int intervalInMs);
SamplingMethodFirstAfterInterval(int intervalInMilliseconds);
/// <summary>
/// Constructs by giving an interval as TimeSpan.
......@@ -41,6 +41,6 @@ namespace PcapDotNet { namespace Core
}
private:
int _intervalInMs;
int _intervalInMilliseconds;
};
}}
\ No newline at end of file
......@@ -10,162 +10,162 @@ namespace PcapDotNet { namespace Core
/// <summary>
/// unspecified
/// </summary>
Unspecified = 0,
Unspecified = 0,
/// <summary>
/// local to host (pipes, portals)
/// </summary>
Unix = 1,
Unix = 1,
/// <summary>
/// internetwork: UDP, TCP, etc.
/// </summary>
Internet = 2,
Internet = 2,
/// <summary>
/// arpanet imp addresses
/// </summary>
ImpLink = 3,
ImpLink = 3,
/// <summary>
/// pup protocols: e.g. BSP
/// </summary>
Pup = 4,
Pup = 4,
/// <summary>
/// mit CHAOS protocols
/// </summary>
Chaos = 5,
Chaos = 5,
/// <summary>
/// XEROX NS protocols
/// </summary>
NS = 6,
NS = 6,
/// <summary>
/// IPX protocols: IPX, SPX, etc.
/// </summary>
Ipx = NS,
Ipx = NS,
/// <summary>
/// ISO protocols
/// </summary>
Iso = 7,
Iso = 7,
/// <summary>
/// OSI is ISO
/// </summary>
Osi = Iso,
Osi = Iso,
/// <summary>
/// european computer manufacturers
/// </summary>
EuropeanComputerManufactures = 8,
EuropeanComputerManufactures = 8,
/// <summary>
/// datakit protocols
/// </summary>
Datakit = 9,
Datakit = 9,
/// <summary>
/// CCITT protocols, X.25 etc
/// </summary>
Ccitt = 10,
Ccitt = 10,
/// <summary>
/// IBM SNA
/// </summary>
Sna = 11,
Sna = 11,
/// <summary>
/// DECnet
/// </summary>
DECnet = 12,
DigitalEquipmentCorporationNet = 12,
/// <summary>
/// Direct data link interface
/// </summary>
DirectDataLinkInterface = 13,
DirectDataLinkInterface = 13,
/// <summary>
/// LAT
/// </summary>
Lat = 14,
Lat = 14,
/// <summary>
/// NSC Hyperchannel
/// </summary>
HyperChannel = 15,
HyperChannel = 15,
/// <summary>
/// AppleTalk
/// </summary>
AppleTalk = 16,
AppleTalk = 16,
/// <summary>
/// NetBios-style addresses
/// </summary>
NetBios = 17,
NetBios = 17,
/// <summary>
/// VoiceView
/// </summary>
VoiceView = 18,
VoiceView = 18,
/// <summary>
/// Protocols from Firefox
/// </summary>
Firefox = 19,
Firefox = 19,
/// <summary>
/// Somebody is using this!
/// </summary>
Unknown1 = 20,
Unknown1 = 20,
/// <summary>
/// Banyan
/// </summary>
Ban = 21,
Ban = 21,
/// <summary>
/// Native ATM Services
/// </summary>
Atm = 22,
AsynchronousTransferMode = 22,
/// <summary>
/// Internetwork Version 6
/// </summary>
Internet6 = 23,
Internet6 = 23,
/// <summary>
/// Microsoft Wolfpack
/// </summary>
Cluster = 24,
Cluster = 24,
/// <summary>
/// IEEE 1284.4 WG AF
/// </summary>
Ieee12844 = 25,
Ieee12844 = 25,
/// <summary>
/// IrDA
/// </summary>
Irda = 26,
InfraredDataAssociation = 26,
/// <summary>
/// Network Designers OSI &amp; gateway
/// </summary>
NetworkDesigners = 28,
NetworkDesigners = 28,
TcnProcess = 29,
TcnProcess = 29,
TcnMessage = 30,
TcnMessage = 30,
Iclfxbm = 31,
Iclfxbm = 31,
/// <summary>
/// Bluetooth RFCOMM/L2CAP protocols
/// </summary>
Bluetooth = 32
Bluetooth = 32
};
}}
\ No newline at end of file
......@@ -40,7 +40,7 @@ namespace PcapDotNet.Packets.Test
public void DataLinkTest()
{
Assert.AreEqual(DataLinkKind.Ethernet.ToString(), DataLink.Ethernet.ToString());
Assert.AreEqual(DataLinkKind.PppWithDirection.ToString(), new DataLink(DataLinkKind.PppWithDirection).ToString());
Assert.AreEqual(DataLinkKind.PointToPointProtocolWithDirection.ToString(), new DataLink(DataLinkKind.PointToPointProtocolWithDirection).ToString());
foreach (DataLink dataLink in new[] { DataLink.Ethernet, DataLink.IpV4 })
{
Assert.AreEqual(dataLink, dataLink);
......
......@@ -554,7 +554,7 @@ namespace PcapDotNet.Packets.Test
public void DnsResourceDataLocationInformationParseWrongLengthTest()
{
var resourceData = new DnsResourceDataLocationInformation(0, 1000, 2000, 3000, 100, 200, 300);
TestResourceRecordIsNotCreatedWithNewLength(DnsType.Loc, resourceData, 1);
TestResourceRecordIsNotCreatedWithNewLength(DnsType.Location, resourceData, 1);
}
[TestMethod]
......@@ -750,8 +750,8 @@ namespace PcapDotNet.Packets.Test
public void DnsResourceDataAddressPrefixListParseWrongLengthTest()
{
var resourceData = new DnsResourceDataAddressPrefixList(new DnsAddressPrefix(AddressFamily.IpV4, 0, false, new DataSegment(new byte[5])));
TestResourceRecordIsNotCreatedWithNewLength(DnsType.Apl, resourceData, 1);
TestResourceRecordIsNotCreatedWithNewLength(DnsType.Apl, resourceData, -1);
TestResourceRecordIsNotCreatedWithNewLength(DnsType.AddressPrefixList, resourceData, 1);
TestResourceRecordIsNotCreatedWithNewLength(DnsType.AddressPrefixList, resourceData, -1);
}
[TestMethod]
......@@ -784,10 +784,10 @@ namespace PcapDotNet.Packets.Test
public void DnsResourceDataGeographicalPositionParseWrongLengthTest()
{
var resourceData = new DnsResourceDataGeographicalPosition("5.03", "-44.4", "22.1");
TestResourceRecordIsNotCreatedWithNewLength(DnsType.GPos, resourceData, 1);
TestResourceRecordIsNotCreatedWithNewLength(DnsType.GPos, resourceData, -5);
TestResourceRecordIsNotCreatedWithNewLength(DnsType.GPos, resourceData, -10);
TestResourceRecordIsNotCreatedWithNewLength(DnsType.GPos, resourceData, -14);
TestResourceRecordIsNotCreatedWithNewLength(DnsType.GeographicalPosition, resourceData, 1);
TestResourceRecordIsNotCreatedWithNewLength(DnsType.GeographicalPosition, resourceData, -5);
TestResourceRecordIsNotCreatedWithNewLength(DnsType.GeographicalPosition, resourceData, -10);
TestResourceRecordIsNotCreatedWithNewLength(DnsType.GeographicalPosition, resourceData, -14);
}
[TestMethod]
......@@ -912,10 +912,10 @@ namespace PcapDotNet.Packets.Test
}
[TestMethod]
public void DnsResourceDataAtmAddressParseWrongLengthTest()
public void DnsResourceDataAsynchronousTransferModeAddressParseWrongLengthTest()
{
var resourceData = new DnsResourceDataAtmAddress(DnsAtmAddressFormat.E164, new DataSegment(new byte[5]));
TestResourceRecordIsNotCreatedWithNewLength(DnsType.AtmA, resourceData, -6);
var resourceData = new DnsResourceDataAsynchronousTransferModeAddress(DnsAsynchronousTransferModeAddressFormat.E164, new DataSegment(new byte[5]));
TestResourceRecordIsNotCreatedWithNewLength(DnsType.AsynchronousTransferModeAddress, resourceData, -6);
}
[TestMethod]
......@@ -996,7 +996,7 @@ namespace PcapDotNet.Packets.Test
public void DnsResourceDataWellKnownServiceParseWrongLengthTest()
{
var resourceData = new DnsResourceDataWellKnownService(IpV4Address.Zero, IpV4Protocol.IpV6Opts, new DataSegment(new byte[5]));
TestResourceRecordIsNotCreatedWithNewLength(DnsType.Wks, resourceData, -6);
TestResourceRecordIsNotCreatedWithNewLength(DnsType.WellKnownService, resourceData, -6);
}
[TestMethod]
......
......@@ -349,7 +349,7 @@ namespace PcapDotNet.Packets.Test
public void IpV6ExtensionHeaderFragmentDataEquals()
{
Assert.AreNotEqual(new IpV6ExtensionHeaderFragmentData(IpV4Protocol.Skip, 0, false, 0),
new IpV6ExtensionHeaderFragmentData(IpV4Protocol.Sm, 0, false, 0));
new IpV6ExtensionHeaderFragmentData(IpV4Protocol.SimpleMulticast, 0, false, 0));
Assert.AreNotEqual(new IpV6ExtensionHeaderFragmentData(IpV4Protocol.Skip, 0, false, 0),
new IpV6ExtensionHeaderFragmentData(IpV4Protocol.Skip, 1, false, 0));
Assert.AreNotEqual(new IpV6ExtensionHeaderFragmentData(IpV4Protocol.Skip, 0, false, 0),
......@@ -2848,7 +2848,7 @@ namespace PcapDotNet.Packets.Test
[ExpectedException(typeof(ArgumentNullException), AllowDerivedTypes = false)]
public void PppFrameCheckSequenceCalculatorCalculateFrameCheckSequence16NullBytes()
{
Assert.IsNull(PppFrameCheckSequenceCalculator.CalculateFrameCheckSequence16(0, null));
Assert.IsNull(PointToPointProtocolFrameCheckSequenceCalculator.CalculateFrameCheckSequence16(0, null));
Assert.Fail();
}
}
......
......@@ -48,7 +48,7 @@ namespace PcapDotNet.Packets.Test
for (int i = 0; i != 100; ++i)
{
DataSegment data = random.NextDataSegment(random.Next(1000));
ushort fcs = PppFrameCheckSequenceCalculator.CalculateFrameCheckSequence16(data);
ushort fcs = PointToPointProtocolFrameCheckSequenceCalculator.CalculateFrameCheckSequence16(data);
}
}
......@@ -60,7 +60,7 @@ namespace PcapDotNet.Packets.Test
for (int fcs16Value = 0; fcs16Value <= ushort.MaxValue; ++fcs16Value)
{
ushort extraValue = (ushort)(fcs16Value ^ 0xffff); // Complement.
Assert.AreEqual(GoodFcs16, PppFrameCheckSequenceCalculator.CalculateFrameCheckSequence16((ushort)fcs16Value, new[] { (byte)extraValue, (byte)(extraValue >> 8) }));
Assert.AreEqual(GoodFcs16, PointToPointProtocolFrameCheckSequenceCalculator.CalculateFrameCheckSequence16((ushort)fcs16Value, new[] { (byte)extraValue, (byte)(extraValue >> 8) }));
}
}
}
......
......@@ -143,7 +143,7 @@ namespace PcapDotNet.Packets.TestUtils
case DnsType.Null:
return new DnsResourceDataAnything(random.NextDataSegment(random.Next(65536)));
case DnsType.Wks:
case DnsType.WellKnownService:
return new DnsResourceDataWellKnownService(random.NextIpV4Address(), random.NextEnum<IpV4Protocol>(),
random.NextDataSegment(random.Next(10)));
......@@ -157,7 +157,7 @@ namespace PcapDotNet.Packets.TestUtils
return new DnsResourceDataMailExchange(random.NextUShort(), random.NextDnsDomainName());
case DnsType.Txt:
case DnsType.Spf:
case DnsType.SenderPolicyFramework:
return new DnsResourceDataText(((Func<DataSegment>)(() => random.NextDataSegment(random.Next(10)))).GenerateArray(10).AsReadOnly());
case DnsType.ResponsiblePerson:
......@@ -195,7 +195,7 @@ namespace PcapDotNet.Packets.TestUtils
case DnsType.PointerX400:
return new DnsResourceDataX400Pointer(random.NextUShort(), random.NextDnsDomainName(), random.NextDnsDomainName());
case DnsType.GPos:
case DnsType.GeographicalPosition:
return new DnsResourceDataGeographicalPosition((random.NextInt(-90, 90) * random.NextDouble()).ToString("0.##########"),
(random.NextInt(-180, 180) * random.NextDouble()).ToString("0.##########"),
(random.NextInt(-500, 50000) * random.NextDouble()).ToString("0.##########"));
......@@ -203,7 +203,7 @@ namespace PcapDotNet.Packets.TestUtils
case DnsType.Aaaa:
return new DnsResourceDataIpV6(random.NextIpV6Address());
case DnsType.Loc:
case DnsType.Location:
return new DnsResourceDataLocationInformation(random.NextByte(),
(ulong)(random.NextInt(0, 10) * Math.Pow(10, random.NextInt(0, 10))),
(ulong)(random.NextInt(0, 10) * Math.Pow(10, random.NextInt(0, 10))),
......@@ -224,8 +224,9 @@ namespace PcapDotNet.Packets.TestUtils
case DnsType.ServerSelection:
return new DnsResourceDataServerSelection(random.NextUShort(), random.NextUShort(), random.NextUShort(), random.NextDnsDomainName());
case DnsType.AtmA:
return new DnsResourceDataAtmAddress(random.NextEnum<DnsAtmAddressFormat>(), random.NextDataSegment(random.Next(100)));
case DnsType.AsynchronousTransferModeAddress:
return new DnsResourceDataAsynchronousTransferModeAddress(random.NextEnum<DnsAsynchronousTransferModeAddressFormat>(),
random.NextDataSegment(random.Next(100)));
case DnsType.NaPtr:
IEnumerable<byte> possibleFlags =
......@@ -258,7 +259,7 @@ namespace PcapDotNet.Packets.TestUtils
case DnsType.Opt:
return new DnsResourceDataOptions(random.NextDnsOptions());
case DnsType.Apl:
case DnsType.AddressPrefixList:
return new DnsResourceDataAddressPrefixList(
((Func<DnsAddressPrefix>)
(() =>
......@@ -266,7 +267,7 @@ namespace PcapDotNet.Packets.TestUtils
random.NextDataSegment(random.Next(0, 128))))).GenerateArray(random.Next(10)));
case DnsType.DelegationSigner:
case DnsType.Cds:
case DnsType.ChildDelegationSigner:
case DnsType.TrustAnchor:
case DnsType.DnsSecLookAsideValidation:
return new DnsResourceDataDelegationSigner(random.NextUShort(), random.NextEnum<DnsAlgorithm>(), random.NextEnum<DnsDigestType>(),
......
......@@ -118,7 +118,7 @@ namespace PcapDotNet.Packets.Arp
/// <summary>
/// MIL-STD-188-220
/// </summary>
MilStd188Hyphen220 = 22,
MilStandard188Hyphen220 = 22,
/// <summary>
/// Metricom
......
......@@ -58,7 +58,7 @@ namespace PcapDotNet.Packets.Arp
/// <summary>
/// [RFC1577]
/// </summary>
NegativeAtmReply = 10,
NegativeAsynchronousTransferModeReply = 10,
//MARS-Request = 11
//MARS-Multi = 12
......
......@@ -26,7 +26,7 @@ namespace PcapDotNet.Packets
/// PPP, as per RFC 1661 and RFC 1662, preceded with a one-byte pseudo-header with a zero value meaning "received by this host"
/// and a non-zero value meaning "sent by this host".
/// </summary>
PppWithDirection,
PointToPointProtocolWithDirection,
/// <summary>
/// Linux cooked-mode capture.
......
......@@ -66,7 +66,7 @@
/// RFC 2136.
/// Server Not Authoritative for zone.
/// </summary>
NotAuth = 9,
NotAuthoritative = 9,
/// <summary>
/// RFC 2136.
......
......@@ -86,10 +86,11 @@
/// <summary>
/// RFC 1035.
/// WKS.
/// A well known service description..
/// Payload type: DnsResourceDataWellKnownService.
/// </summary>
Wks = 11,
WellKnownService = 11,
/// <summary>
/// RFC 1035.
......@@ -199,10 +200,11 @@
/// <summary>
/// RFC 1712.
/// GPos.
/// Geographical Position.
/// Payload type: DnsResourceDataGeographicalPosition.
/// </summary>
GPos = 27,
GeographicalPosition = 27,
/// <summary>
/// RFC 3596.
......@@ -213,10 +215,11 @@
/// <summary>
/// RFC 1876.
/// LOC.
/// Location Information.
/// Payload type: DnsResourceDataLocationInformation.
/// </summary>
Loc = 29,
Location = 29,
/// <summary>
/// RFC 2535, 3755.
......@@ -248,10 +251,11 @@
/// <summary>
/// ATMDOC.
/// ATMA.
/// ATM Address.
/// Payload type: DnsResourceDataAtmAddress.
/// Payload type: DnsResourceDataAsynchronousTransferModeAddress.
/// </summary>
AtmA = 34,
AsynchronousTransferModeAddress = 34,
/// <summary>
/// RFCs 2168, 2915, 3403.
......@@ -304,10 +308,11 @@
/// <summary>
/// RFC 3123.
/// APL.
/// Address Prefix List.
/// Payload type: DnsResourceDataAddressPrefixList.
/// </summary>
Apl = 42,
AddressPrefixList = 42,
/// <summary>
/// RFCs 3658, 4034.
......@@ -406,17 +411,19 @@
/// <summary>
/// Barwood.
/// CDS.
/// Child DS.
/// Payload type: DnsResourceDataDelegationSigner.
/// </summary>
Cds = 59,
ChildDelegationSigner = 59,
/// <summary>
/// RFC 4408.
/// SPF.
/// Sender Policy Framework.
/// Payload type: DnsResourceDataText.
/// </summary>
Spf = 99,
SenderPolicyFramework = 99,
/// <summary>
/// IANA-Reserved.
......
......@@ -3,12 +3,12 @@
/// <summary>
/// The ATM address format values.
/// </summary>
public enum DnsAtmAddressFormat : byte
public enum DnsAsynchronousTransferModeAddressFormat : byte
{
/// <summary>
/// ATM End System Address (AESA) format.
/// ATM End System Address (AESA) format.
/// </summary>
AtmEndSystemAddress = 0,
AsynchronousTransferModeEndSystemAddress = 0,
/// <summary>
/// E.164 format.
......
......@@ -13,7 +13,7 @@
/// <summary>
/// Connection with TLS.
/// </summary>
Tls = 1,
TransportLayerSecurity = 1,
/// <summary>
/// Connection with email.
......
......@@ -22,7 +22,7 @@ namespace PcapDotNet.Packets.Dns
/// +-----+------------------------+
/// </pre>
/// </summary>
[DnsTypeRegistration(Type = DnsType.Apl)]
[DnsTypeRegistration(Type = DnsType.AddressPrefixList)]
public sealed class DnsResourceDataAddressPrefixList: DnsResourceDataSimple, IEquatable<DnsResourceDataAddressPrefixList>
{
/// <summary>
......
......@@ -15,8 +15,8 @@ namespace PcapDotNet.Packets.Dns
/// +-----+---------+
/// </pre>
/// </summary>
[DnsTypeRegistration(Type = DnsType.AtmA)]
public sealed class DnsResourceDataAtmAddress : DnsResourceDataSimple, IEquatable<DnsResourceDataAtmAddress>
[DnsTypeRegistration(Type = DnsType.AsynchronousTransferModeAddress)]
public sealed class DnsResourceDataAsynchronousTransferModeAddress : DnsResourceDataSimple, IEquatable<DnsResourceDataAsynchronousTransferModeAddress>
{
private static class Offset
{
......@@ -38,7 +38,7 @@ namespace PcapDotNet.Packets.Dns
/// This ATM address appears in ATM End System Address Octets field (AESA format) or the Address/Number Digits field (E.164 format) of the Called party number information element [ATMUNI3.1].
/// Subaddress information is intentionally not included because E.164 subaddress information is used for routing.
/// </param>
public DnsResourceDataAtmAddress(DnsAtmAddressFormat format, DataSegment address)
public DnsResourceDataAsynchronousTransferModeAddress(DnsAsynchronousTransferModeAddressFormat format, DataSegment address)
{
Format = format;
Address = address;
......@@ -47,7 +47,7 @@ namespace PcapDotNet.Packets.Dns
/// <summary>
/// The format of Address.
/// </summary>
public DnsAtmAddressFormat Format { get; private set; }
public DnsAsynchronousTransferModeAddressFormat Format { get; private set; }
/// <summary>
/// Variable length string of octets containing the ATM address of the node to which this RR pertains.
......@@ -62,7 +62,7 @@ namespace PcapDotNet.Packets.Dns
/// <summary>
/// Two DnsResourceDataAtmAddress are equal iff their format and address fields are equal.
/// </summary>
public bool Equals(DnsResourceDataAtmAddress other)
public bool Equals(DnsResourceDataAsynchronousTransferModeAddress other)
{
return other != null &&
Format.Equals(other.Format) &&
......@@ -74,7 +74,7 @@ namespace PcapDotNet.Packets.Dns
/// </summary>
public override bool Equals(object obj)
{
return Equals(obj as DnsResourceDataAtmAddress);
return Equals(obj as DnsResourceDataAsynchronousTransferModeAddress);
}
/// <summary>
......@@ -85,8 +85,8 @@ namespace PcapDotNet.Packets.Dns
return Sequence.GetHashCode(Format, Address);
}
internal DnsResourceDataAtmAddress()
: this(DnsAtmAddressFormat.AtmEndSystemAddress, DataSegment.Empty)
internal DnsResourceDataAsynchronousTransferModeAddress()
: this(DnsAsynchronousTransferModeAddressFormat.AsynchronousTransferModeEndSystemAddress, DataSegment.Empty)
{
}
......@@ -106,10 +106,10 @@ namespace PcapDotNet.Packets.Dns
if (data.Length < ConstantPartLength)
return null;
DnsAtmAddressFormat format = (DnsAtmAddressFormat)data[Offset.Format];
DnsAsynchronousTransferModeAddressFormat format = (DnsAsynchronousTransferModeAddressFormat)data[Offset.Format];
DataSegment address = data.Subsegment(Offset.Address, data.Length - ConstantPartLength);
return new DnsResourceDataAtmAddress(format, address);
return new DnsResourceDataAsynchronousTransferModeAddress(format, address);
}
}
}
\ No newline at end of file
......@@ -18,7 +18,7 @@ namespace PcapDotNet.Packets.Dns
/// </pre>
/// </summary>
[DnsTypeRegistration(Type = DnsType.DelegationSigner)]
[DnsTypeRegistration(Type = DnsType.Cds)]
[DnsTypeRegistration(Type = DnsType.ChildDelegationSigner)]
[DnsTypeRegistration(Type = DnsType.TrustAnchor)]
[DnsTypeRegistration(Type = DnsType.DnsSecLookAsideValidation)]
public sealed class DnsResourceDataDelegationSigner : DnsResourceDataSimple, IEquatable<DnsResourceDataDelegationSigner>
......
......@@ -16,7 +16,7 @@ namespace PcapDotNet.Packets.Dns
/// +-----------+
/// </pre>
/// </summary>
[DnsTypeRegistration(Type = DnsType.GPos)]
[DnsTypeRegistration(Type = DnsType.GeographicalPosition)]
public sealed class DnsResourceDataGeographicalPosition : DnsResourceDataSimple, IEquatable<DnsResourceDataGeographicalPosition>
{
/// <summary>
......
......@@ -21,9 +21,9 @@ namespace PcapDotNet.Packets.Dns
/// Constructs the resource data from the CPU and OS parameters.
/// </summary>
/// <param name="cpu">A string which specifies the CPU type.</param>
/// <param name="os">A string which specifies the operating system type.</param>
public DnsResourceDataHostInformation(DataSegment cpu, DataSegment os)
: base(cpu, os)
/// <param name="operatingSystem">A string which specifies the operating system type.</param>
public DnsResourceDataHostInformation(DataSegment cpu, DataSegment operatingSystem)
: base(cpu, operatingSystem)
{
}
......@@ -35,7 +35,7 @@ namespace PcapDotNet.Packets.Dns
/// <summary>
/// A string which specifies the operating system type.
/// </summary>
public DataSegment Os { get { return Strings[1]; } }
public DataSegment OperatingSystem { get { return Strings[1]; } }
internal DnsResourceDataHostInformation()
: this(DataSegment.Empty, DataSegment.Empty)
......
......@@ -20,7 +20,7 @@ namespace PcapDotNet.Packets.Dns
/// +-----+---------------------------------------+
/// </pre>
/// </summary>
[DnsTypeRegistration(Type = DnsType.Loc)]
[DnsTypeRegistration(Type = DnsType.Location)]
public sealed class DnsResourceDataLocationInformation : DnsResourceDataSimple, IEquatable<DnsResourceDataLocationInformation>
{
/// <summary>
......
......@@ -110,7 +110,7 @@ namespace PcapDotNet.Packets.Dns
}
internal DnsResourceDataSink()
: this(DnsSinkCodingSubCoding.Asn1SnmpBasicEncodingRules, DataSegment.Empty)
: this(DnsSinkCodingSubCoding.Asn1SimpleNetworkManagementProtocolBasicEncodingRules, DataSegment.Empty)
{
}
......
......@@ -9,7 +9,7 @@ namespace PcapDotNet.Packets.Dns
/// The format of each DNS string is one byte for the length of the string and then the specified number of bytes.
/// </summary>
[DnsTypeRegistration(Type = DnsType.Txt)]
[DnsTypeRegistration(Type = DnsType.Spf)]
[DnsTypeRegistration(Type = DnsType.SenderPolicyFramework)]
public sealed class DnsResourceDataText : DnsResourceDataStrings
{
/// <summary>
......
......@@ -16,7 +16,7 @@ namespace PcapDotNet.Packets.Dns
/// +-----+----------+---------+
/// </pre>
/// </summary>
[DnsTypeRegistration(Type = DnsType.Wks)]
[DnsTypeRegistration(Type = DnsType.WellKnownService)]
public sealed class DnsResourceDataWellKnownService : DnsResourceDataSimple, IEquatable<DnsResourceDataWellKnownService>
{
private static class Offset
......
......@@ -13,7 +13,7 @@
/// <summary>
/// The SNMP subset of ASN.1.
/// </summary>
Asn1Snmp = 0x01,
Asn1SimpleNetworkManagementProtocol = 0x01,
/// <summary>
/// OSI ASN.1 1990 [ASN.1].
......
......@@ -14,37 +14,37 @@
/// The SNMP subset of ASN.1.
/// Basic Encoding Rules.
/// </summary>
Asn1SnmpBasicEncodingRules = 0x0101,
Asn1SimpleNetworkManagementProtocolBasicEncodingRules = 0x0101,
/// <summary>
/// The SNMP subset of ASN.1.
/// Distinguished Encoding Rules.
/// </summary>
Asn1SnmpDistinguishedEncodingRules = 0x0102,
Asn1SimpleNetworkManagementProtocolDistinguishedEncodingRules = 0x0102,
/// <summary>
/// The SNMP subset of ASN.1.
/// Packed Encoding Rules Aligned.
/// </summary>
Asn1SnmpPer = 0x0103,
Asn1SimpleNetworkManagementProtocolPer = 0x0103,
/// <summary>
/// The SNMP subset of ASN.1.
/// Packed Encoding Rules Unaligned.
/// </summary>
Asn1SnmpPerUnaligned = 0x0104,
Asn1SimpleNetworkManagementProtocolPerUnaligned = 0x0104,
/// <summary>
/// The SNMP subset of ASN.1.
/// Canonical Encoding Rules.
/// </summary>
Asn1SnmpCanonicalEncodingRules = 0x0105,
Asn1SimpleNetworkManagementProtocolCanonicalEncodingRules = 0x0105,
/// <summary>
/// The SNMP subset of ASN.1.
/// An OID preceded by a one byte unsigned length appears at the beginning of the data area to indicate which private encoding.
/// </summary>
Asn1SnmpPrivate = 0x01FE,
Asn1SimpleNetworkManagementProtocolPrivate = 0x01FE,
/// <summary>
/// OSI ASN.1 1990 [ASN.1].
......
......@@ -207,7 +207,7 @@ namespace PcapDotNet.Packets.IpV4
/// <summary>
/// BNA
/// </summary>
Bna = 0x31,
BurroughsNetworkArchitecture = 0x31,
/// <summary>
/// ESP. Encapsulating Security Payload RFC 2406.
/// </summary>
......@@ -319,7 +319,7 @@ namespace PcapDotNet.Packets.IpV4
/// <summary>
/// SUN ND PROTOCOL-Temporary
/// </summary>
SunNd = 0x4D,
SunNetworkDisk = 0x4D,
/// <summary>
/// WIDEBAND Monitoring
/// </summary>
......@@ -499,15 +499,15 @@ namespace PcapDotNet.Packets.IpV4
/// <summary>
/// SM
/// </summary>
Sm = 0x7A,
SimpleMulticast = 0x7A,
/// <summary>
/// Performance Transparency Protocol
/// </summary>
PerformanceTransparencyProtocol = 0x7B,
/// <summary>
/// IS-IS over IPv4
/// IS-IS over IPv4
/// </summary>
IsIsOverIpV4 = 0x7C,
IntermediateSystemToIntermediateSystemOverIpV4 = 0x7C,
/// <summary>
///
/// </summary>
......
......@@ -48,7 +48,7 @@ namespace PcapDotNet.Packets.IpV6
/// <summary>
/// Possible Out-of-Sync BCE State.
/// </summary>
PossibleOutOfSyncBceState = 7,
PossibleOutOfSyncBindingCacheEntryState = 7,
/// <summary>
/// Global Revocation Trigger Value.
......
......@@ -137,8 +137,9 @@ namespace PcapDotNet.Packets.IpV6
/// <summary>
/// RFC 4285.
/// MIPV6-AUTH-FAIL.
/// </summary>
MIpV6AuthFail = 146,
MobileIpV6AuthenticationFailed = 146,
/// <summary>
/// RFC 4866.
......@@ -204,8 +205,9 @@ namespace PcapDotNet.Packets.IpV6
/// <summary>
/// RFC 5213.
/// BCE_PBU_PREFIX_SET_DO_NOT_MATCH.
/// </summary>
BceProxyBindingUpdatePrefixSetDoNotMatch = 159,
BindingCacheEntryProxyBindingUpdatePrefixSetDoNotMatch = 159,
/// <summary>
/// RFC 5213.
......
......@@ -254,7 +254,7 @@ namespace PcapDotNet.Packets.IpV6
byte[] domainOfInterpretationBytes = new byte[sizeof(uint)];
domainOfInterpretationBytes.Write(0, (uint)domainOfInterpretation, Endianity.Big);
ushort checksum =
PppFrameCheckSequenceCalculator.CalculateFrameCheckSequence16(
PointToPointProtocolFrameCheckSequenceCalculator.CalculateFrameCheckSequence16(
new byte[0].Concat((byte)IpV6OptionType.Calipso,
(byte)(OptionDataMinimumLength + compartmentBitmap.Length)).Concat(
domainOfInterpretationBytes)
......
......@@ -6,7 +6,7 @@ namespace PcapDotNet.Packets.IpV6
/// <summary>
/// RFC 1662.
/// </summary>
public static class PppFrameCheckSequenceCalculator
public static class PointToPointProtocolFrameCheckSequenceCalculator
{
private const ushort InitialValue = 0xffff;
......
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