boxtec
/
yacy_search_server
mirror of https://github.com/yacy/yacy_search_server
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

Correct usage of vhost in wget/wput requests:

Browse Source 
- yacyClient: don't use own .yacyh domain in requests, instead use .yacyh domain of target peer for everything but ranking distribution
- natLib: use full hostname instead of just SLD.TLD



git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@2232 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
hermens 19 years ago
parent bde748f68f
commit d4645062bc
2 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File

6
source/de/anomic/net/natLib.java
Unescape View File

@ -72,7 +72,7 @@ public class natLib {
private static String getWhatIsMyIP() { private static String getWhatIsMyIP() {
try { try {
ArrayList x = httpc.wget(new URL("http://www.whatismyip.com/"), "whatsmyip.com", 5000, null, null, null); ArrayList x = httpc.wget(new URL("http://www.whatismyip.com/"), "www.whatsmyip.com", 5000, null, null, null);
x = nxTools.grep(x, 0, "Your IP is"); x = nxTools.grep(x, 0, "Your IP is");
String line = nxTools.tail1(x); String line = nxTools.tail1(x);
return nxTools.awk(line, " ", 4); return nxTools.awk(line, " ", 4);
@ -83,7 +83,7 @@ public class natLib {
private static String getStanford() { private static String getStanford() {
try { try {
ArrayList x = httpc.wget(new URL("http://www.slac.stanford.edu/cgi-bin/nph-traceroute.pl"), "stanford.edu", 5000, null, null, null); ArrayList x = httpc.wget(new URL("http://www.slac.stanford.edu/cgi-bin/nph-traceroute.pl"), "www.slac.stanford.edu", 5000, null, null, null);
x = nxTools.grep(x, 0, "firewall protecting your browser"); x = nxTools.grep(x, 0, "firewall protecting your browser");
String line = nxTools.tail1(x); String line = nxTools.tail1(x);
return nxTools.awk(line, " ", 7); return nxTools.awk(line, " ", 7);
@ -94,7 +94,7 @@ public class natLib {
private static String getIPID() { private static String getIPID() {
try { try {
ArrayList x = httpc.wget(new URL("http://ipid.shat.net/"), "shat.net", 5000, null, null, null); ArrayList x = httpc.wget(new URL("http://ipid.shat.net/"), "ipid.shat.net", 5000, null, null, null);
x = nxTools.grep(x, 2, "Your IP address"); x = nxTools.grep(x, 2, "Your IP address");
String line = nxTools.tail1(x); String line = nxTools.tail1(x);
return nxTools.awk(nxTools.awk(nxTools.awk(line, " ", 5), ">", 2), "<", 1); return nxTools.awk(nxTools.awk(nxTools.awk(line, " ", 5), ">", 2), "<", 1);

38
source/de/anomic/yacy/yacyClient.java
Unescape View File

@ -127,7 +127,7 @@ public final class yacyClient {
// sending request // sending request
result = nxTools.table( result = nxTools.table(
httpc.wput(url, httpc.wput(url,
yacyCore.seedDB.mySeed.getHexHash() + ".yacyh", yacySeed.b64Hash2hexHash(otherHash) + ".yacyh",
105000, 105000,
null, null,
null, null,
@ -260,7 +260,7 @@ public final class yacyClient {
"&object=seed" + "&object=seed" +
"&env=" + seedHash "&env=" + seedHash
), ),
yacyCore.seedDB.mySeed.getHexHash() + ".yacyh", target.getHexHash() + ".yacyh",
10000, 10000,
null, null,
null, null,
@ -297,7 +297,7 @@ public final class yacyClient {
"&env=" + wordHash + "&env=" + wordHash +
"&ttl=0" "&ttl=0"
), ),
yacyCore.seedDB.mySeed.getHexHash() + ".yacyh", target.getHexHash() + ".yacyh",
10000, 10000,
null, null,
null, null,
@ -338,7 +338,7 @@ public final class yacyClient {
final HashMap result = nxTools.table( final HashMap result = nxTools.table(
httpc.wget( httpc.wget(
new URL(querystr), new URL(querystr),
yacyCore.seedDB.mySeed.getHexHash() + ".yacyh", target.getHexHash() + ".yacyh",
6000, 6000,
null, null,
null, null,
@ -429,7 +429,7 @@ public final class yacyClient {
final HashMap result = nxTools.table( final HashMap result = nxTools.table(
httpc.wput( httpc.wput(
new URL(url), new URL(url),
yacyCore.seedDB.mySeed.getHexHash() + ".yacyh", targetPeer.getHexHash() + ".yacyh",
300000, 300000,
null, null,
null, null,
@ -564,7 +564,7 @@ public final class yacyClient {
return nxTools.table( return nxTools.table(
httpc.wput( httpc.wput(
new URL("http://" + address + "/yacy/message.html"), new URL("http://" + address + "/yacy/message.html"),
yacyCore.seedDB.mySeed.getHexHash() + ".yacyh", yacySeed.b64Hash2hexHash(targetHash) + ".yacyh",
8000, 8000,
null, null,
null, null,
@ -609,7 +609,7 @@ public final class yacyClient {
try { try {
final ArrayList v = httpc.wput( final ArrayList v = httpc.wput(
new URL("http://" + address + "/yacy/message.html"), new URL("http://" + address + "/yacy/message.html"),
yacyCore.seedDB.mySeed.getHexHash() + ".yacyh", yacySeed.b64Hash2hexHash(targetHash) + ".yacyh",
20000, 20000,
null, null,
null, null,
@ -660,10 +660,11 @@ public final class yacyClient {
// send request // send request
try { try {
final URL url = new URL("http://" + targetAddress + "/yacy/transfer.html");
return nxTools.table( return nxTools.table(
httpc.wput( httpc.wput(
new URL("http://" + targetAddress + "/yacy/transfer.html"), url,
yacyCore.seedDB.mySeed.getHexHash() + ".yacyh", url.getHost(), // yacyCore.seedDB.mySeed.getHexHash() + ".yacyh",
8000, 8000,
null, null,
null, null,
@ -702,9 +703,10 @@ public final class yacyClient {
// sending request // sending request
try { try {
final URL url = new URL("http://" + targetAddress + "/yacy/transfer.html");
final ArrayList v = httpc.wput( final ArrayList v = httpc.wput(
new URL("http://" + targetAddress + "/yacy/transfer.html"), url,
yacyCore.seedDB.mySeed.getHexHash() + ".yacyh", url.getHost(), // yacyCore.seedDB.mySeed.getHexHash() + ".yacyh",
20000, 20000,
null, null,
null, null,
@ -789,7 +791,7 @@ public final class yacyClient {
return nxTools.table( return nxTools.table(
httpc.wput( httpc.wput(
new URL("http://" + address + "/yacy/crawlOrder.html"), new URL("http://" + address + "/yacy/crawlOrder.html"),
yacyCore.seedDB.mySeed.getHexHash() + ".yacyh", targetSeed.getHexHash() + ".yacyh",
timeout, timeout,
null, null,
null, null,
@ -864,7 +866,7 @@ public final class yacyClient {
"&wordh=" + wordhashes + "&wordh=" + wordhashes +
"&lurlEntry=" + ((entry == null) ? "" : crypt.simpleEncode(entry.toString(), key)) "&lurlEntry=" + ((entry == null) ? "" : crypt.simpleEncode(entry.toString(), key))
), ),
yacyCore.seedDB.mySeed.getHexHash() + ".yacyh", targetSeed.getHexHash() + ".yacyh",
60000, 60000,
null, null,
null, null,
@ -1019,7 +1021,7 @@ public final class yacyClient {
try { try {
final ArrayList v = httpc.wput( final ArrayList v = httpc.wput(
new URL("http://" + address + "/yacy/transferRWI.html"), new URL("http://" + address + "/yacy/transferRWI.html"),
yacyCore.seedDB.mySeed.getHexHash() + ".yacyh", targetSeed.getHexHash() + ".yacyh",
timeout, timeout,
null, null,
null, null,
@ -1081,7 +1083,7 @@ public final class yacyClient {
try { try {
final ArrayList v = httpc.wput( final ArrayList v = httpc.wput(
new URL("http://" + address + "/yacy/transferURL.html"), new URL("http://" + address + "/yacy/transferURL.html"),
yacyCore.seedDB.mySeed.getHexHash() + ".yacyh", targetSeed.getHexHash() + ".yacyh",
timeout, timeout,
null, null,
null, null,
@ -1099,7 +1101,7 @@ public final class yacyClient {
result.put("urlPayloadSize", new Integer(urlPayloadSize)); result.put("urlPayloadSize", new Integer(urlPayloadSize));
return result; return result;
} catch (Exception e) { } catch (Exception e) {
yacyCore.log.logSevere("yacyClient.transferRWI error:" + e.getMessage()); yacyCore.log.logSevere("yacyClient.transferURL error:" + e.getMessage());
return null; return null;
} }
} }
@ -1120,7 +1122,7 @@ public final class yacyClient {
try { try {
final ArrayList v = httpc.wput( final ArrayList v = httpc.wput(
new URL("http://" + address + "/yacy/profile.html"), new URL("http://" + address + "/yacy/profile.html"),
yacyCore.seedDB.mySeed.getHexHash() + ".yacyh", targetSeed.getHexHash() + ".yacyh",
10000, 10000,
null, null,
null, null,
@ -1160,7 +1162,7 @@ public final class yacyClient {
"&count=10" + "&count=10" +
"&resource=global" + "&resource=global" +
"&query=" + wordhashe), "&query=" + wordhashe),
yacyCore.seedDB.mySeed.getHexHash() + ".yacyh", target.getHexHash() + ".yacyh",
5000, 5000,
null, null,
null, null,

Write Preview
Loading…
Cancel
Save