Sort messages by Server/Client and separate pure structures.

feature-npv2
Icedream 2014-05-17 07:21:21 +02:00
parent 05a0ee8ac0
commit 976949571a
36 changed files with 75 additions and 65 deletions

View File

@ -1,5 +1,6 @@
using System.Collections.Generic; using System.Collections.Generic;
using NPSharp.RPC.Messages; using NPSharp.RPC.Messages;
using NPSharp.RPC.Messages.Structs;
namespace NPSharp namespace NPSharp
{ {

View File

@ -6,6 +6,8 @@ using System.Threading.Tasks;
using log4net; using log4net;
using NPSharp.RPC; using NPSharp.RPC;
using NPSharp.RPC.Messages; using NPSharp.RPC.Messages;
using NPSharp.RPC.Messages.Client;
using NPSharp.RPC.Messages.Server;
namespace NPSharp namespace NPSharp
{ {

View File

@ -8,6 +8,8 @@ using System.Threading.Tasks;
using log4net; using log4net;
using NPSharp.RPC; using NPSharp.RPC;
using NPSharp.RPC.Messages; using NPSharp.RPC.Messages;
using NPSharp.RPC.Messages.Client;
using NPSharp.RPC.Messages.Server;
using NPSharp.Steam; using NPSharp.Steam;
namespace NPSharp namespace NPSharp

View File

@ -2,6 +2,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using NPSharp.RPC; using NPSharp.RPC;
using NPSharp.RPC.Messages; using NPSharp.RPC.Messages;
using NPSharp.RPC.Messages.Structs;
using NPSharp.Steam; using NPSharp.Steam;
namespace NPSharp namespace NPSharp

View File

@ -1,6 +1,6 @@
using ProtoBuf; using ProtoBuf;
namespace NPSharp.RPC.Messages namespace NPSharp.RPC.Messages.Client
{ {
[Packet(1004)] [Packet(1004)]
[ProtoContract] [ProtoContract]

View File

@ -1,7 +1,7 @@
using System; using System;
using ProtoBuf; using ProtoBuf;
namespace NPSharp.RPC.Messages namespace NPSharp.RPC.Messages.Client
{ {
[Packet(1004)] [Packet(1004)]
[ProtoContract] [ProtoContract]

View File

@ -1,6 +1,6 @@
using ProtoBuf; using ProtoBuf;
namespace NPSharp.RPC.Messages namespace NPSharp.RPC.Messages.Client
{ {
[Packet(1002)] [Packet(1002)]
[ProtoContract] [ProtoContract]

View File

@ -1,6 +1,6 @@
using ProtoBuf; using ProtoBuf;
namespace NPSharp.RPC.Messages namespace NPSharp.RPC.Messages.Client
{ {
[Packet(1001)] [Packet(1001)]
[ProtoContract] [ProtoContract]

View File

@ -1,6 +1,6 @@
using ProtoBuf; using ProtoBuf;
namespace NPSharp.RPC.Messages namespace NPSharp.RPC.Messages.Client
{ {
[Packet(1003)] [Packet(1003)]
[ProtoContract] [ProtoContract]

View File

@ -1,7 +1,7 @@
using System; using System;
using ProtoBuf; using ProtoBuf;
namespace NPSharp.RPC.Messages namespace NPSharp.RPC.Messages.Client
{ {
[ProtoContract] [ProtoContract]
[Packet(1202)] [Packet(1202)]

View File

@ -1,7 +1,7 @@
using System; using System;
using ProtoBuf; using ProtoBuf;
namespace NPSharp.RPC.Messages namespace NPSharp.RPC.Messages.Client
{ {
[ProtoContract] [ProtoContract]
[Packet(1214)] [Packet(1214)]

View File

@ -1,6 +1,7 @@
using NPSharp.RPC.Messages.Structs;
using ProtoBuf; using ProtoBuf;
namespace NPSharp.RPC.Messages namespace NPSharp.RPC.Messages.Client
{ {
[ProtoContract] [ProtoContract]
[Packet(1213)] [Packet(1213)]

View File

@ -1,7 +1,7 @@
using System; using System;
using ProtoBuf; using ProtoBuf;
namespace NPSharp.RPC.Messages namespace NPSharp.RPC.Messages.Client
{ {
[ProtoContract] [ProtoContract]
[Packet(1201)] [Packet(1201)]

View File

@ -1,6 +1,6 @@
using ProtoBuf; using ProtoBuf;
namespace NPSharp.RPC.Messages namespace NPSharp.RPC.Messages.Client
{ {
[Packet(2002)] [Packet(2002)]
[ProtoContract] [ProtoContract]

View File

@ -1,6 +1,6 @@
using ProtoBuf; using ProtoBuf;
namespace NPSharp.RPC.Messages namespace NPSharp.RPC.Messages.Client
{ {
[ProtoContract] [ProtoContract]
[Packet(1101)] [Packet(1101)]

View File

@ -1,6 +1,6 @@
using ProtoBuf; using ProtoBuf;
namespace NPSharp.RPC.Messages namespace NPSharp.RPC.Messages.Client
{ {
[Packet(1102)] [Packet(1102)]
[ProtoContract] [ProtoContract]

View File

@ -1,6 +1,6 @@
using ProtoBuf; using ProtoBuf;
namespace NPSharp.RPC.Messages namespace NPSharp.RPC.Messages.Client
{ {
[Packet(1104)] [Packet(1104)]
[ProtoContract] [ProtoContract]

View File

@ -1,6 +1,6 @@
using ProtoBuf; using ProtoBuf;
namespace NPSharp.RPC.Messages namespace NPSharp.RPC.Messages.Client
{ {
[Packet(1103)] [Packet(1103)]
[ProtoContract] [ProtoContract]

View File

@ -1,6 +1,6 @@
using ProtoBuf; using ProtoBuf;
namespace NPSharp.RPC.Messages namespace NPSharp.RPC.Messages.Server
{ {
[Packet(1006)] [Packet(1006)]
[ProtoContract] [ProtoContract]

View File

@ -1,6 +1,6 @@
using ProtoBuf; using ProtoBuf;
namespace NPSharp.RPC.Messages namespace NPSharp.RPC.Messages.Server
{ {
[Packet(1022)] [Packet(1022)]
[ProtoContract] [ProtoContract]

View File

@ -1,6 +1,6 @@
using ProtoBuf; using ProtoBuf;
namespace NPSharp.RPC.Messages namespace NPSharp.RPC.Messages.Server
{ {
[Packet(1010)] [Packet(1010)]
[ProtoContract] [ProtoContract]

View File

@ -1,6 +1,6 @@
using ProtoBuf; using ProtoBuf;
namespace NPSharp.RPC.Messages namespace NPSharp.RPC.Messages.Server
{ {
[Packet(1011)] [Packet(1011)]
[ProtoContract] [ProtoContract]

View File

@ -1,7 +1,7 @@
using System; using System;
using ProtoBuf; using ProtoBuf;
namespace NPSharp.RPC.Messages namespace NPSharp.RPC.Messages.Server
{ {
[Packet(1012)] [Packet(1012)]
[ProtoContract] [ProtoContract]

View File

@ -1,6 +1,6 @@
using ProtoBuf; using ProtoBuf;
namespace NPSharp.RPC.Messages namespace NPSharp.RPC.Messages.Server
{ {
[Packet(2001)] [Packet(2001)]
[ProtoContract] [ProtoContract]

View File

@ -1,12 +1,13 @@
using NPSharp.RPC.Messages.Structs;
using ProtoBuf; using ProtoBuf;
namespace NPSharp.RPC.Messages namespace NPSharp.RPC.Messages.Server
{ {
[ProtoContract] [ProtoContract]
[Packet(1203)] [Packet(1203)]
public sealed class FriendsGetProfileDataResultMessage : RPCServerMessage public sealed class FriendsGetProfileDataResultMessage : RPCServerMessage
{ {
[ProtoMember(1)] [ProtoMember(1)]
public ProfileDataResult[] Results { get; set; } public ProfileData[] Results { get; set; }
} }
} }

View File

@ -1,6 +1,6 @@
using ProtoBuf; using ProtoBuf;
namespace NPSharp.RPC.Messages namespace NPSharp.RPC.Messages.Server
{ {
[ProtoContract] [ProtoContract]
[Packet(1215)] [Packet(1215)]

View File

@ -1,7 +1,8 @@
using System; using System;
using NPSharp.RPC.Messages.Structs;
using ProtoBuf; using ProtoBuf;
namespace NPSharp.RPC.Messages namespace NPSharp.RPC.Messages.Server
{ {
[ProtoContract] [ProtoContract]
[Packet(1212)] [Packet(1212)]

View File

@ -1,6 +1,7 @@
using NPSharp.RPC.Messages.Structs;
using ProtoBuf; using ProtoBuf;
namespace NPSharp.RPC.Messages namespace NPSharp.RPC.Messages.Server
{ {
[ProtoContract] [ProtoContract]
[Packet(1211)] [Packet(1211)]

View File

@ -1,6 +1,6 @@
using ProtoBuf; using ProtoBuf;
namespace NPSharp.RPC.Messages namespace NPSharp.RPC.Messages.Server
{ {
[Packet(1000)] [Packet(1000)]
[ProtoContract] [ProtoContract]

View File

@ -1,6 +1,6 @@
using ProtoBuf; using ProtoBuf;
namespace NPSharp.RPC.Messages namespace NPSharp.RPC.Messages.Server
{ {
[Packet(1111)] [Packet(1111)]
[ProtoContract] [ProtoContract]

View File

@ -1,6 +1,6 @@
using ProtoBuf; using ProtoBuf;
namespace NPSharp.RPC.Messages namespace NPSharp.RPC.Messages.Server
{ {
[Packet(1112)] [Packet(1112)]
[ProtoContract] [ProtoContract]

View File

@ -1,6 +1,6 @@
using ProtoBuf; using ProtoBuf;
namespace NPSharp.RPC.Messages namespace NPSharp.RPC.Messages.Server
{ {
[Packet(1113)] [Packet(1113)]
[ProtoContract] [ProtoContract]

View File

@ -1,7 +1,7 @@
using System; using System;
using ProtoBuf; using ProtoBuf;
namespace NPSharp.RPC.Messages namespace NPSharp.RPC.Messages.Structs
{ {
[ProtoContract] [ProtoContract]
public sealed class FriendDetails public sealed class FriendDetails

View File

@ -1,6 +1,6 @@
using ProtoBuf; using ProtoBuf;
namespace NPSharp.RPC.Messages namespace NPSharp.RPC.Messages.Structs
{ {
[ProtoContract] [ProtoContract]
public sealed class FriendsPresence public sealed class FriendsPresence

View File

@ -1,12 +1,12 @@
using System; using System;
using ProtoBuf; using ProtoBuf;
namespace NPSharp.RPC.Messages namespace NPSharp.RPC.Messages.Structs
{ {
[ProtoContract] [ProtoContract]
public sealed class ProfileDataResult public sealed class ProfileData
{ {
internal ProfileDataResult() internal ProfileData()
{ {
} }

View File

@ -77,42 +77,42 @@
<Compile Include="NPServer.cs" /> <Compile Include="NPServer.cs" />
<Compile Include="NPServerClient.cs" /> <Compile Include="NPServerClient.cs" />
<Compile Include="PresenceState.cs" /> <Compile Include="PresenceState.cs" />
<Compile Include="RPC\Messages\AuthenticateRegisterServerMessage.cs" /> <Compile Include="RPC\Messages\Client\AuthenticateRegisterServerMessage.cs" />
<Compile Include="RPC\Messages\AuthenticateRegisterServerResultMessage.cs" /> <Compile Include="RPC\Messages\Server\AuthenticateRegisterServerResultMessage.cs" />
<Compile Include="RPC\Messages\AuthenticateUserGroupMessage.cs" /> <Compile Include="RPC\Messages\Server\AuthenticateUserGroupMessage.cs" />
<Compile Include="RPC\Messages\AuthenticateValidateTicketMessage.cs" /> <Compile Include="RPC\Messages\Client\AuthenticateValidateTicketMessage.cs" />
<Compile Include="RPC\Messages\AuthenticateValidateTicketResultMessage.cs" /> <Compile Include="RPC\Messages\Server\AuthenticateValidateTicketResultMessage.cs" />
<Compile Include="RPC\Messages\AuthenticateWithDetailsMessage.cs" /> <Compile Include="RPC\Messages\Client\AuthenticateWithDetailsMessage.cs" />
<Compile Include="RPC\Messages\AuthenticateWithKeyMessage.cs" /> <Compile Include="RPC\Messages\Client\AuthenticateWithKeyMessage.cs" />
<Compile Include="RPC\Messages\FriendDetails.cs" /> <Compile Include="RPC\Messages\Structs\FriendDetails.cs" />
<Compile Include="RPC\Messages\FriendsSetSteamIDMessage.cs" /> <Compile Include="RPC\Messages\Client\FriendsSetSteamIDMessage.cs" />
<Compile Include="RPC\Messages\FriendsGetProfileDataMessage.cs" /> <Compile Include="RPC\Messages\Client\FriendsGetProfileDataMessage.cs" />
<Compile Include="RPC\Messages\FriendsGetProfileDataResultMessage.cs" /> <Compile Include="RPC\Messages\Server\FriendsGetProfileDataResultMessage.cs" />
<Compile Include="RPC\Messages\FriendsGetUserAvatarMessage.cs" /> <Compile Include="RPC\Messages\Client\FriendsGetUserAvatarMessage.cs" />
<Compile Include="RPC\Messages\FriendsGetUserAvatarResultMessage.cs" /> <Compile Include="RPC\Messages\Server\FriendsGetUserAvatarResultMessage.cs" />
<Compile Include="RPC\Messages\FriendsPresence.cs" /> <Compile Include="RPC\Messages\Structs\FriendsPresence.cs" />
<Compile Include="RPC\Messages\FriendsPresenceMessage.cs" /> <Compile Include="RPC\Messages\Server\FriendsPresenceMessage.cs" />
<Compile Include="RPC\Messages\FriendsRosterMessage.cs" /> <Compile Include="RPC\Messages\Server\FriendsRosterMessage.cs" />
<Compile Include="RPC\Messages\FriendsSetPresenceMessage.cs" /> <Compile Include="RPC\Messages\Client\FriendsSetPresenceMessage.cs" />
<Compile Include="RPC\Messages\ProfileDataResult.cs" /> <Compile Include="RPC\Messages\Structs\ProfileData.cs" />
<Compile Include="RPC\RPCClientStream.cs" /> <Compile Include="RPC\RPCClientStream.cs" />
<Compile Include="RPC\Messages\AuthenticateExternalStatusMessage.cs" /> <Compile Include="RPC\Messages\Server\AuthenticateExternalStatusMessage.cs" />
<Compile Include="RPC\Messages\AuthenticateResultMessage.cs" /> <Compile Include="RPC\Messages\Server\AuthenticateResultMessage.cs" />
<Compile Include="RPC\Messages\AuthenticateWithTokenMessage.cs" /> <Compile Include="RPC\Messages\Client\AuthenticateWithTokenMessage.cs" />
<Compile Include="RPC\Messages\CloseAppMessage.cs" /> <Compile Include="RPC\Messages\Server\CloseAppMessage.cs" />
<Compile Include="RPC\Messages\HelloMessage.cs" /> <Compile Include="RPC\Messages\Server\HelloMessage.cs" />
<Compile Include="RPC\Messages\MessagingSendDataMessage.cs" /> <Compile Include="RPC\Messages\Client\MessagingSendDataMessage.cs" />
<Compile Include="RPC\Messages\RPCMessage.cs" /> <Compile Include="RPC\Messages\RPCMessage.cs" />
<Compile Include="RPC\Messages\PacketAttribute.cs" /> <Compile Include="RPC\Messages\PacketAttribute.cs" />
<Compile Include="RPC\Messages\RPCClientMessage.cs" /> <Compile Include="RPC\Messages\RPCClientMessage.cs" />
<Compile Include="RPC\Messages\RPCServerMessage.cs" /> <Compile Include="RPC\Messages\RPCServerMessage.cs" />
<Compile Include="RPC\Messages\StorageGetUserFileMessage.cs" /> <Compile Include="RPC\Messages\Client\StorageGetUserFileMessage.cs" />
<Compile Include="RPC\Messages\StorageGetPublisherFileMessage.cs" /> <Compile Include="RPC\Messages\Client\StorageGetPublisherFileMessage.cs" />
<Compile Include="RPC\Messages\StoragePublisherFileMessage.cs" /> <Compile Include="RPC\Messages\Server\StoragePublisherFileMessage.cs" />
<Compile Include="RPC\Messages\StorageSendRandomStringMessage.cs" /> <Compile Include="RPC\Messages\Client\StorageSendRandomStringMessage.cs" />
<Compile Include="RPC\Messages\StorageUserFileMessage.cs" /> <Compile Include="RPC\Messages\Server\StorageUserFileMessage.cs" />
<Compile Include="RPC\Messages\StorageWriteUserFileMessage.cs" /> <Compile Include="RPC\Messages\Client\StorageWriteUserFileMessage.cs" />
<Compile Include="RPC\Messages\StorageWriteUserFileResultMessage.cs" /> <Compile Include="RPC\Messages\Server\StorageWriteUserFileResultMessage.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Authentication\SessionAuthenticationClient.cs" /> <Compile Include="Authentication\SessionAuthenticationClient.cs" />
<Compile Include="RPC\RPCServerStream.cs" /> <Compile Include="RPC\RPCServerStream.cs" />