Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/Messaging/Messages/Distributed/DistributedBranchLevel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,11 @@ public static DistributedBranchLevel FromByteArray(byte[] bytes)

var level = reader.ReadInteger();

if (SoulseekClient.ReportUnreadMessageData && reader.HasMoreData)
{
Diagnostics.GlobalDiagnostic.Warning($"Message reader for {nameof(MessageCode.Distributed.BranchLevel)} finalized with {reader.Remaining} unread bytes");
}

return new DistributedBranchLevel(level);
}

Expand Down
5 changes: 5 additions & 0 deletions src/Messaging/Messages/Distributed/DistributedBranchRoot.cs
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,11 @@ public static DistributedBranchRoot FromByteArray(byte[] bytes)

var username = reader.ReadString();

if (SoulseekClient.ReportUnreadMessageData && reader.HasMoreData)
{
Diagnostics.GlobalDiagnostic.Warning($"Message reader for {nameof(MessageCode.Distributed.BranchRoot)} finalized with {reader.Remaining} unread bytes");
}

return new DistributedBranchRoot(username);
}

Expand Down
5 changes: 5 additions & 0 deletions src/Messaging/Messages/Distributed/DistributedChildDepth.cs
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,11 @@ public static DistributedChildDepth FromByteArray(byte[] bytes)

var depth = reader.ReadInteger();

if (SoulseekClient.ReportUnreadMessageData && reader.HasMoreData)
{
Diagnostics.GlobalDiagnostic.Warning($"Message reader for {nameof(MessageCode.Distributed.ChildDepth)} finalized with {reader.Remaining} unread bytes");
}

return new DistributedChildDepth(depth);
}

Expand Down
5 changes: 5 additions & 0 deletions src/Messaging/Messages/Distributed/DistributedPingRequest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,11 @@ public static DistributedPingRequest FromByteArray(byte[] bytes)
throw new MessageException($"Message Code mismatch creating {nameof(DistributedPingRequest)} (expected: {(int)MessageCode.Distributed.Ping}, received: {(int)code})");
}

if (SoulseekClient.ReportUnreadMessageData && reader.HasMoreData)
{
Diagnostics.GlobalDiagnostic.Warning($"Message reader for {nameof(MessageCode.Distributed.Ping)} finalized with {reader.Remaining} unread bytes");
}

return new DistributedPingRequest();
}

Expand Down
5 changes: 5 additions & 0 deletions src/Messaging/Messages/Distributed/DistributedPingResponse.cs
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,11 @@ public static DistributedPingResponse FromByteArray(byte[] bytes)
token = reader.ReadInteger();
}

if (SoulseekClient.ReportUnreadMessageData && reader.HasMoreData)
{
Diagnostics.GlobalDiagnostic.Warning($"Message reader for {nameof(MessageCode.Distributed.Ping)} finalized with {reader.Remaining} unread bytes");
}

return new DistributedPingResponse(token);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,11 @@ public static DistributedSearchRequest FromByteArray(byte[] bytes)
var token = reader.ReadInteger();
var query = reader.ReadString();

if (SoulseekClient.ReportUnreadMessageData && reader.HasMoreData)
{
Diagnostics.GlobalDiagnostic.Warning($"Message reader for {nameof(MessageCode.Distributed.SearchRequest)} finalized with {reader.Remaining} unread bytes");
}

return new DistributedSearchRequest(username, token, query);
}

Expand Down
5 changes: 5 additions & 0 deletions src/Messaging/Messages/Initialization/PeerInit.cs
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,11 @@ public static bool TryFromByteArray(byte[] bytes, out PeerInit response)
var transferType = reader.ReadString();
var token = reader.ReadInteger();

if (SoulseekClient.ReportUnreadMessageData && reader.HasMoreData)
{
Diagnostics.GlobalDiagnostic.Warning($"Message reader for {nameof(MessageCode.Initialization.PeerInit)} finalized with {reader.Remaining} unread bytes");
}

response = new PeerInit(username, transferType, token);
return true;
}
Expand Down
5 changes: 5 additions & 0 deletions src/Messaging/Messages/Initialization/PierceFirewall.cs
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,11 @@ public static bool TryFromByteArray(byte[] bytes, out PierceFirewall response)

var token = reader.ReadInteger();

if (SoulseekClient.ReportUnreadMessageData && reader.HasMoreData)
{
Diagnostics.GlobalDiagnostic.Warning($"Message reader for {nameof(MessageCode.Initialization.PierceFirewall)} finalized with {reader.Remaining} unread bytes");
}

