diff --git a/htroot/Network.html b/htroot/Network.html index e65cca3b1..9779baea7 100644 --- a/htroot/Network.html +++ b/htroot/Network.html @@ -133,7 +133,7 @@ document.getElementById("apilink").setAttribute("href", "Network.xml?" + window. #{list}# #[hash]# - #[shortname]##(ssl)#::https supported#(/ssl)# + #[shortname]##(ssl)#::https supported#(/ssl)# #(type)##(direct)#Junior passive::Junior direct::Junior offline#(/direct)#::#(direct)#senior passive::Senior direct::Senior offline#(/direct)#::#(direct)#Principal passive::Principal active::Principal offline#(/direct)##(/type)##(acceptcrawl)#no crawl::crawl possible::crawl possible#(/acceptcrawl)##(dhtreceive)#no DHT receive::DHT receive enabled::DHT receive enabled#(/dhtreceive)##{ips}##{/ips}# #[version]# diff --git a/htroot/Network.java b/htroot/Network.java index 23377ed76..4d98628a2 100644 --- a/htroot/Network.java +++ b/htroot/Network.java @@ -406,6 +406,8 @@ public class Network { prop.putHTML(STR_TABLE_LIST + conCount + "_fullname", seed.get(Seed.NAME, "deadlink")); prop.put(STR_TABLE_LIST + conCount + "_special", (seed.getFlagRootNode() && !seed.getFlagAcceptRemoteIndex()) ? 1 : 0); prop.put(STR_TABLE_LIST + conCount + "_ssl", (seed.getFlagSSLAvailable()) ? 1 : 0); + prop.put(STR_TABLE_LIST + conCount + "_ssl_ip", seed.getIP()); + prop.put(STR_TABLE_LIST + conCount + "_ssl_portssl", seed.get(Seed.PORTSSL,"8443")); userAgent = null; if (seed.hash != null && seed.hash.equals(sb.peers.mySeed().hash)) { userAgent = ClientIdentification.yacyInternetCrawlerAgent.userAgent; diff --git a/source/net/yacy/peers/Seed.java b/source/net/yacy/peers/Seed.java index c7e44bf79..bc9d64385 100644 --- a/source/net/yacy/peers/Seed.java +++ b/source/net/yacy/peers/Seed.java @@ -195,6 +195,7 @@ public class Seed implements Cloneable, Comparable, Comparator public static final String IP6 = "IP6"; public static final String PORT = "Port"; + public static final String PORTSSL = "PortSSL"; // https port public static final String SEEDLISTURL = "seedURL"; public static final String NEWS = "news"; // news attachment public static final String DCT = "dct"; // disconnect time diff --git a/source/net/yacy/search/Switchboard.java b/source/net/yacy/search/Switchboard.java index c1b29eb95..a26cd725c 100644 --- a/source/net/yacy/search/Switchboard.java +++ b/source/net/yacy/search/Switchboard.java @@ -3739,6 +3739,7 @@ public final class Switchboard extends serverSwitch { mySeed.setFlagAcceptRemoteCrawl(getConfigBool("crawlResponse", true)); mySeed.setFlagAcceptRemoteIndex(getConfigBool("allowReceiveIndex", true)); mySeed.setFlagSSLAvailable(this.getHttpServer() != null && this.getHttpServer().withSSL() && getConfigBool("server.https", false)); + if (mySeed.getFlagSSLAvailable()) mySeed.put(Seed.PORTSSL, Integer.toString(getPublicPort("port.ssl", 8443))); // set local ips String staticIP = this.getConfig("staticIP", "");