From cd17ab1cd833bc83d3f619a367a860ea57694d08 Mon Sep 17 00:00:00 2001 From: icedream Date: Wed, 7 May 2014 17:42:51 +0200 Subject: [PATCH] Removing wrongly capitalized files. --- .../AuthenticateExternalStatusMessage.cs | 12 -- .../Rpc/Packets/AuthenticateResultMessage.cs | 18 --- .../Packets/AuthenticateWithTokenMessage.cs | 12 -- src/libnpsharp/Rpc/Packets/CloseAppMessage.cs | 12 -- src/libnpsharp/Rpc/Packets/HelloMessage.cs | 22 --- .../Rpc/Packets/MessagingSendDataMessage.cs | 15 -- src/libnpsharp/Rpc/Packets/PacketAttribute.cs | 14 -- .../Rpc/Packets/RpcClientMessage.cs | 30 ---- src/libnpsharp/Rpc/Packets/RpcMessage.cs | 15 -- .../Rpc/Packets/RpcServerMessage.cs | 67 --------- .../Packets/StorageGetPublisherFileMessage.cs | 12 -- .../Rpc/Packets/StorageGetUserFileMessage.cs | 15 -- .../Packets/StoragePublisherFileMessage.cs | 18 --- .../Packets/StorageSendRandomStringMessage.cs | 12 -- .../Rpc/Packets/StorageUserFileMessage.cs | 21 --- .../Packets/StorageWriteUserFileMessage.cs | 18 --- .../StorageWriteUserFileResultMessage.cs | 18 --- src/libnpsharp/Rpc/RpcClientStream.cs | 128 ------------------ 18 files changed, 459 deletions(-) delete mode 100644 src/libnpsharp/Rpc/Packets/AuthenticateExternalStatusMessage.cs delete mode 100644 src/libnpsharp/Rpc/Packets/AuthenticateResultMessage.cs delete mode 100644 src/libnpsharp/Rpc/Packets/AuthenticateWithTokenMessage.cs delete mode 100644 src/libnpsharp/Rpc/Packets/CloseAppMessage.cs delete mode 100644 src/libnpsharp/Rpc/Packets/HelloMessage.cs delete mode 100644 src/libnpsharp/Rpc/Packets/MessagingSendDataMessage.cs delete mode 100644 src/libnpsharp/Rpc/Packets/PacketAttribute.cs delete mode 100644 src/libnpsharp/Rpc/Packets/RpcClientMessage.cs delete mode 100644 src/libnpsharp/Rpc/Packets/RpcMessage.cs delete mode 100644 src/libnpsharp/Rpc/Packets/RpcServerMessage.cs delete mode 100644 src/libnpsharp/Rpc/Packets/StorageGetPublisherFileMessage.cs delete mode 100644 src/libnpsharp/Rpc/Packets/StorageGetUserFileMessage.cs delete mode 100644 src/libnpsharp/Rpc/Packets/StoragePublisherFileMessage.cs delete mode 100644 src/libnpsharp/Rpc/Packets/StorageSendRandomStringMessage.cs delete mode 100644 src/libnpsharp/Rpc/Packets/StorageUserFileMessage.cs delete mode 100644 src/libnpsharp/Rpc/Packets/StorageWriteUserFileMessage.cs delete mode 100644 src/libnpsharp/Rpc/Packets/StorageWriteUserFileResultMessage.cs delete mode 100644 src/libnpsharp/Rpc/RpcClientStream.cs diff --git a/src/libnpsharp/Rpc/Packets/AuthenticateExternalStatusMessage.cs b/src/libnpsharp/Rpc/Packets/AuthenticateExternalStatusMessage.cs deleted file mode 100644 index 78f2f56..0000000 --- a/src/libnpsharp/Rpc/Packets/AuthenticateExternalStatusMessage.cs +++ /dev/null @@ -1,12 +0,0 @@ -using ProtoBuf; - -namespace NPSharp.RPC.Packets -{ - [Packet(1006)] - [ProtoContract] - class AuthenticateExternalStatusMessage : RPCServerMessage - { - [ProtoMember(1)] - public int Status { get; set; } - } -} \ No newline at end of file diff --git a/src/libnpsharp/Rpc/Packets/AuthenticateResultMessage.cs b/src/libnpsharp/Rpc/Packets/AuthenticateResultMessage.cs deleted file mode 100644 index 42cb81c..0000000 --- a/src/libnpsharp/Rpc/Packets/AuthenticateResultMessage.cs +++ /dev/null @@ -1,18 +0,0 @@ -using ProtoBuf; - -namespace NPSharp.RPC.Packets -{ - [Packet(1010)] - [ProtoContract] - class AuthenticateResultMessage : RPCServerMessage - { - [ProtoMember(1)] - public int Result { get; set; } - - [ProtoMember(2)] - public ulong NPID { get; set; } - - [ProtoMember(3)] - public string SessionToken { get; set; } - } -} \ No newline at end of file diff --git a/src/libnpsharp/Rpc/Packets/AuthenticateWithTokenMessage.cs b/src/libnpsharp/Rpc/Packets/AuthenticateWithTokenMessage.cs deleted file mode 100644 index eff3199..0000000 --- a/src/libnpsharp/Rpc/Packets/AuthenticateWithTokenMessage.cs +++ /dev/null @@ -1,12 +0,0 @@ -using ProtoBuf; - -namespace NPSharp.RPC.Packets -{ - [Packet(1003)] - [ProtoContract] - class AuthenticateWithTokenMessage : RPCClientMessage - { - [ProtoMember(1)] - public string Token { get; set; } - } -} diff --git a/src/libnpsharp/Rpc/Packets/CloseAppMessage.cs b/src/libnpsharp/Rpc/Packets/CloseAppMessage.cs deleted file mode 100644 index 2dd2710..0000000 --- a/src/libnpsharp/Rpc/Packets/CloseAppMessage.cs +++ /dev/null @@ -1,12 +0,0 @@ -using ProtoBuf; - -namespace NPSharp.RPC.Packets -{ - [Packet(2001)] - [ProtoContract] - class CloseAppMessage : RPCServerMessage - { - [ProtoMember(1)] - public string Reason { get; set; } - } -} \ No newline at end of file diff --git a/src/libnpsharp/Rpc/Packets/HelloMessage.cs b/src/libnpsharp/Rpc/Packets/HelloMessage.cs deleted file mode 100644 index 42cb333..0000000 --- a/src/libnpsharp/Rpc/Packets/HelloMessage.cs +++ /dev/null @@ -1,22 +0,0 @@ -using ProtoBuf; - -namespace NPSharp.RPC.Packets -{ - [Packet(1000)] - [ProtoContract] - class HelloMessage : RPCServerMessage - { - // I seriously have no idea where in the code this is used but whatever - [ProtoMember(1)] - public int Number1 { get; set; } - - [ProtoMember(2)] - public int Number2 { get; set; } - - [ProtoMember(3)] - public string Name { get; set; } - - [ProtoMember(4)] - public string String2 { get; set; } - } -} diff --git a/src/libnpsharp/Rpc/Packets/MessagingSendDataMessage.cs b/src/libnpsharp/Rpc/Packets/MessagingSendDataMessage.cs deleted file mode 100644 index 360787c..0000000 --- a/src/libnpsharp/Rpc/Packets/MessagingSendDataMessage.cs +++ /dev/null @@ -1,15 +0,0 @@ -using ProtoBuf; - -namespace NPSharp.RPC.Packets -{ - [Packet(2002)] - [ProtoContract] - class MessagingSendDataMessage : RPCClientMessage - { - [ProtoMember(1)] - public ulong NPID { get; set; } - - [ProtoMember(2)] - public byte[] Data { get; set; } - } -} \ No newline at end of file diff --git a/src/libnpsharp/Rpc/Packets/PacketAttribute.cs b/src/libnpsharp/Rpc/Packets/PacketAttribute.cs deleted file mode 100644 index ed5124b..0000000 --- a/src/libnpsharp/Rpc/Packets/PacketAttribute.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; - -namespace NPSharp.RPC.Packets -{ - class PacketAttribute : Attribute - { - public PacketAttribute(uint type) - { - Type = type; - } - - public uint Type { get; set; } - } -} diff --git a/src/libnpsharp/Rpc/Packets/RpcClientMessage.cs b/src/libnpsharp/Rpc/Packets/RpcClientMessage.cs deleted file mode 100644 index d08ae6f..0000000 --- a/src/libnpsharp/Rpc/Packets/RpcClientMessage.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Net; - -namespace NPSharp.RPC.Packets -{ - public class RPCClientMessage : RPCMessage - { - public byte[] Serialize(uint id) - { - byte[] content; - using (var bufferStream = new MemoryStream()) - { - ProtoBuf.Serializer.Serialize(bufferStream, this); - bufferStream.Seek(0, SeekOrigin.Begin); - content = bufferStream.ToArray(); - } - - var buffer = new List(); - buffer.AddRange(BitConverter.GetBytes((uint)IPAddress.HostToNetworkOrder(Signature))); - buffer.AddRange(BitConverter.GetBytes((uint)IPAddress.HostToNetworkOrder(content.Length))); - buffer.AddRange(BitConverter.GetBytes((uint)IPAddress.HostToNetworkOrder(GetTypeId()))); - buffer.AddRange(BitConverter.GetBytes((uint)IPAddress.HostToNetworkOrder(id))); - buffer.AddRange(content); - - return buffer.ToArray(); - } - } -} \ No newline at end of file diff --git a/src/libnpsharp/Rpc/Packets/RpcMessage.cs b/src/libnpsharp/Rpc/Packets/RpcMessage.cs deleted file mode 100644 index 7712425..0000000 --- a/src/libnpsharp/Rpc/Packets/RpcMessage.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System.Linq; - -namespace NPSharp.RPC.Packets -{ - public class RPCMessage - { - internal const uint Signature = 0xDEADC0DE; // I wonder if aiw3 changed this since kernal noted it in his source code. - - public uint GetTypeId() - { - var packet = (PacketAttribute) GetType().GetCustomAttributes(typeof (PacketAttribute), false).Single(); - return packet.Type; - } - } -} diff --git a/src/libnpsharp/Rpc/Packets/RpcServerMessage.cs b/src/libnpsharp/Rpc/Packets/RpcServerMessage.cs deleted file mode 100644 index 84de050..0000000 --- a/src/libnpsharp/Rpc/Packets/RpcServerMessage.cs +++ /dev/null @@ -1,67 +0,0 @@ -using System; -using System.Diagnostics; -using System.IO; -using System.Linq; -using System.Net; -using System.Net.Sockets; -using System.Reflection; - -namespace NPSharp.RPC.Packets -{ - public class RPCServerMessage : RPCMessage - { - public uint MessageId { get; private set; } - - public static RPCServerMessage Deserialize(NetworkStream ns) - { - var header = new byte[16]; - var l = ns.Read(header, 0, header.Length); - if (l == 0) - return null; - if (l < 16) - throw new ProtocolViolationException("Received incomplete header"); - - var signature = (uint)IPAddress.NetworkToHostOrder(BitConverter.ToUInt32(header, 0)); - var length = (uint)IPAddress.NetworkToHostOrder(BitConverter.ToUInt32(header, 4)); - var type = (uint)IPAddress.NetworkToHostOrder(BitConverter.ToUInt32(header, 8)); - var buffer = new byte[length]; - ns.Read(buffer, 0, buffer.Length); - - if (signature != Signature) - throw new ProtocolViolationException("Received packet with invalid signature"); - - RPCServerMessage packet; - - using (var ms = new MemoryStream(buffer)) - { - var types = Assembly.GetExecutingAssembly().GetTypes().Where( - t => - t.IsSubclassOf(typeof (RPCServerMessage)) - && - ((PacketAttribute) t.GetCustomAttributes(typeof (PacketAttribute), false).Single()).Type == type - ).ToArray(); - if (!types.Any()) - { - throw new ProtocolViolationException("Received packet of unknown type"); - } - if (types.Count() > 1) - { -#if DEBUG - Debug.Fail(string.Format("Bug in program code: Found more than 1 type for packet ID {0}", type)); -#else - // TODO: log4net - return null; -#endif - } - packet = (RPCServerMessage)ProtoBuf.Serializer.NonGeneric.Deserialize( - types.Single(), - ms - ); - } - - packet.MessageId = (uint)IPAddress.NetworkToHostOrder(BitConverter.ToUInt32(header, 12)); - - return packet; - } - } -} \ No newline at end of file diff --git a/src/libnpsharp/Rpc/Packets/StorageGetPublisherFileMessage.cs b/src/libnpsharp/Rpc/Packets/StorageGetPublisherFileMessage.cs deleted file mode 100644 index 86b6732..0000000 --- a/src/libnpsharp/Rpc/Packets/StorageGetPublisherFileMessage.cs +++ /dev/null @@ -1,12 +0,0 @@ -using ProtoBuf; - -namespace NPSharp.RPC.Packets -{ - [ProtoContract] - [Packet(1101)] - class StorageGetPublisherFileMessage : RPCClientMessage - { - [ProtoMember(1)] - public string FileName { get; set; } - } -} diff --git a/src/libnpsharp/Rpc/Packets/StorageGetUserFileMessage.cs b/src/libnpsharp/Rpc/Packets/StorageGetUserFileMessage.cs deleted file mode 100644 index 0b27e3b..0000000 --- a/src/libnpsharp/Rpc/Packets/StorageGetUserFileMessage.cs +++ /dev/null @@ -1,15 +0,0 @@ -using ProtoBuf; - -namespace NPSharp.RPC.Packets -{ - [Packet(1102)] - [ProtoContract] - class StorageGetUserFileMessage : RPCClientMessage - { - [ProtoMember(1)] - public string FileName { get; set; } - - [ProtoMember(2)] - public ulong NPID { get; set; } // SERIOUSLY WHY IS THIS EVEN HERE - } -} \ No newline at end of file diff --git a/src/libnpsharp/Rpc/Packets/StoragePublisherFileMessage.cs b/src/libnpsharp/Rpc/Packets/StoragePublisherFileMessage.cs deleted file mode 100644 index 77881b2..0000000 --- a/src/libnpsharp/Rpc/Packets/StoragePublisherFileMessage.cs +++ /dev/null @@ -1,18 +0,0 @@ -using ProtoBuf; - -namespace NPSharp.RPC.Packets -{ - [Packet(1111)] - [ProtoContract] - class StoragePublisherFileMessage : RPCServerMessage - { - [ProtoMember(1)] - public int Result { get; set; } - - [ProtoMember(2)] - public string FileName { get; set; } - - [ProtoMember(3)] - public byte[] FileData { get; set; } - } -} \ No newline at end of file diff --git a/src/libnpsharp/Rpc/Packets/StorageSendRandomStringMessage.cs b/src/libnpsharp/Rpc/Packets/StorageSendRandomStringMessage.cs deleted file mode 100644 index 6943bf7..0000000 --- a/src/libnpsharp/Rpc/Packets/StorageSendRandomStringMessage.cs +++ /dev/null @@ -1,12 +0,0 @@ -using ProtoBuf; - -namespace NPSharp.RPC.Packets -{ - [Packet(1104)] - [ProtoContract] - class StorageSendRandomStringMessage : RPCClientMessage - { - [ProtoMember(1)] - public string RandomString { get; set; } - } -} \ No newline at end of file diff --git a/src/libnpsharp/Rpc/Packets/StorageUserFileMessage.cs b/src/libnpsharp/Rpc/Packets/StorageUserFileMessage.cs deleted file mode 100644 index 3a2b85a..0000000 --- a/src/libnpsharp/Rpc/Packets/StorageUserFileMessage.cs +++ /dev/null @@ -1,21 +0,0 @@ -using ProtoBuf; - -namespace NPSharp.RPC.Packets -{ - [Packet(1112)] - [ProtoContract] - class StorageUserFileMessage : RPCServerMessage - { - [ProtoMember(1)] - public int Result { get; set; } - - [ProtoMember(2)] - public string FileName { get; set; } - - [ProtoMember(3)] - public ulong NPID { get; set; } - - [ProtoMember(4)] - public byte[] FileData { get; set; } - } -} \ No newline at end of file diff --git a/src/libnpsharp/Rpc/Packets/StorageWriteUserFileMessage.cs b/src/libnpsharp/Rpc/Packets/StorageWriteUserFileMessage.cs deleted file mode 100644 index b9a9dd9..0000000 --- a/src/libnpsharp/Rpc/Packets/StorageWriteUserFileMessage.cs +++ /dev/null @@ -1,18 +0,0 @@ -using ProtoBuf; - -namespace NPSharp.RPC.Packets -{ - [Packet(1103)] - [ProtoContract] - class StorageWriteUserFileMessage : RPCClientMessage - { - [ProtoMember(1)] - public string FileName { get; set; } - - [ProtoMember(2)] - public ulong NPID { get; set; } - - [ProtoMember(3)] - public byte[] FileData { get; set; } - } -} \ No newline at end of file diff --git a/src/libnpsharp/Rpc/Packets/StorageWriteUserFileResultMessage.cs b/src/libnpsharp/Rpc/Packets/StorageWriteUserFileResultMessage.cs deleted file mode 100644 index 8c7f463..0000000 --- a/src/libnpsharp/Rpc/Packets/StorageWriteUserFileResultMessage.cs +++ /dev/null @@ -1,18 +0,0 @@ -using ProtoBuf; - -namespace NPSharp.RPC.Packets -{ - [Packet(1113)] - [ProtoContract] - class StorageWriteUserFileResultMessage : RPCServerMessage - { - [ProtoMember(1)] - public int Result { get; set; } - - [ProtoMember(2)] - public string FileName { get; set; } - - [ProtoMember(3)] - public ulong NPID { get; set; } - } -} \ No newline at end of file diff --git a/src/libnpsharp/Rpc/RpcClientStream.cs b/src/libnpsharp/Rpc/RpcClientStream.cs deleted file mode 100644 index c09522c..0000000 --- a/src/libnpsharp/Rpc/RpcClientStream.cs +++ /dev/null @@ -1,128 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Net.Sockets; -using NPSharp.RPC.Packets; - -namespace NPSharp.RPC -{ - /// - /// Represents a low-level client stream which can communicate with an NP server using RPC packets. - /// - public class RPCClientStream - { - private NetworkStream _ns; - private uint _id; - - private readonly string _host; - private readonly ushort _port; - - private readonly Dictionary> _callbacks = new Dictionary>(); - - /// - /// Initializes an RPC connection stream with a specified host and port. - /// - /// The host to connect to. - /// The port to use. Default: 3025. - public RPCClientStream(string host, ushort port = 3025) - { - _host = host; - _port = port; - } - - /// - /// Opens the RPC stream to the NP server. - /// - /// True if the connection succeeded, otherwise false. - public bool Open() - { - // Connection already established? - if (_ns != null) - throw new InvalidOperationException("Connection already opened"); - - var tcp = new TcpClient(); - try - { - tcp.Connect(_host, _port); - } - catch - { - return false; - } - _ns = tcp.GetStream(); - return true; - } - - /// - /// Closes the connection with the NP server. - /// - /// - public void Close(int timeout = 2000) - { - // Connection already closed? - if (_ns == null) - throw new InvalidOperationException("Connection already closed"); - - try - { - _ns.Close(timeout); - _ns.Dispose(); - } - finally - { - _ns = null; - } - } - - /// - /// Attaches a callback to the next message being sent out. This allows handling response packets. - /// - /// The method to call when we receive a response to the next message - public void AttachCallback(Action callback) - { - if (_callbacks.ContainsKey(_id)) - throw new Exception("There is already a callback for the current message. You can only add max. one callback."); - _callbacks.Add(_id, callback); - } - - // TODO: Exposure of message ID needed or no? - /// - /// Sends out an RPC message. - /// - /// The RPC message to send out. - /// The new ID of the message. - public uint Send(RPCClientMessage message) - { - if (_ns == null) - throw new InvalidOperationException("You need to open the stream first."); - - var buffer = message.Serialize(_id); - - _ns.Write(buffer, 0, buffer.Length); - - return _id++; - } - - /// - /// Waits for the next RPC message from the server and reads it. - /// - /// The received server message. - public RPCServerMessage Read() - { - if (_ns == null) - throw new InvalidOperationException("You need to open the stream first."); - - var message = RPCServerMessage.Deserialize(_ns); - - if (message == null) - return null; - - if (!_callbacks.ContainsKey(message.MessageId)) - return message; - - _callbacks[message.MessageId].Invoke(message); - _callbacks.Remove(message.MessageId); - - return message; - } - } -}