response = new PierceFirewall(token);
return true;
}
Expand Down
5 changes: 5 additions & 0 deletions src/Messaging/Messages/Peer/BrowseResponseFactory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,11 @@ public static BrowseResponse FromByteArray(byte[] bytes)
}
}

if (SoulseekClient.ReportUnreadMessageData && reader.HasMoreData)
{
Diagnostics.GlobalDiagnostic.Warning($"Message reader for {nameof(MessageCode.Peer.BrowseResponse)} finalized with {reader.Remaining} unread bytes");
}

return new BrowseResponse(directoryList, lockedDirectoryList);
}

Expand Down
5 changes: 5 additions & 0 deletions src/Messaging/Messages/Peer/FolderContentsRequest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,11 @@ public static FolderContentsRequest FromByteArray(byte[] bytes)
var token = reader.ReadInteger();
var directoryName = reader.ReadString();

if (SoulseekClient.ReportUnreadMessageData && reader.HasMoreData)
{
Diagnostics.GlobalDiagnostic.Warning($"Message reader for {nameof(MessageCode.Peer.FolderContentsRequest)} finalized with {reader.Remaining} unread bytes");
}

return new FolderContentsRequest(token, directoryName);
}

Expand Down
5 changes: 5 additions & 0 deletions src/Messaging/Messages/Peer/FolderContentsResponse.cs
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,11 @@ public static FolderContentsResponse FromByteArray(byte[] bytes)
directoryList.Add(reader.ReadDirectory());
}

if (SoulseekClient.ReportUnreadMessageData && reader.HasMoreData)
{
Diagnostics.GlobalDiagnostic.Warning($"Message reader for {nameof(MessageCode.Peer.FolderContentsResponse)} finalized with {reader.Remaining} unread bytes");
}

return new FolderContentsResponse(token, rootDirectory, directoryList);
}

Expand Down
5 changes: 5 additions & 0 deletions src/Messaging/Messages/Peer/PeerSearchRequest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,11 @@ public static PeerSearchRequest FromByteArray(byte[] bytes)
var token = reader.ReadInteger();
var query = reader.ReadString();

if (SoulseekClient.ReportUnreadMessageData && reader.HasMoreData)
{
Diagnostics.GlobalDiagnostic.Warning($"Message reader for {nameof(MessageCode.Peer.SearchRequest)} finalized with {reader.Remaining} unread bytes");
}

return new PeerSearchRequest(token, query);
}
}
Expand Down
5 changes: 5 additions & 0 deletions src/Messaging/Messages/Peer/PlaceInQueueRequest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,11 @@ public static PlaceInQueueRequest FromByteArray(byte[] bytes)

var filename = reader.ReadString();

if (SoulseekClient.ReportUnreadMessageData && reader.HasMoreData)
{
Diagnostics.GlobalDiagnostic.Warning($"Message reader for {nameof(MessageCode.Peer.PlaceInQueueRequest)} finalized with {reader.Remaining} unread bytes");
}

return new PlaceInQueueRequest(filename);
}

Expand Down
5 changes: 5 additions & 0 deletions src/Messaging/Messages/Peer/PlaceInQueueResponse.cs
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,11 @@ public static PlaceInQueueResponse FromByteArray(byte[] bytes)
var filename = reader.ReadString();
var placeInQueue = reader.ReadInteger();

if (SoulseekClient.ReportUnreadMessageData && reader.HasMoreData)
{
Diagnostics.GlobalDiagnostic.Warning($"Message reader for {nameof(MessageCode.Peer.PlaceInQueueResponse)} finalized with {reader.Remaining} unread bytes");
}

return new PlaceInQueueResponse(filename, placeInQueue);
}

Expand Down
6 changes: 6 additions & 0 deletions src/Messaging/Messages/Peer/QueueDownloadRequest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,12 @@ public static QueueDownloadRequest FromByteArray(byte[] bytes)
}

var filename = reader.ReadString();

if (SoulseekClient.ReportUnreadMessageData && reader.HasMoreData)
{
Diagnostics.GlobalDiagnostic.Warning($"Message reader for {nameof(MessageCode.Peer.QueueDownload)} finalized with {reader.Remaining} unread bytes");
}

return new QueueDownloadRequest(filename);
}

Expand Down
5 changes: 5 additions & 0 deletions src/Messaging/Messages/Peer/SearchResponseFactory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,11 @@ public static SearchResponse FromByteArray(byte[] bytes)
lockedFileList = reader.ReadFiles(count);
}

if (SoulseekClient.ReportUnreadMessageData && reader.HasMoreData)
{
Diagnostics.GlobalDiagnostic.Warning($"Message reader for {nameof(MessageCode.Peer.SearchResponse)} finalized with {reader.Remaining} unread bytes");
}

