Speed up port protocol resolution.

Workaround for #332. Instead of loading services when we find a new open port, do it when we enter in the prrt scanner, and in a thread. So when a new open port is discovered, it has already loaded ~2000 ports.

Also avoid to create new objects on every iteration of the loops.

Author: gainan

cSploit/src/org/csploit/android/core/System.java

@@ -21,9 +21,7 @@
 import android.app.Activity;
 import android.app.ActivityManager;
 import android.app.ActivityManager.RunningServiceInfo;
-import android.app.AlertDialog;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
@@ -32,7 +30,6 @@
 import android.net.wifi.WifiManager;
 import android.net.wifi.WifiManager.WifiLock;
 import android.os.Build;
-import android.os.Bundle;
 import android.os.Environment;
 import android.os.PowerManager;
 import android.os.PowerManager.WakeLock;
@@ -156,6 +153,8 @@ public static void init(Context context) throws Exception{
       mKnownIssues = new KnownIssues();
       mPlugins = new ArrayList<Plugin>();
       mOpenPorts = new SparseIntArray(3);
+      mServices = new HashMap<String, String>();
+      mPorts = new HashMap<String, String>();
 
       // if we are here, network initialization didn't throw any error, lock wifi
       WifiManager wifiManager = (WifiManager) mContext.getSystemService(Context.WIFI_SERVICE);
@@ -520,38 +519,46 @@ public static void unregisterSettingListener(SettingReceiver receiver) {
     }
   }
 
-  private static void preloadServices(){
-    if(mServices == null || mPorts == null){
-      try{
-        // preload network service map and mac vendors
-        mServices = new HashMap<String, String>();
-        mPorts = new HashMap<String, String>();
-
-        @SuppressWarnings("ConstantConditions")
-        FileInputStream fstream = new FileInputStream(mContext.getFilesDir().getAbsolutePath() + "/tools/nmap/nmap-services");
+  public static void preloadServices(){
+    if (mServices.size() > 0 && mPorts.size() > 0)
+      return;
 
-        DataInputStream in = new DataInputStream(fstream);
-        BufferedReader reader = new BufferedReader(new InputStreamReader(in));
-        String line;
-        Matcher matcher;
+    FileReader fr = null;
+    BufferedReader reader = null;
+    try{
+      // preload network service and ports map
 
-        while((line = reader.readLine()) != null){
-          line = line.trim();
+      //@SuppressWarnings("ConstantConditions")
+      fr = new FileReader(mContext.getFilesDir().getAbsolutePath() + "/tools/nmap/nmap-services");
+      reader = new BufferedReader(fr);
+      String line;
+      Matcher matcher;
+      String port, proto;
 
-          if((matcher = SERVICE_PARSER.matcher(line)) != null && matcher.find()){
-            String proto = matcher.group(1),
-              port = matcher.group(2);
+      while ((line = reader.readLine()) != null) {
+        if ((matcher = SERVICE_PARSER.matcher(line)) != null && matcher.find()) {
+          proto = matcher.group(1);
+          port = matcher.group(2);
 
-            mServices.put(proto, port);
-            mPorts.put(port, proto);
-          }
+          mServices.put(proto, port);
+          mPorts.put(port, proto);
         }
-
-        in.close();
       }
-      catch(Exception e){
-        errorLogging(e);
+
+    } catch (Exception e) {
+      mServices.clear();
+      mPorts.clear();
+
+      errorLogging(e);
+    }
+    finally {
+      try {
+        if (fr != null)
+          fr.close();
+        if (reader != null)
+          reader.close();
       }
+      catch (Exception e){}
     }
   }
 
@@ -946,7 +953,6 @@ public static String getMacVendor(byte[] mac){
   }
 
   public static String getProtocolByPort(String port){
-    preloadServices();
 
     return mPorts.containsKey(port) ? mPorts.get(port) : null;
   }
@@ -956,7 +962,6 @@ public static String getProtocolByPort(int port) {
   }
 
   public static int getPortByProtocol(String protocol){
-    preloadServices();
 
     return mServices.containsKey(protocol) ? Integer.parseInt(mServices.get(protocol)) : 0;
   }

cSploit/src/org/csploit/android/plugins/PortScanner.java

@@ -23,7 +23,6 @@
 import android.content.SharedPreferences;
 import android.net.Uri;
 import android.os.Bundle;
-import android.preference.PreferenceManager;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -70,6 +69,7 @@ public class PortScanner extends Plugin {
 	private static final String CUSTOM_PARAMETERS = "PortScanner.Prefs.CustomParameters";
 	private static final String CUSTOM_PARAMETERS_TEXT = "PortScanner.Prefs.CustomParameters.Text";
 	private SharedPreferences mPreferences = null;
+	private boolean unresolvedPorts = false;
 
 	public PortScanner() {
 		super(R.string.port_scanner, R.string.port_scanner_desc,
@@ -187,6 +187,13 @@ public void onCreate(Bundle savedInstanceState) {
 		mScanToggleButton = (ToggleButton) findViewById(R.id.scanToggleButton);
 		mScanProgress = (ProgressBar) findViewById(R.id.scanActivity);
 
+		new Thread(new Runnable() {
+			@Override
+			public void run() {
+				System.preloadServices();
+			}
+		}).start();
+
 		if (mPreferences.getBoolean(CUSTOM_PARAMETERS, false))
 			displayParametersField();
 
@@ -383,6 +390,29 @@ public void run() {
 		public void onEnd(int exitCode) {
 			super.onEnd(exitCode);
 
+			// last chance to resolve ports protocols
+			if (unresolvedPorts) {
+				String temp_port, port, protocol;
+				for (int i = 0; i < mPortList.size(); i++) {
+					if (mPortList.get(i).startsWith("tcp : ") || mPortList.get(i).startsWith("udp : ")) {
+						temp_port = mPortList.get(i);
+						port = temp_port.split("\\s")[2];
+						protocol = System.getProtocolByPort(port);
+
+						if (protocol != null)
+							mPortList.set(i, port + " ( " + protocol + " )");
+
+						Logger.debug("unresolved port: " + port + ":" + protocol);
+					}
+				}
+				PortScanner.this.runOnUiThread(new Runnable() {
+					@Override
+					public void run() {
+						mListAdapter.notifyDataSetChanged();
+					}
+				});
+			}
+
 			PortScanner.this.runOnUiThread(new Runnable() {
 				@Override
 				public void run() {
@@ -406,8 +436,10 @@ public void run() {
 					if (resolvedProtocol != null)
 						entry = port + " ( " + resolvedProtocol + " )";
 
-					else
+					else {
+						unresolvedPorts = true;
 						entry = portProtocol + " : " + port;
+					}
 
 					// add open port to the listview and notify the environment
 					// about the event