Merge pull request #264 from gainan/dns_spoof_improvements

dns spoof module improvements

Author: tux-mind

cSploit/res/layout/plugin_mitm_dns_spoofing.xml

@@ -1,10 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
                 android:focusable="true" android:focusableInTouchMode="true"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
-                android:orientation="vertical"
-                android:padding="8dp">
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:padding="6dp">
 
     <ToggleButton
             android:id="@+id/sniffToggleButton"
@@ -59,6 +57,7 @@
         android:layout_alignParentRight="true"
         android:layout_alignParentEnd="true"
         android:scrollbars="vertical|horizontal"
+        android:scrollHorizontally="true"
         android:editable="true" />
 
 </RelativeLayout>

cSploit/src/org/csploit/android/plugins/mitm/DNSSpoofing.java

@@ -33,6 +33,7 @@
 import org.csploit.android.core.ChildManager;
 import org.csploit.android.core.Logger;
 import org.csploit.android.core.System;
+import org.csploit.android.gui.dialogs.ErrorDialog;
 import org.csploit.android.tools.Ettercap;
 
 import java.io.BufferedReader;
@@ -71,6 +72,7 @@ public void onCreate(Bundle savedInstanceState) {
         mCmdSave = (Button) findViewById(R.id.cmd_save);
 		mSniffToggleButton = (ToggleButton) findViewById(R.id.sniffToggleButton);
 		mSniffProgress = (ProgressBar) findViewById(R.id.sniffActivity);
+        mTextDnsList.setHorizontallyScrolling(true);
 
 		mSpoofSession = new SpoofSession(false, false, null, null);
 
@@ -193,6 +195,20 @@ public void run() {
           });
         }
 
+          @Override
+          public void onError(final String error) {
+              DNSSpoofing.this.runOnUiThread(new Runnable() {
+                  @Override
+                  public void run() {
+                      if (!DNSSpoofing.this.isFinishing()) {
+                          new ErrorDialog(getString(R.string.error), error,
+                                  DNSSpoofing.this).show();
+                          setStoppedState();
+                      }
+                  }
+              });
+          }
+
         @Override
         public void onDeath(final int signal) {
           DNSSpoofing.this.runOnUiThread(new Runnable() {

cSploit/src/org/csploit/android/plugins/mitm/SpoofSession.java

@@ -138,6 +138,7 @@ public void start(final OnDNSSpoofedReceiver listener) throws ChildManager.Child
               @Override
               public void onError(String line) {
                 SpoofSession.this.stop();
+                listener.onError(line);
               }
             });
 

cSploit/src/org/csploit/android/tools/Ettercap.java

@@ -68,7 +68,7 @@ else if(e instanceof Message) {
           Logger.info("OnDNSSpooferReceiver() message: " + e);
           Message m = (Message)e;
           if (m.severity == Message.Severity.ERROR)
-            onEnd(0);
+            onError(((Message) e).message);
         }
         else if (e instanceof Newline){
           Logger.info("OnDNSSpooferReceiver() Newline: " + e.toString());
@@ -81,6 +81,7 @@ else if (e instanceof Newline){
       public abstract void onEnd(int exitValue);
       public abstract void onSpoofed(String line);
       public abstract void onStderr(String line);
+      public abstract void onError(String error);
       public abstract void onReady();
     }