flavien/Projet_JAVA_P2P_STRI2A
3
2
Fork 0
Code Issues 11 Pull Requests Releases 13 Activity

Merge pull request 'Fix udp sending ratio for tracker instead of server used' (#130) from fix-udp into master
All checks were successful
flavien's git/Projet_JAVA_P2P_STRI2A/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Flavien Haas 2020-04-13 22:18:12 +02:00
commit b7fc61c440
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/clientP2P/ClientDownloadUDP.java
View File

@ -64,7 +64,7 @@ public class ClientDownloadUDP extends ClientDownload {
* @param hostItem Hostitem of the server
*/
protected ClientDownloadPart createDownloadPart(HostItem hostItem) {
return (ClientDownloadPart)new ClientDownloadPartUDP((ClientDownload)this, filename, hostItem.getUDPSocket(), partsSubdir, logger, client, tracker);
return (ClientDownloadPart)new ClientDownloadPartUDP((ClientDownload)this, filename, hostItem.getUDPSocket(), partsSubdir, logger, client, hostItem);
}
/** Implementation of writeLog

6
src/tracker/TrackerManagement.java
View File

@ -259,7 +259,11 @@ public abstract class TrackerManagement extends ServeErrors implements Runnable
while(readLock.get() > 0) {
this.wait();
}
if (!ratioDown.containsKey(updateRatioClient) || ! ratioUp.containsKey(updateRatioServer)) {
if (!ratioDown.containsKey(updateRatioClient)) {
writeLog("Unkwnow client host " + updateRatioClient, LogLevel.Debug);
sendUnknownHost(pd);
} else if (!ratioUp.containsKey(updateRatioServer)) {
writeLog("Unkwnow server host " + updateRatioServer, LogLevel.Debug);
sendUnknownHost(pd);
} else {
ratioDown.put(updateRatioClient, Long.valueOf(ratioDown.get(updateRatioClient).longValue() + ratioSize));