KnightsOfTheArk
/
DepotDownloader
mirror of https://github.com/SteamRE/DepotDownloader.git
23
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Style fixes for CDNClientPool

Browse Source
pull/25/head
Ryan Kistner 10 years ago
parent 9b778c374e
commit 06a7d099ba
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File

30
DepotDownloader/CDNClientPool.cs
Unescape Escape View File

@ -16,7 +16,7 @@ namespace DepotDownloader
/// </summary> /// </summary>
class CDNClientPool class CDNClientPool
{ {
private static int ServerEndpointMinimumSize = 8; private const int ServerEndpointMinimumSize = 8;
private Steam3Session steamSession; private Steam3Session steamSession;
@ -43,7 +43,7 @@ namespace DepotDownloader
monitorThread.Start(); monitorThread.Start();
} }
private List<CDNClient.Server> fetchBootstrapServerList() private List<CDNClient.Server> FetchBootstrapServerList()
{ {
CDNClient bootstrap = new CDNClient(steamSession.steamClient); CDNClient bootstrap = new CDNClient(steamSession.steamClient);
@ -75,7 +75,7 @@ namespace DepotDownloader
steamSession.steamClient.IsConnected && steamSession.steamClient.IsConnected &&
steamSession.steamClient.GetServersOfType(EServerType.CS).Count > 0) steamSession.steamClient.GetServersOfType(EServerType.CS).Count > 0)
{ {
var servers = fetchBootstrapServerList(); var servers = FetchBootstrapServerList();
var weightedCdnServers = servers.Select(x => var weightedCdnServers = servers.Select(x =>
{ {
@ -95,13 +95,13 @@ namespace DepotDownloader
} }
} }
private void releaseConnection(CDNClient client) private void ReleaseConnection(CDNClient client)
{ {
Tuple<uint, CDNClient.Server> authData; Tuple<uint, CDNClient.Server> authData;
activeClientAuthed.TryRemove(client, out authData); activeClientAuthed.TryRemove(client, out authData);
} }
private CDNClient buildConnection(uint depotId, byte[] depotKey, CDNClient.Server serverSeed, CancellationToken token) private CDNClient BuildConnection(uint depotId, byte[] depotKey, CDNClient.Server serverSeed, CancellationToken token)
{ {
CDNClient.Server server = null; CDNClient.Server server = null;
CDNClient client = null; CDNClient client = null;
@ -157,7 +157,7 @@ namespace DepotDownloader
return client; return client;
} }
private bool reauthConnection(CDNClient client, CDNClient.Server server, uint depotId, byte[] depotKey) private bool ReauthConnection(CDNClient client, CDNClient.Server server, uint depotId, byte[] depotKey)
{ {
DebugLog.Assert(server.Type == "CDN" || steamSession.AppTickets[depotId] == null, "CDNClientPool", "Re-authing a CDN or anonymous connection"); DebugLog.Assert(server.Type == "CDN" || steamSession.AppTickets[depotId] == null, "CDNClientPool", "Re-authing a CDN or anonymous connection");
@ -183,7 +183,7 @@ namespace DepotDownloader
return false; return false;
} }
public CDNClient getConnectionForDepot(uint depotId, byte[] depotKey, CancellationToken token) public CDNClient GetConnectionForDepot(uint depotId, byte[] depotKey, CancellationToken token)
{ {
CDNClient client = null; CDNClient client = null;
@ -194,42 +194,42 @@ namespace DepotDownloader
// if we couldn't find a connection, make one now // if we couldn't find a connection, make one now
if (client == null) if (client == null)
{ {
client = buildConnection(depotId, depotKey, null, token); client = BuildConnection(depotId, depotKey, null, token);
} }
// if we couldn't find the authorization data or it's not authed to this depotid, re-initialize // if we couldn't find the authorization data or it's not authed to this depotid, re-initialize
if (!activeClientAuthed.TryGetValue(client, out authData) || authData.Item1 != depotId) if (!activeClientAuthed.TryGetValue(client, out authData) || authData.Item1 != depotId)
{ {
if (authData.Item2.Type == "CDN" && reauthConnection(client, authData.Item2, depotId, depotKey)) if (authData.Item2.Type == "CDN" && ReauthConnection(client, authData.Item2, depotId, depotKey))
{ {
Console.WriteLine("Re-authed CDN connection to content server {0} from {1} to {2}", authData.Item2, authData.Item1, depotId); Console.WriteLine("Re-authed CDN connection to content server {0} from {1} to {2}", authData.Item2, authData.Item1, depotId);
} }
else if (authData.Item2.Type == "CS" && steamSession.AppTickets[depotId] == null && reauthConnection(client, authData.Item2, depotId, depotKey)) else if (authData.Item2.Type == "CS" && steamSession.AppTickets[depotId] == null && ReauthConnection(client, authData.Item2, depotId, depotKey))
{ {
Console.WriteLine("Re-authed anonymous connection to content server {0} from {1} to {2}", authData.Item2, authData.Item1, depotId); Console.WriteLine("Re-authed anonymous connection to content server {0} from {1} to {2}", authData.Item2, authData.Item1, depotId);
} }
else else
{ {
releaseConnection(client); ReleaseConnection(client);
client = buildConnection(depotId, depotKey, authData.Item2, token); client = BuildConnection(depotId, depotKey, authData.Item2, token);
} }
} }
return client; return client;
} }
public void returnConnection(CDNClient client) public void ReturnConnection(CDNClient client)
{ {
if (client == null) return; if (client == null) return;
activeClientPool.Add(client); activeClientPool.Add(client);
} }
public void returnBrokenConnection(CDNClient client) public void ReturnBrokenConnection(CDNClient client)
{ {
if (client == null) return; if (client == null) return;
releaseConnection(client); ReleaseConnection(client);
} }
} }
} }

