Skip to content

Distributed Peer-to-Peer Web Search Engine and Intranet Search Appliance

beautified default peer names

Michael Peter Christenbaad56d83da4
diff --git a/defaults/yacy.init b/defaults/yacy.init
index f6330b1e5..50c695e27 100644
--- a/defaults/yacy.init
+++ b/defaults/yacy.init
@@ -16,9 +16,6 @@ port.ssl = 8443
# port to listen for a shutdown signal ( -1 = disable use of a shutdown port, 8005 = recommended default )
port.shutdown = -1
-# prefix for new default peer names
-peernameprefix=_anon
-
# use UPnP [true/false]
upnp.enabled = true
# remote host on UPnP device (for more than one connection)
diff --git a/source/net/yacy/peers/Seed.java b/source/net/yacy/peers/Seed.java
index 7d27b92d2..1d182139d 100644
--- a/source/net/yacy/peers/Seed.java
+++ b/source/net/yacy/peers/Seed.java
@@ -92,7 +92,7 @@ import net.yacy.utils.crypt;
public class Seed implements Cloneable, Comparable<Seed>, Comparator<Seed>
{
- public static String ANON_PREFIX = "_anon";
+ public static String ANON_PREFIX = "agent";
public static final int maxsize = 16000;
/**
@@ -319,10 +319,17 @@ public class Seed implements Cloneable, Comparable<Seed>, Comparator<Seed>
* @return
*/
private static String defaultPeerName() {
- return ANON_PREFIX
- + OS.infoKey()
+ Random r = new Random(System.currentTimeMillis());
+ char[] n = new char[7];
+ for (int i = 0; i < 7; i++) {
+ n[i] = i % 2 == 1 ? "aeiou".charAt(r.nextInt(5)) : "bdfghklmnprst".charAt(r.nextInt(13));
+ }
+ return
+ ANON_PREFIX
+ "-"
- + (System.currentTimeMillis() % 77777777L)
+ + new String(n)
+ + "-"
+ + OS.infoKey()
+ "-"
+ Network.speedKey;
}
diff --git a/source/net/yacy/search/Switchboard.java b/source/net/yacy/search/Switchboard.java
index 3539ea246..ccb63dccd 100644
--- a/source/net/yacy/search/Switchboard.java
+++ b/source/net/yacy/search/Switchboard.java
@@ -340,9 +340,6 @@ public final class Switchboard extends serverSwitch {
setLog(new ConcurrentLog("SWITCHBOARD"));
AccessTracker.setDumpFile(new File(dataPath, "DATA/LOG/queries.log"));
- // set default peer name
- Seed.ANON_PREFIX = getConfig("peernameprefix", "_anon");
-
// set timeoutrequests
boolean timeoutrequests = getConfigBool("timeoutrequests", true);
TimeoutRequest.enable = timeoutrequests;