diff --git a/source/Cosmos.System2/Network/ARP/ARPPacket.cs b/source/Cosmos.System2/Network/ARP/ARPPacket.cs index 8620d7c57..574cbb591 100644 --- a/source/Cosmos.System2/Network/ARP/ARPPacket.cs +++ b/source/Cosmos.System2/Network/ARP/ARPPacket.cs @@ -109,9 +109,9 @@ namespace Cosmos.System.Network.ARP /// /// Init ARPPacket fields. /// - protected override void initFields() + protected override void InitFields() { - base.initFields(); + base.InitFields(); aHardwareType = (ushort)((RawData[14] << 8) | RawData[15]); aProtocolType = (ushort)((RawData[16] << 8) | RawData[17]); aHardwareLen = RawData[18]; @@ -143,7 +143,7 @@ namespace Cosmos.System.Network.ARP RawData[20] = (byte)(operation >> 8); RawData[21] = (byte)(operation >> 0); - initFields(); + InitFields(); } /// diff --git a/source/Cosmos.System2/Network/ARP/ARPPacket_Ethernet.cs b/source/Cosmos.System2/Network/ARP/ARPPacket_Ethernet.cs index ce7df0ed5..90a568353 100644 --- a/source/Cosmos.System2/Network/ARP/ARPPacket_Ethernet.cs +++ b/source/Cosmos.System2/Network/ARP/ARPPacket_Ethernet.cs @@ -55,9 +55,9 @@ namespace Cosmos.System.Network.ARP /// Init ARPPacket_Ethernet fields. /// /// Thrown if RawData is invalid or null. - protected override void initFields() + protected override void InitFields() { - base.initFields(); + base.InitFields(); mSenderMAC = new MACAddress(RawData, 22); mSenderIP = new Address(RawData, 28); if (SenderIP == null) @@ -94,7 +94,7 @@ namespace Cosmos.System.Network.ARP RawData[38 + i] = targetIP.address[i]; } - initFields(); + InitFields(); } /// diff --git a/source/Cosmos.System2/Network/EthernetPacket.cs b/source/Cosmos.System2/Network/EthernetPacket.cs index 3fa7ad17d..4ae2615b9 100644 --- a/source/Cosmos.System2/Network/EthernetPacket.cs +++ b/source/Cosmos.System2/Network/EthernetPacket.cs @@ -39,13 +39,13 @@ namespace Cosmos.System.Network protected EthernetPacket(byte[] rawData) { RawData = rawData; - initFields(); + InitFields(); } /// /// Init EthernetPacket fields. /// - protected virtual void initFields() + protected virtual void InitFields() { destMAC = new MACAddress(RawData, 0); srcMAC = new MACAddress(RawData, 6); @@ -80,7 +80,7 @@ namespace Cosmos.System.Network RawData[12] = (byte)(type >> 8); RawData[13] = (byte)(type >> 0); - initFields(); + InitFields(); } /// @@ -100,7 +100,7 @@ namespace Cosmos.System.Network { RawData[6 + i] = value.bytes[i]; } - initFields(); + InitFields(); } } @@ -116,7 +116,7 @@ namespace Cosmos.System.Network { RawData[i] = value.bytes[i]; } - initFields(); + InitFields(); } } diff --git a/source/Cosmos.System2/Network/IPV4/UDP/DHCP/DHCPAck.cs b/source/Cosmos.System2/Network/IPV4/UDP/DHCP/DHCPAck.cs index 0d9ac642c..f7b374c85 100644 --- a/source/Cosmos.System2/Network/IPV4/UDP/DHCP/DHCPAck.cs +++ b/source/Cosmos.System2/Network/IPV4/UDP/DHCP/DHCPAck.cs @@ -26,9 +26,9 @@ namespace Cosmos.System.Network.IPv4.UDP.DHCP /// Init DHCPAck fields. /// /// Thrown if RawData is invalid or null. - protected override void initFields() + protected override void InitFields() { - base.initFields(); + base.InitFields(); foreach (var option in Options) { diff --git a/source/Cosmos.System2/Network/IPV4/UDP/DHCP/DHCPDiscover.cs b/source/Cosmos.System2/Network/IPV4/UDP/DHCP/DHCPDiscover.cs index c38be28d2..a9f0f440b 100644 --- a/source/Cosmos.System2/Network/IPV4/UDP/DHCP/DHCPDiscover.cs +++ b/source/Cosmos.System2/Network/IPV4/UDP/DHCP/DHCPDiscover.cs @@ -47,9 +47,9 @@ namespace Cosmos.System.Network.IPv4.UDP.DHCP RawData[291] = 0xff; //ENDMARK } - protected override void initFields() + protected override void InitFields() { - base.initFields(); + base.InitFields(); } } diff --git a/source/Cosmos.System2/Network/IPV4/UDP/DHCP/DHCPPacket.cs b/source/Cosmos.System2/Network/IPV4/UDP/DHCP/DHCPPacket.cs index d89430ad8..2e611a1c2 100644 --- a/source/Cosmos.System2/Network/IPV4/UDP/DHCP/DHCPPacket.cs +++ b/source/Cosmos.System2/Network/IPV4/UDP/DHCP/DHCPPacket.cs @@ -153,16 +153,16 @@ namespace Cosmos.System.Network.IPv4.UDP.DHCP RawData[280] = 0x53; RawData[281] = 0x63; - initFields(); + InitFields(); } /// /// Init DHCPPacket fields. /// /// Thrown if RawData is invalid or null. - protected override void initFields() + protected override void InitFields() { - base.initFields(); + base.InitFields(); MessageType = RawData[42]; Client = new Address(RawData, 58); Server = new Address(RawData, 62); diff --git a/source/Cosmos.System2/Network/IPV4/UDP/DHCP/DHCPRelease.cs b/source/Cosmos.System2/Network/IPV4/UDP/DHCP/DHCPRelease.cs index acdba9ba6..e9d9ff92e 100644 --- a/source/Cosmos.System2/Network/IPV4/UDP/DHCP/DHCPRelease.cs +++ b/source/Cosmos.System2/Network/IPV4/UDP/DHCP/DHCPRelease.cs @@ -66,9 +66,9 @@ namespace Cosmos.System.Network.IPv4.UDP.DHCP /// Init DHCPRelease fields. /// /// Thrown if RawData is invalid or null. - protected override void initFields() + protected override void InitFields() { - base.initFields(); + base.InitFields(); } } diff --git a/source/Cosmos.System2/Network/IPV4/UDP/DHCP/DHCPRequest.cs b/source/Cosmos.System2/Network/IPV4/UDP/DHCP/DHCPRequest.cs index c9cdc055c..7f0153385 100644 --- a/source/Cosmos.System2/Network/IPV4/UDP/DHCP/DHCPRequest.cs +++ b/source/Cosmos.System2/Network/IPV4/UDP/DHCP/DHCPRequest.cs @@ -75,9 +75,9 @@ namespace Cosmos.System.Network.IPv4.UDP.DHCP /// Init DHCPRequest fields. /// /// Thrown if RawData is invalid or null. - protected override void initFields() + protected override void InitFields() { - base.initFields(); + base.InitFields(); } } diff --git a/source/Cosmos.System2/Network/IPV4/UDP/DNS/DNSClient.cs b/source/Cosmos.System2/Network/IPV4/UDP/DNS/DNSClient.cs index daad62894..dec08b9bc 100644 --- a/source/Cosmos.System2/Network/IPV4/UDP/DNS/DNSClient.cs +++ b/source/Cosmos.System2/Network/IPV4/UDP/DNS/DNSClient.cs @@ -23,7 +23,7 @@ namespace Cosmos.System.Network.IPv4.UDP.DNS private string queryurl; /// - /// Create new inctanse of the class. + /// Create new instance of the class. /// /// Thrown on fatal error (contact support). /// Thrown if UdpClient with localPort 53 exists. diff --git a/source/Cosmos.System2/Network/IPV4/UDP/DNS/DNSPacket.cs b/source/Cosmos.System2/Network/IPV4/UDP/DNS/DNSPacket.cs index f85d046ca..6d8102931 100644 --- a/source/Cosmos.System2/Network/IPV4/UDP/DNS/DNSPacket.cs +++ b/source/Cosmos.System2/Network/IPV4/UDP/DNS/DNSPacket.cs @@ -115,16 +115,16 @@ namespace Cosmos.System.Network.IPv4.UDP.DNS RawData[this.DataOffset + 18] = (byte)((0 >> 8) & 0xFF); RawData[this.DataOffset + 19] = (byte)((0 >> 0) & 0xFF); - initFields(); + InitFields(); } /// /// Init DNSPacket fields. /// /// Thrown if RawData is invalid or null. - protected override void initFields() + protected override void InitFields() { - base.initFields(); + base.InitFields(); TransactionID = (UInt16)((RawData[this.DataOffset + 8] << 8) | RawData[this.DataOffset + 9]); DNSFlags = (UInt16)((RawData[this.DataOffset + 10] << 8) | RawData[this.DataOffset + 11]); Questions = (UInt16)((RawData[this.DataOffset + 12] << 8) | RawData[this.DataOffset + 13]); @@ -269,9 +269,9 @@ namespace Cosmos.System.Network.IPv4.UDP.DNS /// Init DNSPacketAsk fields. /// /// Thrown if RawData is invalid or null. - protected override void initFields() + protected override void InitFields() { - base.initFields(); + base.InitFields(); } } @@ -299,9 +299,9 @@ namespace Cosmos.System.Network.IPv4.UDP.DNS /// Init DNSPacketAnswer fields. /// /// Thrown if RawData is invalid or null. - protected override void initFields() + protected override void InitFields() { - base.initFields(); + base.InitFields(); if ((ushort)(DNSFlags & 0x0F) != (ushort)ReplyCode.OK) { diff --git a/source/Cosmos.System2/Network/IPv4/ICMPPacket.cs b/source/Cosmos.System2/Network/IPv4/ICMPPacket.cs index d55214ede..c8094e35a 100644 --- a/source/Cosmos.System2/Network/IPv4/ICMPPacket.cs +++ b/source/Cosmos.System2/Network/IPv4/ICMPPacket.cs @@ -79,10 +79,10 @@ namespace Cosmos.System.Network.IPv4 /// Init ICMPPacket fields.1 /// /// Thrown if RawData is invalid or null. - protected override void initFields() + protected override void InitFields() { - //Sys.Console.WriteLine("ICMPPacket.initFields() called;"); - base.initFields(); + //Sys.Console.WriteLine("ICMPPacket.InitFields() called;"); + base.InitFields(); icmpType = RawData[DataOffset]; icmpCode = RawData[DataOffset + 1]; icmpCRC = (ushort)((RawData[DataOffset + 2] << 8) | RawData[DataOffset + 3]); @@ -115,7 +115,7 @@ namespace Cosmos.System.Network.IPv4 RawData[DataOffset + 2] = (byte)((icmpCRC >> 8) & 0xFF); RawData[DataOffset + 3] = (byte)((icmpCRC >> 0) & 0xFF); - initFields(); + InitFields(); } /// @@ -222,10 +222,10 @@ namespace Cosmos.System.Network.IPv4 RawData[DataOffset + 3] = (byte)((icmpCRC >> 0) & 0xFF); } - protected override void initFields() + protected override void InitFields() { - //Sys.Console.WriteLine("ICMPEchoRequest.initFields() called;"); - base.initFields(); + //Sys.Console.WriteLine("ICMPEchoRequest.InitFields() called;"); + base.InitFields(); icmpID = (ushort)((RawData[DataOffset + 4] << 8) | RawData[DataOffset + 5]); icmpSequence = (ushort)((RawData[DataOffset + 6] << 8) | RawData[DataOffset + 7]); } @@ -277,10 +277,10 @@ namespace Cosmos.System.Network.IPv4 /// Init ICMPEchoReply fields. /// /// Thrown if RawData is invalid or null. - protected override void initFields() + protected override void InitFields() { - //Sys.Console.WriteLine("ICMPEchoReply.initFields() called;"); - base.initFields(); + //Sys.Console.WriteLine("ICMPEchoReply.InitFields() called;"); + base.InitFields(); icmpID = (ushort)((RawData[DataOffset + 4] << 8) | RawData[DataOffset + 5]); icmpSequence = (ushort)((RawData[DataOffset + 6] << 8) | RawData[DataOffset + 7]); } diff --git a/source/Cosmos.System2/Network/IPv4/IPPacket.cs b/source/Cosmos.System2/Network/IPv4/IPPacket.cs index bc43167e5..f5d6350dc 100644 --- a/source/Cosmos.System2/Network/IPv4/IPPacket.cs +++ b/source/Cosmos.System2/Network/IPv4/IPPacket.cs @@ -89,9 +89,9 @@ namespace Cosmos.System.Network.IPv4 /// Init IPPacket fields. /// /// Thrown if RawData is invalid or null. - protected override void initFields() + protected override void InitFields() { - base.initFields(); + base.InitFields(); IPVersion = (byte)((RawData[14] & 0xF0) >> 4); ipHeaderLength = (byte)(RawData[14] & 0x0F); TypeOfService = RawData[15]; @@ -172,7 +172,7 @@ namespace Cosmos.System.Network.IPv4 RawData[24] = (byte)((IPCRC >> 8) & 0xFF); RawData[25] = (byte)((IPCRC >> 0) & 0xFF); - initFields(); + InitFields(); } /// diff --git a/source/Cosmos.System2/Network/IPv4/UDP/UDPPacket.cs b/source/Cosmos.System2/Network/IPv4/UDP/UDPPacket.cs index ce4315f5b..cca779d8e 100644 --- a/source/Cosmos.System2/Network/IPv4/UDP/UDPPacket.cs +++ b/source/Cosmos.System2/Network/IPv4/UDP/UDPPacket.cs @@ -73,14 +73,14 @@ namespace Cosmos.System.Network.IPv4.UDP : base((ushort)(datalength + 8), 17, source, dest, 0x00) { MakePacket(srcport, destport, datalength); - initFields(); + InitFields(); } public UDPPacket(Address source, Address dest, UInt16 srcport, UInt16 destport, UInt16 datalength, MACAddress destmac) : base((ushort)(datalength + 8), 17, source, dest, 0x00, destmac) { MakePacket(srcport, destport, datalength); - initFields(); + InitFields(); } /// @@ -103,7 +103,7 @@ namespace Cosmos.System.Network.IPv4.UDP RawData[this.DataOffset + 8 + b] = data[b]; } - initFields(); + InitFields(); } private void MakePacket(ushort srcport, ushort destport, ushort length) @@ -125,9 +125,9 @@ namespace Cosmos.System.Network.IPv4.UDP /// Init UDPPacket fields. /// /// Thrown if RawData is invalid or null. - protected override void initFields() + protected override void InitFields() { - base.initFields(); + base.InitFields(); SourcePort = (ushort)((RawData[DataOffset] << 8) | RawData[DataOffset + 1]); DestinationPort = (ushort)((RawData[DataOffset + 2] << 8) | RawData[DataOffset + 3]); UDP_Length = (ushort)((RawData[DataOffset + 4] << 8) | RawData[DataOffset + 5]); diff --git a/source/Cosmos.System2/Network/IPv4/UDP/UdpClient.cs b/source/Cosmos.System2/Network/IPv4/UDP/UdpClient.cs index 25eb5b1a4..4702cda71 100644 --- a/source/Cosmos.System2/Network/IPv4/UDP/UdpClient.cs +++ b/source/Cosmos.System2/Network/IPv4/UDP/UdpClient.cs @@ -139,7 +139,7 @@ namespace Cosmos.System.Network.IPv4.UDP { if ((destination == null) || (destinationPort == 0)) { - throw new Exception("Must establish a default remote host by calling Connect() before using this Send() overload"); + throw new InvalidOperationException("Must establish a default remote host by calling Connect() before using this Send() overload"); } Send(data, destination, destinationPort); diff --git a/source/Cosmos.System2/Network/NetworkStack.cs b/source/Cosmos.System2/Network/NetworkStack.cs index 5ba6da6ef..747914b79 100644 --- a/source/Cosmos.System2/Network/NetworkStack.cs +++ b/source/Cosmos.System2/Network/NetworkStack.cs @@ -97,13 +97,7 @@ namespace Cosmos.System.Network /// public static bool ConfigEmpty() { - int counter = 0; - - foreach (NetworkDevice device in NetworkConfig.Keys) - { - counter++; - } - if (counter == 0) + if (NetworkConfig.Keys.Count == 0) { return true; }