From ac61a398285ee94cc8c5b4502561fb5c9ac7f9b4 Mon Sep 17 00:00:00 2001
From: reger <reger18@arcor.de>
Date: Sat, 20 Dec 2014 01:59:00 +0100
Subject: [PATCH] use peeraddress for link in remote crawl list to make link
 work without enabled proxy

upd pom for Jetty (missing in last commit)
---
 htroot/RemoteCrawl_p.html |  2 +-
 htroot/RemoteCrawl_p.java |  3 ++-
 pom.xml                   | 26 +++++++++++++-------------
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/htroot/RemoteCrawl_p.html b/htroot/RemoteCrawl_p.html
index f43855962..f077944f0 100644
--- a/htroot/RemoteCrawl_p.html
+++ b/htroot/RemoteCrawl_p.html
@@ -52,7 +52,7 @@
       </tr>
       #{list}#
       <tr class="TableCell#(dark)#Light::Dark::Summary#(/dark)#">
-        <td><a href="http://www.#[fullname]#.yacy">#[shortname]#</a></td>
+        <td><a href="http://#[peeraddress]#">#[shortname]#</a></td>
         <td align="right">#[RCount]#</td>
         <td align="right">#[version]#</td>
         <td align="right">#[ppm]#</td>
diff --git a/htroot/RemoteCrawl_p.java b/htroot/RemoteCrawl_p.java
index 09ad581f7..bbdb9f0d7 100644
--- a/htroot/RemoteCrawl_p.java
+++ b/htroot/RemoteCrawl_p.java
@@ -114,8 +114,9 @@ public class RemoteCrawl_p {
                 prop.put(STR_TABLE_LIST + conCount + "_dark", ((dark) ? 1 : 0) ); dark=!dark;
                 String shortname = seed.get(Seed.NAME, "deadlink");
                 if (shortname.length() > 20) shortname = shortname.substring(0, 20) + "...";
+                final String peeradr =   seed.getPublicAddress(seed.getIPs().iterator().next());
                 prop.putHTML(STR_TABLE_LIST + conCount + "_shortname", shortname);
-                prop.putHTML(STR_TABLE_LIST + conCount + "_fullname", seed.get(Seed.NAME, "deadlink"));
+                prop.putHTML(STR_TABLE_LIST + conCount + "_peeraddress", peeradr);
                 prop.put(STR_TABLE_LIST + conCount + "_age", seed.getAge());
                 String[] yv = yacyVersion.combined2prettyVersion(seed.get(Seed.VERSION, "0.1"), shortname);
                 prop.putHTML(STR_TABLE_LIST + conCount + "_version", yv[0] + "/" + yv[1]);
diff --git a/pom.xml b/pom.xml
index 4a4c60d1c..623addb58 100644
--- a/pom.xml
+++ b/pom.xml
@@ -549,67 +549,67 @@
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-server</artifactId>
-            <version>9.2.4.v20141103</version>
+            <version>9.2.6.v20141205</version>
         </dependency>      
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-servlet</artifactId>
-            <version>9.2.4.v20141103</version>
+            <version>9.2.6.v20141205</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-servlets</artifactId>
-            <version>9.2.4.v20141103</version>
+            <version>9.2.6.v20141205</version>
         </dependency>    
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-webapp</artifactId>
-            <version>9.2.4.v20141103</version>
+            <version>9.2.6.v20141205</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-util</artifactId>
-            <version>9.2.4.v20141103</version>
+            <version>9.2.6.v20141205</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-xml</artifactId>
-            <version>9.2.4.v20141103</version>
+            <version>9.2.6.v20141205</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-http</artifactId>
-            <version>9.2.4.v20141103</version>
+            <version>9.2.6.v20141205</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-security</artifactId>
-            <version>9.2.4.v20141103</version>
+            <version>9.2.6.v20141205</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-io</artifactId>
-            <version>9.2.4.v20141103</version>
+            <version>9.2.6.v20141205</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-continuation</artifactId>
-            <version>9.2.4.v20141103</version>
+            <version>9.2.6.v20141205</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-jmx</artifactId>
-            <version>9.2.4.v20141103</version>
+            <version>9.2.6.v20141205</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-proxy</artifactId>
-            <version>9.2.4.v20141103</version>
+            <version>9.2.6.v20141205</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-deploy</artifactId>
-            <version>9.2.4.v20141103</version>
+            <version>9.2.6.v20141205</version>
         </dependency>
         <dependency>
             <groupId>org.bitlet</groupId>