From baad56d83da4ae3508bb1f6595f5cced5cedb7a3 Mon Sep 17 00:00:00 2001
From: Michael Peter Christen <mc@yacy.net>
Date: Mon, 14 Dec 2020 02:08:49 +0100
Subject: [PATCH] beautified default peer names

---
 defaults/yacy.init                      |  3 ---
 source/net/yacy/peers/Seed.java         | 15 +++++++++++----
 source/net/yacy/search/Switchboard.java |  3 ---
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/defaults/yacy.init b/defaults/yacy.init
index f6330b1e59..50c695e27c 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 7d27b92d28..1d182139d0 100644
--- a/source/net/yacy/peers/Seed.java
+++ b/source/net/yacy/peers/Seed.java
@@ -92,7 +92,7 @@
 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 static String checkPeerName(String name) {
      * @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 3539ea2467..ccb63dccdd 100644
--- a/source/net/yacy/search/Switchboard.java
+++ b/source/net/yacy/search/Switchboard.java
@@ -340,9 +340,6 @@ public Switchboard(final File dataPath, final File appPath, final String initPat
         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;