Removed bin and gen folder

Renamed ByteArrayHandlerImpl to ByteArrayHandler
Renamed StringHandlerImpl to StringHandler

.classpath

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>

bin/AndroidManifest.xml

@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.tudarmstadt.informatik.hostage"
-    android:versionCode="1"
-    android:versionName="1.0" >
-
-    <uses-sdk
-        android:minSdkVersion="8"
-        android:targetSdkVersion="18" />
-
-    <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-
-    <application
-        android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
-        <activity
-            android:name="de.tudarmstadt.informatik.hostage.ui.MainActivity"
-            android:label="@string/app_name" 
-            android:configChanges="keyboardHidden|orientation|screenSize">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <activity
-            android:name="de.tudarmstadt.informatik.hostage.ui.ViewLog"
-            android:label="@string/statistics" >
-        </activity>
-       	<activity
-            android:name="de.tudarmstadt.informatik.hostage.ui.ViewLogTable"
-            android:label="@string/database" >
-        </activity>
-        
-       	<activity
-            android:name="de.tudarmstadt.informatik.hostage.ui.SettingsActivity"
-            android:label="@string/settings" >
-        </activity>
-        
-       	<activity
-            android:name="de.tudarmstadt.informatik.hostage.ui.AboutActivity"
-            android:label="@string/action_about" >
-        </activity>
-
-        <service 
-            android:name="de.tudarmstadt.informatik.hostage.HoneyService" >
-        </service>
-    </application>
-
-</manifest>

bin/jarlist.cache

@@ -1,3 +0,0 @@
-# cache for current jar dependency. DO NOT EDIT.
-# format is <lastModified> <length> <SHA-1> <path>
-# Encoding is UTF-8

gen/de/tudarmstadt/informatik/hostage/BuildConfig.java

@@ -1,6 +0,0 @@
-/** Automatically generated file. DO NOT MODIFY */
-package de.tudarmstadt.informatik.hostage;
-
-public final class BuildConfig {
-    public final static boolean DEBUG = true;
-}

gen/de/tudarmstadt/informatik/hostage/R.java

