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

fixed id problem

Browse Source
This commit is contained in:
Ulf Gebhardt 2013-02-11 11:49:48 +01:00
parent 75ef51315c
commit 2ef74f7707
4 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ws2012/P2P/uebungen/11/src/CLI.java
View File

@ -65,7 +65,7 @@ public class CLI {
String data = splitted[2];
// TODO not implemented
// Zum testen:
FileIdentifier fileIDToStore = new FileIdentifier(1, fileID2.getBytes());
FileIdentifier fileIDToStore = new FileIdentifier(1,fileID2.getBytes());
node.store(fileIDToStore);
node.storeData(fileIDToStore,data);
break;

22
ws2012/P2P/uebungen/11/src/node/FileIdentifier.java
View File

@ -4,9 +4,25 @@ import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
public class FileIdentifier extends Identifier {
private String fileID;
public FileIdentifier(int size, byte[] fileID) {
super(size, fileID);
}
super(size, fileID);
/*//calculate SHA-256 Hash of key
try {
MessageDigest md = MessageDigest.getInstance("SHA-256");
md.update(fileID.getBytes());
this.fileID = md.digest().toString();
} catch (NoSuchAlgorithmException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}*/
}
public String getKey() {
return this.fileID;
}
}

5
ws2012/P2P/uebungen/11/src/node/Node.java
View File

@ -232,9 +232,8 @@ public class Node {
send(receiver, MessageType.DATA_REQ, fileID.getBytes(), true, null);
}
public void sendData(NodeIdentifier receiver, FileIdentifier fileID) {
//String data = "abcdefghijklmnop"; //TODO this shit does not work for some reason // this.data.get(fileID);
public void sendData(NodeIdentifier receiver, Identifier fileID) {
String data = this.data.get(fileID);
if(data == null){
//TODO We dont have that data. -> DOES NOT WORK PROPERLY!

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

@ -241,7 +241,7 @@ public class UDPHandler implements Runnable {
String chunkContent = parts[3];
LOGGER.log(Level.INFO,"recieved Chunk file: "+fileID+" count: "+chunkCount+" id: "+chunkID);
FileIdentifier fid = new FileIdentifier(8,fileID.getBytes());
FileIdentifier fid = new FileIdentifier(1,fileID.getBytes());
if(chunklist.get(fid) == null){
chunklist.put(fid, new HashMap<Integer,String>());
}
@ -269,10 +269,10 @@ public class UDPHandler implements Runnable {
}
private void receiveDataReq(NodeIdentifier fromID, Identifier rpcID) {
FileIdentifier fid = new FileIdentifier(8, buffer.array());
node.sendData(fromID, fid);
//TODO ?
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);
}