Browse Source

changed packet structure for mirroring connections

Mihai Plasoianu 10 years ago
parent
commit
c21516d544

+ 3 - 3
src/de/tudarmstadt/informatik/hostage/HoneyHandler.java

@@ -15,9 +15,9 @@ import de.tudarmstadt.informatik.hostage.logging.Logger;
 import de.tudarmstadt.informatik.hostage.logging.MyLocationManager;
 import de.tudarmstadt.informatik.hostage.logging.Record;
 import de.tudarmstadt.informatik.hostage.logging.Record.TYPE;
+import de.tudarmstadt.informatik.hostage.mirror.Mirror;
 import de.tudarmstadt.informatik.hostage.nio.Reader;
 import de.tudarmstadt.informatik.hostage.nio.Writer;
-import de.tudarmstadt.informatik.hostage.protocol.GHOST;
 import de.tudarmstadt.informatik.hostage.protocol.Protocol;
 import de.tudarmstadt.informatik.hostage.protocol.Protocol.TALK_FIRST;
 import de.tudarmstadt.informatik.hostage.wrapper.Packet;
@@ -65,8 +65,8 @@ public class HoneyHandler implements Runnable {
 		this.listener = listener;
 		this.protocol = protocol;
 		if (protocol.toString().equals("GHOST")) {
-			((GHOST) protocol).setAttackerIP(client.getInetAddress());
-			((GHOST) protocol).setCurrentPort(listener.getPort());
+			((Mirror) protocol).setAttackerIP(client.getInetAddress());
+			((Mirror) protocol).setCurrentPort(listener.getPort());
 		}
 		this.client = client;
 		this.thread = new Thread(this);

+ 9 - 12
src/de/tudarmstadt/informatik/hostage/protocol/GHOST.java → src/de/tudarmstadt/informatik/hostage/mirror/Mirror.java

@@ -1,4 +1,4 @@
-package de.tudarmstadt.informatik.hostage.protocol;
+package de.tudarmstadt.informatik.hostage.mirror;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
@@ -8,6 +8,7 @@ import java.net.Socket;
 import java.util.ArrayList;
 import java.util.List;
 
+import de.tudarmstadt.informatik.hostage.protocol.Protocol;
 import de.tudarmstadt.informatik.hostage.wrapper.Packet;
 
 /**
@@ -18,7 +19,7 @@ import de.tudarmstadt.informatik.hostage.wrapper.Packet;
  * 
  * @author Wulf Pfeiffer
  */
-public class GHOST implements Protocol {
+public class Mirror implements Protocol {
 
 	private boolean isClosed = false;
 
@@ -27,11 +28,10 @@ public class GHOST implements Protocol {
 	private BufferedInputStream mirrorInputStream;
 
 	private BufferedOutputStream mirrorOutputStream;
-	
+
 	private int currentPort;
-	
+
 	private InetAddress attackerIP;
-	
 
 	public void setCurrentPort(int currentPort) {
 		this.currentPort = currentPort;
@@ -62,13 +62,10 @@ public class GHOST implements Protocol {
 		try {
 			if (mirroredConnection == null) {
 				mirroredConnection = new Socket(attackerIP, currentPort);
-				mirrorInputStream = new BufferedInputStream(
-						mirroredConnection.getInputStream());
-				mirrorOutputStream = new BufferedOutputStream(
-						mirroredConnection.getOutputStream());
+				mirrorInputStream = new BufferedInputStream(mirroredConnection.getInputStream());
+				mirrorOutputStream = new BufferedOutputStream(mirroredConnection.getOutputStream());
 			}
-			if (mirroredConnection.isInputShutdown()
-					|| mirroredConnection.isOutputShutdown()) {
+			if (mirroredConnection.isInputShutdown() || mirroredConnection.isOutputShutdown()) {
 				mirrorInputStream.close();
 				mirrorOutputStream.close();
 				mirroredConnection.close();
@@ -94,7 +91,7 @@ public class GHOST implements Protocol {
 
 	@Override
 	public String toString() {
-		return "GHOST";
+		return "Mirror";
 	}
 
 	@Override