return new SearchResponse(username, token, hasFreeUploadSlot: freeUploadSlots > 0, uploadSpeed, queueLength, fileList, lockedFileList);
}

Expand Down
5 changes: 5 additions & 0 deletions src/Messaging/Messages/Peer/TransferRequest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,11 @@ public static TransferRequest FromByteArray(byte[] bytes)
fileSize = reader.ReadLong();
}

if (SoulseekClient.ReportUnreadMessageData && reader.HasMoreData)
{
Diagnostics.GlobalDiagnostic.Warning($"Message reader for {nameof(MessageCode.Peer.TransferRequest)} finalized with {reader.Remaining} unread bytes");
}

return new TransferRequest(direction, token, filename, fileSize);
}

Expand Down
17 changes: 14 additions & 3 deletions src/Messaging/Messages/Peer/TransferResponse.cs
Original file line number Diff line number Diff line change
Expand Up @@ -100,18 +100,29 @@ public static TransferResponse FromByteArray(byte[] bytes)
var token = reader.ReadInteger();
var allowed = reader.ReadByte() == 1;

TransferResponse response;

if (allowed && reader.HasMoreData)
{
var fileSize = reader.ReadLong();
return new TransferResponse(token, fileSize);
response = new TransferResponse(token, fileSize);
}
else if (!allowed)
{
var msg = reader.ReadString();
return new TransferResponse(token, msg);
response = new TransferResponse(token, msg);
}
else
{
response = new TransferResponse(token);
}

if (SoulseekClient.ReportUnreadMessageData && reader.HasMoreData)
{
Diagnostics.GlobalDiagnostic.Warning($"Message reader for {nameof(MessageCode.Peer.TransferResponse)} finalized with {reader.Remaining} unread bytes");
}

return new TransferResponse(token);
return response;
}

/// <summary>
Expand Down
5 changes: 5 additions & 0 deletions src/Messaging/Messages/Peer/UploadDenied.cs
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,11 @@ public static UploadDenied FromByteArray(byte[] bytes)
var filename = reader.ReadString();
var msg = reader.ReadString();

if (SoulseekClient.ReportUnreadMessageData && reader.HasMoreData)
{
Diagnostics.GlobalDiagnostic.Warning($"Message reader for {nameof(MessageCode.Peer.UploadDenied)} finalized with {reader.Remaining} unread bytes");
}

return new UploadDenied(filename, msg);
}

Expand Down
5 changes: 5 additions & 0 deletions src/Messaging/Messages/Peer/UploadFailed.cs
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,11 @@ public static UploadFailed FromByteArray(byte[] bytes)

var filename = reader.ReadString();

if (SoulseekClient.ReportUnreadMessageData && reader.HasMoreData)
{
Diagnostics.GlobalDiagnostic.Warning($"Message reader for {nameof(MessageCode.Peer.UploadFailed)} finalized with {reader.Remaining} unread bytes");
}

return new UploadFailed(filename);
}

Expand Down
9 changes: 6 additions & 3 deletions src/Messaging/Messages/Peer/UserInfoResponseFactory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,8 @@
// SPDX-License-Identifier: GPL-3.0-only
// </copyright>

namespace Soulseek
namespace Soulseek.Messaging.Messages
{
using Soulseek.Messaging;

/// <summary>
/// The response to a user info request.
/// </summary>
Expand Down Expand Up @@ -59,6 +57,11 @@ public static UserInfo FromByteArray(byte[] bytes)
var queueLength = reader.ReadInteger();
var hasFreeUploadSlot = reader.ReadByte() > 0;

if (SoulseekClient.ReportUnreadMessageData && reader.HasMoreData)
{
Diagnostics.GlobalDiagnostic.Warning($"Message reader for {nameof(MessageCode.Peer.InfoResponse)} finalized with {reader.Remaining} unread bytes");
}

return new UserInfo(description, uploadSlots, queueLength, hasFreeUploadSlot, picture);
}

Expand Down
5 changes: 5 additions & 0 deletions src/Messaging/Messages/Server/CannotConnect.cs
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,11 @@ public static CannotConnect FromByteArray(byte[] bytes)
username = reader.ReadString();
}

if (SoulseekClient.ReportUnreadMessageData && reader.HasMoreData)
{
Diagnostics.GlobalDiagnostic.Warning($"Message reader for {nameof(MessageCode.Server.CannotConnect)} finalized with {reader.Remaining} unread bytes");
}

return new CannotConnect(token, username);
}

