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

- Make short timeouts for the XML parser so we don't hang when

Browse Source 
the UPnP device goes away - same as for HTTP POST
- Stuff the port mapping requester into a thread so it doesn't
  delay everything for several seconds
- Handle UPnP devices that return IP = 0.0.0.0
- Better HTML output when no IP found
- Tweak logging
- Set Disposer thread name
- Keep the control point running after we find an IGD,
  so that we get notifications of it leaving or
  coming back or replaced.
This commit is contained in:
zzz
2009-05-03 18:35:27 +00:00
parent c6b2492e73
commit 65a41908ec
5 changed files with 120 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

139
router/java/src/net/i2p/router/transport/UPnP.java
View File

@@ -12,7 +12,6 @@ import java.util.Set;
import net.i2p.util.Log; import net.i2p.util.Log;
import net.i2p.I2PAppContext; import net.i2p.I2PAppContext;
import net.i2p.router.RouterContext;
import org.cybergarage.upnp.Action; import org.cybergarage.upnp.Action;
import org.cybergarage.upnp.ActionList; import org.cybergarage.upnp.ActionList;
@@ -94,6 +93,8 @@ public class UPnP extends ControlPoint implements DeviceChangeListener {
public void terminate() { public void terminate() {
unregisterPortMappings(); unregisterPortMappings();
super.stop(); super.stop();
_router = null;
_service = null;
} }
public DetectedIP[] getAddress() { public DetectedIP[] getAddress() {
@@ -140,10 +141,13 @@ public class UPnP extends ControlPoint implements DeviceChangeListener {
return; return;
} }
} }
if(!ROUTER_DEVICE.equals(dev.getDeviceType()) || !dev.isRootDevice()) if(!ROUTER_DEVICE.equals(dev.getDeviceType()) || !dev.isRootDevice()) {
return; // Silently ignore non-IGD devices _log.warn("UP&P non-IGD device found, ignoring : " + dev.getFriendlyName());
else if(isNATPresent()) { return; // ignore non-IGD devices
_log.error("We got a second IGD on the network! the plugin doesn't handle that: let's disable it."); } else if(isNATPresent()) {
// maybe we should see if the old one went away before ignoring the new one?
_log.warn("UP&P ignoring additional IGD device found: " + dev.getFriendlyName() + " UDN: " + dev.getUDN());
/********** seems a little drastic
isDisabled = true; isDisabled = true;
synchronized(lock) { synchronized(lock) {
@@ -152,18 +156,21 @@ public class UPnP extends ControlPoint implements DeviceChangeListener {
} }
stop(); stop();
**************/
return; return;
} }
_log.warn("UP&P IGD found : " + dev.getFriendlyName()); _log.warn("UP&P IGD found : " + dev.getFriendlyName() + " UDN: " + dev.getUDN());
synchronized(lock) { synchronized(lock) {
_router = dev; _router = dev;
} }
discoverService(); discoverService();
// We have found the device we need: stop the listener thread // We have found the device we need: stop the listener thread
stop(); /// No, let's stick around to get notifications
//stop();
synchronized(lock) { synchronized(lock) {
/// we should look for the next one
if(_service == null) { if(_service == null) {
_log.error("The IGD device we got isn't suiting our needs, let's disable the plugin"); _log.error("The IGD device we got isn't suiting our needs, let's disable the plugin");
isDisabled = true; isDisabled = true;
@@ -238,15 +245,29 @@ public class UPnP extends ControlPoint implements DeviceChangeListener {
} }
public void deviceRemoved(Device dev ){ public void deviceRemoved(Device dev ){
_log.warn("UP&P device removed : " + dev.getFriendlyName() + " UDN: " + dev.getUDN());
synchronized (lock) { synchronized (lock) {
if(_router == null) return; if(_router == null) return;
if(_router.equals(dev)) { // I2P this wasn't working
//if(_router.equals(dev)) {
if(ROUTER_DEVICE.equals(dev.getDeviceType()) &&
dev.isRootDevice() &&
stringEquals(_router.getFriendlyName(), dev.getFriendlyName()) &&
stringEquals(_router.getUDN(), dev.getUDN())) {
_log.warn("UP&P IGD device removed : " + dev.getFriendlyName());
_router = null; _router = null;
_service = null; _service = null;
} }
} }
} }
/** compare two strings, either of which could be null */
private static boolean stringEquals(String a, String b) {
if (a != null)
return a.equals(b);
return b == null;
}
/** /**
* @return whether we are behind an UPnP-enabled NAT/router * @return whether we are behind an UPnP-enabled NAT/router
*/ */
@@ -266,7 +287,11 @@ public class UPnP extends ControlPoint implements DeviceChangeListener {
if(getIP == null || !getIP.postControlAction()) if(getIP == null || !getIP.postControlAction())
return null; return null;
return (getIP.getOutputArgumentList().getArgument("NewExternalIPAddress")).getValue(); String rv = (getIP.getOutputArgumentList().getArgument("NewExternalIPAddress")).getValue();
// I2P some devices return 0.0.0.0 when not connected
if ("0.0.0.0".equals(rv))
return null;
return rv;
} }
/** /**
@@ -416,7 +441,11 @@ public class UPnP extends ControlPoint implements DeviceChangeListener {
// FIXME L10n! // FIXME L10n!
sb.append("<p>Found "); sb.append("<p>Found ");
listSubDev(null, _router, sb); listSubDev(null, _router, sb);
sb.append("<br>The current external IP address reported by UPnP is " + getNATAddress()); String addr = getNATAddress();
if (addr != null)
sb.append("<br>The current external IP address reported by UPnP is " + addr);
else
sb.append("<br>The current external IP address is not available.");
int downstreamMaxBitRate = getDownstreamMaxBitRate(); int downstreamMaxBitRate = getDownstreamMaxBitRate();
int upstreamMaxBitRate = getUpstramMaxBitRate(); int upstreamMaxBitRate = getUpstramMaxBitRate();
if(downstreamMaxBitRate > 0) if(downstreamMaxBitRate > 0)
@@ -554,36 +583,78 @@ public class UPnP extends ControlPoint implements DeviceChangeListener {
return "?"; return "?";
} }
private static int __id = 0;
/**
* postControlAction() can take many seconds, especially if it's failing,
* and onChangePublicPorts() may be called from threads we don't want to slow down,
* so throw this in a thread.
*/
private void registerPorts(Set<ForwardPort> portsToForwardNow) { private void registerPorts(Set<ForwardPort> portsToForwardNow) {
for(ForwardPort port : portsToForwardNow) { Thread t = new Thread(new RegisterPortsThread(portsToForwardNow));
String proto = protoToString(port.protocol); t.setName("UPnP Port Opener " + (++__id));
if (proto.length() <= 1) { t.setDaemon(true);
HashMap<ForwardPort, ForwardPortStatus> map = new HashMap<ForwardPort, ForwardPortStatus>(); t.start();
map.put(port, new ForwardPortStatus(ForwardPortStatus.DEFINITE_FAILURE, "Protocol not supported", port.portNumber)); }
forwardCallback.portForwardStatus(map);
continue; private class RegisterPortsThread implements Runnable {
} private Set<ForwardPort> portsToForwardNow;
if(tryAddMapping(proto, port.portNumber, port.name, port)) {
HashMap<ForwardPort, ForwardPortStatus> map = new HashMap<ForwardPort, ForwardPortStatus>(); public RegisterPortsThread(Set<ForwardPort> ports) {
map.put(port, new ForwardPortStatus(ForwardPortStatus.MAYBE_SUCCESS, "Port apparently forwarded by UPnP", port.portNumber)); portsToForwardNow = ports;
forwardCallback.portForwardStatus(map); }
continue;
} else { public void run() {
HashMap<ForwardPort, ForwardPortStatus> map = new HashMap<ForwardPort, ForwardPortStatus>(); for(ForwardPort port : portsToForwardNow) {
map.put(port, new ForwardPortStatus(ForwardPortStatus.PROBABLE_FAILURE, "UPnP port forwarding apparently failed", port.portNumber)); String proto = protoToString(port.protocol);
forwardCallback.portForwardStatus(map); if (proto.length() <= 1) {
continue; HashMap<ForwardPort, ForwardPortStatus> map = new HashMap<ForwardPort, ForwardPortStatus>();
map.put(port, new ForwardPortStatus(ForwardPortStatus.DEFINITE_FAILURE, "Protocol not supported", port.portNumber));
forwardCallback.portForwardStatus(map);
continue;
}
if(tryAddMapping(proto, port.portNumber, port.name, port)) {
HashMap<ForwardPort, ForwardPortStatus> map = new HashMap<ForwardPort, ForwardPortStatus>();
map.put(port, new ForwardPortStatus(ForwardPortStatus.MAYBE_SUCCESS, "Port apparently forwarded by UPnP", port.portNumber));
forwardCallback.portForwardStatus(map);
continue;
} else {
HashMap<ForwardPort, ForwardPortStatus> map = new HashMap<ForwardPort, ForwardPortStatus>();
map.put(port, new ForwardPortStatus(ForwardPortStatus.PROBABLE_FAILURE, "UPnP port forwarding apparently failed", port.portNumber));
forwardCallback.portForwardStatus(map);
continue;
}
} }
} }
} }
/**
* postControlAction() can take many seconds, especially if it's failing,
* and onChangePublicPorts() may be called from threads we don't want to slow down,
* so throw this in a thread.
*/
private void unregisterPorts(Set<ForwardPort> portsToForwardNow) { private void unregisterPorts(Set<ForwardPort> portsToForwardNow) {
for(ForwardPort port : portsToForwardNow) { Thread t = new Thread(new UnregisterPortsThread(portsToForwardNow));
String proto = protoToString(port.protocol); t.setName("UPnP Port Opener " + (++__id));
if (proto.length() <= 1) t.setDaemon(true);
// Ignore, we've already complained about it t.start();
continue; }
removeMapping(proto, port.portNumber, port, false);
private class UnregisterPortsThread implements Runnable {
private Set<ForwardPort> portsToForwardNow;
public UnregisterPortsThread(Set<ForwardPort> ports) {
portsToForwardNow = ports;
}
public void run() {
for(ForwardPort port : portsToForwardNow) {
String proto = protoToString(port.protocol);
if (proto.length() <= 1)
// Ignore, we've already complained about it
continue;
removeMapping(proto, port.portNumber, port, false);
}
} }
} }

4
router/java/src/org/cybergarage/http/HTTPServer.java
View File

@@ -174,7 +174,7 @@ public class HTTPServer implements Runnable
Thread.yield(); Thread.yield();
Socket sock; Socket sock;
try { try {
Debug.message("accept ..."); //Debug.message("accept ...");
sock = accept(); sock = accept();
if (sock != null) if (sock != null)
Debug.message("sock = " + sock.getRemoteSocketAddress()); Debug.message("sock = " + sock.getRemoteSocketAddress());
@@ -185,7 +185,7 @@ public class HTTPServer implements Runnable
} }
HTTPServerThread httpServThread = new HTTPServerThread(this, sock); HTTPServerThread httpServThread = new HTTPServerThread(this, sock);
httpServThread.start(); httpServThread.start();
Debug.message("httpServThread ..."); //Debug.message("httpServThread ...");
} }
} }

