zzz/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made type argument for Transport.getClockSkews() consistent

Browse Source
This commit is contained in:
str4d
2013-11-21 02:27:53 +00:00
parent 693cc828c2
commit f0055ccbfe
4 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java
View File

@@ -97,7 +97,7 @@ public class CommSystemFacadeImpl extends CommSystemFacade {
*/ */
@Override @Override
public long getFramedAveragePeerClockSkew(int percentToInclude) { public long getFramedAveragePeerClockSkew(int percentToInclude) {
Vector skews = _manager.getClockSkews(); Vector<Long> skews = _manager.getClockSkews();
if (skews == null || if (skews == null ||
skews.isEmpty() || skews.isEmpty() ||
(skews.size() < 5 && _context.clock().getUpdatedSuccessfully())) { (skews.size() < 5 && _context.clock().getUpdatedSuccessfully())) {

2
router/java/src/net/i2p/router/transport/Transport.java
View File

@@ -127,7 +127,7 @@ public interface Transport {
public int countActiveSendPeers(); public int countActiveSendPeers();
public boolean haveCapacity(); public boolean haveCapacity();
public boolean haveCapacity(int pct); public boolean haveCapacity(int pct);
public Vector getClockSkews(); public Vector<Long> getClockSkews();
public List<String> getMostRecentErrorMessages(); public List<String> getMostRecentErrorMessages();
public void renderStatusHTML(Writer out, String urlBase, int sortFlags) throws IOException; public void renderStatusHTML(Writer out, String urlBase, int sortFlags) throws IOException;

2
router/java/src/net/i2p/router/transport/TransportImpl.java
View File

@@ -175,7 +175,7 @@ public abstract class TransportImpl implements Transport {
* Vector composed of Long, each element representing a peer skew in seconds. * Vector composed of Long, each element representing a peer skew in seconds.
* Dummy version. Transports override it. * Dummy version. Transports override it.
*/ */
public Vector getClockSkews() { return new Vector(); } public Vector<Long> getClockSkews() { return new Vector<Long>(); }
public List<String> getMostRecentErrorMessages() { return Collections.emptyList(); } public List<String> getMostRecentErrorMessages() { return Collections.emptyList(); }

11
router/java/src/net/i2p/router/transport/TransportManager.java
View File

@@ -29,7 +29,6 @@ import net.i2p.router.CommSystemFacade;
import net.i2p.router.OutNetMessage; import net.i2p.router.OutNetMessage;
import net.i2p.router.RouterContext; import net.i2p.router.RouterContext;
import static net.i2p.router.transport.Transport.AddressSource.*; import static net.i2p.router.transport.Transport.AddressSource.*;
import net.i2p.router.transport.TransportManager.Port;
import net.i2p.router.transport.crypto.DHSessionKeyBuilder; import net.i2p.router.transport.crypto.DHSessionKeyBuilder;
import net.i2p.router.transport.ntcp.NTCPTransport; import net.i2p.router.transport.ntcp.NTCPTransport;
import net.i2p.router.transport.udp.UDPTransport; import net.i2p.router.transport.udp.UDPTransport;
@@ -286,10 +285,10 @@ public class TransportManager implements TransportEventListener {
* Vector composed of Long, each element representing a peer skew in seconds. * Vector composed of Long, each element representing a peer skew in seconds.
* Note: this method returns them in whimsical order. * Note: this method returns them in whimsical order.
*/ */
public Vector getClockSkews() { public Vector<Long> getClockSkews() {
Vector skews = new Vector(); Vector<Long> skews = new Vector<Long>();
for (Transport t : _transports.values()) { for (Transport t : _transports.values()) {
Vector tempSkews = t.getClockSkews(); Vector<Long> tempSkews = t.getClockSkews();
if ((tempSkews == null) || (tempSkews.isEmpty())) continue; if ((tempSkews == null) || (tempSkews.isEmpty())) continue;
skews.addAll(tempSkews); skews.addAll(tempSkews);
} }
@@ -435,7 +434,7 @@ public class TransportManager implements TransportEventListener {
throw new IllegalArgumentException("WTF, bids for a message bound to ourselves?"); throw new IllegalArgumentException("WTF, bids for a message bound to ourselves?");
List<TransportBid> rv = new ArrayList<TransportBid>(_transports.size()); List<TransportBid> rv = new ArrayList<TransportBid>(_transports.size());
Set failedTransports = msg.getFailedTransports(); Set<String> failedTransports = msg.getFailedTransports();
for (Transport t : _transports.values()) { for (Transport t : _transports.values()) {
if (failedTransports.contains(t.getStyle())) { if (failedTransports.contains(t.getStyle())) {
if (_log.shouldLog(Log.DEBUG)) if (_log.shouldLog(Log.DEBUG))
@@ -461,7 +460,7 @@ public class TransportManager implements TransportEventListener {
public TransportBid getNextBid(OutNetMessage msg) { public TransportBid getNextBid(OutNetMessage msg) {
int unreachableTransports = 0; int unreachableTransports = 0;
Hash peer = msg.getTarget().getIdentity().calculateHash(); Hash peer = msg.getTarget().getIdentity().calculateHash();
Set failedTransports = msg.getFailedTransports(); Set<String> failedTransports = msg.getFailedTransports();
TransportBid rv = null; TransportBid rv = null;
for (Transport t : _transports.values()) { for (Transport t : _transports.values()) {
if (t.isUnreachable(peer)) { if (t.isUnreachable(peer)) {