Qortal/altcoinj
3
0
Fork 0
mirror of https://github.com/Qortal/altcoinj.git synced 2025-01-30 23:02:15 +00:00
Code Issues Projects Releases Wiki Activity

Try all returned IP addresses in IRC discovery and use the given timeout.

Browse Source 
Resolves issue 268. Resolves issue 269.
This commit is contained in:
Mike Hearn 2013-01-11 22:20:49 +01:00
parent 1454261ff3
commit 9da08d2036
1 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
core/src/main/java/com/google/bitcoin/discovery/IrcDiscovery.java
View File

@ -23,10 +23,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.io.*; import java.io.*;
import java.net.InetAddress; import java.net.*;
import java.net.InetSocketAddress;
import java.net.Socket;
import java.net.UnknownHostException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Random; import java.util.Random;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@ -86,18 +83,38 @@ public class IrcDiscovery implements PeerDiscovery {
} }
/** /**
* Returns a list of peers that were found in the IRC channel. Note that just because a peer appears in the list * Returns a list of peers that were found in the IRC channel. Note that just because a peer appears in the list
* does not mean it is accepting connections. BUG: the given timeout values are ignored. * does not mean it is accepting connections. The given time out value is applied for every IP returned by DNS
* for the given server, so a timeout value of 1 second may result in 5 seconds delay if 5 servers are advertised.
*/ */
public InetSocketAddress[] getPeers(long timeoutValue, TimeUnit timeoutUnit) throws PeerDiscoveryException { public InetSocketAddress[] getPeers(long timeoutValue, TimeUnit timeoutUnit) throws PeerDiscoveryException {
// TODO: Make the timeout value be respected.
ArrayList<InetSocketAddress> addresses = new ArrayList<InetSocketAddress>(); ArrayList<InetSocketAddress> addresses = new ArrayList<InetSocketAddress>();
connection = null; connection = null;
BufferedReader reader = null;
try { try {
InetAddress ip = InetAddress.getByName(server); InetAddress[] ips = InetAddress.getAllByName(server);
log.info("Connecting to IRC with " + ip); // Pick a random server for load balancing reasons. Try the rest if
connection = new Socket(server, port); int ipCursorStart = (int)(Math.random()*ips.length);
int ipCursor = ipCursorStart;
do {
connection = new Socket();
try {
InetAddress ip = ips[ipCursor];
long timeoutMsec = TimeUnit.MILLISECONDS.convert(timeoutValue, timeoutUnit);
log.info("Connecting to IRC with " + ip);
connection.connect(new InetSocketAddress(ip, port), (int)timeoutMsec);
} catch (SocketTimeoutException e) {
connection = null;
} catch (IOException e) {
connection = null;
}
ipCursor = (ipCursor + 1) % ips.length;
if (ipCursor == ipCursorStart) {
throw new PeerDiscoveryException("Could not connect to " + server);
}
} while (connection == null);
writer = new BufferedWriter(new OutputStreamWriter(connection.getOutputStream(), "UTF-8")); writer = new BufferedWriter(new OutputStreamWriter(connection.getOutputStream(), "UTF-8"));
BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream(), "UTF-8")); reader = new BufferedReader(new InputStreamReader(connection.getInputStream(), "UTF-8"));
// Generate a random nick for the connection. This is chosen to be clearly identifiable as coming from // Generate a random nick for the connection. This is chosen to be clearly identifiable as coming from
// bitcoinj but not match the standard nick format, so full peers don't try and connect to us. // bitcoinj but not match the standard nick format, so full peers don't try and connect to us.
@ -110,7 +127,7 @@ public class IrcDiscovery implements PeerDiscovery {
writer.flush(); writer.flush();
// Wait to be logged in. Worst case we end up blocked until the server PING/PONGs us out. // Wait to be logged in. Worst case we end up blocked until the server PING/PONGs us out.
String currLine = null; String currLine;
while ((currLine = reader.readLine()) != null) { while ((currLine = reader.readLine()) != null) {
onIRCReceive(currLine); onIRCReceive(currLine);
// 004 tells us we are connected // 004 tells us we are connected
@ -154,9 +171,12 @@ public class IrcDiscovery implements PeerDiscovery {
throw new PeerDiscoveryException(e.getMessage(), e); throw new PeerDiscoveryException(e.getMessage(), e);
} finally { } finally {
try { try {
if (reader != null) reader.close();
if (writer != null) writer.close();
// No matter what try to close the connection. // No matter what try to close the connection.
connection.close(); if (connection != null) connection.close();
} catch (Exception e2) { } catch (IOException e) {
log.warn("Exception whilst closing IRC discovery: " + e.toString());
} }
} }
return addresses.toArray(new InetSocketAddress[]{}); return addresses.toArray(new InetSocketAddress[]{});