Browse Source

Moved ProtocolSettings from commons to protocol
minor changes

Wulf Pfeiffer 10 years ago
parent
commit
f3ec54c1a8

+ 1 - 3
src/de/tudarmstadt/informatik/hostage/HoneyService.java

@@ -28,12 +28,12 @@ import android.support.v4.content.LocalBroadcastManager;
 import android.util.Log;
 import android.widget.Toast;
 import de.tudarmstadt.informatik.hostage.commons.HelperUtils;
-import de.tudarmstadt.informatik.hostage.commons.ProtocolSettings;
 import de.tudarmstadt.informatik.hostage.logging.DatabaseHandler;
 import de.tudarmstadt.informatik.hostage.logging.Logger;
 import de.tudarmstadt.informatik.hostage.logging.MyLocationManager;
 import de.tudarmstadt.informatik.hostage.logging.SQLLogger;
 import de.tudarmstadt.informatik.hostage.protocol.Protocol;
+import de.tudarmstadt.informatik.hostage.protocol.ProtocolSettings;
 import de.tudarmstadt.informatik.hostage.ui.MainActivity;
 /**
  * Background service running as long as at least one protocol is active.
@@ -380,13 +380,11 @@ public class HoneyService extends Service {
 			 } catch (Exception e) {
 				 e.printStackTrace();
 			 }
-			 System.out.println(sb.length());
 			 return sb.toString();
 		 }
 			 
 		 @Override
 		 protected void onPostExecute(String result){
-			 System.out.println("hi " + result);
 			 if (result != null)
 				 ProtocolSettings.setHttpQotd(result);
 			 else

+ 0 - 1
src/de/tudarmstadt/informatik/hostage/protocol/HTTP.java

@@ -7,7 +7,6 @@ import java.util.List;
 import java.util.Locale;
 import java.util.TimeZone;
 
-import de.tudarmstadt.informatik.hostage.commons.ProtocolSettings;
 
 /**
  * HTTP protocol

+ 0 - 1
src/de/tudarmstadt/informatik/hostage/protocol/MySQL.java

@@ -4,7 +4,6 @@ import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.List;
 import de.tudarmstadt.informatik.hostage.commons.HelperUtils;
-import de.tudarmstadt.informatik.hostage.commons.ProtocolSettings;
 import de.tudarmstadt.informatik.hostage.wrapper.ByteArray;
 
 /**

+ 3 - 1
src/de/tudarmstadt/informatik/hostage/commons/ProtocolSettings.java → src/de/tudarmstadt/informatik/hostage/protocol/ProtocolSettings.java

@@ -1,7 +1,9 @@
-package de.tudarmstadt.informatik.hostage.commons;
+package de.tudarmstadt.informatik.hostage.protocol;
 
 import java.security.SecureRandom;
 
+import de.tudarmstadt.informatik.hostage.commons.HelperUtils;
+
 /**
  * This class holds informations for all protocols, e.g. server name, version etc.
  * It provides getters and setters.

+ 0 - 1
src/de/tudarmstadt/informatik/hostage/protocol/SMB.java

@@ -9,7 +9,6 @@ import java.util.List;
 import java.util.TimeZone;
 
 import de.tudarmstadt.informatik.hostage.commons.HelperUtils;
-import de.tudarmstadt.informatik.hostage.commons.ProtocolSettings;
 import de.tudarmstadt.informatik.hostage.wrapper.ByteArray;
 
 /**

+ 0 - 1
src/de/tudarmstadt/informatik/hostage/protocol/SSH.java

@@ -18,7 +18,6 @@ import javax.crypto.interfaces.DHPublicKey;
 import javax.crypto.spec.DHParameterSpec;
 import javax.crypto.spec.DHPublicKeySpec;
 import de.tudarmstadt.informatik.hostage.commons.HelperUtils;
-import de.tudarmstadt.informatik.hostage.commons.ProtocolSettings;
 import de.tudarmstadt.informatik.hostage.wrapper.ByteArray;
 
 /**

+ 0 - 1
src/de/tudarmstadt/informatik/hostage/protocol/TELNET.java

@@ -4,7 +4,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import de.tudarmstadt.informatik.hostage.commons.HelperUtils;
-import de.tudarmstadt.informatik.hostage.commons.ProtocolSettings;
 import de.tudarmstadt.informatik.hostage.wrapper.ByteArray;
 
 /**