Expand Down
5 changes: 5 additions & 0 deletions src/Messaging/Messages/Server/CannotJoinRoomNotification.cs
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,11 @@ public static CannotJoinRoomNotification FromByteArray(byte[] bytes)

var roomName = reader.ReadString();

if (SoulseekClient.ReportUnreadMessageData && reader.HasMoreData)
{
Diagnostics.GlobalDiagnostic.Warning($"Message reader for {nameof(MessageCode.Server.CannotJoinRoom)} finalized with {reader.Remaining} unread bytes");
}

return new CannotJoinRoomNotification(roomName);
}
}
Expand Down
5 changes: 5 additions & 0 deletions src/Messaging/Messages/Server/ConnectToPeerResponse.cs
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,11 @@ public static ConnectToPeerResponse FromByteArray(byte[] bytes)
var token = reader.ReadInteger();
var isPrivileged = reader.ReadByte() > 0;

if (SoulseekClient.ReportUnreadMessageData && reader.HasMoreData)
{
Diagnostics.GlobalDiagnostic.Warning($"Message reader for {nameof(MessageCode.Server.ConnectToPeer)} finalized with {reader.Remaining} unread bytes");
}

return new ConnectToPeerResponse(username, type, ipAddress, port, token, isPrivileged);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,11 @@ public static IReadOnlyCollection<string> FromByteArray(byte[] bytes)
list.Add(reader.ReadString());
}

if (SoulseekClient.ReportUnreadMessageData && reader.HasMoreData)
{
Diagnostics.GlobalDiagnostic.Warning($"Message reader for {nameof(MessageCode.Server.ExcludedSearchPhrases)} finalized with {reader.Remaining} unread bytes");
}

return list.AsReadOnly();
}
}
Expand Down
5 changes: 5 additions & 0 deletions src/Messaging/Messages/Server/GlobalMessageNotification.cs
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@ public static string FromByteArray(byte[] bytes)

var msg = reader.ReadString();

if (SoulseekClient.ReportUnreadMessageData && reader.HasMoreData)
{
Diagnostics.GlobalDiagnostic.Warning($"Message reader for {nameof(MessageCode.Server.GlobalAdminMessage)} finalized with {reader.Remaining} unread bytes");
}

return msg;
}
}
Expand Down
9 changes: 8 additions & 1 deletion src/Messaging/Messages/Server/IntegerResponse.cs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,14 @@ public static int FromByteArray<T>(byte[] bytes)
where T : Enum
{
var reader = new MessageReader<T>(bytes);
return reader.ReadInteger();
var value = reader.ReadInteger();

if (SoulseekClient.ReportUnreadMessageData && reader.HasMoreData)
{
Diagnostics.GlobalDiagnostic.Warning($"Message reader for {reader.ReadCode()} finalized with {reader.Remaining} unread bytes");
}

return value;
}
}
}
5 changes: 5 additions & 0 deletions src/Messaging/Messages/Server/JoinRoomResponse.cs
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,11 @@ internal static RoomData FromByteArray(byte[] bytes)
}
}

if (SoulseekClient.ReportUnreadMessageData && reader.HasMoreData)
{
Diagnostics.GlobalDiagnostic.Warning($"Message reader for {nameof(MessageCode.Server.JoinRoom)} finalized with {reader.Remaining} unread bytes");
}

return new RoomData(roomName, users, owner != null, owner, operatorList);
}
}
Expand Down
5 changes: 5 additions & 0 deletions src/Messaging/Messages/Server/LeaveRoomResponse.cs
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,11 @@ public static LeaveRoomResponse FromByteArray(byte[] bytes)

var roomName = reader.ReadString();

if (SoulseekClient.ReportUnreadMessageData && reader.HasMoreData)
{
Diagnostics.GlobalDiagnostic.Warning($"Message reader for {nameof(MessageCode.Server.LeaveRoom)} finalized with {reader.Remaining} unread bytes");
}

return new LeaveRoomResponse(roomName);
}
}
Expand Down
5 changes: 5 additions & 0 deletions src/Messaging/Messages/Server/LoginResponse.cs
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,11 @@ public static LoginResponse FromByteArray(byte[] bytes)
msg += string.IsNullOrWhiteSpace(detail) ? string.Empty : ": " + detail;
}

if (SoulseekClient.ReportUnreadMessageData && reader.HasMoreData)
{
Diagnostics.GlobalDiagnostic.Warning($"Message reader for {nameof(MessageCode.Server.Login)} finalized with {reader.Remaining} unread bytes");
}

return new LoginResponse(succeeded, msg, ipAddress, hash, isSupporter);
}
}
Expand Down
Loading
Loading