diff --git a/server/Configuration.cs b/server/Configuration.cs index 8215fa8..4a35fea 100644 --- a/server/Configuration.cs +++ b/server/Configuration.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Square.INI; +using Glove.INI; -namespace CircleScape { +namespace SockScape { public static class Configuration { private static SettingsFile Settings; diff --git a/server/DAL/Origin.cs b/server/DAL/Origin.cs index 47726f7..1d639d1 100644 --- a/server/DAL/Origin.cs +++ b/server/DAL/Origin.cs @@ -6,7 +6,7 @@ using System.Net; using System.Text; using System.Threading.Tasks; -namespace CircleScape.DAL { +namespace SockScape.DAL { public partial class Origin { public long Id { get; set; } diff --git a/server/DAL/ScapeDb.cs b/server/DAL/ScapeDb.cs index 1f5a0c0..3f1fc56 100644 --- a/server/DAL/ScapeDb.cs +++ b/server/DAL/ScapeDb.cs @@ -1,4 +1,4 @@ -namespace CircleScape.DAL { +namespace SockScape.DAL { using System; using System.Data.Entity; using System.ComponentModel.DataAnnotations.Schema; diff --git a/server/DAL/Session.cs b/server/DAL/Session.cs index 6e39df3..1cfca6c 100644 --- a/server/DAL/Session.cs +++ b/server/DAL/Session.cs @@ -6,7 +6,7 @@ using System.Net; using System.Text; using System.Threading.Tasks; -namespace CircleScape.DAL { +namespace SockScape.DAL { public partial class Session { public long Id { get; set; } diff --git a/server/DAL/User.cs b/server/DAL/User.cs index 6a53c3b..6ce1188 100644 --- a/server/DAL/User.cs +++ b/server/DAL/User.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace CircleScape.DAL { +namespace SockScape.DAL { public partial class User { public long Id { get; set; } diff --git a/server/Encryption/Cipher.cs b/server/Encryption/Cipher.cs index f0afa85..6fdd81a 100644 --- a/server/Encryption/Cipher.cs +++ b/server/Encryption/Cipher.cs @@ -4,9 +4,9 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Numerics; -using Square; +using Glove; -namespace CircleScape.Encryption { +namespace SockScape.Encryption { class Cipher { private byte[] Key = new byte[512 / 8]; private byte[] State = new byte[256]; diff --git a/server/Encryption/KeyExchange.cs b/server/Encryption/KeyExchange.cs index 10b8899..764109b 100644 --- a/server/Encryption/KeyExchange.cs +++ b/server/Encryption/KeyExchange.cs @@ -4,10 +4,10 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Numerics; -using Square; +using Glove; using System.Globalization; -namespace CircleScape.Encryption { +namespace SockScape.Encryption { class Key { private readonly static BigInteger Secret = RNG.NextPrime(512 / 8); public BigInteger Generator { get; private set; } = 2; diff --git a/server/Entrypoint.cs b/server/Entrypoint.cs index 729489b..e8e99f9 100644 --- a/server/Entrypoint.cs +++ b/server/Entrypoint.cs @@ -5,11 +5,11 @@ using System.Text; using System.Threading.Tasks; //using CircleScape.DAL; using System.Numerics; -using Square; +using Glove; using System.Net; using Kneesocks; -namespace CircleScape { +namespace SockScape { class Entrypoint { static void Main(string[] args) { diff --git a/server/Libraries/Square/ArrayExtensions.cs b/server/Libraries/Glove/ArrayExtensions.cs similarity index 99% rename from server/Libraries/Square/ArrayExtensions.cs rename to server/Libraries/Glove/ArrayExtensions.cs index 1c991c6..36b9be7 100644 --- a/server/Libraries/Square/ArrayExtensions.cs +++ b/server/Libraries/Glove/ArrayExtensions.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Square { +namespace Glove { public static class ArrayExtensions { public static T[] Subset(this T[] arr, int offset, int count = -1) { var arrEnum = arr.AsEnumerable(); diff --git a/server/Libraries/Square/CryptoExtensions.cs b/server/Libraries/Glove/CryptoExtensions.cs similarity index 97% rename from server/Libraries/Square/CryptoExtensions.cs rename to server/Libraries/Glove/CryptoExtensions.cs index 6083f3f..7a403ef 100644 --- a/server/Libraries/Square/CryptoExtensions.cs +++ b/server/Libraries/Glove/CryptoExtensions.cs @@ -5,7 +5,7 @@ using System.Security.Cryptography; using System.Text; using System.Threading.Tasks; -namespace Square { +namespace Glove { public static class CryptoExtensions { public static byte[] SHA1(this string str) => Encoding.UTF8.GetBytes(str).SHA1(); diff --git a/server/Libraries/Square/General.cs b/server/Libraries/Glove/General.cs similarity index 93% rename from server/Libraries/Square/General.cs rename to server/Libraries/Glove/General.cs index 8c354de..c4e893a 100644 --- a/server/Libraries/Square/General.cs +++ b/server/Libraries/Glove/General.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Square { +namespace Glove { public static class Utils { public static void Swap(ref T a, ref T b) { T c = a; diff --git a/server/Libraries/Square/Square.csproj b/server/Libraries/Glove/Glove.csproj similarity index 100% rename from server/Libraries/Square/Square.csproj rename to server/Libraries/Glove/Glove.csproj diff --git a/server/Libraries/Square/INI/Instance.cs b/server/Libraries/Glove/INI/Instance.cs similarity index 98% rename from server/Libraries/Square/INI/Instance.cs rename to server/Libraries/Glove/INI/Instance.cs index 376a94b..4d343c8 100644 --- a/server/Libraries/Square/INI/Instance.cs +++ b/server/Libraries/Glove/INI/Instance.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Square.INI { +namespace Glove.INI { public class Instance : IEnumerable> { private Dictionary Data = new Dictionary(StringComparer.OrdinalIgnoreCase); diff --git a/server/Libraries/Square/INI/Section.cs b/server/Libraries/Glove/INI/Section.cs similarity index 97% rename from server/Libraries/Square/INI/Section.cs rename to server/Libraries/Glove/INI/Section.cs index 374caeb..c25ef9e 100644 --- a/server/Libraries/Square/INI/Section.cs +++ b/server/Libraries/Glove/INI/Section.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Square.INI { +namespace Glove.INI { public class Section : IEnumerable { private List Instances = new List(); diff --git a/server/Libraries/Square/INI/SectionRules.cs b/server/Libraries/Glove/INI/SectionRules.cs similarity index 94% rename from server/Libraries/Square/INI/SectionRules.cs rename to server/Libraries/Glove/INI/SectionRules.cs index 1326154..bf65076 100644 --- a/server/Libraries/Square/INI/SectionRules.cs +++ b/server/Libraries/Glove/INI/SectionRules.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Square.INI { +namespace Glove.INI { public class SectionRules { public string Name { get; set; } public bool Required { get; set; } = true; diff --git a/server/Libraries/Square/INI/SettingsFile.cs b/server/Libraries/Glove/INI/SettingsFile.cs similarity index 99% rename from server/Libraries/Square/INI/SettingsFile.cs rename to server/Libraries/Glove/INI/SettingsFile.cs index a595ea3..1134d05 100644 --- a/server/Libraries/Square/INI/SettingsFile.cs +++ b/server/Libraries/Glove/INI/SettingsFile.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Square.INI { +namespace Glove.INI { public class SettingsFile { private Dictionary Sections = new Dictionary(StringComparer.OrdinalIgnoreCase); diff --git a/server/Libraries/Square/INI/Value.cs b/server/Libraries/Glove/INI/Value.cs similarity index 97% rename from server/Libraries/Square/INI/Value.cs rename to server/Libraries/Glove/INI/Value.cs index 6c9884b..2ab74a7 100644 --- a/server/Libraries/Square/INI/Value.cs +++ b/server/Libraries/Glove/INI/Value.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Square.INI { +namespace Glove.INI { public class Value { private string Raw; diff --git a/server/Libraries/Square/NumericExtensions.cs b/server/Libraries/Glove/NumericExtensions.cs similarity index 99% rename from server/Libraries/Square/NumericExtensions.cs rename to server/Libraries/Glove/NumericExtensions.cs index 6a7135c..177edd9 100644 --- a/server/Libraries/Square/NumericExtensions.cs +++ b/server/Libraries/Glove/NumericExtensions.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; using System.Numerics; using System.Globalization; -namespace Square { +namespace Glove { public static class NumericExtensions { public static byte[] Pack(this Single value) => BitConverter.GetBytes(value).HostToNetworkOrder(); diff --git a/server/Libraries/Square/Properties/AssemblyInfo.cs b/server/Libraries/Glove/Properties/AssemblyInfo.cs similarity index 100% rename from server/Libraries/Square/Properties/AssemblyInfo.cs rename to server/Libraries/Glove/Properties/AssemblyInfo.cs diff --git a/server/Libraries/Square/RandomContext.cs b/server/Libraries/Glove/RandomContext.cs similarity index 99% rename from server/Libraries/Square/RandomContext.cs rename to server/Libraries/Glove/RandomContext.cs index 66b3224..07040d1 100644 --- a/server/Libraries/Square/RandomContext.cs +++ b/server/Libraries/Glove/RandomContext.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using System.Numerics; -namespace Square { +namespace Glove { public static class RNG { private static Random RandCtx = new Random(); diff --git a/server/Libraries/Square/StringExtensions.cs b/server/Libraries/Glove/StringExtensions.cs similarity index 98% rename from server/Libraries/Square/StringExtensions.cs rename to server/Libraries/Glove/StringExtensions.cs index e7f570b..29bb093 100644 --- a/server/Libraries/Square/StringExtensions.cs +++ b/server/Libraries/Glove/StringExtensions.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Square { +namespace Glove { public static class StringExtensions { public static byte[] GetBytes(this string str, bool isUtf8 = true) => isUtf8 ? Encoding.UTF8.GetBytes(str) diff --git a/server/Libraries/Kneesocks/Connection.cs b/server/Libraries/Kneesocks/Connection.cs index cfd849d..22cba31 100644 --- a/server/Libraries/Kneesocks/Connection.cs +++ b/server/Libraries/Kneesocks/Connection.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Net.Sockets; using System.Text; using System.Threading.Tasks; -using Square; +using Glove; using System.IO; using System.Net; diff --git a/server/Libraries/Kneesocks/Frame.cs b/server/Libraries/Kneesocks/Frame.cs index 30611c5..8992074 100644 --- a/server/Libraries/Kneesocks/Frame.cs +++ b/server/Libraries/Kneesocks/Frame.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Square; +using Glove; namespace Kneesocks { public class Frame { diff --git a/server/Libraries/Kneesocks/Handshake.cs b/server/Libraries/Kneesocks/Handshake.cs index d4b4bfa..e9827d9 100644 --- a/server/Libraries/Kneesocks/Handshake.cs +++ b/server/Libraries/Kneesocks/Handshake.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Square; +using Glove; namespace Kneesocks { public class Handshake { diff --git a/server/Libraries/Kneesocks/Kneesocks.csproj b/server/Libraries/Kneesocks/Kneesocks.csproj index 0f59bb6..82f4a3b 100644 --- a/server/Libraries/Kneesocks/Kneesocks.csproj +++ b/server/Libraries/Kneesocks/Kneesocks.csproj @@ -50,9 +50,9 @@ - + {054f172e-9683-40bc-8bdd-7671340ec193} - Square + Glove diff --git a/server/Migrations/201706040437361_Initial.Designer.cs b/server/Migrations/201706040437361_Initial.Designer.cs index 33c7e11..bcaed10 100644 --- a/server/Migrations/201706040437361_Initial.Designer.cs +++ b/server/Migrations/201706040437361_Initial.Designer.cs @@ -1,5 +1,5 @@ // -namespace CircleScape.Migrations +namespace SocjScape.Migrations { using System.CodeDom.Compiler; using System.Data.Entity.Migrations; diff --git a/server/Migrations/201706040437361_Initial.cs b/server/Migrations/201706040437361_Initial.cs index c85cc5e..6924e5c 100644 --- a/server/Migrations/201706040437361_Initial.cs +++ b/server/Migrations/201706040437361_Initial.cs @@ -1,4 +1,4 @@ -namespace CircleScape.Migrations +namespace SockScape.Migrations { using System; using System.Data.Entity.Migrations; diff --git a/server/Migrations/Configuration.cs b/server/Migrations/Configuration.cs index d299984..c3ac6e9 100644 --- a/server/Migrations/Configuration.cs +++ b/server/Migrations/Configuration.cs @@ -1,11 +1,11 @@ -namespace CircleScape.Migrations +namespace SockScape.Migrations { using System; using System.Data.Entity; using System.Data.Entity.Migrations; using System.Linq; - internal sealed class Configuration : DbMigrationsConfiguration + internal sealed class Configuration : DbMigrationsConfiguration { public Configuration() { @@ -13,7 +13,7 @@ namespace CircleScape.Migrations AutomaticMigrationsEnabled = false; } - protected override void Seed(CircleScape.DAL.ScapeDb context) + protected override void Seed(SockScape.DAL.ScapeDb context) { // This method will be called after migrating to the latest version. diff --git a/server/ServerList.cs b/server/ServerList.cs index 6bc41f9..f4e2836 100644 --- a/server/ServerList.cs +++ b/server/ServerList.cs @@ -5,7 +5,7 @@ using System.Net; using System.Text; using System.Threading.Tasks; -namespace CircleScape { +namespace SockScape { static class ServerList { public static Dictionary Servers { get; private set; } = new Dictionary(); diff --git a/server/CircleScape.csproj b/server/SockScape.csproj similarity index 98% rename from server/CircleScape.csproj rename to server/SockScape.csproj index d6090e5..bbf7c87 100644 --- a/server/CircleScape.csproj +++ b/server/SockScape.csproj @@ -125,9 +125,9 @@ {347353f6-cecd-4895-8717-2b5394ac71cc} Kneesocks - + {054f172e-9683-40bc-8bdd-7671340ec193} - Square + Glove diff --git a/server/CircleScape.sln b/server/SockScape.sln similarity index 84% rename from server/CircleScape.sln rename to server/SockScape.sln index 1289dc0..782d721 100644 --- a/server/CircleScape.sln +++ b/server/SockScape.sln @@ -1,13 +1,13 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26430.6 +VisualStudioVersion = 15.0.26403.7 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CircleScape", "CircleScape.csproj", "{438DBAC1-BA37-40BB-9CCE-0FE1F23C6DC5}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SockScape", "SockScape.csproj", "{438DBAC1-BA37-40BB-9CCE-0FE1F23C6DC5}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kneesocks", "Libraries\Kneesocks\Kneesocks.csproj", "{347353F6-CECD-4895-8717-2B5394AC71CC}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Square", "Libraries\Square\Square.csproj", "{054F172E-9683-40BC-8BDD-7671340EC193}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Glove", "Libraries\Glove\Glove.csproj", "{054F172E-9683-40BC-8BDD-7671340EC193}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/server/Socks/MasterConnection.cs b/server/Socks/MasterConnection.cs index cf8b4ce..b65d0f7 100644 --- a/server/Socks/MasterConnection.cs +++ b/server/Socks/MasterConnection.cs @@ -4,9 +4,9 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using Kneesocks; -using Square; +using Glove; -namespace CircleScape.Socks { +namespace SockScape.Socks { class MasterConnection : Connection { } diff --git a/server/Socks/MasterUdpClient.cs b/server/Socks/MasterUdpClient.cs index e0e8778..ce51ef6 100644 --- a/server/Socks/MasterUdpClient.cs +++ b/server/Socks/MasterUdpClient.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace CircleScape.Socks { +namespace SockScape.Socks { class MasterUdpClient { } diff --git a/server/Socks/MasterUdpServer.cs b/server/Socks/MasterUdpServer.cs index 24b09a6..3b3d986 100644 --- a/server/Socks/MasterUdpServer.cs +++ b/server/Socks/MasterUdpServer.cs @@ -7,7 +7,7 @@ using System.Text; using System.Threading; using System.Threading.Tasks; -namespace CircleScape.Socks { +namespace SockScape.Socks { static class MasterUdpServer { private static UdpClient Sock; private static Thread ListeningThread = null; diff --git a/server/Socks/Packet.cs b/server/Socks/Packet.cs index a623293..51f55f9 100644 --- a/server/Socks/Packet.cs +++ b/server/Socks/Packet.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Square; +using Glove; -namespace CircleScape { +namespace SockScape { class Packet { public enum kId { KeyExchange = 0, diff --git a/server/Socks/PlayerConnection.cs b/server/Socks/PlayerConnection.cs index 0405593..eb068bb 100644 --- a/server/Socks/PlayerConnection.cs +++ b/server/Socks/PlayerConnection.cs @@ -5,10 +5,10 @@ using System.Net.Sockets; using System.Text; using System.Threading.Tasks; using Kneesocks; -using Square; -using CircleScape.Encryption; +using Glove; +using SockScape.Encryption; -namespace CircleScape { +namespace SockScape { class PlayerConnection : Connection { private DateTime ConnectionOpened; private Key Key; diff --git a/server/What/INIFile.cs b/server/What/INIFile.cs deleted file mode 100644 index f74d857..0000000 --- a/server/What/INIFile.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; - -namespace What -{ - public class INIFile { - - } -} diff --git a/server/What/What.csproj b/server/What/What.csproj deleted file mode 100644 index 954020d..0000000 --- a/server/What/What.csproj +++ /dev/null @@ -1,7 +0,0 @@ - - - - netstandard1.4 - - - \ No newline at end of file