1
router/java/src/org/cybergarage/upnp/device/Disposer.java
View File

@@ -51,6 +51,7 @@ public class Disposer extends ThreadCore
public void run() public void run()
{ {
Thread.currentThread().setName("UPnP-Disposer");
ControlPoint ctrlp = getControlPoint(); ControlPoint ctrlp = getControlPoint();
long monitorInterval = ctrlp.getExpiredDeviceMonitoringInterval() * 1000; long monitorInterval = ctrlp.getExpiredDeviceMonitoringInterval() * 1000;

3
router/java/src/org/cybergarage/upnp/ssdp/SSDPNotifySocket.java
View File

@@ -104,7 +104,8 @@ public class SSDPNotifySocket extends HTTPMUSocket implements Runnable
InetAddress maddr = getMulticastInetAddress(); InetAddress maddr = getMulticastInetAddress();
InetAddress pmaddr = packet.getHostInetAddress(); InetAddress pmaddr = packet.getHostInetAddress();
if (maddr.equals(pmaddr) == false) { if (maddr.equals(pmaddr) == false) {
Debug.warning("Invalidate Multicast Recieved : " + maddr + "," + pmaddr); // I2P
//Debug.warning("Invalidate Multicast Recieved : " + maddr + "," + pmaddr);
continue; continue;
} }

13
router/java/src/org/cybergarage/xml/Parser.java
View File

@@ -3,7 +3,7 @@
* CyberXML for Java * CyberXML for Java
* *
* Copyright (C) Satoshi Konno 2002 * Copyright (C) Satoshi Konno 2002
* *
* File: Parser.java * File: Parser.java
* *
* Revision; * Revision;
@@ -14,14 +14,14 @@
* - Change parse(String) to use StringBufferInputStream instead of URL. * - Change parse(String) to use StringBufferInputStream instead of URL.
* *
******************************************************************/ ******************************************************************/
package org.cybergarage.xml; package org.cybergarage.xml;
import java.net.*; import java.net.*;
import java.io.*; import java.io.*;
public abstract class Parser public abstract class Parser
{ {
//////////////////////////////////////////////// ////////////////////////////////////////////////
// Constructor // Constructor
//////////////////////////////////////////////// ////////////////////////////////////////////////
@@ -44,6 +44,13 @@ public abstract class Parser
{ {
try { try {
HttpURLConnection urlCon = (HttpURLConnection)locationURL.openConnection(); HttpURLConnection urlCon = (HttpURLConnection)locationURL.openConnection();
// I2P mods to prevent hangs (see HTTPRequest for more info)
// this seems to work, getInputStream actually does the connect(),
// (as shown by a thread dump)
// so we can set these after openConnection()
// Alternative would be foo = new HttpURLConnection(locationURL); foo.set timeouts; foo.connect()
urlCon.setConnectTimeout(2*1000);
urlCon.setReadTimeout(1000);
urlCon.setRequestMethod("GET"); urlCon.setRequestMethod("GET");
InputStream urlIn = urlCon.getInputStream(); InputStream urlIn = urlCon.getInputStream();