ulfgebhardt/college
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed acks

Browse Source
This commit is contained in:
Ulf Gebhardt 2013-02-11 12:51:55 +01:00
parent 308a6ecfb5
commit f947628b17
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ws2012/P2P/uebungen/11/src/message/Ack.java
View File

@ -109,10 +109,8 @@ public class Ack {
Level.FINE,
"Didn't receive RPC Ack {0} by now. Resending... ",
new Object[] { rpcId });
LOGGER.log(Level.INFO, receiver.getAddress().toString());
if(!receiver.getAddress().toString().equals("/0.0.0.0:0")){
//TODO
channel.send(buffer, receiver.getAddress());}
LOGGER.log(Level.INFO, receiver.getAddress().toString());
channel.send(buffer, receiver.getAddress());
} catch (IOException e) {
e.printStackTrace();
}

13
ws2012/P2P/uebungen/11/src/node/UDPHandler.java
View File

@ -251,8 +251,7 @@ public class UDPHandler implements Runnable {
if(chunklist.get(fid).size() >= chunkCount){
LOGGER.log(Level.INFO,"FILE complete file: "+fileID+" count: "+chunkCount+" id: "+chunkID);
String file = "";
for(int i=0; i<chunklist.get(fid).size();i++){
//TODO Reihenfolge!!!
for(int i=0; i<chunklist.get(fid).size();i++){
file += chunklist.get(fid).get(i);
}
node.store(fid);
@ -260,10 +259,8 @@ public class UDPHandler implements Runnable {
chunklist.remove(fid);
LOGGER.log(Level.INFO,"FILE DATA: "+file);
}
// This should be the answer to a prior FIND_NODE -> mark this RPC ID as
// received
node.receivedRPC(fromID, rpcID);
node.sendAck(fromID, rpcID);
LOGGER.log(Level.INFO, "Received [DATA] [{0}] from Node {1})",
new Object[] { data.toString(), fromID });
@ -273,8 +270,8 @@ public class UDPHandler implements Runnable {
private void receiveDataReq(NodeIdentifier fromID, Identifier rpcID) {
Identifier fid = getIDFromBuffer();
//FileIdentifier fid = new FileIdentifier(1, buffer.array());
node.sendData(fromID, fid);
node.receivedRPC(fromID, rpcID);
node.sendData(fromID, fid);
node.sendAck(fromID, rpcID);
}
private void receivePong(NodeIdentifier fromID, Identifier rpcID) {