16
DepotDownloader/ContentDownloader.cs
Unescape Escape View File

@ -528,15 +528,15 @@ namespace DepotDownloader
{ {
CDNClient client = null; CDNClient client = null;
try { try {
client = cdnPool.getConnectionForDepot(depot.id, depot.depotKey, CancellationToken.None); client = cdnPool.GetConnectionForDepot(depot.id, depot.depotKey, CancellationToken.None);
depotManifest = client.DownloadManifest(depot.id, depot.manifestId); depotManifest = client.DownloadManifest(depot.id, depot.manifestId);
cdnPool.returnConnection(client); cdnPool.ReturnConnection(client);
} }
catch (WebException e) catch (WebException e)
{ {
cdnPool.returnBrokenConnection(client); cdnPool.ReturnBrokenConnection(client);
if (e.Status == WebExceptionStatus.ProtocolError) if (e.Status == WebExceptionStatus.ProtocolError)
{ {
@ -558,7 +558,7 @@ namespace DepotDownloader
} }
catch (Exception e) catch (Exception e)
{ {
cdnPool.returnBrokenConnection(client); cdnPool.ReturnBrokenConnection(client);
Console.WriteLine("Encountered error downloading manifest for depot {0} {1}: {2}", depot.id, depot.manifestId, e.Message); Console.WriteLine("Encountered error downloading manifest for depot {0} {1}: {2}", depot.id, depot.manifestId, e.Message);
} }
} }
@ -746,7 +746,7 @@ namespace DepotDownloader
CDNClient client; CDNClient client;
try try
{ {
client = cdnPool.getConnectionForDepot(depot.id, depot.depotKey, cts.Token); client = cdnPool.GetConnectionForDepot(depot.id, depot.depotKey, cts.Token);
} }
catch (OperationCanceledException) catch (OperationCanceledException)
{ {
@ -763,12 +763,12 @@ namespace DepotDownloader
try try
{ {
chunkData = client.DownloadDepotChunk(depot.id, data); chunkData = client.DownloadDepotChunk(depot.id, data);
cdnPool.returnConnection(client); cdnPool.ReturnConnection(client);
break; break;
} }
catch (WebException e) catch (WebException e)
{ {
cdnPool.returnBrokenConnection(client); cdnPool.ReturnBrokenConnection(client);
if (e.Status == WebExceptionStatus.ProtocolError) if (e.Status == WebExceptionStatus.ProtocolError)
{ {
@ -791,7 +791,7 @@ namespace DepotDownloader
} }
catch (Exception e) catch (Exception e)
{ {
cdnPool.returnBrokenConnection(client); cdnPool.ReturnBrokenConnection(client);
Console.WriteLine("Encountered unexpected error downloading chunk {0}: {1}", chunkID, e.Message); Console.WriteLine("Encountered unexpected error downloading chunk {0}: {1}", chunkID, e.Message);
} }
} }

Write Preview
Loading…
Cancel
Save