@@ -1,190 +0,0 @@
-/* AUTO-GENERATED FILE.  DO NOT MODIFY.
- *
- * This class was automatically generated by the
- * aapt tool from the resource data it found.  It
- * should not be modified by hand.
- */
-
-package de.tudarmstadt.informatik.hostage;
-
-public final class R {
-    public static final class anim {
-        public static final int in_left_to_right=0x7f040000;
-        public static final int in_right_to_left=0x7f040001;
-        public static final int out_left_to_right=0x7f040002;
-        public static final int out_right_to_left=0x7f040003;
-    }
-    public static final class array {
-        public static final int delete_criteria=0x7f060001;
-        public static final int format=0x7f060000;
-        public static final int protocols=0x7f060002;
-        public static final int renderer=0x7f060003;
-    }
-    public static final class attr {
-    }
-    public static final class color {
-        public static final int dark_grey=0x7f070001;
-        public static final int light_grey=0x7f070000;
-    }
-    public static final class dimen {
-        /**  Default screen margins, per the Android Design guidelines. 
-
-         Customize dimensions originally defined in res/values/dimens.xml (such as
-         screen margins) for sw720dp devices (e.g. 10" tablets) in landscape here.
-    
-         */
-        public static final int activity_horizontal_margin=0x7f080000;
-        public static final int activity_vertical_margin=0x7f080001;
-    }
-    public static final class drawable {
-        public static final int ic_launcher=0x7f020000;
-        public static final int ic_service_green=0x7f020001;
-        public static final int ic_service_red=0x7f020002;
-        public static final int ic_service_yellow=0x7f020003;
-        public static final int light_green=0x7f020004;
-        public static final int light_green_large=0x7f020005;
-        public static final int light_grey=0x7f020006;
-        public static final int light_grey_large=0x7f020007;
-        public static final int light_red=0x7f020008;
-        public static final int light_red_large=0x7f020009;
-        public static final int light_yellow=0x7f02000a;
-        public static final int light_yellow_large=0x7f02000b;
-    }
-    public static final class id {
-        public static final int TextViewServices=0x7f0c0017;
-        public static final int action_about=0x7f0c0027;
-        public static final int action_settings=0x7f0c0026;
-        public static final int buttonDeleteLog=0x7f0c0022;
-        public static final int buttonExportDatabase=0x7f0c0020;
-        public static final int buttonShowLog=0x7f0c000d;
-        public static final int buttonUploadLog=0x7f0c0021;
-        public static final int checkBoxParanoid=0x7f0c000b;
-        public static final int imageViewLight=0x7f0c000a;
-        public static final int layoutContainer=0x7f0c001a;
-        public static final int listViewProtocols=0x7f0c0018;
-        public static final int textFirstAttack=0x7f0c001b;
-        public static final int textFirstAttackValue=0x7f0c001c;
-        public static final int textLastAttack=0x7f0c001d;
-        public static final int textLastAttackValue=0x7f0c001e;
-        public static final int textLogFile=0x7f0c001f;
-        public static final int textStatistics=0x7f0c0019;
-        public static final int textViewBSSID=0x7f0c0011;
-        public static final int textViewBSSIDValue=0x7f0c0012;
-        public static final int textViewConnections=0x7f0c0024;
-        public static final int textViewConnectionsValue=0x7f0c0025;
-        public static final int textViewDetails=0x7f0c000e;
-        public static final int textViewExternalIP=0x7f0c0015;
-        public static final int textViewExternalIPValue=0x7f0c0016;
-        public static final int textViewInternalIP=0x7f0c0013;
-        public static final int textViewInternalIPValue=0x7f0c0014;
-        public static final int textViewProtocol=0x7f0c0023;
-        public static final int textViewSSID=0x7f0c000f;
-        public static final int textViewSSIDValue=0x7f0c0010;
-        public static final int textViewStatus=0x7f0c0009;
-        public static final int text_author_1=0x7f0c0004;
-        public static final int text_author_2=0x7f0c0005;
-        public static final int text_author_3=0x7f0c0006;
-        public static final int text_author_4=0x7f0c0007;
-        public static final int text_authors=0x7f0c0003;
-        public static final int text_description=0x7f0c0002;
-        public static final int text_version=0x7f0c0000;
-        public static final int toggleButtonOnOff=0x7f0c000c;
-        public static final int version=0x7f0c0001;
-        public static final int viewAnimator=0x7f0c0008;
-    }
-    public static final class layout {
-        public static final int activity_about=0x7f030000;
-        public static final int activity_main=0x7f030001;
-        public static final int activity_viewlog=0x7f030002;
-        public static final int list_view_protocols_row=0x7f030003;
-    }
-    public static final class menu {
-        public static final int main=0x7f0b0000;
-    }
-    public static final class string {
-        public static final int action_about=0x7f090002;
-        public static final int action_settings=0x7f090001;
-        public static final int app_name=0x7f090000;
-        public static final int authors=0x7f09001c;
-        public static final int authors_j=0x7f090020;
-        public static final int authors_l=0x7f09001e;
-        public static final int authors_m=0x7f09001d;
-        public static final int authors_w=0x7f09001f;
-        public static final int bssid=0x7f090009;
-        public static final int cancel=0x7f090015;
-        public static final int capital_off=0x7f090004;
-        public static final int capital_on=0x7f090003;
-        public static final int clear=0x7f090013;
-        public static final int connections=0x7f09000d;
-        public static final int database=0x7f09000f;
-        public static final int delete=0x7f090014;
-        public static final int delete_dialog_title=0x7f090018;
-        public static final int description=0x7f09001b;
-        public static final int details=0x7f090007;
-        public static final int dialog_clear_database=0x7f090016;
-        public static final int dialog_clear_database_date=0x7f090019;
-        public static final int export_dialog_title=0x7f090017;
-        public static final int external_ip=0x7f09000b;
-        public static final int firstAttack=0x7f090011;
-        public static final int internal_ip=0x7f09000a;
-        public static final int lastAttack=0x7f090012;
-        public static final int log_actions=0x7f090010;
-        public static final int paranoid=0x7f090006;
-        public static final int pref_alarm=0x7f090022;
-        public static final int pref_alarm_default=0x7f090023;
-        public static final int pref_alarm_summ=0x7f090024;
-        public static final int pref_connection_settings=0x7f090034;
-        public static final int pref_external_location_title=0x7f090028;
-        public static final int pref_external_storage_summ=0x7f090027;
-        public static final int pref_external_storage_title=0x7f090026;
-        public static final int pref_max_connections=0x7f09002e;
-        public static final int pref_max_connections_default=0x7f09002f;
-        public static final int pref_notification=0x7f090029;
-        public static final int pref_sleeptime=0x7f090032;
-        public static final int pref_sleeptime_default=0x7f090033;
-        public static final int pref_storage=0x7f090025;
-        public static final int pref_timeout=0x7f090030;
-        public static final int pref_timeout_default=0x7f090031;
-        public static final int pref_upload=0x7f09002c;
-        public static final int pref_upload_server=0x7f09002d;
-        public static final int pref_vibration=0x7f09002a;
-        public static final int pref_vibration_summ=0x7f09002b;
-        public static final int services=0x7f09000c;
-        public static final int settings=0x7f090021;
-        public static final int ssid=0x7f090008;
-        public static final int statistics=0x7f09000e;
-        public static final int status=0x7f090005;
-        public static final int text_version=0x7f09001a;
-    }
-    public static final class style {
-        /** 
-        Base application theme, dependent on API level. This theme is replaced
-        by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
-    
-
-            Theme customizations available in newer API levels can go in
-            res/values-vXX/styles.xml, while customizations related to
-            backward-compatibility can go here.
-        
-
-        Base application theme for API 11+. This theme completely replaces
-        AppBaseTheme from res/values/styles.xml on API 11+ devices.
-    
- API 11 theme customizations can go here. 
-
-        Base application theme for API 14+. This theme completely replaces
-        AppBaseTheme from BOTH res/values/styles.xml and
-        res/values-v11/styles.xml on API 14+ devices.
-    
- API 14 theme customizations can go here. 
-         */
-        public static final int AppBaseTheme=0x7f0a0000;
-        /**  Application theme. 
- All customizations that are NOT specific to a particular API-level can go here. 
-         */
-        public static final int AppTheme=0x7f0a0001;
-    }
-    public static final class xml {
-        public static final int preferences=0x7f050000;
-    }
-}

