diff --git a/core/src/main/java/com/google/bitcoin/core/NetworkParameters.java b/core/src/main/java/com/google/bitcoin/core/NetworkParameters.java index cc34ceff..02f2e936 100644 --- a/core/src/main/java/com/google/bitcoin/core/NetworkParameters.java +++ b/core/src/main/java/com/google/bitcoin/core/NetworkParameters.java @@ -61,8 +61,7 @@ public class NetworkParameters implements Serializable { private final Block genesisBlock; /** What the easiest allowable proof of work should be. */ public /*final*/ BigInteger proofOfWorkLimit; - /** Default TCP port on which to connect to nodes. */ - public final int port; + private final int port; /** The header bytes that identify the start of a packet on this network. */ public final long packetMagic; /** @@ -393,4 +392,9 @@ public class NetworkParameters implements Serializable { public Block getGenesisBlock() { return genesisBlock; } + + /** Default TCP port on which to connect to nodes. */ + public int getPort() { + return port; + } } diff --git a/core/src/main/java/com/google/bitcoin/core/PeerAddress.java b/core/src/main/java/com/google/bitcoin/core/PeerAddress.java index ced43a68..909cf545 100644 --- a/core/src/main/java/com/google/bitcoin/core/PeerAddress.java +++ b/core/src/main/java/com/google/bitcoin/core/PeerAddress.java @@ -90,7 +90,7 @@ public class PeerAddress extends ChildMessage { * Constructs a peer address from the given IP address. Port and protocol version are default for the prodnet. */ public PeerAddress(InetAddress addr) { - this(addr, NetworkParameters.prodNet().port); + this(addr, NetworkParameters.prodNet().getPort()); } public PeerAddress(InetSocketAddress addr) { diff --git a/core/src/main/java/com/google/bitcoin/core/PeerGroup.java b/core/src/main/java/com/google/bitcoin/core/PeerGroup.java index 413e8eff..e78101a3 100644 --- a/core/src/main/java/com/google/bitcoin/core/PeerGroup.java +++ b/core/src/main/java/com/google/bitcoin/core/PeerGroup.java @@ -485,7 +485,7 @@ public class PeerGroup extends AbstractIdleService { /** Convenience method for addAddress(new PeerAddress(address, params.port)); */ public void addAddress(InetAddress address) { - addAddress(new PeerAddress(address, params.port)); + addAddress(new PeerAddress(address, params.getPort())); } /** diff --git a/core/src/main/java/com/google/bitcoin/core/TCPNetworkConnection.java b/core/src/main/java/com/google/bitcoin/core/TCPNetworkConnection.java index 06423101..812d720b 100644 --- a/core/src/main/java/com/google/bitcoin/core/TCPNetworkConnection.java +++ b/core/src/main/java/com/google/bitcoin/core/TCPNetworkConnection.java @@ -178,7 +178,7 @@ public class TCPNetworkConnection implements NetworkConnection { @Override public String toString() { - return "[" + remoteIp.getHostAddress() + "]:" + params.port; + return "[" + remoteIp.getHostAddress() + "]:" + params.getPort(); } public class NetworkHandler extends ReplayingDecoder implements ChannelDownstreamHandler { @@ -244,7 +244,7 @@ public class TCPNetworkConnection implements NetworkConnection { } public PeerAddress getPeerAddress() { - return new PeerAddress(remoteIp, params.port); + return new PeerAddress(remoteIp, params.getPort()); } public void close() { diff --git a/core/src/main/java/com/google/bitcoin/core/VersionMessage.java b/core/src/main/java/com/google/bitcoin/core/VersionMessage.java index 0eea1c01..88dedf70 100644 --- a/core/src/main/java/com/google/bitcoin/core/VersionMessage.java +++ b/core/src/main/java/com/google/bitcoin/core/VersionMessage.java @@ -101,8 +101,8 @@ public class VersionMessage extends Message { // We hard-code the IPv4 localhost address here rather than use InetAddress.getLocalHost() because some // mobile phones have broken localhost DNS entries, also, this is faster. final byte[] localhost = new byte[] { 127, 0, 0, 1 }; - myAddr = new PeerAddress(InetAddress.getByAddress(localhost), params.port, 0); - theirAddr = new PeerAddress(InetAddress.getByAddress(localhost), params.port, 0); + myAddr = new PeerAddress(InetAddress.getByAddress(localhost), params.getPort(), 0); + theirAddr = new PeerAddress(InetAddress.getByAddress(localhost), params.getPort(), 0); } catch (UnknownHostException e) { throw new RuntimeException(e); // Cannot happen (illegal IP length). } diff --git a/core/src/main/java/com/google/bitcoin/discovery/DnsDiscovery.java b/core/src/main/java/com/google/bitcoin/discovery/DnsDiscovery.java index c55b48cf..f9e33a2d 100644 --- a/core/src/main/java/com/google/bitcoin/discovery/DnsDiscovery.java +++ b/core/src/main/java/com/google/bitcoin/discovery/DnsDiscovery.java @@ -94,7 +94,7 @@ public class DnsDiscovery implements PeerDiscovery { continue; } for (InetAddress addr : inetAddresses) { - addrs.add(new InetSocketAddress(addr, netParams.port)); + addrs.add(new InetSocketAddress(addr, netParams.getPort())); } } if (addrs.size() == 0) diff --git a/core/src/main/java/com/google/bitcoin/discovery/SeedPeers.java b/core/src/main/java/com/google/bitcoin/discovery/SeedPeers.java index 0358ecf2..c165f6ce 100644 --- a/core/src/main/java/com/google/bitcoin/discovery/SeedPeers.java +++ b/core/src/main/java/com/google/bitcoin/discovery/SeedPeers.java @@ -53,7 +53,7 @@ public class SeedPeers implements PeerDiscovery { private InetSocketAddress nextPeer() throws UnknownHostException { if (pnseedIndex >= seedAddrs.length) return null; return new InetSocketAddress(convertAddress(seedAddrs[pnseedIndex++]), - params.port); + params.getPort()); } /** @@ -70,7 +70,7 @@ public class SeedPeers implements PeerDiscovery { private InetSocketAddress[] allPeers() throws UnknownHostException { InetSocketAddress[] addresses = new InetSocketAddress[seedAddrs.length]; for (int i = 0; i < seedAddrs.length; ++i) { - addresses[i] = new InetSocketAddress(convertAddress(seedAddrs[i]), params.port); + addresses[i] = new InetSocketAddress(convertAddress(seedAddrs[i]), params.getPort()); } return addresses; } diff --git a/examples/src/main/java/com/google/bitcoin/examples/FetchBlock.java b/examples/src/main/java/com/google/bitcoin/examples/FetchBlock.java index 97d6997f..9e5d7731 100644 --- a/examples/src/main/java/com/google/bitcoin/examples/FetchBlock.java +++ b/examples/src/main/java/com/google/bitcoin/examples/FetchBlock.java @@ -37,7 +37,7 @@ public class FetchBlock { BlockChain chain = new BlockChain(params, blockStore); PeerGroup peerGroup = new PeerGroup(params, chain); peerGroup.startAndWait(); - PeerAddress addr = new PeerAddress(InetAddress.getLocalHost(), params.port); + PeerAddress addr = new PeerAddress(InetAddress.getLocalHost(), params.getPort()); peerGroup.addAddress(addr); peerGroup.waitForPeers(1).get(); Peer peer = peerGroup.getConnectedPeers().get(0); diff --git a/examples/src/main/java/com/google/bitcoin/examples/FetchTransactions.java b/examples/src/main/java/com/google/bitcoin/examples/FetchTransactions.java index bb7f0a6a..41c79165 100644 --- a/examples/src/main/java/com/google/bitcoin/examples/FetchTransactions.java +++ b/examples/src/main/java/com/google/bitcoin/examples/FetchTransactions.java @@ -38,7 +38,7 @@ public class FetchTransactions { BlockChain chain = new BlockChain(params, blockStore); PeerGroup peerGroup = new PeerGroup(params, chain); peerGroup.startAndWait(); - peerGroup.addAddress(new PeerAddress(InetAddress.getLocalHost(), params.port)); + peerGroup.addAddress(new PeerAddress(InetAddress.getLocalHost(), params.getPort())); peerGroup.waitForPeers(1).get(); Peer peer = peerGroup.getConnectedPeers().get(0); diff --git a/examples/src/main/java/com/google/bitcoin/examples/PrintPeers.java b/examples/src/main/java/com/google/bitcoin/examples/PrintPeers.java index d87ea9ee..07c6cbba 100644 --- a/examples/src/main/java/com/google/bitcoin/examples/PrintPeers.java +++ b/examples/src/main/java/com/google/bitcoin/examples/PrintPeers.java @@ -76,7 +76,7 @@ public class PrintPeers { List> futures = Lists.newArrayList(); for (final InetAddress addr : addrs) { final ListenableFuture future = - TCPNetworkConnection.connectTo(params, new InetSocketAddress(addr, params.port), 1000 /* timeout */); + TCPNetworkConnection.connectTo(params, new InetSocketAddress(addr, params.getPort()), 1000 /* timeout */); futures.add(future); // Once the connection has completed version handshaking ... Futures.addCallback(future, new FutureCallback() { diff --git a/tools/src/main/java/com/google/bitcoin/tools/WalletTool.java b/tools/src/main/java/com/google/bitcoin/tools/WalletTool.java index 2239d614..488afa3e 100644 --- a/tools/src/main/java/com/google/bitcoin/tools/WalletTool.java +++ b/tools/src/main/java/com/google/bitcoin/tools/WalletTool.java @@ -585,7 +585,7 @@ public class WalletTool { String[] peerAddrs = peersFlag.split(","); for (String peer : peerAddrs) { try { - peers.addAddress(new PeerAddress(InetAddress.getByName(peer), params.port)); + peers.addAddress(new PeerAddress(InetAddress.getByName(peer), params.getPort())); } catch (UnknownHostException e) { System.err.println("Could not understand peer domain name/IP address: " + peer + ": " + e.getMessage()); System.exit(1);