From 31dec13fc3c04196c5636d756c1acb2df1bb0c89 Mon Sep 17 00:00:00 2001 From: Michael Scholz Date: Sun, 10 Feb 2013 20:41:42 +0100 Subject: [PATCH] updated send date stuff --- ws2012/P2P/uebungen/11/src/CLI.java | 18 ++++++++++++++++++ ws2012/P2P/uebungen/11/src/node/Node.java | 5 +++-- ws2012/P2P/uebungen/11/testfile.txt | 1 + 3 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 ws2012/P2P/uebungen/11/testfile.txt diff --git a/ws2012/P2P/uebungen/11/src/CLI.java b/ws2012/P2P/uebungen/11/src/CLI.java index 045562a7..d44d340a 100644 --- a/ws2012/P2P/uebungen/11/src/CLI.java +++ b/ws2012/P2P/uebungen/11/src/CLI.java @@ -1,7 +1,11 @@ import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileWriter; import java.io.IOException; import java.io.InputStreamReader; import java.net.InetSocketAddress; +import java.nio.MappedByteBuffer; import java.util.logging.LogManager; import node.Identifier; @@ -28,6 +32,7 @@ public class CLI { String[] splitted = s.split(" "); String cmd = splitted[0]; + String nodeID = splitted[1]; switch (cmd) { case "status": @@ -41,6 +46,19 @@ public class CLI { Identifier fileIDToFind = new Identifier(8, Identifier.getStaticIdentifier(8).getBytes()); node.findValue(fileIDToFind); break; + case "data": + File file = new File("/Users/Michael/Uni/allgemeiner Git/college/ws2012/P2P/uebungen/11/testfile.txt"); + + FileWriter fw = new FileWriter(file, true); + fw.write("ichbininhalteinesfiles"); + fw.flush(); + fw.close(); + //node.storeFile(file); + NodeIdentifier nodeIdenti = new NodeIdentifier(8, + nodeID.getBytes(), new InetSocketAddress( + "127.0.0.1", 50000)); + node.sendFile(nodeIdenti, file); + break; case "leave": node.leave(); break; diff --git a/ws2012/P2P/uebungen/11/src/node/Node.java b/ws2012/P2P/uebungen/11/src/node/Node.java index ef0a66d1..3c24209d 100644 --- a/ws2012/P2P/uebungen/11/src/node/Node.java +++ b/ws2012/P2P/uebungen/11/src/node/Node.java @@ -62,7 +62,7 @@ public class Node { private Identifier nodeID = Identifier.getRandomIdentifier(ID_BITS); private IRoutingTable routingTable = new RoutingTableImpl(BUCKET_SIZE, this); - private ArrayList files; + private ArrayList files = new ArrayList(); public Node() { System.setProperty("java.net.preferIPv4Stack", "true"); @@ -435,8 +435,9 @@ public class Node { public void storeFile(File file) { files.add(file); } + - private void sendFile(NodeIdentifier nodeID, File file) { + public void sendFile(NodeIdentifier nodeID, File file) { // calculate chunk size = BUFFER - ID_BITS - fileID - eofChar int CHUNK_SIZE = BUFFER_SIZE - ID_BITS - 10 - 1; diff --git a/ws2012/P2P/uebungen/11/testfile.txt b/ws2012/P2P/uebungen/11/testfile.txt new file mode 100644 index 00000000..121c3185 --- /dev/null +++ b/ws2012/P2P/uebungen/11/testfile.txt @@ -0,0 +1 @@ +ichbininhalteinesfilesichbininhalteinesfilesichbininhalteinesfilesichbininhalteinesfilesichbininhalteinesfiles \ No newline at end of file