res/values/renderer.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string-array name="renderer">
-        <item>MySQL</item>
-        <item>SMB</item>
-        <item>TELNET</item>
-    </string-array>
-
-</resources>

src/de/tudarmstadt/informatik/hostage/HoneyListener.java

@@ -13,8 +13,8 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import de.tudarmstadt.informatik.hostage.handler.AbstractHandler;
-import de.tudarmstadt.informatik.hostage.handler.ByteArrayHandlerImpl;
-import de.tudarmstadt.informatik.hostage.handler.StringHandlerImpl;
+import de.tudarmstadt.informatik.hostage.handler.ByteArrayHandler;
+import de.tudarmstadt.informatik.hostage.handler.StringHandler;
 import de.tudarmstadt.informatik.hostage.net.MyServerSocketFactory;
 import de.tudarmstadt.informatik.hostage.protocol.Protocol;
 import de.tudarmstadt.informatik.hostage.protocol.SSLProtocol;
@@ -201,9 +201,9 @@ public class HoneyListener implements Runnable {
 	private AbstractHandler newInstance(HoneyService service,
 			HoneyListener listener, Protocol protocol, Socket client) {
 		if (protocol.getType().equals(String.class)) {
-			return new StringHandlerImpl(service, listener, protocol, client);
+			return new StringHandler(service, listener, protocol, client);
 		} else if (protocol.getType().equals(ByteArray.class)) {
-			return new ByteArrayHandlerImpl(service, listener, protocol, client);
+			return new ByteArrayHandler(service, listener, protocol, client);
 		} else {
 			return null;
 		}

src/de/tudarmstadt/informatik/hostage/handler/ByteArrayHandlerImpl.java → src/de/tudarmstadt/informatik/hostage/handler/ByteArrayHandler.java

@@ -19,11 +19,11 @@ import de.tudarmstadt.informatik.hostage.protocol.Protocol;
 import de.tudarmstadt.informatik.hostage.protocol.Protocol.TALK_FIRST;
 import de.tudarmstadt.informatik.hostage.wrapper.ByteArray;
 
-public class ByteArrayHandlerImpl extends AbstractHandler {
+public class ByteArrayHandler extends AbstractHandler {
 
 	private int SLEEPTIME;
 	
-	public ByteArrayHandlerImpl(HoneyService service, HoneyListener listener,
+	public ByteArrayHandler(HoneyService service, HoneyListener listener,
 			Protocol protocol, Socket client) {
 		super(service, listener, protocol, client);
 		SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(service);

src/de/tudarmstadt/informatik/hostage/handler/StringHandlerImpl.java → src/de/tudarmstadt/informatik/hostage/handler/StringHandler.java

@@ -14,9 +14,9 @@ import de.tudarmstadt.informatik.hostage.logging.Record.TYPE;
 import de.tudarmstadt.informatik.hostage.protocol.Protocol;
 import de.tudarmstadt.informatik.hostage.protocol.Protocol.TALK_FIRST;
 
-public class StringHandlerImpl extends AbstractHandler {
+public class StringHandler extends AbstractHandler {
 
-	public StringHandlerImpl(HoneyService service, HoneyListener listener,
+	public StringHandler(HoneyService service, HoneyListener listener,
 			Protocol protocol, Socket client) {
 		super(service, listener, protocol, client);
 	}

src/de/tudarmstadt/informatik/hostage/protocol/Protocol.java

@@ -5,6 +5,7 @@ import java.util.List;
 /**
  * Interface for protocols that are used by the application.
  * @param <T> Denotes if the protocol is using Strings or ByteArrays.
+ * @author Mihai Plasoianu
  */
 public interface Protocol<T> {
 

src/de/tudarmstadt/informatik/hostage/render/SMBRenderer.java

@@ -100,6 +100,9 @@ public class SMBRenderer implements ProtocolRenderer {
 	private String getContent(byte cmd, byte[] packet) {
 		switch(cmd) {
 		case 0x72: return get0x72content(packet);
+		case 0x73: return HelperUtils.byteToStr(packet);
+		case (byte) 0xa2: return HelperUtils.byteToStr(packet);
+		case 0x25: return HelperUtils.byteToStr(packet);
 		default: return "";
 		}
 	}

src/de/tudarmstadt/informatik/hostage/render/TELNETRenderer.java

@@ -1,10 +1,12 @@
 package de.tudarmstadt.informatik.hostage.render;
 
+import de.tudarmstadt.informatik.hostage.commons.HelperUtils;
+
 public class TELNETRenderer implements ProtocolRenderer {
 
 	@Override
 	public String render(String packet) {
-		return "";
+		return HelperUtils.byteToStr(HelperUtils.hexStringToByte(packet));
 	}
 
 }

src/de/tudarmstadt/informatik/hostage/render/ViewLogRenderer.java

@@ -10,7 +10,7 @@ public class ViewLogRenderer {
 	}
 	
 	private static ProtocolRenderer getRenderer(String protocol) {
-		String[] protocols = MainActivity.getContext().getResources().getStringArray(R.array.renderer);
+		String[] protocols = MainActivity.getContext().getResources().getStringArray(R.array.protocols);
 		String packageName = ProtocolRenderer.class.getPackage().getName();
 		ProtocolRenderer renderer = new DefaultRenderer();