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

SSU: Skip down interfaces when looking for MTU,

Browse Source 
handle bad values better
This commit is contained in:
zzz
2020-02-05 16:43:58 +00:00
parent efe85cc30a
commit dd3dbbf7f9
1 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
router/java/src/net/i2p/router/transport/udp/MTU.java
View File

@ -58,6 +58,16 @@ public class MTU {
if (ifcs != null) { if (ifcs != null) {
while (ifcs.hasMoreElements()) { while (ifcs.hasMoreElements()) {
NetworkInterface ifc = ifcs.nextElement(); NetworkInterface ifc = ifcs.nextElement();
try {
if (!ifc.isUp()) {
// This is super-important on Windows which has 40+ down interfaces
// and will also deliver IP addresses for down interfaces,
// for example recently disconnected wifi.
continue;
}
} catch (SocketException e) {
continue;
}
for(Enumeration<InetAddress> addrs = ifc.getInetAddresses(); addrs.hasMoreElements();) { for(Enumeration<InetAddress> addrs = ifc.getInetAddresses(); addrs.hasMoreElements();) {
InetAddress addr = addrs.nextElement(); InetAddress addr = addrs.nextElement();
if (ia.equals(addr)) { if (ia.equals(addr)) {
@ -66,8 +76,12 @@ public class MTU {
//return ifc.getMTU(); //return ifc.getMTU();
boolean isIPv6 = addr instanceof Inet6Address; boolean isIPv6 = addr instanceof Inet6Address;
int mtu = ifc.getMTU(); int mtu = ifc.getMTU();
if ((isIPv6 && mtu < PeerState.MIN_IPV6_MTU) || // can be -1 on Windows
(!isIPv6 && mtu < PeerState.MIN_MTU)) { if (mtu < 0)
mtu = isIPv6 ? PeerState.MIN_IPV6_MTU : 1500;
if (mtu > 0 &&
((isIPv6 && mtu < PeerState.MIN_IPV6_MTU) ||
(!isIPv6 && mtu < PeerState.MIN_MTU))) {
Log log = I2PAppContext.getGlobalContext().logManager().getLog(MTU.class); Log log = I2PAppContext.getGlobalContext().logManager().getLog(MTU.class);
log.logAlways(Log.WARN, "Unusually low MTU " + mtu + " for interface " + ia + log.logAlways(Log.WARN, "Unusually low MTU " + mtu + " for interface " + ia +
", consider disabling"); ", consider disabling");
@ -122,11 +136,23 @@ public class MTU {
try { try {
Enumeration<NetworkInterface> ifcs = NetworkInterface.getNetworkInterfaces(); Enumeration<NetworkInterface> ifcs = NetworkInterface.getNetworkInterfaces();
if (ifcs != null) { if (ifcs != null) {
// this is O(n**2) through the interfaces and very slow on windows
while (ifcs.hasMoreElements()) { while (ifcs.hasMoreElements()) {
NetworkInterface ifc = ifcs.nextElement(); NetworkInterface ifc = ifcs.nextElement();
try {
if (!ifc.isUp()) {
// This is super-important on Windows which has 40+ down interfaces
// and will also deliver IP addresses for down interfaces,
// for example recently disconnected wifi.
continue;
}
} catch (SocketException e) {
continue;
}
for(Enumeration<InetAddress> addrs = ifc.getInetAddresses(); addrs.hasMoreElements();) { for(Enumeration<InetAddress> addrs = ifc.getInetAddresses(); addrs.hasMoreElements();) {
InetAddress addr = addrs.nextElement(); InetAddress addr = addrs.nextElement();
System.out.println("I2P MTU for " + addr.getHostAddress() + " is " + getMTU(addr)); System.out.println("MTU for " + addr.getHostAddress() + " is " + ifc.getMTU() +
" I2P MTU is " + getMTU(addr));
} }
} }
} }