[Azureus-commitlog] azureus2/org/gudy/azureus2/core3/config/impl ConfigurationDefaults.java,1.172,1.173 ConfigurationChecker.java,1.85,1.86

[Alon R. <no...@us...>]

Update of /cvsroot/azureus/azureus2/org/gudy/azureus2/core3/config/impl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28926/org/gudy/azureus2/core3/config/impl

Modified Files:
	ConfigurationDefaults.java ConfigurationChecker.java 
Log Message:
Default listen port is now random (10000-65535).

Index: ConfigurationDefaults.java
===================================================================
RCS file: /cvsroot/azureus/azureus2/org/gudy/azureus2/core3/config/impl/ConfigurationDefaults.java,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- ConfigurationDefaults.java	22 Dec 2005 08:36:06 -0000	1.172
+++ ConfigurationDefaults.java	31 Dec 2005 04:30:01 -0000	1.173
@@ -17,6 +17,7 @@
 import org.gudy.azureus2.core3.tracker.host.TRHost;
 import org.gudy.azureus2.core3.tracker.server.TRTrackerServer;
 import org.gudy.azureus2.core3.util.AEMonitor;
+import org.gudy.azureus2.core3.util.RandomUtils;
 import org.gudy.azureus2.core3.util.SystemProperties;
 
 import com.aelitis.azureus.plugins.startstoprules.defaultplugin.DefaultRankCalculator;
@@ -95,7 +96,7 @@
 
     def.put("Override Ip", "");
     def.put("Enable incremental file creation", FALSE);
-    def.put("TCP.Listen.Port", new Long(6881));
+    def.put("TCP.Listen.Port", new Long( RandomUtils.generateRandomNetworkListenPort() ));
     def.put("max active torrents", new Long(4));
     def.put("max downloads", new Long(4));
     def.put("Newly Seeding Torrents Get First Priority", TRUE);
@@ -121,9 +122,9 @@
     def.put("priorityExtensionsIgnoreCase", FALSE);
     def.put("Ip Filter Enabled", TRUE);
     def.put("Ip Filter Allow",FALSE);
-	def.put("Ip Filter Enable Banning", TRUE);
-	def.put("Ip Filter Ban Block Limit", new Long(4));
-	def.put("Ip Filter Banning Persistent", TRUE);
+    def.put("Ip Filter Enable Banning", TRUE);
+    def.put("Ip Filter Ban Block Limit", new Long(4));
+    def.put("Ip Filter Banning Persistent", TRUE);
     def.put("Allow Same IP Peers",FALSE);
     def.put("Use Super Seeding",FALSE);
 

Index: ConfigurationChecker.java
===================================================================
RCS file: /cvsroot/azureus/azureus2/org/gudy/azureus2/core3/config/impl/ConfigurationChecker.java,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- ConfigurationChecker.java	1 Dec 2005 06:28:31 -0000	1.85
+++ ConfigurationChecker.java	31 Dec 2005 04:30:01 -0000	1.86
@@ -240,6 +240,12 @@
 	    		changed	= true;	    		
 	    	}
 	    	 	
+	    	//make sure we set and save the random listen port
+	    	if( !COConfigurationManager.doesParameterNonDefaultExist( "TCP.Listen.Port" ) ) {
+	    		COConfigurationManager.setParameter( "TCP.Listen.Port", COConfigurationManager.getIntParameter( "TCP.Listen.Port" ) );
+	    		changed = true;
+	    	}
+	    	
 	    }
 	    else {  //this is a pre-existing installation, called every time after first
 	   	 //enable Advanced user mode for existing users by default, to ease 2304-->2306 migrations
@@ -309,7 +315,7 @@
 	
 	    String uniqueId = COConfigurationManager.getStringParameter("ID",null);
 	    if(uniqueId == null || uniqueId.length() != 20) {
-	      uniqueId = generatePeerId();      
+	      uniqueId = RandomUtils.generateRandomAlphanumerics( 20 );
 	      COConfigurationManager.setParameter("ID", uniqueId);
 	      changed = true;
 	    }
@@ -415,26 +421,14 @@
   	}
   }
   
-  public static String generatePeerId() {
-    String uniqueId = "";
-    long currentTime = SystemTime.getCurrentTime();
-    for(int i = 0 ; i < currentTime % 1000 ; i++)
-      Math.random();            
-    //Allocate 20 random chars ID
-    String chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
-    for(int i = 0 ; i < 20 ; i++) {
-      int pos = (int) ( Math.random() * chars.length());
-      uniqueId += chars.charAt(pos);
-    }
-    return uniqueId;
-  }
+  
   
   public static void main(String args[]) {
     Integer obj = new Integer(1);
     HashMap test = new HashMap();
     int collisions = 0;
     for(int i = 0 ; i < 1000000 ; i++) {
-      String id = generatePeerId();
+      String id = RandomUtils.generateRandomAlphanumerics( 20 );
       if(test.containsKey(id)) {
         collisions++;
       } else {