diff --git a/.gitignore b/.gitignore index b449312c7356b8d2de1e8fa03204ecf08e5d15bc..c4360ae9362780dfb9ed89d3f68b2cb81820f1a2 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -/Brennenstuhl/nbproject/private/ \ No newline at end of file +/Brennenstuhl/nbproject/private/ +/BrennenstuhlTobias/build/ \ No newline at end of file diff --git a/BrennenstuhlTobias/pdulog/Pdusave.dislog b/BrennenstuhlTobias/pdulog/Pdusave.dislog deleted file mode 100644 index 6aaeadbcc52eeb86a551634170839ca93cc90ccd..0000000000000000000000000000000000000000 --- a/BrennenstuhlTobias/pdulog/Pdusave.dislog +++ /dev/null @@ -1,7 +0,0 @@ -!Begin!Beginning of DIS capture file, Pdusave.dislog. [PDU Header],[PDU Stream] -[0,0,0,0,0,0,0,0],[B@5c884fd0 -[0,0,0,0,33,55,-1,12],[B@1052d894 -[0,0,0,0,-5,-90,8,-96],[B@cfb77b1 -[0,0,0,1,42,117,-65,24],[B@2f6f2e70 -[0,0,0,1,120,127,104,-68],[B@7eb7c289 -!End!End of DIS capture file, Pdusave.dislog. diff --git a/BrennenstuhlTobias/pdulog/Pdusave1.dislog b/BrennenstuhlTobias/pdulog/Pdusave1.dislog deleted file mode 100644 index 89f5b423ab9de220dc0c70998a367cd001eb5db3..0000000000000000000000000000000000000000 --- a/BrennenstuhlTobias/pdulog/Pdusave1.dislog +++ /dev/null @@ -1,6 +0,0 @@ -!Begin!Beginning of DIS capture file, Pdusave1.dislog. [PDU Header],[PDU Stream] -[0,0,0,0,0,0,0,0][B@7e0210b4,[B@4ceb7d75 -[0,0,0,0,15,-123,-106,-84][B@2fb955dd,[B@4af2482a -[0,0,0,0,40,-121,-54,88][B@42856fc3,[B@55ee8e64 -[0,0,0,1,42,-59,-20,124][B@301c3eb9,[B@68779388 -!End!End of DIS capture file, Pdusave1.dislog. diff --git a/BrennenstuhlTobias/pdulog/Pdusave2.dislog b/BrennenstuhlTobias/pdulog/Pdusave2.dislog deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/BrennenstuhlTobias/src/PduStreamTools/PduListenerSaver.java b/BrennenstuhlTobias/src/PduStreamTools/PduListenerSaver.java index 9ce3d5cafa3710084ea4b3a2c63e7c88dd2ec7ee..19c13ddd8360a4289875228ea576894966dec731 100644 --- a/BrennenstuhlTobias/src/PduStreamTools/PduListenerSaver.java +++ b/BrennenstuhlTobias/src/PduStreamTools/PduListenerSaver.java @@ -50,11 +50,11 @@ public class PduListenerSaver { System.out.println("Beginning pdu save to directory " + outDir); //RecorderPlainText stores an unencoded PduLog - //RecorderPlainText recorder = new RecorderPlainText(outDir, mcast, port); + RecorderPlainText recorder = new RecorderPlainText(outDir, mcast, port); //RecorderBase64 stores a BASE64 encoded PduLog //RecorderBase64 recorder = new RecorderBase64(outDir, mcast, port); //RecorderBinary stores a Binary PduLog - RecorderBinary recorder = new RecorderBinary(outDir, mcast, port); + //RecorderBinary recorder = new RecorderBinary(outDir, mcast, port); recorder.startResume(); mystate state = mystate.RUNNING; diff --git a/BrennenstuhlTobias/src/PduStreamTools/PduReaderPlayer.java b/BrennenstuhlTobias/src/PduStreamTools/PduReaderPlayer.java index d4f7b941ee429bb34eaff722fd3de8610e67ae5d..2dc0e56fda57347b78634ce799db195c61d45b06 100644 --- a/BrennenstuhlTobias/src/PduStreamTools/PduReaderPlayer.java +++ b/BrennenstuhlTobias/src/PduStreamTools/PduReaderPlayer.java @@ -53,9 +53,9 @@ public class PduReaderPlayer { try { //Use Tobis Code without decryption //Does only work with unecrypted PduLogs - //PlayerPlainText player = new PlayerPlainText(mcast, port, new File(outDir).toPath()); + PlayerPlainText player = new PlayerPlainText(mcast, port, new File(outDir).toPath()); //Use Mike Baileys Code to store a file in BASE64 format - PlayerBase64 player = new PlayerBase64(mcast, port, new File(outDir).toPath()); + //PlayerBase64 player = new PlayerBase64(mcast, port, new File(outDir).toPath()); player.startResume();