make cache thread safe.

changed names a while.

Author: tux-mind

cSploit/src/org/csploit/android/net/http/RequestParser.java

@@ -297,7 +297,7 @@ public static String getBaseDomain(String hostname){
     if(Patterns.IP_ADDRESS.matcher(hostname).matches())
       return hostname;
 
-    String cached_domain = DNSCache.getInstance().getCachedRootDomain(hostname);
+    String cached_domain = DNSCache.getInstance().getRootDomain(hostname);
     if (cached_domain != null) {
       return cached_domain;
     }
@@ -318,7 +318,7 @@ public static String getBaseDomain(String hostname){
           domain += host_parts[i] + ".";
         }
 
-        DNSCache.getInstance().addCachedRootDomain(domain.substring(0, domain.length() - 1));
+        DNSCache.getInstance().addRootDomain(domain.substring(0, domain.length() - 1));
         return domain.substring(0, domain.length() - 1);
       }
     }
@@ -333,7 +333,7 @@ public static String getBaseDomain(String hostname){
     }
 
     if(startIndex > 0) {
-      DNSCache.getInstance().addCachedRootDomain(hostname.substring(startIndex));
+      DNSCache.getInstance().addRootDomain(hostname.substring(startIndex));
       return hostname.substring(startIndex);
     }
     else

cSploit/src/org/csploit/android/net/http/proxy/DNSCache.java

@@ -32,16 +32,16 @@ public class DNSCache
 {
   private static DNSCache mInstance = new DNSCache();
 
-  private HashMap<String, InetAddress> mCache = null;
-  private ArrayList<String> mCachedRootDomain = null;
+  private final HashMap<String, InetAddress> mCache;
+  private final ArrayList<String> mRootDomainCache;
 
   public static DNSCache getInstance(){
     return mInstance;
   }
 
   private DNSCache() {
     mCache = new HashMap<>();
-    mCachedRootDomain = new ArrayList<>();
+    mRootDomainCache = new ArrayList<>();
   }
 
   /**
@@ -50,10 +50,12 @@ private DNSCache() {
    * @param hostname hostname to check
    * @return String the root domain or null
    */
-  public String getCachedRootDomain (String hostname){
-    for (String rootDomain : mCachedRootDomain){
-      if (hostname.endsWith(rootDomain)){
-        return rootDomain;
+  public String getRootDomain(String hostname){
+    synchronized (mRootDomainCache) {
+      for (String rootDomain : mRootDomainCache) {
+        if (hostname.endsWith(rootDomain)) {
+          return rootDomain;
+        }
       }
     }
 
@@ -66,8 +68,10 @@ public String getCachedRootDomain (String hostname){
    *
    * @param rootdomain Root domain to add to the list
    */
-  public void addCachedRootDomain (String rootdomain){
-    mCachedRootDomain.add(rootdomain);
+  public void addRootDomain(String rootdomain){
+    synchronized (mRootDomainCache) {
+      mRootDomainCache.add(rootdomain);
+    }
   }
 
   private InetAddress getAddress(String server) throws IOException{