From b77be20cc1198d0418440db0a0ea472f150a9cdf Mon Sep 17 00:00:00 2001 From: zzz Date: Fri, 5 Feb 2010 00:31:00 +0000 Subject: [PATCH] set up transport cost constants --- .../src/net/i2p/router/transport/CommSystemFacadeImpl.java | 4 ++-- .../java/src/net/i2p/router/transport/ntcp/NTCPAddress.java | 3 ++- .../java/src/net/i2p/router/transport/udp/UDPTransport.java | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java b/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java index f1460b9f7a..5e55b1aa80 100644 --- a/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java +++ b/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java @@ -234,7 +234,7 @@ public class CommSystemFacadeImpl extends CommSystemFacade { props.setProperty(NTCPAddress.PROP_HOST, name); props.setProperty(NTCPAddress.PROP_PORT, port); RouterAddress addr = new RouterAddress(); - addr.setCost(10); + addr.setCost(NTCPAddress.DEFAULT_COST); addr.setExpiration(null); addr.setOptions(props); addr.setTransportStyle(NTCPTransport.STYLE); @@ -268,7 +268,7 @@ public class CommSystemFacadeImpl extends CommSystemFacade { RouterAddress newAddr = oldAddr; if (newAddr == null) { newAddr = new RouterAddress(); - newAddr.setCost(10); + newAddr.setCost(NTCPAddress.DEFAULT_COST); newAddr.setExpiration(null); newAddr.setTransportStyle(NTCPTransport.STYLE); newProps = new Properties(); diff --git a/router/java/src/net/i2p/router/transport/ntcp/NTCPAddress.java b/router/java/src/net/i2p/router/transport/ntcp/NTCPAddress.java index 860634d8f5..e13bcc31c7 100644 --- a/router/java/src/net/i2p/router/transport/ntcp/NTCPAddress.java +++ b/router/java/src/net/i2p/router/transport/ntcp/NTCPAddress.java @@ -28,6 +28,7 @@ public class NTCPAddress { public final static String PROP_PORT = "port"; /** Host name used in RouterAddress definitions */ public final static String PROP_HOST = "host"; + public static final int DEFAULT_COST = 10; public NTCPAddress(String host, int port) { if (host != null) @@ -82,7 +83,7 @@ public class NTCPAddress { RouterAddress addr = new RouterAddress(); - addr.setCost(10); + addr.setCost(DEFAULT_COST); addr.setExpiration(null); Properties props = new Properties(); diff --git a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java index 075326c53b..ccf5792b7a 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java @@ -154,6 +154,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority private static final int MAX_CONSECUTIVE_FAILED = 5; + public static final int DEFAULT_COST = 5; private static final int TEST_FREQUENCY = 13*60*1000; public static final long[] RATES = { 10*60*1000 }; @@ -1213,7 +1214,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority options.setProperty(UDPAddress.PROP_INTRO_KEY, _introKey.toBase64()); RouterAddress addr = new RouterAddress(); - addr.setCost(5); + addr.setCost(DEFAULT_COST); addr.setExpiration(null); addr.setTransportStyle(STYLE); addr.setOptions(options);