From 312e6071d7eac58fe1b70297789fd8a9d563833b Mon Sep 17 00:00:00 2001 From: zzz Date: Thu, 19 Feb 2009 21:42:59 +0000 Subject: [PATCH 01/23] upnp first cut --- LICENSE.txt | 12 +- licenses/LICENSE-UPnP.txt | 12 + .../transport/TransportEventListener.java | 1 + .../i2p/router/transport/TransportImpl.java | 2 + .../router/transport/TransportManager.java | 8 + .../src/net/i2p/router/transport/UPnP.java | 624 ++++++ .../net/i2p/router/transport/UPnPManager.java | 115 ++ .../router/transport/ntcp/NTCPTransport.java | 2 + .../router/transport/udp/UDPTransport.java | 5 + .../java/src/org/cybergarage/http/Date.java | 165 ++ .../java/src/org/cybergarage/http/HTML.java | 22 + .../java/src/org/cybergarage/http/HTTP.java | 210 ++ .../src/org/cybergarage/http/HTTPHeader.java | 144 ++ .../src/org/cybergarage/http/HTTPPacket.java | 808 ++++++++ .../src/org/cybergarage/http/HTTPRequest.java | 495 +++++ .../cybergarage/http/HTTPRequestListener.java | 21 + .../org/cybergarage/http/HTTPResponse.java | 115 ++ .../src/org/cybergarage/http/HTTPServer.java | 204 ++ .../org/cybergarage/http/HTTPServerList.java | 104 + .../cybergarage/http/HTTPServerThread.java | 54 + .../src/org/cybergarage/http/HTTPSocket.java | 249 +++ .../src/org/cybergarage/http/HTTPStatus.java | 185 ++ .../src/org/cybergarage/http/Parameter.java | 61 + .../org/cybergarage/http/ParameterList.java | 60 + .../org/cybergarage/net/HostInterface.java | 230 +++ .../java/src/org/cybergarage/soap/SOAP.java | 81 + .../src/org/cybergarage/soap/SOAPRequest.java | 183 ++ .../org/cybergarage/soap/SOAPResponse.java | 191 ++ .../java/src/org/cybergarage/upnp/Action.java | 370 ++++ .../src/org/cybergarage/upnp/ActionList.java | 46 + .../org/cybergarage/upnp/AllowedValue.java | 70 + .../cybergarage/upnp/AllowedValueList.java | 49 + .../cybergarage/upnp/AllowedValueRange.java | 104 + .../src/org/cybergarage/upnp/Argument.java | 231 +++ .../org/cybergarage/upnp/ArgumentList.java | 77 + .../org/cybergarage/upnp/ControlPoint.java | 917 +++++++++ .../java/src/org/cybergarage/upnp/Device.java | 1809 +++++++++++++++++ .../src/org/cybergarage/upnp/DeviceList.java | 46 + .../java/src/org/cybergarage/upnp/Icon.java | 136 ++ .../src/org/cybergarage/upnp/IconList.java | 46 + .../src/org/cybergarage/upnp/Service.java | 747 +++++++ .../src/org/cybergarage/upnp/ServiceList.java | 53 + .../cybergarage/upnp/ServiceStateTable.java | 46 + .../org/cybergarage/upnp/StateVariable.java | 374 ++++ .../java/src/org/cybergarage/upnp/UPnP.java | 232 +++ .../src/org/cybergarage/upnp/UPnPStatus.java | 81 + .../upnp/control/ActionListener.java | 23 + .../upnp/control/ActionRequest.java | 145 ++ .../upnp/control/ActionResponse.java | 120 ++ .../org/cybergarage/upnp/control/Control.java | 29 + .../upnp/control/ControlRequest.java | 128 ++ .../upnp/control/ControlResponse.java | 168 ++ .../upnp/control/QueryListener.java | 25 + .../upnp/control/QueryRequest.java | 117 ++ .../upnp/control/QueryResponse.java | 97 + .../upnp/control/RenewSubscriber.java | 65 + .../cybergarage/upnp/device/Advertiser.java | 68 + .../cybergarage/upnp/device/Description.java | 24 + .../upnp/device/DeviceChangeListener.java | 27 + .../org/cybergarage/upnp/device/Disposer.java | 65 + .../device/InvalidDescriptionException.java | 43 + .../src/org/cybergarage/upnp/device/MAN.java | 31 + .../src/org/cybergarage/upnp/device/NT.java | 30 + .../src/org/cybergarage/upnp/device/NTS.java | 38 + .../upnp/device/NotifyListener.java | 23 + .../src/org/cybergarage/upnp/device/ST.java | 71 + .../upnp/device/SearchListener.java | 23 + .../upnp/device/SearchResponseListener.java | 23 + .../src/org/cybergarage/upnp/device/USN.java | 40 + .../cybergarage/upnp/event/EventListener.java | 21 + .../cybergarage/upnp/event/NotifyRequest.java | 187 ++ .../org/cybergarage/upnp/event/Property.java | 65 + .../cybergarage/upnp/event/PropertyList.java | 46 + .../cybergarage/upnp/event/Subscriber.java | 180 ++ .../upnp/event/SubscriberList.java | 48 + .../cybergarage/upnp/event/Subscription.java | 75 + .../upnp/event/SubscriptionRequest.java | 221 ++ .../upnp/event/SubscriptionResponse.java | 84 + .../cybergarage/upnp/ssdp/HTTPMUSocket.java | 198 ++ .../cybergarage/upnp/ssdp/HTTPUSocket.java | 239 +++ .../src/org/cybergarage/upnp/ssdp/SSDP.java | 77 + .../upnp/ssdp/SSDPNotifyRequest.java | 31 + .../upnp/ssdp/SSDPNotifySocket.java | 131 ++ .../upnp/ssdp/SSDPNotifySocketList.java | 106 + .../org/cybergarage/upnp/ssdp/SSDPPacket.java | 243 +++ .../cybergarage/upnp/ssdp/SSDPRequest.java | 104 + .../cybergarage/upnp/ssdp/SSDPResponse.java | 126 ++ .../upnp/ssdp/SSDPSearchRequest.java | 61 + .../upnp/ssdp/SSDPSearchResponse.java | 35 + .../upnp/ssdp/SSDPSearchResponseSocket.java | 107 + .../ssdp/SSDPSearchResponseSocketList.java | 144 ++ .../upnp/ssdp/SSDPSearchSocket.java | 118 ++ .../upnp/ssdp/SSDPSearchSocketList.java | 105 + .../org/cybergarage/upnp/xml/ActionData.java | 57 + .../cybergarage/upnp/xml/ArgumentData.java | 41 + .../org/cybergarage/upnp/xml/DeviceData.java | 170 ++ .../org/cybergarage/upnp/xml/NodeData.java | 43 + .../org/cybergarage/upnp/xml/ServiceData.java | 98 + .../upnp/xml/StateVariableData.java | 73 + .../java/src/org/cybergarage/util/Debug.java | 51 + .../src/org/cybergarage/util/FileUtil.java | 77 + .../org/cybergarage/util/ListenerList.java | 31 + .../java/src/org/cybergarage/util/Mutex.java | 54 + .../src/org/cybergarage/util/StringUtil.java | 123 ++ .../src/org/cybergarage/util/ThreadCore.java | 76 + .../src/org/cybergarage/util/TimerUtil.java | 37 + .../src/org/cybergarage/xml/Attribute.java | 61 + .../org/cybergarage/xml/AttributeList.java | 47 + router/java/src/org/cybergarage/xml/Node.java | 415 ++++ .../src/org/cybergarage/xml/NodeList.java | 65 + .../java/src/org/cybergarage/xml/Parser.java | 110 + .../org/cybergarage/xml/ParserException.java | 33 + router/java/src/org/cybergarage/xml/XML.java | 65 + .../cybergarage/xml/parser/JaxpParser.java | 127 ++ .../src/org/freenetproject/DetectedIP.java | 68 + .../src/org/freenetproject/ForwardPort.java | 45 + .../freenetproject/ForwardPortCallback.java | 14 + .../org/freenetproject/ForwardPortStatus.java | 33 + router/java/src/org/imports | 57 + .../src/org/xmlpull/v1/XmlPullParser.java | 1116 ++++++++++ .../xmlpull/v1/XmlPullParserException.java | 80 + .../org/xmlpull/v1/XmlPullParserFactory.java | 356 ++++ .../src/org/xmlpull/v1/XmlSerializer.java | 326 +++ 123 files changed, 17920 insertions(+), 1 deletion(-) create mode 100644 licenses/LICENSE-UPnP.txt create mode 100644 router/java/src/net/i2p/router/transport/UPnP.java create mode 100644 router/java/src/net/i2p/router/transport/UPnPManager.java create mode 100644 router/java/src/org/cybergarage/http/Date.java create mode 100644 router/java/src/org/cybergarage/http/HTML.java create mode 100644 router/java/src/org/cybergarage/http/HTTP.java create mode 100644 router/java/src/org/cybergarage/http/HTTPHeader.java create mode 100644 router/java/src/org/cybergarage/http/HTTPPacket.java create mode 100644 router/java/src/org/cybergarage/http/HTTPRequest.java create mode 100644 router/java/src/org/cybergarage/http/HTTPRequestListener.java create mode 100644 router/java/src/org/cybergarage/http/HTTPResponse.java create mode 100644 router/java/src/org/cybergarage/http/HTTPServer.java create mode 100644 router/java/src/org/cybergarage/http/HTTPServerList.java create mode 100644 router/java/src/org/cybergarage/http/HTTPServerThread.java create mode 100644 router/java/src/org/cybergarage/http/HTTPSocket.java create mode 100644 router/java/src/org/cybergarage/http/HTTPStatus.java create mode 100644 router/java/src/org/cybergarage/http/Parameter.java create mode 100644 router/java/src/org/cybergarage/http/ParameterList.java create mode 100644 router/java/src/org/cybergarage/net/HostInterface.java create mode 100644 router/java/src/org/cybergarage/soap/SOAP.java create mode 100644 router/java/src/org/cybergarage/soap/SOAPRequest.java create mode 100644 router/java/src/org/cybergarage/soap/SOAPResponse.java create mode 100644 router/java/src/org/cybergarage/upnp/Action.java create mode 100644 router/java/src/org/cybergarage/upnp/ActionList.java create mode 100644 router/java/src/org/cybergarage/upnp/AllowedValue.java create mode 100644 router/java/src/org/cybergarage/upnp/AllowedValueList.java create mode 100644 router/java/src/org/cybergarage/upnp/AllowedValueRange.java create mode 100644 router/java/src/org/cybergarage/upnp/Argument.java create mode 100644 router/java/src/org/cybergarage/upnp/ArgumentList.java create mode 100644 router/java/src/org/cybergarage/upnp/ControlPoint.java create mode 100644 router/java/src/org/cybergarage/upnp/Device.java create mode 100644 router/java/src/org/cybergarage/upnp/DeviceList.java create mode 100644 router/java/src/org/cybergarage/upnp/Icon.java create mode 100644 router/java/src/org/cybergarage/upnp/IconList.java create mode 100644 router/java/src/org/cybergarage/upnp/Service.java create mode 100644 router/java/src/org/cybergarage/upnp/ServiceList.java create mode 100644 router/java/src/org/cybergarage/upnp/ServiceStateTable.java create mode 100644 router/java/src/org/cybergarage/upnp/StateVariable.java create mode 100644 router/java/src/org/cybergarage/upnp/UPnP.java create mode 100644 router/java/src/org/cybergarage/upnp/UPnPStatus.java create mode 100644 router/java/src/org/cybergarage/upnp/control/ActionListener.java create mode 100644 router/java/src/org/cybergarage/upnp/control/ActionRequest.java create mode 100644 router/java/src/org/cybergarage/upnp/control/ActionResponse.java create mode 100644 router/java/src/org/cybergarage/upnp/control/Control.java create mode 100644 router/java/src/org/cybergarage/upnp/control/ControlRequest.java create mode 100644 router/java/src/org/cybergarage/upnp/control/ControlResponse.java create mode 100644 router/java/src/org/cybergarage/upnp/control/QueryListener.java create mode 100644 router/java/src/org/cybergarage/upnp/control/QueryRequest.java create mode 100644 router/java/src/org/cybergarage/upnp/control/QueryResponse.java create mode 100644 router/java/src/org/cybergarage/upnp/control/RenewSubscriber.java create mode 100644 router/java/src/org/cybergarage/upnp/device/Advertiser.java create mode 100644 router/java/src/org/cybergarage/upnp/device/Description.java create mode 100644 router/java/src/org/cybergarage/upnp/device/DeviceChangeListener.java create mode 100644 router/java/src/org/cybergarage/upnp/device/Disposer.java create mode 100644 router/java/src/org/cybergarage/upnp/device/InvalidDescriptionException.java create mode 100644 router/java/src/org/cybergarage/upnp/device/MAN.java create mode 100644 router/java/src/org/cybergarage/upnp/device/NT.java create mode 100644 router/java/src/org/cybergarage/upnp/device/NTS.java create mode 100644 router/java/src/org/cybergarage/upnp/device/NotifyListener.java create mode 100644 router/java/src/org/cybergarage/upnp/device/ST.java create mode 100644 router/java/src/org/cybergarage/upnp/device/SearchListener.java create mode 100644 router/java/src/org/cybergarage/upnp/device/SearchResponseListener.java create mode 100644 router/java/src/org/cybergarage/upnp/device/USN.java create mode 100644 router/java/src/org/cybergarage/upnp/event/EventListener.java create mode 100644 router/java/src/org/cybergarage/upnp/event/NotifyRequest.java create mode 100644 router/java/src/org/cybergarage/upnp/event/Property.java create mode 100644 router/java/src/org/cybergarage/upnp/event/PropertyList.java create mode 100644 router/java/src/org/cybergarage/upnp/event/Subscriber.java create mode 100644 router/java/src/org/cybergarage/upnp/event/SubscriberList.java create mode 100644 router/java/src/org/cybergarage/upnp/event/Subscription.java create mode 100644 router/java/src/org/cybergarage/upnp/event/SubscriptionRequest.java create mode 100644 router/java/src/org/cybergarage/upnp/event/SubscriptionResponse.java create mode 100644 router/java/src/org/cybergarage/upnp/ssdp/HTTPMUSocket.java create mode 100644 router/java/src/org/cybergarage/upnp/ssdp/HTTPUSocket.java create mode 100644 router/java/src/org/cybergarage/upnp/ssdp/SSDP.java create mode 100644 router/java/src/org/cybergarage/upnp/ssdp/SSDPNotifyRequest.java create mode 100644 router/java/src/org/cybergarage/upnp/ssdp/SSDPNotifySocket.java create mode 100644 router/java/src/org/cybergarage/upnp/ssdp/SSDPNotifySocketList.java create mode 100644 router/java/src/org/cybergarage/upnp/ssdp/SSDPPacket.java create mode 100644 router/java/src/org/cybergarage/upnp/ssdp/SSDPRequest.java create mode 100644 router/java/src/org/cybergarage/upnp/ssdp/SSDPResponse.java create mode 100644 router/java/src/org/cybergarage/upnp/ssdp/SSDPSearchRequest.java create mode 100644 router/java/src/org/cybergarage/upnp/ssdp/SSDPSearchResponse.java create mode 100644 router/java/src/org/cybergarage/upnp/ssdp/SSDPSearchResponseSocket.java create mode 100644 router/java/src/org/cybergarage/upnp/ssdp/SSDPSearchResponseSocketList.java create mode 100644 router/java/src/org/cybergarage/upnp/ssdp/SSDPSearchSocket.java create mode 100644 router/java/src/org/cybergarage/upnp/ssdp/SSDPSearchSocketList.java create mode 100644 router/java/src/org/cybergarage/upnp/xml/ActionData.java create mode 100644 router/java/src/org/cybergarage/upnp/xml/ArgumentData.java create mode 100644 router/java/src/org/cybergarage/upnp/xml/DeviceData.java create mode 100644 router/java/src/org/cybergarage/upnp/xml/NodeData.java create mode 100644 router/java/src/org/cybergarage/upnp/xml/ServiceData.java create mode 100644 router/java/src/org/cybergarage/upnp/xml/StateVariableData.java create mode 100644 router/java/src/org/cybergarage/util/Debug.java create mode 100644 router/java/src/org/cybergarage/util/FileUtil.java create mode 100644 router/java/src/org/cybergarage/util/ListenerList.java create mode 100644 router/java/src/org/cybergarage/util/Mutex.java create mode 100644 router/java/src/org/cybergarage/util/StringUtil.java create mode 100644 router/java/src/org/cybergarage/util/ThreadCore.java create mode 100644 router/java/src/org/cybergarage/util/TimerUtil.java create mode 100644 router/java/src/org/cybergarage/xml/Attribute.java create mode 100644 router/java/src/org/cybergarage/xml/AttributeList.java create mode 100644 router/java/src/org/cybergarage/xml/Node.java create mode 100644 router/java/src/org/cybergarage/xml/NodeList.java create mode 100644 router/java/src/org/cybergarage/xml/Parser.java create mode 100644 router/java/src/org/cybergarage/xml/ParserException.java create mode 100644 router/java/src/org/cybergarage/xml/XML.java create mode 100644 router/java/src/org/cybergarage/xml/parser/JaxpParser.java create mode 100644 router/java/src/org/freenetproject/DetectedIP.java create mode 100644 router/java/src/org/freenetproject/ForwardPort.java create mode 100644 router/java/src/org/freenetproject/ForwardPortCallback.java create mode 100644 router/java/src/org/freenetproject/ForwardPortStatus.java create mode 100644 router/java/src/org/imports create mode 100644 router/java/src/org/xmlpull/v1/XmlPullParser.java create mode 100644 router/java/src/org/xmlpull/v1/XmlPullParserException.java create mode 100644 router/java/src/org/xmlpull/v1/XmlPullParserFactory.java create mode 100644 router/java/src/org/xmlpull/v1/XmlSerializer.java diff --git a/LICENSE.txt b/LICENSE.txt index 324f532c6..00e231a78 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -67,7 +67,17 @@ Public domain except as listed below: Router: -Public domain +Public domain except as listed below: + UPnP.java: + From freenet + See licenses/LICENSE-GPLv2.txt + + UPnP subsystem: + Copyright (C) 2003-2006 Satoshi Konno + See licenses/LICENSE-UPnP.txt + + XMLPull library used by UPnP: + See licenses/LICENSE-Apache2.0.txt diff --git a/licenses/LICENSE-UPnP.txt b/licenses/LICENSE-UPnP.txt new file mode 100644 index 000000000..7e2a36863 --- /dev/null +++ b/licenses/LICENSE-UPnP.txt @@ -0,0 +1,12 @@ +Copyright (C) 2003-2006 Satoshi Konno +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + +3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/router/java/src/net/i2p/router/transport/TransportEventListener.java b/router/java/src/net/i2p/router/transport/TransportEventListener.java index 31d52758c..2be28bea4 100644 --- a/router/java/src/net/i2p/router/transport/TransportEventListener.java +++ b/router/java/src/net/i2p/router/transport/TransportEventListener.java @@ -14,4 +14,5 @@ import net.i2p.data.i2np.I2NPMessage; public interface TransportEventListener { public void messageReceived(I2NPMessage message, RouterIdentity fromRouter, Hash fromRouterHash); + public void transportAddressChanged(); } diff --git a/router/java/src/net/i2p/router/transport/TransportImpl.java b/router/java/src/net/i2p/router/transport/TransportImpl.java index 04a2cde91..f9ac683b6 100644 --- a/router/java/src/net/i2p/router/transport/TransportImpl.java +++ b/router/java/src/net/i2p/router/transport/TransportImpl.java @@ -410,6 +410,8 @@ public abstract class TransportImpl implements Transport { protected void replaceAddress(RouterAddress address) { // _log.error("Replacing address for " + getStyle() + " was " + _currentAddress + " now " + address); _currentAddress = address; + if (_listener != null) + _listener.transportAddressChanged(); if ("SSU".equals(getStyle())) _context.commSystem().notifyReplaceAddress(address); } diff --git a/router/java/src/net/i2p/router/transport/TransportManager.java b/router/java/src/net/i2p/router/transport/TransportManager.java index bade75913..0b7d8d547 100644 --- a/router/java/src/net/i2p/router/transport/TransportManager.java +++ b/router/java/src/net/i2p/router/transport/TransportManager.java @@ -35,6 +35,7 @@ public class TransportManager implements TransportEventListener { private Log _log; private List _transports; private RouterContext _context; + private UPnPManager _upnpManager; private final static String PROP_ENABLE_UDP = "i2np.udp.enable"; private final static String PROP_ENABLE_NTCP = "i2np.ntcp.enable"; @@ -51,6 +52,7 @@ public class TransportManager implements TransportEventListener { _context.statManager().createRateStat("transport.bidFailNoTransports", "Could not attempt to bid on message, as none of the transports could attempt it", "Transport", new long[] { 60*1000, 10*60*1000, 60*60*1000 }); _context.statManager().createRateStat("transport.bidFailAllTransports", "Could not attempt to bid on message, as all of the transports had failed", "Transport", new long[] { 60*1000, 10*60*1000, 60*60*1000 }); _transports = new ArrayList(); + _upnpManager = new UPnPManager(context); } public void addTransport(Transport transport) { @@ -91,6 +93,7 @@ public class TransportManager implements TransportEventListener { } public void startListening() { + _upnpManager.start(); configTransports(); _log.debug("Starting up the transport manager"); for (int i = 0; i < _transports.size(); i++) { @@ -109,6 +112,7 @@ public class TransportManager implements TransportEventListener { } public void stopListening() { + _upnpManager.stop(); for (int i = 0; i < _transports.size(); i++) { ((Transport)_transports.get(i)).stopListening(); } @@ -341,6 +345,10 @@ public class TransportManager implements TransportEventListener { } } + public void transportAddressChanged() { + _upnpManager.update(getAddresses()); + } + public List getMostRecentErrorMessages() { List rv = new ArrayList(16); for (int i = 0; i < _transports.size(); i++) { diff --git a/router/java/src/net/i2p/router/transport/UPnP.java b/router/java/src/net/i2p/router/transport/UPnP.java new file mode 100644 index 000000000..aef65adc5 --- /dev/null +++ b/router/java/src/net/i2p/router/transport/UPnP.java @@ -0,0 +1,624 @@ +/* This code is part of Freenet. It is distributed under the GNU General + * Public License, version 2 (or at your option any later version). See + * http://www.gnu.org/ for further details of the GPL. */ +package net.i2p.router.transport; + +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Set; + +import net.i2p.util.Log; +import net.i2p.I2PAppContext; +import net.i2p.router.RouterContext; + +import org.cybergarage.upnp.Action; +import org.cybergarage.upnp.ActionList; +import org.cybergarage.upnp.Argument; +import org.cybergarage.upnp.ArgumentList; +import org.cybergarage.upnp.ControlPoint; +import org.cybergarage.upnp.Device; +import org.cybergarage.upnp.DeviceList; +import org.cybergarage.upnp.Service; +import org.cybergarage.upnp.ServiceList; +import org.cybergarage.upnp.ServiceStateTable; +import org.cybergarage.upnp.StateVariable; +import org.cybergarage.upnp.device.DeviceChangeListener; +import org.freenetproject.DetectedIP; +import org.freenetproject.ForwardPort; +import org.freenetproject.ForwardPortCallback; +import org.freenetproject.ForwardPortStatus; + +/** + * This (and all in org/freenet, org/cybergarage, org/xmlpull) + * grabbed from freenet SVN, mid-February 2009 by zzz. + * This file modded somewhat to remove freenet-specific stuff, + * but most of the glue to I2P is in UPnPManager (which was written + * from scratch and is not the Limewire one referred to below). + * + * ================== + * + * This plugin implements UP&P support on a Freenet node. + * + * @author Florent Daignière <nextgens@freenetproject.org> + * + * + * some code has been borrowed from Limewire : @see com.limegroup.gnutella.UPnPManager + * + * @see http://www.upnp.org/ + * @see http://en.wikipedia.org/wiki/Universal_Plug_and_Play + * + * TODO: Support multiple IGDs ? + * TODO: Advertise the node like the MDNS plugin does + * TODO: Implement EventListener and react on ip-change + */ +public class UPnP extends ControlPoint implements DeviceChangeListener { + private Log _log; + private I2PAppContext _context; + + /** some schemas */ + private static final String ROUTER_DEVICE = "urn:schemas-upnp-org:device:InternetGatewayDevice:1"; + private static final String WAN_DEVICE = "urn:schemas-upnp-org:device:WANDevice:1"; + private static final String WANCON_DEVICE = "urn:schemas-upnp-org:device:WANConnectionDevice:1"; + private static final String WAN_IP_CONNECTION = "urn:schemas-upnp-org:service:WANIPConnection:1"; + private static final String WAN_PPP_CONNECTION = "urn:schemas-upnp-org:service:WANPPPConnection:1"; + + private Device _router; + private Service _service; + private boolean isDisabled = false; // We disable the plugin if more than one IGD is found + private final Object lock = new Object(); + // FIXME: detect it for real and deal with it! @see #2524 + private volatile boolean thinksWeAreDoubleNatted = false; + + /** List of ports we want to forward */ + private Set portsToForward; + /** List of ports we have actually forwarded */ + private Set portsForwarded; + /** Callback to call when a forward fails or succeeds */ + private ForwardPortCallback forwardCallback; + + public UPnP(I2PAppContext context) { + super(); + _context = context; + _log = _context.logManager().getLog(UPnP.class); + portsForwarded = new HashSet(); + addDeviceChangeListener(this); + } + + public void runPlugin() { + super.start(); + } + + public void terminate() { + unregisterPortMappings(); + super.stop(); + } + + public DetectedIP[] getAddress() { + _log.info("UP&P.getAddress() is called \\o/"); + if(isDisabled) { + _log.warn("Plugin has been disabled previously, ignoring request."); + return null; + } else if(!isNATPresent()) { + _log.warn("No UP&P device found, detection of the external ip address using the plugin has failed"); + return null; + } + + DetectedIP result = null; + final String natAddress = getNATAddress(); + try { + InetAddress detectedIP = InetAddress.getByName(natAddress); + short status = DetectedIP.NOT_SUPPORTED; + thinksWeAreDoubleNatted = !TransportImpl.isPubliclyRoutable(detectedIP.getAddress()); + // If we have forwarded a port AND we don't have a private address + if((portsForwarded.size() > 1) && (!thinksWeAreDoubleNatted)) + status = DetectedIP.FULL_INTERNET; + + result = new DetectedIP(detectedIP, status); + + _log.warn("Successful UP&P discovery :" + result); + + return new DetectedIP[] { result }; + } catch (UnknownHostException e) { + _log.error("Caught an UnknownHostException resolving " + natAddress, e); + return null; + } + } + + public void deviceAdded(Device dev) { + synchronized (lock) { + if(isDisabled) { + _log.warn("Plugin has been disabled previously, ignoring new device."); + return; + } + } + if(!ROUTER_DEVICE.equals(dev.getDeviceType()) || !dev.isRootDevice()) + return; // Silently ignore non-IGD devices + else if(isNATPresent()) { + _log.error("We got a second IGD on the network! the plugin doesn't handle that: let's disable it."); + isDisabled = true; + + synchronized(lock) { + _router = null; + _service = null; + } + + stop(); + return; + } + + _log.warn("UP&P IGD found : " + dev.getFriendlyName()); + synchronized(lock) { + _router = dev; + } + + discoverService(); + // We have found the device we need: stop the listener thread + stop(); + synchronized(lock) { + if(_service == null) { + _log.error("The IGD device we got isn't suiting our needs, let's disable the plugin"); + isDisabled = true; + _router = null; + return; + } + } + registerPortMappings(); + } + + private void registerPortMappings() { + Set ports; + synchronized(lock) { + ports = portsToForward; + } + if(ports == null) return; + registerPorts(ports); + } + + /** + * Traverses the structure of the router device looking for the port mapping service. + */ + private void discoverService() { + synchronized (lock) { + for (Iterator iter = _router.getDeviceList().iterator();iter.hasNext();) { + Device current = (Device)iter.next(); + if (!current.getDeviceType().equals(WAN_DEVICE)) + continue; + + DeviceList l = current.getDeviceList(); + for (int i=0;i"); + for(int i=0; i"); + } + sb.append(""); + } + + private void listActionsArguments(Action action, StringBuilder sb) { + ArgumentList ar = action.getArgumentList(); + for(int i=0; iargument ("+i+") :" + argument.getName()+""); + } + } + + private void listActions(Service service, StringBuilder sb) { + ActionList al = service.getActionList(); + for(int i=0; iaction ("+i+") :" + action.getName()); + listActionsArguments(action, sb); + sb.append(""); + } + } + + private String toString(String action, String Argument, Service serv) { + Action getIP = serv.getAction(action); + if(getIP == null || !getIP.postControlAction()) + return null; + + Argument ret = getIP.getOutputArgumentList().getArgument(Argument); + return ret.getValue(); + } + + // TODO: extend it! RTFM + private void listSubServices(Device dev, StringBuilder sb) { + ServiceList sl = dev.getServiceList(); + for(int i=0; iservice ("+i+") : "+serv.getServiceType()+"
"); + if("urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1".equals(serv.getServiceType())){ + sb.append("WANCommonInterfaceConfig"); + sb.append(" status: " + toString("GetCommonLinkProperties", "NewPhysicalLinkStatus", serv)); + sb.append(" type: " + toString("GetCommonLinkProperties", "NewWANAccessType", serv)); + sb.append(" upstream: " + toString("GetCommonLinkProperties", "NewLayer1UpstreamMaxBitRate", serv)); + sb.append(" downstream: " + toString("GetCommonLinkProperties", "NewLayer1DownstreamMaxBitRate", serv) + "
"); + }else if("urn:schemas-upnp-org:service:WANPPPConnection:1".equals(serv.getServiceType())){ + sb.append("WANPPPConnection"); + sb.append(" status: " + toString("GetStatusInfo", "NewConnectionStatus", serv)); + sb.append(" type: " + toString("GetConnectionTypeInfo", "NewConnectionType", serv)); + sb.append(" upstream: " + toString("GetLinkLayerMaxBitRates", "NewUpstreamMaxBitRate", serv)); + sb.append(" downstream: " + toString("GetLinkLayerMaxBitRates", "NewDownstreamMaxBitRate", serv) + "
"); + sb.append(" external IP: " + toString("GetExternalIPAddress", "NewExternalIPAddress", serv) + "
"); + }else if("urn:schemas-upnp-org:service:Layer3Forwarding:1".equals(serv.getServiceType())){ + sb.append("Layer3Forwarding"); + sb.append("DefaultConnectionService: " + toString("GetDefaultConnectionService", "NewDefaultConnectionService", serv)); + }else if(WAN_IP_CONNECTION.equals(serv.getServiceType())){ + sb.append("WANIPConnection"); + sb.append(" status: " + toString("GetStatusInfo", "NewConnectionStatus", serv)); + sb.append(" type: " + toString("GetConnectionTypeInfo", "NewConnectionType", serv)); + sb.append(" external IP: " + toString("GetExternalIPAddress", "NewExternalIPAddress", serv) + "
"); + }else if("urn:schemas-upnp-org:service:WANEthernetLinkConfig:1".equals(serv.getServiceType())){ + sb.append("WANEthernetLinkConfig"); + sb.append(" status: " + toString("GetEthernetLinkStatus", "NewEthernetLinkStatus", serv) + "
"); + }else + sb.append("~~~~~~~ "+serv.getServiceType()); + listActions(serv, sb); + listStateTable(serv, sb); + sb.append(""); + } + } + + private void listSubDev(String prefix, Device dev, StringBuilder sb){ + sb.append("

Device : "+dev.getFriendlyName()+" - "+ dev.getDeviceType()+"
"); + listSubServices(dev, sb); + + DeviceList dl = dev.getDeviceList(); + for(int j=0; j"); + listSubDev(dev.getFriendlyName(), subDev, sb); + sb.append("

"); + } + sb.append("

"); + } + +/***** + public String handleHTTPGet(HTTPRequest request) throws PluginHTTPException { + if(request.isParameterSet("getDeviceCapabilities")) { + final StringBuilder sb = new StringBuilder(); + sb.append("UPnP report"); + listSubDev("WANDevice", _router, sb); + sb.append(""); + return sb.toString(); + } + + HTMLNode pageNode = pr.getPageMaker().getPageNode("UP&P plugin configuration page", false, null); + HTMLNode contentNode = pr.getPageMaker().getContentNode(pageNode); + + if(isDisabled) { + HTMLNode disabledInfobox = contentNode.addChild("div", "class", "infobox infobox-error"); + HTMLNode disabledInfoboxHeader = disabledInfobox.addChild("div", "class", "infobox-header"); + HTMLNode disabledInfoboxContent = disabledInfobox.addChild("div", "class", "infobox-content"); + + disabledInfoboxHeader.addChild("#", "UP&P plugin report"); + disabledInfoboxContent.addChild("#", "The plugin has been disabled; Do you have more than one UP&P IGD on your LAN ?"); + return pageNode.generate(); + } else if(!isNATPresent()) { + HTMLNode notFoundInfobox = contentNode.addChild("div", "class", "infobox infobox-warning"); + HTMLNode notFoundInfoboxHeader = notFoundInfobox.addChild("div", "class", "infobox-header"); + HTMLNode notFoundInfoboxContent = notFoundInfobox.addChild("div", "class", "infobox-content"); + + notFoundInfoboxHeader.addChild("#", "UP&P plugin report"); + notFoundInfoboxContent.addChild("#", "The plugin hasn't found any UP&P aware, compatible device on your LAN."); + return pageNode.generate(); + } + + HTMLNode foundInfobox = contentNode.addChild("div", "class", "infobox infobox-normal"); + HTMLNode foundInfoboxHeader = foundInfobox.addChild("div", "class", "infobox-header"); + HTMLNode foundInfoboxContent = foundInfobox.addChild("div", "class", "infobox-content"); + + // FIXME L10n! + foundInfoboxHeader.addChild("#", "UP&P plugin report"); + foundInfoboxContent.addChild("p", "The following device has been found : ").addChild("a", "href", "?getDeviceCapabilities").addChild("#", _router.getFriendlyName()); + foundInfoboxContent.addChild("p", "Our current external ip address is : " + getNATAddress()); + int downstreamMaxBitRate = getDownstreamMaxBitRate(); + int upstreamMaxBitRate = getUpstramMaxBitRate(); + if(downstreamMaxBitRate > 0) + foundInfoboxContent.addChild("p", "Our reported max downstream bit rate is : " + getDownstreamMaxBitRate()+ " bits/sec"); + if(upstreamMaxBitRate > 0) + foundInfoboxContent.addChild("p", "Our reported max upstream bit rate is : " + getUpstramMaxBitRate()+ " bits/sec"); + synchronized(lock) { + if(portsToForward != null) { + for(ForwardPort port : portsToForward) { + if(portsForwarded.contains(port)) { + foundInfoboxContent.addChild("p", "The "+port.name+" port "+port.portNumber+" / "+port.protocol+" has been forwarded successfully."); + } else { + foundInfoboxContent.addChild("p", "The "+port.name+" port "+port.portNumber+" / "+port.protocol+" has not been forwarded."); + } + } + } + } + + return pageNode.generate(); + } + + public String handleHTTPPost(HTTPRequest request) throws PluginHTTPException { + return null; + } +***/ + + private boolean addMapping(String protocol, int port, String description, ForwardPort fp) { + if(isDisabled || !isNATPresent() || _router == null) { + _log.error("Can't addMapping: " + isDisabled + " " + isNATPresent() + " " + _router); + return false; + } + + // Just in case... + // this confuses my linksys - zzz + // removeMapping(protocol, port, fp, true); + + Action add = _service.getAction("AddPortMapping"); + if(add == null) { + _log.error("Couldn't find AddPortMapping action!"); + return false; + } + + + add.setArgumentValue("NewRemoteHost", ""); + add.setArgumentValue("NewExternalPort", port); + add.setArgumentValue("NewInternalClient", _router.getInterfaceAddress()); + add.setArgumentValue("NewInternalPort", port); + add.setArgumentValue("NewProtocol", protocol); + add.setArgumentValue("NewPortMappingDescription", description); + add.setArgumentValue("NewEnabled","1"); + add.setArgumentValue("NewLeaseDuration", 0); + + if(add.postControlAction()) { + synchronized(lock) { + portsForwarded.add(fp); + } + return true; + } else return false; + } + + private boolean removeMapping(String protocol, int port, ForwardPort fp, boolean noLog) { + if(isDisabled || !isNATPresent()) + return false; + + Action remove = _service.getAction("DeletePortMapping"); + if(remove == null) { + _log.error("Couldn't find DeletePortMapping action!"); + return false; + } + + // remove.setArgumentValue("NewRemoteHost", ""); + remove.setArgumentValue("NewExternalPort", port); + remove.setArgumentValue("NewProtocol", protocol); + + boolean retval = remove.postControlAction(); + synchronized(lock) { + portsForwarded.remove(fp); + } + + if(!noLog) + _log.warn("UPnP: Removed mapping for "+fp.name+" "+port+" / "+protocol); + return retval; + } + + public void onChangePublicPorts(Set ports, ForwardPortCallback cb) { + Set portsToDumpNow = null; + Set portsToForwardNow = null; + _log.warn("UP&P Forwarding "+ports.size()+" ports..."); + synchronized(lock) { + if(forwardCallback != null && forwardCallback != cb && cb != null) { + _log.error("ForwardPortCallback changed from "+forwardCallback+" to "+cb+" - using new value, but this is very strange!"); + } + forwardCallback = cb; + if(portsToForward == null || portsToForward.isEmpty()) { + portsToForward = ports; + portsToForwardNow = ports; + portsToDumpNow = null; + } else if(ports == null || ports.isEmpty()) { + portsToDumpNow = portsToForward; + portsToForward = ports; + portsToForwardNow = null; + } else { + // Some ports to keep, some ports to dump + // Ports in ports but not in portsToForwardNow we must forward + // Ports in portsToForwardNow but not in ports we must dump + for(ForwardPort port: ports) { + if(portsToForward.contains(port)) { + // We have forwarded it, and it should be forwarded, cool. + } else { + // Needs forwarding + if(portsToForwardNow == null) portsToForwardNow = new HashSet(); + portsToForwardNow.add(port); + } + } + for(ForwardPort port : portsToForward) { + if(ports.contains(port)) { + // Should be forwarded, has been forwarded, cool. + } else { + // Needs dropping + if(portsToDumpNow == null) portsToDumpNow = new HashSet(); + portsToDumpNow.add(port); + } + } + portsToForward = ports; + } + if(_router == null) return; // When one is found, we will do the forwards + } + if(portsToDumpNow != null) + unregisterPorts(portsToDumpNow); + if(portsToForwardNow != null) + registerPorts(portsToForwardNow); + } + + private void registerPorts(Set portsToForwardNow) { + for(ForwardPort port : portsToForwardNow) { + String proto; + if(port.protocol == ForwardPort.PROTOCOL_UDP_IPV4) + proto = "UDP"; + else if(port.protocol == ForwardPort.PROTOCOL_TCP_IPV4) + proto = "TCP"; + else { + HashMap map = new HashMap(); + 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 map = new HashMap(); + map.put(port, new ForwardPortStatus(ForwardPortStatus.MAYBE_SUCCESS, "Port apparently forwarded by UPnP", port.portNumber)); + forwardCallback.portForwardStatus(map); + continue; + } else { + HashMap map = new HashMap(); + map.put(port, new ForwardPortStatus(ForwardPortStatus.PROBABLE_FAILURE, "UPnP port forwarding apparently failed", port.portNumber)); + forwardCallback.portForwardStatus(map); + continue; + } + } + } + + private void unregisterPorts(Set portsToForwardNow) { + for(ForwardPort port : portsToForwardNow) { + String proto; + if(port.protocol == ForwardPort.PROTOCOL_UDP_IPV4) + proto = "UDP"; + else if(port.protocol == ForwardPort.PROTOCOL_TCP_IPV4) + proto = "TCP"; + else { + // Ignore, we've already complained about it + continue; + } + removeMapping(proto, port.portNumber, port, false); + } + } + + public static void main(String[] args) throws Exception { + UPnP upnp = new UPnP(I2PAppContext.getGlobalContext()); + ControlPoint cp = new ControlPoint(); + System.out.println("Searching for up&p devices:"); + cp.start(); + cp.search(); + while(true) { + DeviceList list = cp.getDeviceList(); + System.out.println("Found " + list.size() + " devices!"); + StringBuilder sb = new StringBuilder(); + Iterator it = list.iterator(); + while(it.hasNext()) { + Device device = it.next(); + upnp.listSubDev(device.toString(), device, sb); + System.out.println("Here is the listing for " + device.toString() + " :"); + System.out.println(sb.toString()); + sb = new StringBuilder(); + } + System.out.println("End"); + Thread.sleep(2000); + } + } +} diff --git a/router/java/src/net/i2p/router/transport/UPnPManager.java b/router/java/src/net/i2p/router/transport/UPnPManager.java new file mode 100644 index 000000000..4deaebc4d --- /dev/null +++ b/router/java/src/net/i2p/router/transport/UPnPManager.java @@ -0,0 +1,115 @@ +package net.i2p.router.transport; + +/* + * public domain + */ + +import java.util.HashSet; +import java.util.Map; +import java.util.Properties; +import java.util.Set; + +import net.i2p.data.RouterAddress; +import net.i2p.router.RouterContext; +import net.i2p.util.Log; + +import org.cybergarage.util.Debug; +import org.freenetproject.DetectedIP; +import org.freenetproject.ForwardPort; +import org.freenetproject.ForwardPortCallback; +import org.freenetproject.ForwardPortStatus; + +/** + * Bridge from the I2P RouterAddress data structure to + * the freenet data structures + * + * No disable option yet. + * UPnP listens on ports 1900, 8008, and 8058 - no config option yet. + * No routerconsole support yet. + * + * @author zzz + */ +public class UPnPManager { + private Log _log; + private RouterContext _context; + private UPnP _upnp; + private UPnPCallback _upnpCallback; + private boolean _isRunning; + + public UPnPManager(RouterContext context) { + _context = context; + _log = _context.logManager().getLog(UPnPManager.class); + _upnp = new UPnP(context); + _upnpCallback = new UPnPCallback(); + _isRunning = false; + } + + public synchronized void start() { + _log.error("UPnP Start"); + Debug.on(); // UPnP stuff -> wrapper log + if (!_isRunning) + _upnp.runPlugin(); + _isRunning = true; + } + + public synchronized void stop() { + _log.error("UPnP Stop"); + if (_isRunning) + _upnp.terminate(); + _isRunning = false; + } + + /** call when the ports might have changed */ + public void update(Map addresses) { + _log.error("UPnP Update:"); + if (!_isRunning) + return; + Set forwards = new HashSet(addresses.size()); + for (String style : addresses.keySet()) { + RouterAddress ra = addresses.get(style); + if (ra == null) + continue; + Properties opts = ra.getOptions(); + if (opts == null) + continue; + String s = opts.getProperty("port"); + if (s == null) + continue; + int port = -1; + try { + port = Integer.parseInt(s); + } catch (NumberFormatException nfe) { continue; } + int protocol = -1; + if ("SSU".equals(style)) + protocol = ForwardPort.PROTOCOL_UDP_IPV4; + else if ("NTCP".equals(style)) + protocol = ForwardPort.PROTOCOL_TCP_IPV4; + else + continue; + _log.error("Adding: " + style + " " + port); + ForwardPort fp = new ForwardPort(style, false, protocol, port); + forwards.add(fp); + } + _upnp.onChangePublicPorts(forwards, _upnpCallback); + } + + /** just logs for now */ + private class UPnPCallback implements ForwardPortCallback { + + /** Called to indicate status on one or more forwarded ports. */ + public void portForwardStatus(Map statuses) { + _log.error("UPnP Callback:"); + + DetectedIP[] ips = _upnp.getAddress(); + for (DetectedIP ip : ips) { + _log.error("External address: " + ip.publicAddress + " type: " + ip.natType); + } + + for (ForwardPort fp : statuses.keySet()) { + ForwardPortStatus fps = statuses.get(fp); + _log.error(fp.name + " " + fp.protocol + " " + fp.portNumber + + " status: " + fps.status + " reason: " + fps.reasonString + " ext port: " + fps.externalPort); + } + } + } +} diff --git a/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java b/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java index c23245bae..2d5df4be0 100644 --- a/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java +++ b/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java @@ -543,6 +543,8 @@ public class NTCPTransport extends TransportImpl { NTCPConnection con = (NTCPConnection)iter.next(); con.close(); } + // will this work? + replaceAddress(null); } public static final String STYLE = "NTCP"; 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 e5185defa..0a2e7f1be 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java @@ -589,11 +589,13 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority return true; } +/*** infinite loop public RouterAddress getCurrentAddress() { if (needsRebuild()) rebuildExternalAddress(false); return super.getCurrentAddress(); } +***/ public void messageReceived(I2NPMessage inMsg, RouterIdentity remoteIdent, Hash remoteIdentHash, long msToReceive, int bytesReceived) { if (inMsg.getType() == DatabaseStoreMessage.MESSAGE_TYPE) { @@ -996,6 +998,9 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority public void stopListening() { shutdown(); + // will this work? + _externalAddress = null; + replaceAddress(null); } private boolean explicitAddressSpecified() { diff --git a/router/java/src/org/cybergarage/http/Date.java b/router/java/src/org/cybergarage/http/Date.java new file mode 100644 index 000000000..117964d34 --- /dev/null +++ b/router/java/src/org/cybergarage/http/Date.java @@ -0,0 +1,165 @@ +/****************************************************************** +* +* CyberHTTP for Java +* +* Copyright (C) Satoshi Konno 2002-2003 +* +* File : Date.java +* +* Revision; +* +* 01/05/03 +* - first revision +* 10/20/04 +* - Theo Beisch +* - Fixed the following methods to use HOUR_OF_DAY instead of HOUR. +* getHour(), getDateString() getTimeString() +* - Fixed getInstance() to return GMT instance. +* +******************************************************************/ + +package org.cybergarage.http; + +import java.util.Calendar; +import java.util.TimeZone; + +public class Date +{ + private Calendar cal; + + public Date(Calendar cal) + { + this.cal = cal; + } + + public Calendar getCalendar() + { + return cal; + } + + //////////////////////////////////////////////// + // Time + //////////////////////////////////////////////// + + public int getHour() + { + // Thanks for Theo Beisch (10/20/04) + return getCalendar().get(Calendar.HOUR_OF_DAY); + } + + public int getMinute() + { + return getCalendar().get(Calendar.MINUTE); + } + + public int getSecond() + { + return getCalendar().get(Calendar.SECOND); + } + + //////////////////////////////////////////////// + // paint + //////////////////////////////////////////////// + + public final static Date getLocalInstance() + { + return new Date(Calendar.getInstance()); + } + + public final static Date getInstance() + { + // Thanks for Theo Beisch (10/20/04) + return new Date(Calendar.getInstance(TimeZone.getTimeZone("GMT"))); + } + + //////////////////////////////////////////////// + // getDateString + //////////////////////////////////////////////// + + public final static String toDateString(int value) + { + if (value < 10) + return "0" + Integer.toString(value); + return Integer.toString(value); + } + + private final static String MONTH_STRING[] = { + "Jan", + "Feb", + "Mar", + "Apr", + "May", + "Jun", + "Jul", + "Aug", + "Sep", + "Oct", + "Nov", + "Dec", + }; + + public final static String toMonthString(int value) + { + value -= Calendar.JANUARY; + if (0 <= value && value < 12) + return MONTH_STRING[value]; + return ""; + } + + private final static String WEEK_STRING[] = { + "Sun", + "Mon", + "Tue", + "Wed", + "Thu", + "Fri", + "Sat", + }; + + public final static String toWeekString(int value) + { + value -= Calendar.SUNDAY; + if (0 <= value && value < 7) + return WEEK_STRING[value]; + return ""; + } + + public final static String toTimeString(int value) + { + String str = ""; + if (value < 10) + str += "0"; + str += Integer.toString(value); + return str; + } + + public String getDateString() + { + // Thanks for Theo Beisch (10/20/04) + Calendar cal = getCalendar(); + return + toWeekString(cal.get(Calendar.DAY_OF_WEEK)) +", " + + toTimeString(cal.get(Calendar.DATE)) + " " + + toMonthString(cal.get(Calendar.MONTH)) + " " + + Integer.toString(cal.get(Calendar.YEAR)) + " " + + toTimeString(cal.get(Calendar.HOUR_OF_DAY)) + ":" + + toTimeString(cal.get(Calendar.MINUTE)) + ":" + + toTimeString(cal.get(Calendar.SECOND)) + " GMT"; + } + + //////////////////////////////////////////////// + // getTimeString + //////////////////////////////////////////////// + + public String getTimeString() + { + // Thanks for Theo Beisch (10/20/04) + Calendar cal = getCalendar(); + return + toDateString(cal.get(Calendar.HOUR_OF_DAY)) + + (((cal.get(Calendar.SECOND) % 2) == 0) ? ":" : " ") + + toDateString(cal.get(Calendar.MINUTE)); + } + +} + diff --git a/router/java/src/org/cybergarage/http/HTML.java b/router/java/src/org/cybergarage/http/HTML.java new file mode 100644 index 000000000..0d06e7ca5 --- /dev/null +++ b/router/java/src/org/cybergarage/http/HTML.java @@ -0,0 +1,22 @@ +/****************************************************************** +* +* CyberHTTP for Java +* +* Copyright (C) Satoshi Konno 2002-2003 +* +* File: HTML.java +* +* Revision; +* +* 01/05/03 +* - first revision. +* +******************************************************************/ + +package org.cybergarage.http; + +public class HTML +{ + public static final String CONTENT_TYPE = "text/html; charset=\"utf-8\""; +} + diff --git a/router/java/src/org/cybergarage/http/HTTP.java b/router/java/src/org/cybergarage/http/HTTP.java new file mode 100644 index 000000000..ec7ccbde1 --- /dev/null +++ b/router/java/src/org/cybergarage/http/HTTP.java @@ -0,0 +1,210 @@ +/****************************************************************** +* +* CyberHTTP for Java +* +* Copyright (C) Satoshi Konno 2002 +* +* File: HTTP.java +* +* Revision: +* +* 11/18/02 +* - first revision. +* 08/30/03 +* - Giordano Sassaroli +* - Problem : the method getPort should return the default http port 80 when a port is not specified +* - Description : the method is used in ControlRequest.setRequestHost() and in SubscriptionRequest.setService(). maybe the default port check could be done in these methods. +* 09/03/02 +* - Added getRequestHostURL(). +* 03/11/04 +* - Added the following methods to send big content stream. +* post(HTTPResponse, byte[]) +* post(HTTPResponse, InputStream) +* 05/26/04 +* - Added NO_CATCH and MAX_AGE. +* 10/20/04 +* - Brent Hills +* - Added Range and MYNAME; +* +******************************************************************/ + +package org.cybergarage.http; + +import java.net.*; + +public class HTTP +{ + //////////////////////////////////////////////// + // Constants + //////////////////////////////////////////////// + + public static final String HOST = "HOST"; + + public static final String VERSION = "1.1"; + public static final String VERSION_10 = "1.0"; + public static final String VERSION_11 = "1.1"; + + public static final String CRLF = "\r\n"; + public static final String TAB = "\t"; + + public static final String SOAP_ACTION = "SOAPACTION"; + + public static final String M_SEARCH = "M-SEARCH"; + public static final String NOTIFY = "NOTIFY"; + public static final String POST = "POST"; + public static final String GET = "GET"; + public static final String HEAD = "HEAD"; + public static final String SUBSCRIBE = "SUBSCRIBE"; + public static final String UNSUBSCRIBE = "UNSUBSCRIBE"; + + public static final String DATE = "Date"; + public static final String CACHE_CONTROL = "Cache-Control"; + public static final String NO_CACHE = "no-cache"; + public static final String MAX_AGE = "max-age"; + public static final String CONNECTION = "Connection"; + public static final String CLOSE = "close"; + public static final String KEEP_ALIVE = "Keep-Alive"; + public static final String CONTENT_TYPE = "Content-Type"; + public static final String CONTENT_LENGTH = "Content-Length"; + public static final String CONTENT_RANGE = "Content-Range"; + public static final String CONTENT_RANGE_BYTES = "bytes"; + // Thanks for Brent Hills (10/20/04) + public static final String RANGE = "Range"; + public static final String TRANSFER_ENCODING = "Transfer-Encoding"; + public static final String CHUNKED = "Chunked"; + public static final String LOCATION = "Location"; + public static final String SERVER = "Server"; + + + public static final String ST = "ST"; + public static final String MX = "MX"; + public static final String MAN = "MAN"; + public static final String NT = "NT"; + public static final String NTS = "NTS"; + public static final String USN = "USN"; + public static final String EXT = "EXT"; + public static final String SID = "SID"; + public static final String SEQ = "SEQ"; + public final static String CALLBACK = "CALLBACK"; + public final static String TIMEOUT = "TIMEOUT"; + // Thanks for Brent Hills (10/20/04) + public final static String MYNAME = "MYNAME"; + + public static final String REQEST_LINE_DELIM = " "; + public static final String HEADER_LINE_DELIM = " :"; + public static final String STATUS_LINE_DELIM = " "; + + public static final int DEFAULT_PORT = 80; + public static final int DEFAULT_CHUNK_SIZE = 512 * 1024; + public static final int DEFAULT_TIMEOUT = 30; + + //////////////////////////////////////////////// + // URL + //////////////////////////////////////////////// + + public static final boolean isAbsoluteURL(String urlStr) + { + try { + new URL(urlStr); + return true; + } + catch (Exception e) { + return false; + } + } + + public static final String getHost(String urlStr) + { + try { + URL url = new URL(urlStr); + return url.getHost(); + } + catch (Exception e) { + return ""; + } + } + + public static final int getPort(String urlStr) + { + try { + URL url = new URL(urlStr); + // Thanks for Giordano Sassaroli (08/30/03) + int port = url.getPort(); + if (port <= 0) + port = DEFAULT_PORT; + return port; + } + catch (Exception e) { + return DEFAULT_PORT; + } + } + + public static final String getRequestHostURL(String host, int port) + { + String reqHost = "http://" + host + ":" + port; + return reqHost; + } + + public static final String toRelativeURL(String urlStr, boolean withParam) + { + String uri = urlStr; + if (isAbsoluteURL(urlStr) == false) { + if (0 < urlStr.length() && urlStr.charAt(0) != '/') + uri = "/" + urlStr; + } + else { + try{ + URL url = new URL(urlStr); + uri = url.getPath(); + if (withParam == true) { + String queryStr = url.getQuery(); + if (!queryStr.equals("")){ + uri += "?" + queryStr; + } + } + if (uri.endsWith("/")) + uri = uri.substring(0,uri.length()-1); + }catch(Exception e){} + } + return uri; + } + + public static final String toRelativeURL(String urlStr) + { + return toRelativeURL(urlStr, true); + } + + public static final String getAbsoluteURL(String baseURLStr, String relURlStr) + { + try { + URL baseURL = new URL(baseURLStr); + String url = + baseURL.getProtocol() + "://" + + baseURL.getHost() + ":" + + baseURL.getPort() + + toRelativeURL(relURlStr); + return url; + } + catch (Exception e) { + return ""; + } + } + + //////////////////////////////////////////////// + // Chunk Size + //////////////////////////////////////////////// + + private static int chunkSize = DEFAULT_CHUNK_SIZE; + + public static final void setChunkSize(int size) + { + chunkSize = size; + } + + public static final int getChunkSize() + { + return chunkSize; + } + +} + diff --git a/router/java/src/org/cybergarage/http/HTTPHeader.java b/router/java/src/org/cybergarage/http/HTTPHeader.java new file mode 100644 index 000000000..d09446bdc --- /dev/null +++ b/router/java/src/org/cybergarage/http/HTTPHeader.java @@ -0,0 +1,144 @@ +/****************************************************************** +* +* CyberHTTP for Java +* +* Copyright (C) Satoshi Konno 2002 +* +* File: HTTPHeader.java +* +* Revision; +* +* 11/19/02 +* - first revision. +* 05/26/04 +* - Jan Newmarch (05/26/04) +* - Fixed getValue() to compare using String::equals() instead of String::startWidth(). +* +******************************************************************/ + +package org.cybergarage.http; + +import java.io.*; + +import org.cybergarage.util.*; + +public class HTTPHeader +{ + private String name; + private String value; + + public HTTPHeader(String name, String value) + { + setName(name); + setValue(value); + } + + public HTTPHeader(String lineStr) + { + setName(""); + setValue(""); + if (lineStr == null) + return; + int colonIdx = lineStr.indexOf(':'); + if (colonIdx < 0) + return; + String name = new String(lineStr.getBytes(), 0, colonIdx); + String value = new String(lineStr.getBytes(), colonIdx+1, lineStr.length()-colonIdx-1); + setName(name.trim()); + setValue(value.trim()); + } + + //////////////////////////////////////////////// + // Member + //////////////////////////////////////////////// + + public void setName(String name) + { + this.name = name; + } + + public void setValue(String value) + { + this.value = value; + } + + public String getName() + { + return name; + } + + public String getValue() + { + return value; + } + + public boolean hasName() + { + if (name == null || name.length() <= 0) + return false; + return true; + } + + //////////////////////////////////////////////// + // static methods + //////////////////////////////////////////////// + + public final static String getValue(LineNumberReader reader, String name) + { + String bigName = name.toUpperCase(); + try { + String lineStr = reader.readLine(); + while (lineStr != null && 0 < lineStr.length()) { + HTTPHeader header = new HTTPHeader(lineStr); + if (header.hasName() == false) { + lineStr = reader.readLine(); + continue; + } + String bigLineHeaderName = header.getName().toUpperCase(); + // Thanks for Jan Newmarch (05/26/04) + if (bigLineHeaderName.equals(bigName) == false) { + lineStr = reader.readLine(); + continue; + } + return header.getValue(); + } + } + catch (IOException e) { + Debug.warning(e); + return ""; + } + return ""; + } + + public final static String getValue(String data, String name) + { + StringReader strReader = new StringReader(data); + LineNumberReader lineReader = new LineNumberReader(strReader); + return getValue(lineReader, name); + } + + public final static String getValue(byte[] data, String name) + { + return getValue(new String(data), name); + } + + public final static int getIntegerValue(String data, String name) + { + try { + return Integer.parseInt(getValue(data, name)); + } + catch (Exception e) { + return 0; + } + } + + public final static int getIntegerValue(byte[] data, String name) + { + try { + return Integer.parseInt(getValue(data, name)); + } + catch (Exception e) { + return 0; + } + } +} diff --git a/router/java/src/org/cybergarage/http/HTTPPacket.java b/router/java/src/org/cybergarage/http/HTTPPacket.java new file mode 100644 index 000000000..3c0c78e63 --- /dev/null +++ b/router/java/src/org/cybergarage/http/HTTPPacket.java @@ -0,0 +1,808 @@ +/****************************************************************** +* +* CyberHTTP for Java +* +* Copyright (C) Satoshi Konno 2002-2004 +* +* File: HTTPConnection.java +* +* Revision; +* +* 11/18/02 +* - first revision. +* 09/02/03 +* - Giordano Sassaroli +* - Problem : The API is unable to receive responses from the Microsoft UPnP stack +* - Error : the Microsoft UPnP stack is based on ISAPI on IIS, and whenever IIS +* receives a post request, it answers with two responses: the first one has no +* body and it is a code 100 (continue) response, which has to be ignored. The +* second response is the actual one and should be parsed as the response. +* 02/09/04 +* - Ralf G. R. Bergs" +* - Why do you strip leading and trailing white space from the response body? +* - Disabled to trim the content string. +* 03/11/04 +* - Added some methods about InputStream content. +* setContentInputStream(), getContentInputStream() and hasContentInputStream(). +* 03/16/04 +* - Thanks for Darrell Young +* - Added setVersion() and getVersion(); +* 03/17/04 +* - Added hasFirstLine(); +* 05/26/04 +* - Jan Newmarch (05/26/04) +* - Changed setCacheControl() and getChcheControl(); +* 08/25/04 +* - Added the following methods. +* hasContentRange(), setContentRange(), getContentRange(), +* getContentRangeFirstPosition(), getContentRangeLastPosition() and getContentRangeInstanceLength() +* 08/26/04 +* - Added the following methods. +* hasConnection(), setConnection(), getConnection(), +* isCloseConnection() and isKeepAliveConnection() +* 08/27/04 +* - Added a updateWithContentLength paramger to setContent(). +* - Changed to HTTPPacket::set() not to change the header of Content-Length. +* 08/28/04 +* - Added init() and read(). +* 09/19/04 +* - Added a onlyHeaders parameter to set(). +* 10/20/04 +* - Brent Hills +* - Changed hasContentRange() to check Content-Range and Range header. +* - Added support for Range header to getContentRange(). +* 02/02/05 +* - Mark Retallack +* - Fixed set() not to read over the content length when the stream is keep alive. +* 02/28/05 +* - Added the following methods for chunked stream support. +* hasTransferEncoding(), setTransferEncoding(), getTransferEncoding(), isChunked(). +* 03/02/05 +* - Changed post() to suppot chunked stream. +* +*******************************************************************/ + +package org.cybergarage.http; + +import java.io.*; +import java.util.*; + +import org.cybergarage.net.*; +import org.cybergarage.util.*; +import java.util.Calendar; + +public class HTTPPacket +{ + //////////////////////////////////////////////// + // Constructor + //////////////////////////////////////////////// + + public HTTPPacket() + { + setVersion(HTTP.VERSION); + setContentInputStream(null); + } + + public HTTPPacket(HTTPPacket httpPacket) + { + setVersion(HTTP.VERSION); + set(httpPacket); + setContentInputStream(null); + } + + public HTTPPacket(InputStream in) + { + setVersion(HTTP.VERSION); + set(in); + setContentInputStream(null); + } + + //////////////////////////////////////////////// + // init + //////////////////////////////////////////////// + + public void init() + { + setFirstLine(""); + clearHeaders(); + setContent(new byte[0], false); + setContentInputStream(null); + } + + //////////////////////////////////////////////// + // Version + //////////////////////////////////////////////// + + private String version; + + public void setVersion(String ver) + { + version = ver; + } + + public String getVersion() + { + return version; + } + + //////////////////////////////////////////////// + // set + //////////////////////////////////////////////// + + protected boolean set(InputStream in, boolean onlyHeaders) + { + try { + BufferedReader reader = new BufferedReader(new InputStreamReader(in)); + + String firstLine = reader.readLine(); + if (firstLine == null || firstLine.length() <= 0) + return false; + setFirstLine(firstLine); + + // Thanks for Giordano Sassaroli (09/03/03) + HTTPStatus httpStatus = new HTTPStatus(firstLine); + int statCode = httpStatus.getStatusCode(); + if (statCode == HTTPStatus.CONTINUE){ + //ad hoc code for managing iis non-standard behaviour + //iis sends 100 code response and a 200 code response in the same + //stream, so the code should check the presence of the actual + //response in the stream. + //skip all header lines + String headerLine = reader.readLine(); + while ((headerLine != null) && (0 < headerLine.length()) ) { + HTTPHeader header = new HTTPHeader(headerLine); + if (header.hasName() == true) + setHeader(header); + headerLine = reader.readLine(); + } + //look forward another first line + String actualFirstLine = reader.readLine(); + if ((actualFirstLine != null) && (0 < actualFirstLine.length()) ) { + //this is the actual first line + setFirstLine(actualFirstLine); + }else{ + return true; + } + } + + String headerLine = reader.readLine(); + while ((headerLine != null) && (0 < headerLine.length()) ) { + HTTPHeader header = new HTTPHeader(headerLine); + if (header.hasName() == true) + setHeader(header); + headerLine = reader.readLine(); + } + + if (onlyHeaders == true) { + setContent("", false); + return true; + } + + boolean isChunkedRequest = isChunked(); + + long contentLen = 0; + if (isChunkedRequest == true) { + try { + String chunkSizeLine = reader.readLine(); + contentLen = Long.parseLong(new String(chunkSizeLine.getBytes(), 0, chunkSizeLine.length()-2)); + } + catch (Exception e) {}; + } + else + contentLen = getContentLength(); + + StringBuilder contentBuf = new StringBuilder(); + + while (0 < contentLen) { + int chunkSize = HTTP.getChunkSize(); + char readBuf[] = new char[chunkSize]; + long readCnt = 0; + while (readCnt < contentLen) { + try { + // Thanks for Mark Retallack (02/02/05) + long bufReadLen = contentLen - readCnt; + if (chunkSize < bufReadLen) + bufReadLen = chunkSize; + int readLen = reader.read(readBuf, 0, (int)bufReadLen); + if (readLen < 0) + break; + contentBuf.append(new String(readBuf, 0, readLen)); + readCnt += readLen; + } + catch (Exception e) + { + Debug.warning(e); + break; + } + } + if (isChunkedRequest == true) { + // skip CRLF + long skipLen = 0; + do { + long skipCnt = reader.skip(HTTP.CRLF.length() - skipLen); + if (skipCnt < 0) + break; + skipLen += skipCnt; + } while (skipLen < HTTP.CRLF.length()); + // read next chunk size + try { + String chunkSizeLine = reader.readLine(); + contentLen = Long.parseLong(new String(chunkSizeLine.getBytes(), 0, chunkSizeLine.length()-2)); + } + catch (Exception e) { + contentLen = 0; + }; + } + else + contentLen = 0; + } + + // Thanks for Ralf G. R. Bergs (02/09/04) + String contentStr = contentBuf.toString(); + setContent(contentStr.getBytes(), false); + } + catch (Exception e) { + Debug.warning(e); + return false; + } + + return true; + } + + protected boolean set(InputStream in) + { + return set(in, false); + } + + protected boolean set(HTTPSocket httpSock) + { + return set(httpSock.getInputStream()); + } + + protected void set(HTTPPacket httpPacket) + { + setFirstLine(httpPacket.getFirstLine()); + + clearHeaders(); + int nHeaders = httpPacket.getNHeaders(); + for (int n=0; n 0) ? true : false; + } + + //////////////////////////////////////////////// + // Contents (InputStream) + //////////////////////////////////////////////// + + private InputStream contentInput = null; + + public void setContentInputStream(InputStream in) + { + contentInput = in; + } + + public InputStream getContentInputStream() + { + return contentInput; + } + + public boolean hasContentInputStream() + { + return (contentInput != null) ? true : false; + } + + //////////////////////////////////////////////// + // ContentType + //////////////////////////////////////////////// + + public void setContentType(String type) + { + setHeader(HTTP.CONTENT_TYPE, type); + } + + public String getContentType() + { + return getHeaderValue(HTTP.CONTENT_TYPE); + } + + //////////////////////////////////////////////// + // ContentLength + //////////////////////////////////////////////// + + public void setContentLength(long len) + { + setLongHeader(HTTP.CONTENT_LENGTH, len); + } + + public long getContentLength() + { + return getLongHeaderValue(HTTP.CONTENT_LENGTH); + } + + //////////////////////////////////////////////// + // Connection + //////////////////////////////////////////////// + + public boolean hasConnection() + { + return hasHeader(HTTP.CONNECTION); + } + + public void setConnection(String value) + { + setHeader(HTTP.CONNECTION, value); + } + + public String getConnection() + { + return getHeaderValue(HTTP.CONNECTION); + } + + public boolean isCloseConnection() + { + if (hasConnection() == false) + return false; + String connection = getConnection(); + if (connection == null) + return false; + return connection.equalsIgnoreCase(HTTP.CLOSE); + } + + public boolean isKeepAliveConnection() + { + if (hasConnection() == false) + return false; + String connection = getConnection(); + if (connection == null) + return false; + return connection.equalsIgnoreCase(HTTP.KEEP_ALIVE); + } + + //////////////////////////////////////////////// + // ContentRange + //////////////////////////////////////////////// + + public boolean hasContentRange() + { + return (hasHeader(HTTP.CONTENT_RANGE) || hasHeader(HTTP.RANGE)); + } + + public void setContentRange(long firstPos, long lastPos, long length) + { + String rangeStr = ""; + rangeStr += HTTP.CONTENT_RANGE_BYTES + " "; + rangeStr += Long.toString(firstPos) + "-"; + rangeStr += Long.toString(lastPos) + "/"; + rangeStr += ((0 < length) ? Long.toString(length) : "*"); + setHeader(HTTP.CONTENT_RANGE, rangeStr); + } + + public long[] getContentRange() + { + long range[] = new long[3]; + range[0] = range[1] = range[2] = 0; + if (hasContentRange() == false) + return range; + String rangeLine = getHeaderValue(HTTP.CONTENT_RANGE); + // Thanks for Brent Hills (10/20/04) + if (rangeLine.length() <= 0) + rangeLine = getHeaderValue(HTTP.RANGE); + if (rangeLine.length() <= 0) + return range; + // Thanks for Brent Hills (10/20/04) + StringTokenizer strToken = new StringTokenizer(rangeLine, " ="); + // Skip bytes + if (strToken.hasMoreTokens() == false) + return range; + strToken.nextToken(" "); + // Get first-byte-pos + if (strToken.hasMoreTokens() == false) + return range; + String firstPosStr = strToken.nextToken(" -"); + try { + range[0] = Long.parseLong(firstPosStr); + } + catch (NumberFormatException e) {}; + if (strToken.hasMoreTokens() == false) + return range; + String lastPosStr = strToken.nextToken("-/"); + try { + range[1] = Long.parseLong(lastPosStr); + } + catch (NumberFormatException e) {}; + if (strToken.hasMoreTokens() == false) + return range; + String lengthStr = strToken.nextToken("/"); + try { + range[2] = Long.parseLong(lengthStr); + } + catch (NumberFormatException e) {}; + return range; + } + + public long getContentRangeFirstPosition() + { + long range[] = getContentRange(); + return range[0]; + } + + public long getContentRangeLastPosition() + { + long range[] = getContentRange(); + return range[1]; + } + + public long getContentRangeInstanceLength() + { + long range[] = getContentRange(); + return range[2]; + } + + //////////////////////////////////////////////// + // CacheControl + //////////////////////////////////////////////// + + public void setCacheControl(String directive) + { + setHeader(HTTP.CACHE_CONTROL, directive); + } + + public void setCacheControl(String directive, int value) + { + String strVal = directive + "=" + Integer.toString(value); + setHeader(HTTP.CACHE_CONTROL, strVal); + } + + public void setCacheControl(int value) + { + setCacheControl(HTTP.MAX_AGE, value); + } + + public String getCacheControl() + { + return getHeaderValue(HTTP.CACHE_CONTROL); + } + + //////////////////////////////////////////////// + // Server + //////////////////////////////////////////////// + + public void setServer(String name) + { + setHeader(HTTP.SERVER, name); + } + + public String getServer() + { + return getHeaderValue(HTTP.SERVER); + } + + //////////////////////////////////////////////// + // Host + //////////////////////////////////////////////// + + public void setHost(String host, int port) + { + String hostAddr = host; + if (HostInterface.isIPv6Address(host) == true) + hostAddr = "[" + host + "]"; + setHeader(HTTP.HOST, hostAddr + ":" + Integer.toString(port)); + } + + public String getHost() + { + return getHeaderValue(HTTP.HOST); + } + + + //////////////////////////////////////////////// + // Date + //////////////////////////////////////////////// + + public void setDate(Calendar cal) + { + Date date = new Date(cal); + setHeader(HTTP.DATE, date.getDateString()); + } + + public String getDate() + { + return getHeaderValue(HTTP.DATE); + } + + //////////////////////////////////////////////// + // Connection + //////////////////////////////////////////////// + + public boolean hasTransferEncoding() + { + return hasHeader(HTTP.TRANSFER_ENCODING); + } + + public void setTransferEncoding(String value) + { + setHeader(HTTP.TRANSFER_ENCODING, value); + } + + public String getTransferEncoding() + { + return getHeaderValue(HTTP.TRANSFER_ENCODING); + } + + public boolean isChunked() + { + if (hasTransferEncoding() == false) + return false; + String transEnc = getTransferEncoding(); + if (transEnc == null) + return false; + return transEnc.equalsIgnoreCase(HTTP.CHUNKED); + } + + //////////////////////////////////////////////// + // set + //////////////////////////////////////////////// + +/* + public final static boolean parse(HTTPPacket httpPacket, InputStream in) + { + try { + BufferedReader reader = new BufferedReader(new InputStreamReader(in)); + return parse(httpPacket, reader); + } + catch (Exception e) { + Debug.warning(e); + } + return false; + } +*/ +} + diff --git a/router/java/src/org/cybergarage/http/HTTPRequest.java b/router/java/src/org/cybergarage/http/HTTPRequest.java new file mode 100644 index 000000000..f4c6f16e2 --- /dev/null +++ b/router/java/src/org/cybergarage/http/HTTPRequest.java @@ -0,0 +1,495 @@ +/****************************************************************** +* +* CyberHTTP for Java +* +* Copyright (C) Satoshi Konno 2002-2004 +* +* File: HTTPRequest.java +* +* Revision; +* +* 11/18/02 +* - first revision. +* 05/23/03 +* - Giordano Sassaroli +* - Add a relative URL check to setURI(). +* 09/02/03 +* - Giordano Sassaroli +* - Problem : Devices whose description use absolute urls receive wrong http requests +* - Error : the presence of a base url is not mandatory, the API code makes the assumption that control and event subscription urls are relative +* - Description: The method setURI should be changed as follows +* 02/01/04 +* - Added URI parameter methods. +* 03/16/04 +* - Removed setVersion() because the method is added to the super class. +* - Changed getVersion() to return the version when the first line string has the length. +* 05/19/04 +* - Changed post(HTTPResponse *) to close the socket stream from the server. +* 08/19/04 +* - Fixed getFirstLineString() and getHTTPVersion() no to return "HTTP/HTTP/version". +* 08/25/04 +* - Added isHeadRequest(). +* 08/26/04 +* - Changed post(HTTPResponse) not to close the connection. +* - Changed post(String, int) to add a connection header to close. +* 08/27/04 +* - Changed post(String, int) to support the persistent connection. +* 08/28/04 +* - Added isKeepAlive(). +* 10/26/04 +* - Brent Hills +* - Added a fix to post() when the last position of Content-Range header is 0. +* - Added a Content-Range header to the response in post(). +* - Changed the status code for the Content-Range request in post(). +* - Added to check the range of Content-Range request in post(). +* 03/02/05 +* - Changed post() to suppot chunked stream. +* +******************************************************************/ + +package org.cybergarage.http; + +import java.io.*; +import java.net.*; +import java.util.*; + +public class HTTPRequest extends HTTPPacket +{ + //////////////////////////////////////////////// + // Constructor + //////////////////////////////////////////////// + + public HTTPRequest() + { + } + + public HTTPRequest(InputStream in) + { + super(in); + } + + public HTTPRequest(HTTPSocket httpSock) + { + this(httpSock.getInputStream()); + setSocket(httpSock); + } + + //////////////////////////////////////////////// + // Method + //////////////////////////////////////////////// + + private String method = null; + + public void setMethod(String value) + { + method = value; + } + + public String getMethod() + { + if (method != null) + return method; + return getFirstLineToken(0); + } + + public boolean isMethod(String method) + { + String headerMethod = getMethod(); + if (headerMethod == null) + return false; + return headerMethod.equalsIgnoreCase(method); + } + + public boolean isGetRequest() + { + return isMethod(HTTP.GET); + } + + public boolean isPostRequest() + { + return isMethod(HTTP.POST); + } + + public boolean isHeadRequest() + { + return isMethod(HTTP.HEAD); + } + + public boolean isSubscribeRequest() + { + return isMethod(HTTP.SUBSCRIBE); + } + + public boolean isUnsubscribeRequest() + { + return isMethod(HTTP.UNSUBSCRIBE); + } + + public boolean isNotifyRequest() + { + return isMethod(HTTP.NOTIFY); + } + + //////////////////////////////////////////////// + // URI + //////////////////////////////////////////////// + + private String uri = null; + + public void setURI(String value, boolean isCheckRelativeURL) + { + uri = value; + if (isCheckRelativeURL == false) + return; + // Thanks for Giordano Sassaroli (09/02/03) + uri = HTTP.toRelativeURL(uri); + } + + public void setURI(String value) + { + setURI(value, false); + } + + public String getURI() + { + if (uri != null) + return uri; + return getFirstLineToken(1); + } + + //////////////////////////////////////////////// + // URI Parameter + //////////////////////////////////////////////// + + public ParameterList getParameterList() + { + ParameterList paramList = new ParameterList(); + String uri = getURI(); + if (uri == null) + return paramList; + int paramIdx = uri.indexOf('?'); + if (paramIdx < 0) + return paramList; + while (0 < paramIdx) { + int eqIdx = uri.indexOf('=', (paramIdx+1)); + String name = uri.substring(paramIdx+1, eqIdx); + int nextParamIdx = uri.indexOf('&', (eqIdx+1)); + String value = uri.substring(eqIdx+1, (0 < nextParamIdx) ? nextParamIdx : uri.length()); + Parameter param = new Parameter(name, value); + paramList.add(param); + paramIdx = nextParamIdx; + } + return paramList; + } + + public String getParameterValue(String name) + { + ParameterList paramList = getParameterList(); + return paramList.getValue(name); + } + + //////////////////////////////////////////////// + // SOAPAction + //////////////////////////////////////////////// + + public boolean isSOAPAction() + { + return hasHeader(HTTP.SOAP_ACTION); + } + + //////////////////////////////////////////////// + // Host / Port + //////////////////////////////////////////////// + + private String requestHost = ""; + + public void setRequestHost(String host) + { + requestHost = host; + } + + public String getRequestHost() + { + return requestHost; + } + + private int requestPort = -1; + + public void setRequestPort(int host) + { + requestPort = host; + } + + public int getRequestPort() + { + return requestPort; + } + + //////////////////////////////////////////////// + // Socket + //////////////////////////////////////////////// + + private HTTPSocket httpSocket = null; + + public void setSocket(HTTPSocket value) + { + httpSocket = value; + } + + public HTTPSocket getSocket() + { + return httpSocket; + } + + /////////////////////////// ///////////////////// + // local address/port + //////////////////////////////////////////////// + + public String getLocalAddress() + { + return getSocket().getLocalAddress(); + } + + public int getLocalPort() + { + return getSocket().getLocalPort(); + } + + //////////////////////////////////////////////// + // parseRequest + //////////////////////////////////////////////// + + public boolean parseRequestLine(String lineStr) + { + StringTokenizer st = new StringTokenizer(lineStr, HTTP.REQEST_LINE_DELIM); + if (st.hasMoreTokens() == false) + return false; + setMethod(st.nextToken()); + if (st.hasMoreTokens() == false) + return false; + setURI(st.nextToken()); + if (st.hasMoreTokens() == false) + return false; + setVersion(st.nextToken()); + return true; + } + + //////////////////////////////////////////////// + // First Line + //////////////////////////////////////////////// + + public String getHTTPVersion() + { + if (hasFirstLine() == true) + return getFirstLineToken(2); + return "HTTP/" + super.getVersion(); + } + + public String getFirstLineString() + { + return getMethod() + " " + getURI() + " " + getHTTPVersion() + HTTP.CRLF; + } + + //////////////////////////////////////////////// + // getHeader + //////////////////////////////////////////////// + + public String getHeader() + { + StringBuilder str = new StringBuilder(); + + str.append(getFirstLineString()); + + String headerString = getHeaderString(); + str.append(headerString); + + return str.toString(); + } + + //////////////////////////////////////////////// + // isKeepAlive + //////////////////////////////////////////////// + + public boolean isKeepAlive() + { + if (isCloseConnection() == true) + return false; + if (isKeepAliveConnection() == true) + return true; + String httpVer = getHTTPVersion(); + boolean isHTTP10 = (0 < httpVer.indexOf("1.0")) ? true : false; + if (isHTTP10 == true) + return false; + return true; + } + + //////////////////////////////////////////////// + // read + //////////////////////////////////////////////// + + public boolean read() + { + return super.read(getSocket()); + } + + //////////////////////////////////////////////// + // POST (Response) + //////////////////////////////////////////////// + + public boolean post(HTTPResponse httpRes) + { + HTTPSocket httpSock = getSocket(); + long offset = 0; + long length = httpRes.getContentLength(); + if (hasContentRange() == true) { + long firstPos = getContentRangeFirstPosition(); + long lastPos = getContentRangeLastPosition(); + + // Thanks for Brent Hills (10/26/04) + if (lastPos <= 0) + lastPos = length - 1; + if ((firstPos > length ) || (lastPos > length)) + return returnResponse(HTTPStatus.INVALID_RANGE); + httpRes.setContentRange(firstPos, lastPos, length); + httpRes.setStatusCode(HTTPStatus.PARTIAL_CONTENT); + + offset = firstPos; + length = lastPos - firstPos + 1; + } + return httpSock.post(httpRes, offset, length, isHeadRequest()); + //httpSock.close(); + } + + //////////////////////////////////////////////// + // POST (Request) + //////////////////////////////////////////////// + + private Socket postSocket = null; + + public HTTPResponse post(String host, int port, boolean isKeepAlive) + { + HTTPResponse httpRes = new HTTPResponse(); + + setConnection((isKeepAlive == true) ? HTTP.KEEP_ALIVE : HTTP.CLOSE); + + boolean isHeaderRequest = isHeadRequest(); + + OutputStream out = null; + InputStream in = null; + + try { + if (postSocket == null) + postSocket = new Socket(host, port); + + out = postSocket.getOutputStream(); + PrintStream pout = new PrintStream(out); + pout.print(getHeader()); + pout.print(HTTP.CRLF); + + boolean isChunkedRequest = isChunked(); + + String content = getContentString(); + int contentLength = 0; + if (content != null) + contentLength = content.length(); + + if (0 < contentLength) { + if (isChunkedRequest == true) { + String chunSizeBuf = Long.toString(contentLength); + pout.print(chunSizeBuf); + pout.print(HTTP.CRLF); + } + pout.print(content); + if (isChunkedRequest == true) + pout.print(HTTP.CRLF); + } + + if (isChunkedRequest == true) { + pout.print("0"); + pout.print(HTTP.CRLF); + } + + pout.flush(); + + in = postSocket.getInputStream(); + httpRes.set(in, isHeaderRequest); + } + catch (Exception e) { + httpRes.setStatusCode(HTTPStatus.INTERNAL_SERVER_ERROR); + } finally { + if (isKeepAlive == false) { + try { + in.close(); + } catch (Exception e) {}; + if (in != null) + try { + out.close(); + } catch (Exception e) {}; + if (out != null) + try { + postSocket.close(); + } catch (Exception e) {}; + postSocket = null; + } + } + + return httpRes; + } + + public HTTPResponse post(String host, int port) + { + return post(host, port, false); + } + + //////////////////////////////////////////////// + // set + //////////////////////////////////////////////// + + public void set(HTTPRequest httpReq) + { + set((HTTPPacket)httpReq); + setSocket(httpReq.getSocket()); + } + + //////////////////////////////////////////////// + // OK/BAD_REQUEST + //////////////////////////////////////////////// + + public boolean returnResponse(int statusCode) + { + HTTPResponse httpRes = new HTTPResponse(); + httpRes.setStatusCode(statusCode); + httpRes.setContentLength(0); + return post(httpRes); + } + + public boolean returnOK() + { + return returnResponse(HTTPStatus.OK); + } + + public boolean returnBadRequest() + { + return returnResponse(HTTPStatus.BAD_REQUEST); + } + + //////////////////////////////////////////////// + // toString + //////////////////////////////////////////////// + + public String toString() + { + StringBuilder str = new StringBuilder(); + + str.append(getHeader()); + str.append(HTTP.CRLF); + str.append(getContentString()); + + return str.toString(); + } + + public void print() + { + System.out.println(toString()); + } +} diff --git a/router/java/src/org/cybergarage/http/HTTPRequestListener.java b/router/java/src/org/cybergarage/http/HTTPRequestListener.java new file mode 100644 index 000000000..12fcf349e --- /dev/null +++ b/router/java/src/org/cybergarage/http/HTTPRequestListener.java @@ -0,0 +1,21 @@ +/****************************************************************** +* +* CyberHTTP for Java +* +* Copyright (C) Satoshi Konno 2002 +* +* File: HTTPRequestListener.java +* +* Revision; +* +* 12/13/02 +* - first revision. +* +******************************************************************/ + +package org.cybergarage.http; + +public interface HTTPRequestListener +{ + public void httpRequestRecieved(HTTPRequest httpReq); +} diff --git a/router/java/src/org/cybergarage/http/HTTPResponse.java b/router/java/src/org/cybergarage/http/HTTPResponse.java new file mode 100644 index 000000000..b5c247878 --- /dev/null +++ b/router/java/src/org/cybergarage/http/HTTPResponse.java @@ -0,0 +1,115 @@ +/****************************************************************** +* +* CyberHTTP for Java +* +* Copyright (C) Satoshi Konno 2002-2003 +* +* File: HTTPResponse.java +* +* Revision; +* +* 11/18/02 +* - first revision. +* 10/22/03 +* - Changed to initialize a content length header. +* 10/22/04 +* - Added isSuccessful(). +* +******************************************************************/ + +package org.cybergarage.http; + +import java.io.*; + +public class HTTPResponse extends HTTPPacket +{ + //////////////////////////////////////////////// + // Constructor + //////////////////////////////////////////////// + + public HTTPResponse() + { + setContentType(HTML.CONTENT_TYPE); + setServer(HTTPServer.getName()); + setContent(""); + } + + public HTTPResponse(HTTPResponse httpRes) + { + set(httpRes); + } + + public HTTPResponse(InputStream in) + { + super(in); + } + + public HTTPResponse(HTTPSocket httpSock) + { + this(httpSock.getInputStream()); + } + + //////////////////////////////////////////////// + // Status Line + //////////////////////////////////////////////// + + private int statusCode = 0; + + public void setStatusCode(int code) + { + statusCode = code; + } + + public int getStatusCode() + { + if (statusCode != 0) + return statusCode; + HTTPStatus httpStatus = new HTTPStatus(getFirstLine()); + return httpStatus.getStatusCode(); + } + + public boolean isSuccessful() + { + return HTTPStatus.isSuccessful(getStatusCode()); + } + + public String getStatusLineString() + { + return "HTTP/" + getVersion() + " " + getStatusCode() + " " + HTTPStatus.code2String(statusCode) + HTTP.CRLF; + } + + //////////////////////////////////////////////// + // getHeader + //////////////////////////////////////////////// + + public String getHeader() + { + StringBuilder str = new StringBuilder(); + + str.append(getStatusLineString()); + str.append(getHeaderString()); + + return str.toString(); + } + + //////////////////////////////////////////////// + // toString + //////////////////////////////////////////////// + + public String toString() + { + StringBuilder str = new StringBuilder(); + + str.append(getStatusLineString()); + str.append(getHeaderString()); + str.append(HTTP.CRLF); + str.append(getContentString()); + + return str.toString(); + } + + public void print() + { + System.out.println(toString()); + } +} diff --git a/router/java/src/org/cybergarage/http/HTTPServer.java b/router/java/src/org/cybergarage/http/HTTPServer.java new file mode 100644 index 000000000..f589e2e06 --- /dev/null +++ b/router/java/src/org/cybergarage/http/HTTPServer.java @@ -0,0 +1,204 @@ +/****************************************************************** +* +* CyberHTTP for Java +* +* Copyright (C) Satoshi Konno 2002-2003 +* +* File: HTTPServer.java +* +* Revision; +* +* 12/12/02 +* - first revision. +* 10/20/03 +* - Improved the HTTP server using multithreading. +* 08/27/04 +* - Changed accept() to set a default timeout, HTTP.DEFAULT_TIMEOUT, to the socket. +* +******************************************************************/ + +package org.cybergarage.http; + +import java.io.*; +import java.net.*; + +import org.cybergarage.util.*; + +public class HTTPServer implements Runnable +{ + //////////////////////////////////////////////// + // Constants + //////////////////////////////////////////////// + + public final static String NAME = "CyberHTTP"; + public final static String VERSION = "1.0"; + + public final static int DEFAULT_PORT = 80; + + public static String getName() + { + String osName = System.getProperty("os.name"); + String osVer = System.getProperty("os.version"); + return osName + "/" + osVer + " " + NAME + "/" + VERSION; + } + + //////////////////////////////////////////////// + // Constructor + //////////////////////////////////////////////// + + public HTTPServer() + { + serverSock = null; + } + + //////////////////////////////////////////////// + // ServerSocket + //////////////////////////////////////////////// + + private ServerSocket serverSock = null; + private InetAddress bindAddr = null; + private int bindPort = 0; + + public ServerSocket getServerSock() + { + return serverSock; + } + + public String getBindAddress() + { + if (bindAddr == null) + return ""; + return bindAddr.toString(); + } + + public int getBindPort() + { + return bindPort; + } + + //////////////////////////////////////////////// + // open/close + //////////////////////////////////////////////// + + public boolean open(String addr, int port) + { + if (serverSock != null) + return true; + try { + bindAddr = InetAddress.getByName(addr); + bindPort = port; + serverSock = new ServerSocket(bindPort, 0, bindAddr); + serverSock.setSoTimeout(10*1000); + } + catch (IOException e) { + return false; + } + return true; + } + + public boolean close() + { + if (serverSock == null) + return true; + try { + serverSock.close(); + serverSock = null; + bindAddr = null; + bindPort = 0; + } + catch (Exception e) { + Debug.warning(e); + return false; + } + return true; + } + + public Socket accept() + { + if (serverSock == null) + return null; + try { + Socket sock = serverSock.accept(); + sock.setSoTimeout(HTTP.DEFAULT_PORT * 1000); + return sock; + } + catch (Exception e) { + return null; + } + } + + public boolean isOpened() + { + return (serverSock != null) ? true : false; + } + + //////////////////////////////////////////////// + // httpRequest + //////////////////////////////////////////////// + + private ListenerList httpRequestListenerList = new ListenerList(); + + public void addRequestListener(HTTPRequestListener listener) + { + httpRequestListenerList.add(listener); + } + + public void removeRequestListener(HTTPRequestListener listener) + { + httpRequestListenerList.remove(listener); + } + + public void performRequestListener(HTTPRequest httpReq) + { + int listenerSize = httpRequestListenerList.size(); + for (int n=0; n +* - Added PARTIAL_CONTENT and INVALID_RANGE; +* 10/22/04 +* - Added isSuccessful(). +* 10/29/04 +* - Fixed set() to set the version and the response code when the mothod is null. +* - Fixed set() to read multi words of the response sring such as Not Found. +* +******************************************************************/ + +package org.cybergarage.http; + +import java.util.*; + +import org.cybergarage.util.*; + +public class HTTPStatus +{ + //////////////////////////////////////////////// + // Code + //////////////////////////////////////////////// + + public static final int CONTINUE = 100; + public static final int OK = 200; + // Thanks for Brent Hills (10/20/04) + public static final int PARTIAL_CONTENT = 206; + public static final int BAD_REQUEST = 400; + public static final int NOT_FOUND = 404; + public static final int PRECONDITION_FAILED = 412; + // Thanks for Brent Hills (10/20/04) + public static final int INVALID_RANGE = 416; + public static final int INTERNAL_SERVER_ERROR = 500; + + public static final String code2String(int code) + { + switch (code) { + case CONTINUE: return "Continue"; + case OK: return "OK"; + case PARTIAL_CONTENT: return "Partial Content"; + case BAD_REQUEST: return "Bad Request"; + case NOT_FOUND: return "Not Found"; + case PRECONDITION_FAILED: return "Precondition Failed"; + case INVALID_RANGE: return "Invalid Range"; + case INTERNAL_SERVER_ERROR: return "Internal Server Error"; + } + return ""; + } + + //////////////////////////////////////////////// + // Constructor + //////////////////////////////////////////////// + + public HTTPStatus() + { + setVersion(""); + setStatusCode(0); + setReasonPhrase(""); + } + + public HTTPStatus(String ver, int code, String reason) + { + setVersion(ver); + setStatusCode(code); + setReasonPhrase(reason); + } + + public HTTPStatus(String lineStr) + { + set(lineStr); + } + + //////////////////////////////////////////////// + // Member + //////////////////////////////////////////////// + + private String version = ""; + private int statusCode = 0; + private String reasonPhrase = ""; + + public void setVersion(String value) + { + version = value; + } + + public void setStatusCode(int value) + { + statusCode = value; + } + + public void setReasonPhrase(String value) + { + reasonPhrase = value; + } + + public String getVersion() + { + return version; + } + + public int getStatusCode() + { + return statusCode; + } + + public String getReasonPhrase() + { + return reasonPhrase; + } + + //////////////////////////////////////////////// + // Status + //////////////////////////////////////////////// + + final public static boolean isSuccessful(int statCode) + { + if (200 <= statCode && statCode < 300) + return true; + return false; + } + + public boolean isSuccessful() + { + return isSuccessful(getStatusCode()); + } + + //////////////////////////////////////////////// + // set + //////////////////////////////////////////////// + + public void set(String lineStr) + { + if (lineStr == null) { + setVersion(HTTP.VERSION); + setStatusCode(INTERNAL_SERVER_ERROR); + setReasonPhrase(code2String(INTERNAL_SERVER_ERROR)); + return; + } + + try { + StringTokenizer st = new StringTokenizer(lineStr, HTTP.STATUS_LINE_DELIM); + + if (st.hasMoreTokens() == false) + return; + String ver = st.nextToken(); + setVersion(ver.trim()); + + if (st.hasMoreTokens() == false) + return; + String codeStr = st.nextToken(); + int code = 0; + try { + code = Integer.parseInt(codeStr); + } + catch (Exception e1) {} + setStatusCode(code); + + String reason = ""; + while (st.hasMoreTokens() == true) { + if (0 <= reason.length()) + reason += " "; + reason += st.nextToken(); + } + setReasonPhrase(reason.trim()); + } + catch (Exception e) { + Debug.warning(e); + } + + } +} diff --git a/router/java/src/org/cybergarage/http/Parameter.java b/router/java/src/org/cybergarage/http/Parameter.java new file mode 100644 index 000000000..fb29ae994 --- /dev/null +++ b/router/java/src/org/cybergarage/http/Parameter.java @@ -0,0 +1,61 @@ +/****************************************************************** +* +* CyberHTTP for Java +* +* Copyright (C) Satoshi Konno 2002-2004 +* +* File: Parameter.java +* +* Revision; +* +* 02/01/04 +* - first revision. +* +******************************************************************/ + +package org.cybergarage.http; + +public class Parameter +{ + private String name = new String(); + private String value = new String(); + + public Parameter() + { + } + + public Parameter(String name, String value) + { + setName(name); + setValue(value); + } + + //////////////////////////////////////////////// + // name + //////////////////////////////////////////////// + + public void setName(String name) + { + this.name = name; + } + + public String getName() + { + return name; + } + + //////////////////////////////////////////////// + // value + //////////////////////////////////////////////// + + public void setValue(String value) + { + this.value = value; + } + + public String getValue() + { + return value; + } +} + diff --git a/router/java/src/org/cybergarage/http/ParameterList.java b/router/java/src/org/cybergarage/http/ParameterList.java new file mode 100644 index 000000000..9a0b2a6d1 --- /dev/null +++ b/router/java/src/org/cybergarage/http/ParameterList.java @@ -0,0 +1,60 @@ +/****************************************************************** +* +* CyberHTTP for Java +* +* Copyright (C) Satoshi Konno 2002-2004 +* +* File: ParameterList.java +* +* Revision; +* +* 02/01/04 +* - first revision. +* +******************************************************************/ + +package org.cybergarage.http; + +import java.util.*; + +public class ParameterList extends Vector +{ + private static final long serialVersionUID = -6026765325018137641L; + + public ParameterList() + { + } + + public Parameter at(int n) + { + return (Parameter)get(n); + } + + public Parameter getParameter(int n) + { + return (Parameter)get(n); + } + + public Parameter getParameter(String name) + { + if (name == null) + return null; + + int nLists = size(); + for (int n=0; n +* - Changed isUseAddress() to isUsableAddress(). +* +******************************************************************/ + +package org.cybergarage.net; + +import java.net.*; +import java.util.*; + +public class HostInterface +{ + //////////////////////////////////////////////// + // Constants + //////////////////////////////////////////////// + + public static boolean USE_LOOPBACK_ADDR = false; + public static boolean USE_ONLY_IPV4_ADDR = false; + public static boolean USE_ONLY_IPV6_ADDR = false; + + //////////////////////////////////////////////// + // Network Interfaces + //////////////////////////////////////////////// + + private static String ifAddress = ""; + + public final static void setInterface(String ifaddr) + { + ifAddress = ifaddr; + } + + public final static String getInterface() + { + return ifAddress; + } + + private final static boolean hasAssignedInterface() + { + return (0 < ifAddress.length()) ? true : false; + } + + //////////////////////////////////////////////// + // Network Interfaces + //////////////////////////////////////////////// + + // Thanks for Theo Beisch (10/27/04) + + private final static boolean isUsableAddress(InetAddress addr) + { + if (USE_LOOPBACK_ADDR == false) { + if (addr.isLoopbackAddress() == true) + return false; + } + if (USE_ONLY_IPV4_ADDR == true) { + if (addr instanceof Inet6Address) + return false; + } + if (USE_ONLY_IPV6_ADDR == true) { + if (addr instanceof Inet4Address) + return false; + } + return true; + } + + public final static int getNHostAddresses() + { + if (hasAssignedInterface() == true) + return 1; + + int nHostAddrs = 0; + try { + Enumeration nis = NetworkInterface.getNetworkInterfaces(); + while (nis.hasMoreElements()){ + NetworkInterface ni = (NetworkInterface)nis.nextElement(); + Enumeration addrs = ni.getInetAddresses(); + while (addrs.hasMoreElements()) { + InetAddress addr = (InetAddress)addrs.nextElement(); + if (isUsableAddress(addr) == false) + continue; + nHostAddrs++; + } + } + } + catch(Exception e){}; + return nHostAddrs; + } + + public final static String getHostAddress(int n) + { + if (hasAssignedInterface() == true) + return getInterface(); + + int hostAddrCnt = 0; + try { + Enumeration nis = NetworkInterface.getNetworkInterfaces(); + while (nis.hasMoreElements()){ + NetworkInterface ni = (NetworkInterface)nis.nextElement(); + Enumeration addrs = ni.getInetAddresses(); + while (addrs.hasMoreElements()) { + InetAddress addr = (InetAddress)addrs.nextElement(); + if (isUsableAddress(addr) == false) + continue; + if (hostAddrCnt < n) { + hostAddrCnt++; + continue; + } + String host = addr.getHostAddress(); + //if (addr instanceof Inet6Address) + // host = "[" + host + "]"; + return host; + } + } + } + catch(Exception e){}; + return ""; + } + + //////////////////////////////////////////////// + // isIPv?Address + //////////////////////////////////////////////// + + public final static boolean isIPv6Address(String host) + { + try { + InetAddress addr = InetAddress.getByName(host); + return (addr instanceof Inet6Address); + } + catch (Exception e) {} + return false; + } + + public final static boolean isIPv4Address(String host) + { + try { + InetAddress addr = InetAddress.getByName(host); + return (addr instanceof Inet4Address); + } + catch (Exception e) {} + return false; + } + + //////////////////////////////////////////////// + // hasIPv?Interfaces + //////////////////////////////////////////////// + + public final static boolean hasIPv4Addresses() + { + int addrCnt = getNHostAddresses(); + for (int n=0; n"; + + //////////////////////////////////////////////// + // createEnvelopeBodyNode + //////////////////////////////////////////////// + + public final static Node createEnvelopeBodyNode() + { + // + Node envNode = new Node(SOAP.XMLNS + SOAP.DELIM + SOAP.ENVELOPE); + envNode.setAttribute("xmlns" + SOAP.DELIM + SOAP.XMLNS, SOAP.XMLNS_URL); + envNode.setAttribute(SOAP.XMLNS + SOAP.DELIM + "encodingStyle", SOAP.ENCSTYLE_URL); + + // + Node bodyNode = new Node(SOAP.XMLNS + SOAP.DELIM + SOAP.BODY); + envNode.addNode(bodyNode); + + return envNode; + } + + //////////////////////////////////////////////// + // XML Parser + //////////////////////////////////////////////// + + private static Parser xmlParser; + + public final static void setXMLParser(Parser parser) + { + xmlParser = parser; + } + + public final static Parser getXMLParser() + { + return xmlParser; + } +} + diff --git a/router/java/src/org/cybergarage/soap/SOAPRequest.java b/router/java/src/org/cybergarage/soap/SOAPRequest.java new file mode 100644 index 000000000..d07b12d68 --- /dev/null +++ b/router/java/src/org/cybergarage/soap/SOAPRequest.java @@ -0,0 +1,183 @@ +/****************************************************************** +* +* CyberSOAP for Java +* +* Copyright (C) Satoshi Konno 2002 +* +* File: SOAPRequest.java +* +* Revision; +* +* 12/11/02 +* - first revision. +* 02/13/04 +* - Ralf G. R. Bergs , Inma Marin Lopez . +* - Added XML header, to setContent(). +* 05/11/04 +* - Changed the XML header to in setContent(). +* +******************************************************************/ + +package org.cybergarage.soap; + +import java.io.*; + +import org.cybergarage.http.*; +import org.cybergarage.xml.*; +import org.cybergarage.util.*; + +public class SOAPRequest extends HTTPRequest +{ + private final static String SOAPACTION = "SOAPACTION"; + + //////////////////////////////////////////////// + // Constructor + //////////////////////////////////////////////// + + public SOAPRequest() + { + setContentType(SOAP.CONTENT_TYPE); + setMethod(HTTP.POST); + } + + public SOAPRequest(HTTPRequest httpReq) + { + set(httpReq); + } + + //////////////////////////////////////////////// + // SOAPACTION + //////////////////////////////////////////////// + + public void setSOAPAction(String action) + { + setStringHeader(SOAPACTION, action); + } + + public String getSOAPAction() + { + return getStringHeaderValue(SOAPACTION); + } + + public boolean isSOAPAction(String value) + { + String headerValue = getHeaderValue(SOAPACTION); + if (headerValue == null) + return false; + if (headerValue.equals(value) == true) + return true; + String soapAction = getSOAPAction(); + if (soapAction == null) + return false; + return soapAction.equals(value); + } + + //////////////////////////////////////////////// + // post + //////////////////////////////////////////////// + + public SOAPResponse postMessage(String host, int port) + { + HTTPResponse httpRes = post(host, port); + + SOAPResponse soapRes = new SOAPResponse(httpRes); + + byte content[] = soapRes.getContent(); + if (content.length <= 0) + return soapRes; + + try { + ByteArrayInputStream byteIn = new ByteArrayInputStream(content); + Parser xmlParser = SOAP.getXMLParser(); + Node rootNode = xmlParser.parse(byteIn); + soapRes.setEnvelopeNode(rootNode); + } + catch (Exception e) { + Debug.warning(e); + } + + return soapRes; + } + + //////////////////////////////////////////////// + // Node + //////////////////////////////////////////////// + + private Node rootNode; + + private void setRootNode(Node node) + { + rootNode = node; + } + + private synchronized Node getRootNode() + { + if (rootNode != null) + return rootNode; + + try { + byte content[] = getContent(); + ByteArrayInputStream contentIn = new ByteArrayInputStream(content); + Parser parser = SOAP.getXMLParser(); + rootNode = parser.parse(contentIn); + } + catch (ParserException e) { + Debug.warning(e); + } + + return rootNode; + } + + //////////////////////////////////////////////// + // XML + //////////////////////////////////////////////// + + public void setEnvelopeNode(Node node) + { + setRootNode(node); + } + + public Node getEnvelopeNode() + { + return getRootNode(); + } + + public Node getBodyNode() + { + Node envNode = getEnvelopeNode(); + if (envNode == null) + return null; + if (envNode.hasNodes() == false) + return null; + return envNode.getNode(0); + } + + //////////////////////////////////////////////// + // XML Contents + //////////////////////////////////////////////// + + public void setContent(Node node) + { + // Thanks for Ralf G. R. Bergs , Inma Marin Lopez . + String conStr = ""; + conStr += SOAP.VERSION_HEADER; + conStr += "\n"; + conStr += node.toString(); + setContent(conStr); + } + + //////////////////////////////////////////////// + // print + //////////////////////////////////////////////// + + public void print() + { + System.out.println(toString()); + if (hasContent() == true) + return; + Node rootElem = getRootNode(); + if (rootElem == null) + return; + System.out.println(rootElem.toString()); + } +} diff --git a/router/java/src/org/cybergarage/soap/SOAPResponse.java b/router/java/src/org/cybergarage/soap/SOAPResponse.java new file mode 100644 index 000000000..fb59f3a21 --- /dev/null +++ b/router/java/src/org/cybergarage/soap/SOAPResponse.java @@ -0,0 +1,191 @@ +/****************************************************************** +* +* CyberSOAP for Java +* +* Copyright (C) Satoshi Konno 2002 +* +* File: SOAPResponse.java +* +* Revision; +* +* 12/17/02 +* - first revision. +* 02/13/04 +* - Ralf G. R. Bergs , Inma Marin Lopez . +* - Added XML header, to setContent(). +* 05/11/04 +* - Changed the XML header to in setContent(). +* +******************************************************************/ + +package org.cybergarage.soap; + +import org.cybergarage.http.*; +import org.cybergarage.xml.*; + +public class SOAPResponse extends HTTPResponse +{ + //////////////////////////////////////////////// + // Constructor + //////////////////////////////////////////////// + + public SOAPResponse() + { + setRootNode(SOAP.createEnvelopeBodyNode()); + setContentType(XML.CONTENT_TYPE); + } + + public SOAPResponse(HTTPResponse httpRes) + { + super(httpRes); + setRootNode(SOAP.createEnvelopeBodyNode()); + setContentType(XML.CONTENT_TYPE); + } + + public SOAPResponse(SOAPResponse soapRes) + { + super(soapRes); + setEnvelopeNode(soapRes.getEnvelopeNode()); + setContentType(XML.CONTENT_TYPE); + } + + //////////////////////////////////////////////// + // Node + //////////////////////////////////////////////// + + private Node rootNode; + + private void setRootNode(Node node) + { + rootNode = node; + } + + private Node getRootNode() + { + return rootNode; + } + + //////////////////////////////////////////////// + // SOAP Basic + //////////////////////////////////////////////// + + public void setEnvelopeNode(Node node) + { + setRootNode(node); + } + + public Node getEnvelopeNode() + { + return getRootNode(); + } + + public Node getBodyNode() + { + Node envNode = getEnvelopeNode(); + if (envNode == null) + return null; + return envNode.getNodeEndsWith(SOAP.BODY); + } + + public Node getMethodResponseNode(String name) + { + Node bodyNode = getBodyNode(); + if (bodyNode == null) + return null; + String methodResName = name + SOAP.RESPONSE; + return bodyNode.getNodeEndsWith(methodResName); + } + + public Node getFaultNode() + { + Node bodyNode = getBodyNode(); + if (bodyNode == null) + return null; + return bodyNode.getNodeEndsWith(SOAP.FAULT); + } + + public Node getFaultCodeNode() + { + Node faultNode = getFaultNode(); + if (faultNode == null) + return null; + return faultNode.getNodeEndsWith(SOAP.FAULT_CODE); + } + + public Node getFaultStringNode() + { + Node faultNode = getFaultNode(); + if (faultNode == null) + return null; + return faultNode.getNodeEndsWith(SOAP.FAULT_STRING); + } + + public Node getFaultActorNode() + { + Node faultNode = getFaultNode(); + if (faultNode == null) + return null; + return faultNode.getNodeEndsWith(SOAP.FAULTACTOR); + } + + public Node getFaultDetailNode() + { + Node faultNode = getFaultNode(); + if (faultNode == null) + return null; + return faultNode.getNodeEndsWith(SOAP.DETAIL); + } + + public String getFaultCode() + { + Node node = getFaultCodeNode(); + if (node == null) + return ""; + return node.getValue(); + } + + public String getFaultString() + { + Node node = getFaultStringNode(); + if (node == null) + return ""; + return node.getValue(); + } + + public String getFaultActor() + { + Node node = getFaultActorNode(); + if (node == null) + return ""; + return node.getValue(); + } + + //////////////////////////////////////////////// + // XML Contents + //////////////////////////////////////////////// + + public void setContent(Node node) + { + // Thanks for Ralf G. R. Bergs , Inma Marin Lopez . + String conStr = ""; + conStr += SOAP.VERSION_HEADER; + conStr += "\n"; + conStr += node.toString(); + setContent(conStr); + } + + //////////////////////////////////////////////// + // print + //////////////////////////////////////////////// + + public void print() + { + System.out.println(toString()); + if (hasContent() == true) + return; + Node rootElem = getRootNode(); + if (rootElem == null) + return; + System.out.println(rootElem.toString()); + } +} diff --git a/router/java/src/org/cybergarage/upnp/Action.java b/router/java/src/org/cybergarage/upnp/Action.java new file mode 100644 index 000000000..9cf98a44d --- /dev/null +++ b/router/java/src/org/cybergarage/upnp/Action.java @@ -0,0 +1,370 @@ +/****************************************************************** +* +* CyberUPnP for Java +* +* Copyright (C) Satoshi Konno 2002-2004 +* +* File: Action.java +* +* Revision; +* +* 12/05/02 +* - first revision. +* 08/30/03 +* - Gordano Sassaroli +* - Problem : When invoking an action that has at least one out parameter, an error message is returned +* - Error : The action post method gets the entire list of arguments instead of only the in arguments +* 01/04/04 +* - Added UPnP status methods. +* - Changed about new ActionListener interface. +* 01/05/04 +* - Added clearOutputAgumentValues() to initialize the output values before calling performActionListener(). +* 07/09/04 +* - Thanks for Dimas and Stefano Lenzi +* - Changed postControlAction() to set the status code to the UPnPStatus. +* +******************************************************************/ + +package org.cybergarage.upnp; + +import org.cybergarage.xml.*; +import org.cybergarage.util.*; + +import org.cybergarage.upnp.xml.*; +import org.cybergarage.upnp.control.*; + +public class Action +{ + //////////////////////////////////////////////// + // Constants + //////////////////////////////////////////////// + + public final static String ELEM_NAME = "action"; + + //////////////////////////////////////////////// + // Member + //////////////////////////////////////////////// + + private Node serviceNode; + private Node actionNode; + + private Node getServiceNode() + { + return serviceNode; + } + + public Service getService() + { + return new Service(getServiceNode()); + } + + public Node getActionNode() + { + return actionNode; + } + + //////////////////////////////////////////////// + // Constructor + //////////////////////////////////////////////// + + public Action(Node serviceNode, Node actionNode) + { + this.serviceNode = serviceNode; + this.actionNode = actionNode; + } + + public Action(Action action) + { + this.serviceNode = action.getServiceNode(); + this.actionNode = action.getActionNode(); + } + + //////////////////////////////////////////////// + // Mutex + //////////////////////////////////////////////// + + private Mutex mutex = new Mutex(); + + public void lock() + { + mutex.lock(); + } + + public void unlock() + { + mutex.unlock(); + } + + //////////////////////////////////////////////// + // isActionNode + //////////////////////////////////////////////// + + public static boolean isActionNode(Node node) + { + return Action.ELEM_NAME.equals(node.getName()); + } + + //////////////////////////////////////////////// + // name + //////////////////////////////////////////////// + + private final static String NAME = "name"; + + public void setName(String value) + { + getActionNode().setNode(NAME, value); + } + + public String getName() + { + return getActionNode().getNodeValue(NAME); + } + + //////////////////////////////////////////////// + // argumentList + //////////////////////////////////////////////// + + public ArgumentList getArgumentList() + { + ArgumentList argumentList = new ArgumentList(); + Node argumentListNode = getActionNode().getNode(ArgumentList.ELEM_NAME); + if (argumentListNode == null) + return argumentList; + int nodeCnt = argumentListNode.getNNodes(); + for (int n=0; n (08/30/03) + ArgumentList actionArgList = getArgumentList(); + ArgumentList actionInputArgList = getInputArgumentList(); + ActionRequest ctrlReq = new ActionRequest(); + ctrlReq.setRequest(this, actionInputArgList); + if (Debug.isOn() == true) + ctrlReq.print(); + ActionResponse ctrlRes = ctrlReq.post(); + if (Debug.isOn() == true) + ctrlRes.print(); + setControlResponse(ctrlRes); + // Thanks for Dimas and Stefano Lenzi (07/09/04) + int statCode = ctrlRes.getStatusCode(); + setStatus(statCode); + if (ctrlRes.isSuccessful() == false) + return false; + ArgumentList outArgList = ctrlRes.getResponse(); + actionArgList.set(outArgList); + return true; + } + + //////////////////////////////////////////////// + // Debug + //////////////////////////////////////////////// + + public void print() + { + System.out.println("Action : " + getName()); + ArgumentList argList = getArgumentList(); + int nArgs = argList.size(); + for (int n=0; n +* - Problem : when an event notification message is received and the message +* contains updates on more than one variable, only the first variable update +* is notified. +* - Error : the other xml nodes of the message are ignored +* - Fix : add two methods to the NotifyRequest for extracting the property array +* and modify the httpRequestRecieved method in ControlPoint +* 12/12/03 +* - Added a static() to initialize UPnP class. +* 01/06/04 +* - Added the following methods to remove expired devices automatically +* removeExpiredDevices() +* setExpiredDeviceMonitoringInterval()/getExpiredDeviceMonitoringInterval() +* setDeviceDisposer()/getDeviceDisposer() +* 04/20/04 +* - Added the following methods. +* start(String target, int mx) and start(String target). +* 06/23/04 +* - Added setNMPRMode() and isNMPRMode(). +* 07/08/04 +* - Added renewSubscriberService(). +* - Changed start() to create renew subscriber thread when the NMPR mode is true. +* 08/17/04 +* - Fixed removeExpiredDevices() to remove using the device array. +* 10/16/04 +* - Oliver Newell +* - Added this class to allow ControlPoint applications to be notified when +* the ControlPoint base class adds/removes a UPnP device +* 03/30/05 +* - Changed addDevice() to use Parser::parse(URL). +* +*******************************************************************/ + +package org.cybergarage.upnp; + +import org.cybergarage.net.*; +import org.cybergarage.util.*; +import org.cybergarage.xml.*; +import org.cybergarage.http.*; + +import org.cybergarage.upnp.control.*; +import org.cybergarage.upnp.ssdp.*; +import org.cybergarage.upnp.device.*; +import org.cybergarage.upnp.event.*; + +import java.net.*; + +public class ControlPoint implements HTTPRequestListener +{ + private final static int DEFAULT_EVENTSUB_PORT = 8058; + private final static int DEFAULT_SSDP_PORT = 8008; + private final static int DEFAULT_EXPIRED_DEVICE_MONITORING_INTERVAL = 60; + + private final static String DEFAULT_EVENTSUB_URI = "/evetSub"; + + //////////////////////////////////////////////// + // Member + //////////////////////////////////////////////// + + private SSDPNotifySocketList ssdpNotifySocketList; + private SSDPSearchResponseSocketList ssdpSearchResponseSocketList; + + private SSDPNotifySocketList getSSDPNotifySocketList() + { + return ssdpNotifySocketList; + } + + private SSDPSearchResponseSocketList getSSDPSearchResponseSocketList() + { + return ssdpSearchResponseSocketList; + } + + //////////////////////////////////////////////// + // Initialize + //////////////////////////////////////////////// + + static + { + UPnP.initialize(); + } + + //////////////////////////////////////////////// + // Constructor + //////////////////////////////////////////////// + + public ControlPoint(int ssdpPort, int httpPort) + { + ssdpNotifySocketList = new SSDPNotifySocketList(); + ssdpSearchResponseSocketList = new SSDPSearchResponseSocketList(); + + setSSDPPort(ssdpPort); + setHTTPPort(httpPort); + + setDeviceDisposer(null); + setExpiredDeviceMonitoringInterval(DEFAULT_EXPIRED_DEVICE_MONITORING_INTERVAL); + + setRenewSubscriber(null); + + setNMPRMode(false); + setRenewSubscriber(null); + } + + public ControlPoint() + { + this(DEFAULT_SSDP_PORT, DEFAULT_EVENTSUB_PORT); + } + + public void finalize() + { + stop(); + } + + //////////////////////////////////////////////// + // Mutex + //////////////////////////////////////////////// + + private Mutex mutex = new Mutex(); + + public void lock() + { + mutex.lock(); + } + + public void unlock() + { + mutex.unlock(); + } + + //////////////////////////////////////////////// + // Port (SSDP) + //////////////////////////////////////////////// + + private int ssdpPort = 0; + + public int getSSDPPort() { + return ssdpPort; + } + + public void setSSDPPort(int port) { + ssdpPort = port; + } + + //////////////////////////////////////////////// + // Port (EventSub) + //////////////////////////////////////////////// + + private int httpPort = 0; + + public int getHTTPPort() { + return httpPort; + } + + public void setHTTPPort(int port) { + httpPort = port; + } + + //////////////////////////////////////////////// + // NMPR + //////////////////////////////////////////////// + + private boolean nmprMode; + + public void setNMPRMode(boolean flag) + { + nmprMode = flag; + } + + public boolean isNMPRMode() + { + return nmprMode; + } + + //////////////////////////////////////////////// + // Device List + //////////////////////////////////////////////// + + private NodeList devNodeList = new NodeList(); + + private void addDevice(Node rootNode) + { + devNodeList.add(rootNode); + } + + private synchronized void addDevice(SSDPPacket ssdpPacket) + { + if (ssdpPacket.isRootDevice() == false) + return; + + String usn = ssdpPacket.getUSN(); + String udn = USN.getUDN(usn); + Device dev = getDevice(udn); + if (dev != null) { + dev.setSSDPPacket(ssdpPacket); + return; + } + + String location = ssdpPacket.getLocation(); + try { + URL locationUrl = new URL(location); + Parser parser = UPnP.getXMLParser(); + Node rootNode = parser.parse(locationUrl); + Device rootDev = getDevice(rootNode); + if (rootDev == null) + return; + rootDev.setSSDPPacket(ssdpPacket); + addDevice(rootNode); + + // Thanks for Oliver Newell (2004/10/16) + // After node is added, invoke the AddDeviceListener to notify high-level + // control point application that a new device has been added. (The + // control point application must implement the DeviceChangeListener interface + // to receive the notifications) + performAddDeviceListener( rootDev ); + } + catch (MalformedURLException me) { + Debug.warning(ssdpPacket.toString()); + Debug.warning(me); + } + catch (ParserException pe) { + Debug.warning(ssdpPacket.toString()); + Debug.warning(pe); + } + } + + private Device getDevice(Node rootNode) + { + if (rootNode == null) + return null; + Node devNode = rootNode.getNode(Device.ELEM_NAME); + if (devNode == null) + return null; + return new Device(rootNode, devNode); + } + + public DeviceList getDeviceList() + { + DeviceList devList = new DeviceList(); + int nRoots = devNodeList.size(); + for (int n=0; n +* - Problem : bad request response sent even with successful subscriptions +* - Error : a return statement is missing in the httpRequestRecieved method +* 10/21/03 +* - Updated a udn field by a original uuid. +* 10/22/03 +* - Added setActionListener(). +* - Added setQueryListener(). +* 12/12/03 +* - Added a static() to initialize UPnP class. +* 12/25/03 +* - Added advertiser functions. +* 01/05/04 +* - Added isExpired(). +* 03/23/04 +* - Oliver Newell +* - Changed to update the UDN only when the field is null. +* 04/21/04 +* - Added isDeviceType(). +* 06/18/04 +* - Added setNMPRMode() and isNMPRMode(). +* - Changed getDescriptionData() to update only when the NMPR mode is false. +* 06/21/04 +* - Changed start() to send a bye-bye before the announce. +* - Changed annouce(), byebye() and deviceSearchReceived() to send the SSDP +* messsage four times when the NMPR and the Wireless mode are true. +* 07/02/04 +* - Fixed announce() and byebye() to send the upnp::rootdevice message despite embedded devices. +* - Fixed getRootNode() to return the root node when the device is embedded. +* 07/24/04 +* - Thanks for Stefano Lenzi +* - Added getParentDevice(). +* 10/20/04 +* - Brent Hills +* - Changed postSearchResponse() to add MYNAME header. +* 11/19/04 +* - Theo Beisch +* - Added getStateVariable(String serviceType, String name). +* 03/22/05 +* - Changed httpPostRequestRecieved() to return the bad request when the post request isn't the soap action. +* 03/23/05 +* - Added loadDescription(String) to load the description from memory. +* 03/30/05 +* - Added getDeviceByDescriptionURI(). +* - Added getServiceBySCPDURL(). +* 03/31/05 +* - Changed httpGetRequestRecieved() to return the description stream using +* Device::getDescriptionData() and Service::getSCPDData() at first. +* 04/25/05 +* - Thanks for Mikael Hakman +* Changed announce() and byebye() to close the socket after the posting. +* 04/25/05 +* - Thanks for Mikael Hakman +* Changed deviceSearchResponse() answer with USN:UDN:: when request ST is device type. +* 04/25/05 +* - Thanks for Mikael Hakman +* - Changed getDescriptionData() to add a XML declaration at first line. +* 04/25/05 +* - Thanks for Mikael Hakman +* - Added a new setActionListener() and serQueryListner() to include the sub devices. +* +******************************************************************/ + +package org.cybergarage.upnp; + +import java.net.*; +import java.io.*; +import java.util.*; + +import org.cybergarage.net.*; +import org.cybergarage.http.*; +import org.cybergarage.util.*; +import org.cybergarage.xml.*; +import org.cybergarage.soap.*; + +import org.cybergarage.upnp.ssdp.*; +import org.cybergarage.upnp.device.*; +import org.cybergarage.upnp.control.*; +import org.cybergarage.upnp.event.*; +import org.cybergarage.upnp.xml.*; + +public class Device implements org.cybergarage.http.HTTPRequestListener, SearchListener +{ + //////////////////////////////////////////////// + // Constants + //////////////////////////////////////////////// + + public final static String ELEM_NAME = "device"; + public final static String UPNP_ROOTDEVICE = "upnp:rootdevice"; + + public final static int DEFAULT_STARTUP_WAIT_TIME = 1000; + public final static int DEFAULT_DISCOVERY_WAIT_TIME = 300; + public final static int DEFAULT_LEASE_TIME = 30 * 60; + + public final static int HTTP_DEFAULT_PORT = 4004; + + public final static String DEFAULT_DESCRIPTION_URI = "/description.xml"; + + //////////////////////////////////////////////// + // Member + //////////////////////////////////////////////// + + private Node rootNode; + private Node deviceNode; + + public Node getRootNode() + { + if (rootNode != null) + return rootNode; + if (deviceNode == null) + return null; + return deviceNode.getRootNode(); + } + + public Node getDeviceNode() + { + return deviceNode; + } + + public void setRootNode(Node node) + { + rootNode = node; + } + + public void setDeviceNode(Node node) + { + deviceNode = node; + } + + //////////////////////////////////////////////// + // Initialize + //////////////////////////////////////////////// + + static + { + UPnP.initialize(); + } + + //////////////////////////////////////////////// + // Constructor + //////////////////////////////////////////////// + + public Device(Node root, Node device) + { + rootNode = root; + deviceNode = device; + setUUID(UPnP.createUUID()); + setWirelessMode(false); + } + + public Device() + { + this(null, null); + } + + public Device(Node device) + { + this(null, device); + } + + public Device(File descriptionFile) throws InvalidDescriptionException + { + this(null, null); + loadDescription(descriptionFile); + } + + public Device(String descriptionFileName) throws InvalidDescriptionException + { + this(new File(descriptionFileName)); + } + + //////////////////////////////////////////////// + // Mutex + //////////////////////////////////////////////// + + private Mutex mutex = new Mutex(); + + public void lock() + { + mutex.lock(); + } + + public void unlock() + { + mutex.unlock(); + } + + //////////////////////////////////////////////// + // NMPR + //////////////////////////////////////////////// + + public void setNMPRMode(boolean flag) + { + Node devNode = getDeviceNode(); + if (devNode == null) + return; + if (flag == true) { + devNode.setNode(UPnP.INMPR03, UPnP.INMPR03_VERSION); + devNode.removeNode(Device.URLBASE_NAME); + } + else { + devNode.removeNode(UPnP.INMPR03); + } + } + + public boolean isNMPRMode() + { + Node devNode = getDeviceNode(); + if (devNode == null) + return false; + return (devNode.getNode(UPnP.INMPR03) != null) ? true : false; + } + + //////////////////////////////////////////////// + // Wireless + //////////////////////////////////////////////// + + private boolean wirelessMode; + + public void setWirelessMode(boolean flag) + { + wirelessMode = flag; + } + + public boolean isWirelessMode() + { + return wirelessMode; + } + + public int getSSDPAnnounceCount() + { + if (isNMPRMode() == true && isWirelessMode() == true) + return UPnP.INMPR03_DISCOVERY_OVER_WIRELESS_COUNT; + return 1; + } + + //////////////////////////////////////////////// + // Device UUID + //////////////////////////////////////////////// + + private String devUUID; + + private void setUUID(String uuid) + { + devUUID = uuid; + } + + private String getUUID() + { + return devUUID; + } + + private void updateUDN() + { + setUDN("uuid:" + getUUID()); + } + + //////////////////////////////////////////////// + // Root Device + //////////////////////////////////////////////// + + public Device getRootDevice() + { + Node rootNode = getRootNode(); + if (rootNode == null) + return null; + Node devNode = rootNode.getNode(Device.ELEM_NAME); + if (devNode == null) + return null; + return new Device(rootNode, devNode); + } + + //////////////////////////////////////////////// + // Parent Device + //////////////////////////////////////////////// + + // Thanks for Stefano Lenzi (07/24/04) + + public Device getParentDevice() + { + if(isRootDevice()) + return null; + Node devNode = getDeviceNode(); + // + devNode = devNode.getParentNode().getParentNode().getNode(Device.ELEM_NAME); + return new Device(devNode); + } + + //////////////////////////////////////////////// + // UserData + //////////////////////////////////////////////// + + private DeviceData getDeviceData() + { + Node node = getDeviceNode(); + DeviceData userData = (DeviceData)node.getUserData(); + if (userData == null) { + userData = new DeviceData(); + node.setUserData(userData); + userData.setNode(node); + } + return userData; + } + + //////////////////////////////////////////////// + // Description + //////////////////////////////////////////////// + + private void setDescriptionFile(File file) + { + getDeviceData().setDescriptionFile(file); + } + + public File getDescriptionFile() + { + return getDeviceData().getDescriptionFile(); + } + + private void setDescriptionURI(String uri) + { + getDeviceData().setDescriptionURI(uri); + } + + private String getDescriptionURI() + { + return getDeviceData().getDescriptionURI(); + } + + private boolean isDescriptionURI(String uri) + { + String descriptionURI = getDescriptionURI(); + if (uri == null || descriptionURI == null) + return false; + return descriptionURI.equals(uri); + } + + public String getDescriptionFilePath() + { + File descriptionFile = getDescriptionFile(); + if (descriptionFile == null) + return ""; + return descriptionFile.getAbsoluteFile().getParent(); + } + + public boolean loadDescription(String descString) throws InvalidDescriptionException + { + try { + Parser parser = UPnP.getXMLParser(); + rootNode = parser.parse(descString); + if (rootNode == null) + throw new InvalidDescriptionException(Description.NOROOT_EXCEPTION); + deviceNode = rootNode.getNode(Device.ELEM_NAME); + if (deviceNode == null) + throw new InvalidDescriptionException(Description.NOROOTDEVICE_EXCEPTION); + } + catch (ParserException e) { + throw new InvalidDescriptionException(e); + } + + if (initializeLoadedDescription() == false) + return false; + + setDescriptionFile(null); + + return true; + } + + public boolean loadDescription(File file) throws InvalidDescriptionException + { + try { + Parser parser = UPnP.getXMLParser(); + rootNode = parser.parse(file); + if (rootNode == null) + throw new InvalidDescriptionException(Description.NOROOT_EXCEPTION, file); + deviceNode = rootNode.getNode(Device.ELEM_NAME); + if (deviceNode == null) + throw new InvalidDescriptionException(Description.NOROOTDEVICE_EXCEPTION, file); + } + catch (ParserException e) { + throw new InvalidDescriptionException(e); + } + + if (initializeLoadedDescription() == false) + return false; + + setDescriptionFile(file); + + return true; + } + + private boolean initializeLoadedDescription() + { + setDescriptionURI(DEFAULT_DESCRIPTION_URI); + setLeaseTime(DEFAULT_LEASE_TIME); + setHTTPPort(HTTP_DEFAULT_PORT); + + // Thanks for Oliver Newell (03/23/04) + if (hasUDN() == false) + updateUDN(); + + return true; + } + + //////////////////////////////////////////////// + // isDeviceNode + //////////////////////////////////////////////// + + public static boolean isDeviceNode(Node node) + { + return Device.ELEM_NAME.equals(node.getName()); + } + + //////////////////////////////////////////////// + // Root Device + //////////////////////////////////////////////// + + public boolean isRootDevice() + { + return (getRootNode() != null) ? true : false; + } + + //////////////////////////////////////////////// + // Root Device + //////////////////////////////////////////////// + + public void setSSDPPacket(SSDPPacket packet) + { + getDeviceData().setSSDPPacket(packet); + } + + public SSDPPacket getSSDPPacket() + { + if (isRootDevice() == false) + return null; + return getDeviceData().getSSDPPacket(); + } + + //////////////////////////////////////////////// + // Location + //////////////////////////////////////////////// + + public void setLocation(String value) + { + getDeviceData().setLocation(value); + } + + public String getLocation() + { + SSDPPacket packet = getSSDPPacket(); + if (packet != null) + return packet.getLocation(); + return getDeviceData().getLocation(); + } + + //////////////////////////////////////////////// + // LeaseTime + //////////////////////////////////////////////// + + public void setLeaseTime(int value) + { + getDeviceData().setLeaseTime(value); + Advertiser adv = getAdvertiser(); + if (adv != null) { + announce(); + adv.restart(); + } + } + + public int getLeaseTime() + { + SSDPPacket packet = getSSDPPacket(); + if (packet != null) + return packet.getLeaseTime(); + return getDeviceData().getLeaseTime(); + } + + //////////////////////////////////////////////// + // TimeStamp + //////////////////////////////////////////////// + + public long getTimeStamp() + { + SSDPPacket packet = getSSDPPacket(); + if (packet != null) + return packet.getTimeStamp(); + return 0; + } + + public long getElapsedTime() + { + return (System.currentTimeMillis() - getTimeStamp()) / 1000; + } + + public boolean isExpired() + { + long elipsedTime = getElapsedTime(); + long leaseTime = getLeaseTime() + UPnP.DEFAULT_EXPIRED_DEVICE_EXTRA_TIME; + if (leaseTime < elipsedTime) + return true; + return false; + } + + //////////////////////////////////////////////// + // URL Base + //////////////////////////////////////////////// + + private final static String URLBASE_NAME = "URLBase"; + + private void setURLBase(String value) + { + if (isRootDevice() == true) { + Node node = getRootNode().getNode(URLBASE_NAME); + if (node != null) { + node.setValue(value); + return; + } + node = new Node(URLBASE_NAME); + node.setValue(value); + int index = 1; + if (getRootNode().hasNodes() == false) + index = 1; + getRootNode().insertNode(node, index); + } + } + + private void updateURLBase(String host) + { + String urlBase = HostInterface.getHostURL(host, getHTTPPort(), ""); + setURLBase(urlBase); + } + + public String getURLBase() + { + if (isRootDevice() == true) + return getRootNode().getNodeValue(URLBASE_NAME); + return ""; + } + + //////////////////////////////////////////////// + // deviceType + //////////////////////////////////////////////// + + private final static String DEVICE_TYPE = "deviceType"; + + public void setDeviceType(String value) + { + getDeviceNode().setNode(DEVICE_TYPE, value); + } + + public String getDeviceType() + { + return getDeviceNode().getNodeValue(DEVICE_TYPE); + } + + public boolean isDeviceType(String value) + { + if (value == null) + return false; + return value.equals(getDeviceType()); + } + + //////////////////////////////////////////////// + // friendlyName + //////////////////////////////////////////////// + + private final static String FRIENDLY_NAME = "friendlyName"; + + public void setFriendlyName(String value) + { + getDeviceNode().setNode(FRIENDLY_NAME, value); + } + + public String getFriendlyName() + { + return getDeviceNode().getNodeValue(FRIENDLY_NAME); + } + + //////////////////////////////////////////////// + // manufacture + //////////////////////////////////////////////// + + private final static String MANUFACTURE = "manufacture"; + + public void setManufacture(String value) + { + getDeviceNode().setNode(MANUFACTURE, value); + } + + public String getManufacture() + { + return getDeviceNode().getNodeValue(MANUFACTURE); + } + + //////////////////////////////////////////////// + // manufactureURL + //////////////////////////////////////////////// + + private final static String MANUFACTURE_URL = "manufactureURL"; + + public void setManufactureURL(String value) + { + getDeviceNode().setNode(MANUFACTURE_URL, value); + } + + public String getManufactureURL() + { + return getDeviceNode().getNodeValue(MANUFACTURE_URL); + } + + //////////////////////////////////////////////// + // modelDescription + //////////////////////////////////////////////// + + private final static String MODEL_DESCRIPTION = "modelDescription"; + + public void setModelDescription(String value) + { + getDeviceNode().setNode(MODEL_DESCRIPTION, value); + } + + public String getModelDescription() + { + return getDeviceNode().getNodeValue(MODEL_DESCRIPTION); + } + + //////////////////////////////////////////////// + // modelName + //////////////////////////////////////////////// + + private final static String MODEL_NAME = "modelName"; + + public void setModelName(String value) + { + getDeviceNode().setNode(MODEL_NAME, value); + } + + public String getModelName() + { + return getDeviceNode().getNodeValue(MODEL_NAME); + } + + //////////////////////////////////////////////// + // modelNumber + //////////////////////////////////////////////// + + private final static String MODEL_NUMBER = "modelNumber"; + + public void setModelNumber(String value) + { + getDeviceNode().setNode(MODEL_NUMBER, value); + } + + public String getModelNumber() + { + return getDeviceNode().getNodeValue(MODEL_NUMBER); + } + + //////////////////////////////////////////////// + // modelURL + //////////////////////////////////////////////// + + private final static String MODEL_URL = "modelURL"; + + public void setModelURL(String value) + { + getDeviceNode().setNode(MODEL_URL, value); + } + + public String getModelURL() + { + return getDeviceNode().getNodeValue(MODEL_URL); + } + + //////////////////////////////////////////////// + // serialNumber + //////////////////////////////////////////////// + + private final static String SERIAL_NUMBER = "serialNumber"; + + public void setSerialNumber(String value) + { + getDeviceNode().setNode(SERIAL_NUMBER, value); + } + + public String getSerialNumber() + { + return getDeviceNode().getNodeValue(SERIAL_NUMBER); + } + + //////////////////////////////////////////////// + // UDN + //////////////////////////////////////////////// + + private final static String UDN = "UDN"; + + public void setUDN(String value) + { + getDeviceNode().setNode(UDN, value); + } + + public String getUDN() + { + return getDeviceNode().getNodeValue(UDN); + } + + public boolean hasUDN() + { + String udn = getUDN(); + if (udn == null || udn.length() <= 0) + return false; + return true; + } + + //////////////////////////////////////////////// + // UPC + //////////////////////////////////////////////// + + private final static String UPC = "UPC"; + + public void setUPC(String value) + { + getDeviceNode().setNode(UPC, value); + } + + public String getUPC() + { + return getDeviceNode().getNodeValue(UPC); + } + + //////////////////////////////////////////////// + // presentationURL + //////////////////////////////////////////////// + + private final static String presentationURL = "presentationURL"; + + public void setPresentationURL(String value) + { + getDeviceNode().setNode(presentationURL, value); + } + + public String getPresentationURL() + { + return getDeviceNode().getNodeValue(presentationURL); + } + + //////////////////////////////////////////////// + // deviceList + //////////////////////////////////////////////// + + public DeviceList getDeviceList() + { + DeviceList devList = new DeviceList(); + Node devListNode = getDeviceNode().getNode(DeviceList.ELEM_NAME); + if (devListNode == null) + return devList; + int nNode = devListNode.getNNodes(); + for (int n=0; n +* - Fixed SERVICE_ID constant instead of "serviceId". +* 06/17/03 +* - Added notifyAllStateVariables(). +* 09/03/03 +* - Giordano Sassaroli +* - Problem : The device does not accepts request for services when control or subscription urls are absolute +* - Error : device methods, when requests are received, search for services that have a controlUrl (or eventSubUrl) equal to the request URI +* but request URI must be relative, so they cannot equal absolute urls +* 09/03/03 +* - Steven Yen +* - description: to retrieve service information based on information in URLBase and SCPDURL +* - problem: not able to retrieve service information when URLBase is missing and SCPDURL is relative +* - fix: modify to retrieve host information from Header's Location (required) field and update the +* BaseURL tag in the xml so subsequent information retrieval can be done (Steven Yen, 8.27.2003) +* - note: 1. in the case that Header's Location field combine with SCPDURL is not able to retrieve proper +* information, updating BaseURL would not hurt, since exception will be thrown with or without update. +* 2. this problem was discovered when using PC running MS win XP with ICS enabled (gateway). +* It seems that root device xml file does not have BaseURL and SCPDURL are all relative. +* 3. UPnP device architecture states that BaseURL is optional and SCPDURL may be relative as +* specified by UPnP vendor, so MS does not seem to violate the rule. +* 10/22/03 +* - Added setActionListener(). +* 01/04/04 +* - Changed about new QueryListener interface. +* 01/06/04 +* - Moved the following methods to StateVariable class. +* getQueryListener() +* setQueryListener() +* performQueryListener() +* - Added new setQueryListener() to set a listner to all state variables. +* 07/02/04 +* - Added serviceSearchResponse(). +* - Deleted getLocationURL(). +* - Fixed announce() to set the root device URL to the LOCATION field. +* 07/31/04 +* - Changed notify() to remove the expired subscribers and not to remove the invalid response subscribers for NMPR. +* 10/29/04 +* - Fixed a bug when notify() removes the expired devices(). +* 03/23/05 +* - Added loadSCPD() to load the description from memory. +* 03/30/05 +* - Added isSCPDURL(). +* - Removed setDescriptionURL() and getDescriptionURL() +* 03/31/05 +* - Added getSCPDData(). +* 04/25/05 +* - Thanks for Mikael Hakman +* - Changed getSCPDData() to add a XML declaration at first line. +* +******************************************************************/ + +package org.cybergarage.upnp; + +import java.io.*; +import java.net.*; + +import org.cybergarage.http.*; +import org.cybergarage.xml.*; +import org.cybergarage.util.*; + +import org.cybergarage.upnp.ssdp.*; +import org.cybergarage.upnp.xml.*; +import org.cybergarage.upnp.device.*; +import org.cybergarage.upnp.control.*; +import org.cybergarage.upnp.event.*; + +public class Service +{ + //////////////////////////////////////////////// + // Constants + //////////////////////////////////////////////// + + public final static String ELEM_NAME = "service"; + + //////////////////////////////////////////////// + // Member + //////////////////////////////////////////////// + + private Node serviceNode; + + public Node getServiceNode() + { + return serviceNode; + } + + //////////////////////////////////////////////// + // Constructor + //////////////////////////////////////////////// + + public Service(Node node) + { + serviceNode = node; + } + + //////////////////////////////////////////////// + // Mutex + //////////////////////////////////////////////// + + private Mutex mutex = new Mutex(); + + public void lock() + { + mutex.lock(); + } + + public void unlock() + { + mutex.unlock(); + } + + //////////////////////////////////////////////// + // isServiceNode + //////////////////////////////////////////////// + + public static boolean isServiceNode(Node node) + { + return Service.ELEM_NAME.equals(node.getName()); + } + + //////////////////////////////////////////////// + // Device/Root Node + //////////////////////////////////////////////// + + private Node getDeviceNode() + { + Node node = getServiceNode().getParentNode(); + if (node == null) + return null; + return node.getParentNode(); + } + + private Node getRootNode() + { + return getServiceNode().getRootNode(); + } + + //////////////////////////////////////////////// + // Device + //////////////////////////////////////////////// + + public Device getDevice() + { + return new Device(getRootNode(), getDeviceNode()); + } + + public Device getRootDevice() + { + return getDevice().getRootDevice(); + } + + //////////////////////////////////////////////// + // serviceType + //////////////////////////////////////////////// + + private final static String SERVICE_TYPE = "serviceType"; + + public void setServiceType(String value) + { + getServiceNode().setNode(SERVICE_TYPE, value); + } + + public String getServiceType() + { + return getServiceNode().getNodeValue(SERVICE_TYPE); + } + + //////////////////////////////////////////////// + // serviceID + //////////////////////////////////////////////// + + private final static String SERVICE_ID = "serviceId"; + + public void setServiceID(String value) + { + getServiceNode().setNode(SERVICE_ID, value); + } + + public String getServiceID() + { + return getServiceNode().getNodeValue(SERVICE_ID); + } + + //////////////////////////////////////////////// + // isURL + //////////////////////////////////////////////// + + // Thanks for Giordano Sassaroli (09/03/03) + private boolean isURL(String referenceUrl, String url) + { + if (referenceUrl ==null || url == null) + return false; + boolean ret = url.equals(referenceUrl); + if (ret == true) + return true; + String relativeRefUrl = HTTP.toRelativeURL(referenceUrl, false); + ret = url.equals(relativeRefUrl); + if (ret == true) + return true; + return false; + } + + //////////////////////////////////////////////// + // SCPDURL + //////////////////////////////////////////////// + + private final static String SCPDURL = "SCPDURL"; + + public void setSCPDURL(String value) + { + getServiceNode().setNode(SCPDURL, value); + } + + public String getSCPDURL() + { + return getServiceNode().getNodeValue(SCPDURL); + } + + public boolean isSCPDURL(String url) + { + return isURL(getSCPDURL(), url); + } + + //////////////////////////////////////////////// + // controlURL + //////////////////////////////////////////////// + + private final static String CONTROL_URL = "controlURL"; + + public void setControlURL(String value) + { + getServiceNode().setNode(CONTROL_URL, value); + } + + public String getControlURL() + { + return getServiceNode().getNodeValue(CONTROL_URL); + } + + public boolean isControlURL(String url) + { + return isURL(getControlURL(), url); + } + + //////////////////////////////////////////////// + // eventSubURL + //////////////////////////////////////////////// + + private final static String EVENT_SUB_URL = "eventSubURL"; + + public void setEventSubURL(String value) + { + getServiceNode().setNode(EVENT_SUB_URL, value); + } + + public String getEventSubURL() + { + return getServiceNode().getNodeValue(EVENT_SUB_URL); + } + + public boolean isEventSubURL(String url) + { + return isURL(getEventSubURL(), url); + } + + //////////////////////////////////////////////// + // SCPD node + //////////////////////////////////////////////// + + public boolean loadSCPD(String scpdStr) throws InvalidDescriptionException + { + try { + Parser parser = UPnP.getXMLParser(); + Node scpdNode = parser.parse(scpdStr); + if (scpdNode == null) + return false; + ServiceData data = getServiceData(); + data.setSCPDNode(scpdNode); + } + catch (ParserException e) { + throw new InvalidDescriptionException(e); + } + return true; + } + + public boolean loadSCPD(File file) throws ParserException + { + Parser parser = UPnP.getXMLParser(); + Node scpdNode = parser.parse(file); + if (scpdNode == null) + return false; + ServiceData data = getServiceData(); + data.setSCPDNode(scpdNode); + return true; + } + + private Node getSCPDNode(URL scpdUrl) throws ParserException + { + Parser parser = UPnP.getXMLParser(); + return parser.parse(scpdUrl); + } + + private Node getSCPDNode(File scpdFile) throws ParserException + { + Parser parser = UPnP.getXMLParser(); + return parser.parse(scpdFile); + } + + private Node getSCPDNode() + { + ServiceData data = getServiceData(); + Node scpdNode = data.getSCPDNode(); + if (scpdNode != null) + return scpdNode; + + String scpdURLStr = getSCPDURL(); + try { + URL scpdUrl = new URL(scpdURLStr); + scpdNode = getSCPDNode(scpdUrl); + } + catch (Exception e1) { + Device rootDev = getRootDevice(); + String urlBaseStr = rootDev.getURLBase(); + // Thanks for Steven Yen (2003/09/03) + if (urlBaseStr == null || urlBaseStr.length() <= 0) { + String location = rootDev.getLocation(); + String locationHost = HTTP.getHost(location); + int locationPort = HTTP.getPort(location); + urlBaseStr = HTTP.getRequestHostURL(locationHost, locationPort); + } + scpdURLStr = HTTP.toRelativeURL(scpdURLStr); + String newScpdURLStr = urlBaseStr + scpdURLStr; + try { + URL newScpdURL = new URL(newScpdURLStr); + scpdNode = getSCPDNode(newScpdURL); + } + catch (Exception e2) { + newScpdURLStr = HTTP.getAbsoluteURL(urlBaseStr, scpdURLStr); + try { + URL newScpdURL = new URL(newScpdURLStr); + scpdNode = getSCPDNode(newScpdURL); + } + catch (Exception e3) { + newScpdURLStr = rootDev.getDescriptionFilePath() + scpdURLStr; + try { + scpdNode = getSCPDNode(new File(newScpdURLStr)); + } + catch (Exception e4) { + Debug.warning(e4); + } + } + } + } + + data.setSCPDNode(scpdNode); + + return scpdNode; + } + + public byte[] getSCPDData() + { + Node scpdNode = getSCPDNode(); + if (scpdNode == null) + return new byte[0]; + // Thanks for Mikael Hakman (04/25/05) + String desc = new String(); + desc += UPnP.XML_DECLARATION; + desc += "\n"; + desc += scpdNode.toString(); + return desc.getBytes(); + } + + //////////////////////////////////////////////// + // actionList + //////////////////////////////////////////////// + + public ActionList getActionList() + { + ActionList actionList = new ActionList(); + Node scdpNode = getSCPDNode(); + if (scdpNode == null) + return actionList; + Node actionListNode = scdpNode.getNode(ActionList.ELEM_NAME); + if (actionListNode == null) + return actionList; + Node serviceNode = getServiceNode(); + int nNode = actionListNode.getNNodes(); + for (int n=0; n and Stefano Lenzi +* - Changed postQuerylAction() to set the status code to the UPnPStatus. +* 11/09/04 +* - Theo Beisch +* - Changed StateVariable::setValue() to update and send the event when the value is not equal to the current value. +* 11/19/04 +* - Rick Keiner +* - Fixed setValue() to compare only when the current value is not null. +* 02/28/05 +* - Changed getAllowedValueList() to use AllowedValue instead of String as the member. +* +******************************************************************/ + +package org.cybergarage.upnp; + +import org.cybergarage.xml.*; +import org.cybergarage.util.*; + +import org.cybergarage.upnp.control.*; +import org.cybergarage.upnp.xml.*; + +public class StateVariable extends NodeData +{ + //////////////////////////////////////////////// + // Constants + //////////////////////////////////////////////// + + public final static String ELEM_NAME = "stateVariable"; + + //////////////////////////////////////////////// + // Member + //////////////////////////////////////////////// + + private Node stateVariableNode; + private Node serviceNode; + + public Node getServiceNode() + { + return serviceNode; + } + + public Service getService() + { + Node serviceNode = getServiceNode(); + if (serviceNode == null) + return null; + return new Service(serviceNode); + } + + public Node getStateVariableNode() + { + return stateVariableNode; + } + + //////////////////////////////////////////////// + // Constructor + //////////////////////////////////////////////// + + public StateVariable() + { + this.serviceNode = null; + this.stateVariableNode = new Node(); + } + + public StateVariable(Node serviceNode, Node stateVarNode) + { + this.serviceNode = serviceNode; + this.stateVariableNode = stateVarNode; + } + + //////////////////////////////////////////////// + // isStateVariableNode + //////////////////////////////////////////////// + + public static boolean isStateVariableNode(Node node) + { + return StateVariable.ELEM_NAME.equals(node.getName()); + } + + //////////////////////////////////////////////// + // name + //////////////////////////////////////////////// + + private final static String NAME = "name"; + + public void setName(String value) + { + getStateVariableNode().setNode(NAME, value); + } + + public String getName() + { + return getStateVariableNode().getNodeValue(NAME); + } + + //////////////////////////////////////////////// + // dataType + //////////////////////////////////////////////// + + private final static String DATATYPE = "dataType"; + + public void setDataType(String value) + { + getStateVariableNode().setNode(DATATYPE, value); + } + + public String getDataType() + { + return getStateVariableNode().getNodeValue(DATATYPE); + } + + //////////////////////////////////////////////// + // dataType + //////////////////////////////////////////////// + + private final static String SENDEVENTS = "sendEvents"; + private final static String SENDEVENTS_YES = "yes"; + private final static String SENDEVENTS_NO = "no"; + + public void setSendEvents(boolean state) + { + getStateVariableNode().setAttribute(SENDEVENTS, (state == true) ? SENDEVENTS_YES : SENDEVENTS_NO); + } + + public boolean isSendEvents() + { + String state = getStateVariableNode().getAttributeValue(SENDEVENTS); + if (state == null) + return false; + if (state.equalsIgnoreCase(SENDEVENTS_YES) == true) + return true; + return false; + } + + //////////////////////////////////////////////// + // set + //////////////////////////////////////////////// + + public void set(StateVariable stateVar) + { + setName(stateVar.getName()); + setValue(stateVar.getValue()); + setDataType(stateVar.getDataType()); + setSendEvents(stateVar.isSendEvents()); + } + + //////////////////////////////////////////////// + // UserData + //////////////////////////////////////////////// + + public StateVariableData getStateVariableData () + { + Node node = getStateVariableNode(); + StateVariableData userData = (StateVariableData)node.getUserData(); + if (userData == null) { + userData = new StateVariableData(); + node.setUserData(userData); + userData.setNode(node); + } + return userData; + } + + //////////////////////////////////////////////// + // Value + //////////////////////////////////////////////// + + public void setValue(String value) + { + // Thnaks for Tho Beisch (11/09/04) + String currValue = getStateVariableData().getValue(); + // Thnaks for Tho Rick Keiner (11/18/04) + if (currValue != null && currValue.equals(value) == true) + return; + + getStateVariableData().setValue(value); + + // notify event + Service service = getService(); + if (service == null) + return; + if (isSendEvents() == false) + return; + service.notify(this); + } + + public void setValue(int value) + { + setValue(Integer.toString(value)); + } + + public void setValue(long value) + { + setValue(Long.toString(value)); + } + + public String getValue() + { + return getStateVariableData().getValue(); + } + + //////////////////////////////////////////////// + // AllowedValueList + //////////////////////////////////////////////// + + public AllowedValueList getAllowedValueList() + { + AllowedValueList valueList= new AllowedValueList(); + Node valueListNode = getStateVariableNode().getNode(AllowedValueList.ELEM_NAME); + if (valueListNode == null) + return valueList; + int nNode = valueListNode.getNNodes(); + for (int n=0; n and Stefano Lenzi (07/09/04) + if (queryRes.isSuccessful() == false) { + setValue(queryRes.getReturnValue()); + return false; + } + setValue(queryRes.getReturnValue()); + return true; + } + + //////////////////////////////////////////////// + // UPnPStatus + //////////////////////////////////////////////// + + private UPnPStatus upnpStatus = new UPnPStatus(); + + public void setStatus(int code, String descr) + { + upnpStatus.setCode(code); + upnpStatus.setDescription(descr); + } + + public void setStatus(int code) + { + setStatus(code, UPnPStatus.code2String(code)); + } + + public UPnPStatus getStatus() + { + return upnpStatus; + } +} diff --git a/router/java/src/org/cybergarage/upnp/UPnP.java b/router/java/src/org/cybergarage/upnp/UPnP.java new file mode 100644 index 000000000..e27a5db40 --- /dev/null +++ b/router/java/src/org/cybergarage/upnp/UPnP.java @@ -0,0 +1,232 @@ +/****************************************************************** +* +* CyberUPnP for Java +* +* Copyright (C) Satoshi Konno 2002-2003 +* +* File: UPnP.java +* +* Revision; +* +* 11/18/02 +* - first revision. +* 05/13/03 +* - Added support for IPv6 and loopback address. +* 12/26/03 +* - Added support for XML Parser +* 06/18/03 +* - Added INMPR03 and INMPR03_VERSION. +* +******************************************************************/ + +package org.cybergarage.upnp; + +import org.cybergarage.upnp.ssdp.*; +//import org.cybergarage.util.*; +import org.cybergarage.xml.*; +import org.cybergarage.xml.parser.*; +import org.cybergarage.soap.*; +import org.cybergarage.net.*; + +public class UPnP +{ + //////////////////////////////////////////////// + // Constants + //////////////////////////////////////////////// + + public final static String NAME = "CyberLink"; + public final static String VERSION = "1.7"; + + public final static int SERVER_RETRY_COUNT = 100; + public final static int DEFAULT_EXPIRED_DEVICE_EXTRA_TIME = 60; + + public final static String getServerName() + { + String osName = System.getProperty("os.name"); + String osVer = System.getProperty("os.version"); + return osName + "/" + osVer + " UPnP/1.0 " + NAME + "/" + VERSION; + } + + public final static String INMPR03 = "INMPR03"; + public final static String INMPR03_VERSION = "1.0"; + public final static int INMPR03_DISCOVERY_OVER_WIRELESS_COUNT = 4; + + public final static String XML_DECLARATION = ""; + + //////////////////////////////////////////////// + // Enable / Disable + //////////////////////////////////////////////// + + public final static int USE_ONLY_IPV6_ADDR = 1; + public final static int USE_LOOPBACK_ADDR = 2; + public final static int USE_IPV6_LINK_LOCAL_SCOPE = 3; + public final static int USE_IPV6_SUBNET_SCOPE = 4; + public final static int USE_IPV6_ADMINISTRATIVE_SCOPE = 5; + public final static int USE_IPV6_SITE_LOCAL_SCOPE = 6; + public final static int USE_IPV6_GLOBAL_SCOPE = 7; + public final static int USE_SSDP_SEARCHRESPONSE_MULTIPLE_INTERFACES = 8; + public final static int USE_ONLY_IPV4_ADDR = 9; + + public final static void setEnable(int value) + { + switch (value) { + case USE_ONLY_IPV6_ADDR: + { + HostInterface.USE_ONLY_IPV6_ADDR = true; + } + break; + case USE_ONLY_IPV4_ADDR: + { + HostInterface.USE_ONLY_IPV4_ADDR = true; + } + break; + case USE_LOOPBACK_ADDR: + { + HostInterface.USE_LOOPBACK_ADDR = true; + } + break; + case USE_IPV6_LINK_LOCAL_SCOPE: + { + SSDP.setIPv6Address(SSDP.IPV6_LINK_LOCAL_ADDRESS); + } + break; + case USE_IPV6_SUBNET_SCOPE: + { + SSDP.setIPv6Address(SSDP.IPV6_SUBNET_ADDRESS); + } + break; + case USE_IPV6_ADMINISTRATIVE_SCOPE: + { + SSDP.setIPv6Address(SSDP.IPV6_ADMINISTRATIVE_ADDRESS); + } + break; + case USE_IPV6_SITE_LOCAL_SCOPE: + { + SSDP.setIPv6Address(SSDP.IPV6_SITE_LOCAL_ADDRESS); + } + break; + case USE_IPV6_GLOBAL_SCOPE: + { + SSDP.setIPv6Address(SSDP.IPV6_GLOBAL_ADDRESS); + } + break; + } + } + + public final static void setDisable(int value) + { + switch (value) { + case USE_ONLY_IPV6_ADDR: + { + HostInterface.USE_ONLY_IPV6_ADDR = false; + } + break; + case USE_ONLY_IPV4_ADDR: + { + HostInterface.USE_ONLY_IPV4_ADDR = false; + } + break; + case USE_LOOPBACK_ADDR: + { + HostInterface.USE_LOOPBACK_ADDR = false; + } + break; + } + } + + public final static boolean isEnabled(int value) + { + switch (value) { + case USE_ONLY_IPV6_ADDR: + { + return HostInterface.USE_ONLY_IPV6_ADDR; + } + case USE_ONLY_IPV4_ADDR: + { + return HostInterface.USE_ONLY_IPV4_ADDR; + } + case USE_LOOPBACK_ADDR: + { + return HostInterface.USE_LOOPBACK_ADDR; + } + } + return false; + } + + //////////////////////////////////////////////// + // UUID + //////////////////////////////////////////////// + + private static final String toUUID(int seed) + { + String id = Integer.toString((int)(seed & 0xFFFF), 16); + int idLen = id.length(); + String uuid = ""; + for (int n=0; n<(4-idLen); n++) + uuid += "0"; + uuid += id; + return uuid; + } + + public static final String createUUID() + { + long time1 = System.currentTimeMillis(); + long time2 = (long)((double)System.currentTimeMillis() * Math.random()); + return + toUUID((int)(time1 & 0xFFFF)) + "-" + + toUUID((int)((time1 >> 32) | 0xA000) & 0xFFFF) + "-" + + toUUID((int)(time2 & 0xFFFF)) + "-" + + toUUID((int)((time2 >> 32) | 0xE000) & 0xFFFF); + } + + //////////////////////////////////////////////// + // XML Parser + //////////////////////////////////////////////// + + private static Parser xmlParser; + + public final static void setXMLParser(Parser parser) + { + xmlParser = parser; + SOAP.setXMLParser(parser); + } + + public final static Parser getXMLParser() + { + return xmlParser; + } + + //////////////////////////////////////////////// + // Initialize + //////////////////////////////////////////////// + + static + { + //////////////////////////// + // Interface Option + //////////////////////////// + + setXMLParser(new JaxpParser()); + //setXMLParser(new kXML2Parser()); + + //////////////////////////// + // Interface Option + //////////////////////////// + /* + if (HostInterface.hasIPv6Addresses() == true) + setEnable(USE_ONLY_IPV6_ADDR); + */ + + //////////////////////////// + // Debug Option + //////////////////////////// + + //Debug.on(); + } + + public final static void initialize() + { + // Dummy function to call UPnP.static + } + +} diff --git a/router/java/src/org/cybergarage/upnp/UPnPStatus.java b/router/java/src/org/cybergarage/upnp/UPnPStatus.java new file mode 100644 index 000000000..f00ba6921 --- /dev/null +++ b/router/java/src/org/cybergarage/upnp/UPnPStatus.java @@ -0,0 +1,81 @@ +/****************************************************************** +* +* CyberUPnP for Java +* +* Copyright (C) Satoshi Konno 2002-2004 +* +* File: UPnPStatus.java +* +* Revision; +* +* 11/18/02 +* - first revision. +* 01/03/04 +* - Changed the class name from UPnPError to UPnPStatus. +* +******************************************************************/ + +package org.cybergarage.upnp; + +public class UPnPStatus +{ + //////////////////////////////////////////////// + // Code + //////////////////////////////////////////////// + + public static final int INVALID_ACTION = 401; + public static final int INVALID_ARGS = 402; + public static final int OUT_OF_SYNC = 403; + public static final int INVALID_VAR = 404; + public static final int PRECONDITION_FAILED = 412; + public static final int ACTION_FAILED = 501; + + public static final String code2String(int code) + { + switch (code) { + case INVALID_ACTION: return "Invalid Action"; + case INVALID_ARGS: return "Invalid Args"; + case OUT_OF_SYNC: return "Out of Sync"; + case INVALID_VAR: return "Invalid Var"; + case PRECONDITION_FAILED: return "Precondition Failed"; + case ACTION_FAILED: return "Action Failed"; + } + return ""; + } + + //////////////////////////////////////////////// + // Member + //////////////////////////////////////////////// + + private int code; + private String description; + + public UPnPStatus() + { + setCode(0); + setDescription(""); + } + + public UPnPStatus(int code, String desc) + { + setCode(code); + setDescription(desc); + } + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + +} diff --git a/router/java/src/org/cybergarage/upnp/control/ActionListener.java b/router/java/src/org/cybergarage/upnp/control/ActionListener.java new file mode 100644 index 000000000..40f9244b5 --- /dev/null +++ b/router/java/src/org/cybergarage/upnp/control/ActionListener.java @@ -0,0 +1,23 @@ +/****************************************************************** +* +* CyberUPnP for Java +* +* Copyright (C) Satoshi Konno 2002 +* +* File: ActionListener.java +* +* Revision; +* +* 01/16/03 +* - first revision. +* +******************************************************************/ + +package org.cybergarage.upnp.control; + +import org.cybergarage.upnp.*; + +public interface ActionListener +{ + public boolean actionControlReceived(Action action); +} diff --git a/router/java/src/org/cybergarage/upnp/control/ActionRequest.java b/router/java/src/org/cybergarage/upnp/control/ActionRequest.java new file mode 100644 index 000000000..e14db4b46 --- /dev/null +++ b/router/java/src/org/cybergarage/upnp/control/ActionRequest.java @@ -0,0 +1,145 @@ +/****************************************************************** +* +* CyberUPnP for Java +* +* Copyright (C) Satoshi Konno 2002 +* +* File: ControlRequest.java +* +* Revision; +* +* 01/29/03 +* - first revision. +* 05/09/05 +* - Changed getActionName() to return when the delimiter is not found. +* +******************************************************************/ + +package org.cybergarage.upnp.control; + +import org.cybergarage.http.*; +import org.cybergarage.xml.*; +import org.cybergarage.soap.*; + +import org.cybergarage.upnp.*; + +public class ActionRequest extends ControlRequest +{ + //////////////////////////////////////////////// + // Constructor + //////////////////////////////////////////////// + + public ActionRequest() + { + } + + public ActionRequest(HTTPRequest httpReq) + { + set(httpReq); + } + + //////////////////////////////////////////////// + // Action + //////////////////////////////////////////////// + + public Node getActionNode() + { + Node bodyNode = getBodyNode(); + if (bodyNode == null) + return null; + if (bodyNode.hasNodes() == false) + return null; + return bodyNode.getNode(0); + } + + public String getActionName() + { + Node node = getActionNode(); + if (node == null) + return ""; + String name = node.getName(); + if (name == null) + return ""; + int idx = name.indexOf(SOAP.DELIM)+1; + if (idx < 0) + return ""; + return name.substring(idx, name.length()); + } + + public ArgumentList getArgumentList() + { + Node actNode = getActionNode(); + int nArgNodes = actNode.getNNodes(); + ArgumentList argList = new ArgumentList(); + for (int n=0; n +* - Problem : Action Responses do not contain the mandatory header field EXT +* - Error : ActionResponse class does not set the EXT header +* +******************************************************************/ + +package org.cybergarage.upnp.control; + +import org.cybergarage.upnp.*; +import org.cybergarage.http.*; +import org.cybergarage.soap.*; +import org.cybergarage.xml.*; + +public class ActionResponse extends ControlResponse +{ + //////////////////////////////////////////////// + // Constructor + //////////////////////////////////////////////// + + public ActionResponse() + { + setHeader(HTTP.EXT, ""); + } + + public ActionResponse(SOAPResponse soapRes) + { + super(soapRes); + setHeader(HTTP.EXT, ""); + } + + + //////////////////////////////////////////////// + // Response + //////////////////////////////////////////////// + + public void setResponse(Action action) + { + setStatusCode(HTTPStatus.OK); + + Node bodyNode = getBodyNode(); + Node resNode = createResponseNode(action); + bodyNode.addNode(resNode); + + Node envNode = getEnvelopeNode(); + setContent(envNode); + } + + private Node createResponseNode(Action action) + { + String actionName = action.getName(); + Node actionNameResNode = new Node(SOAP.METHODNS + SOAP.DELIM + actionName + SOAP.RESPONSE); + + Service service = action.getService(); + if (service != null) { + actionNameResNode.setAttribute( + "xmlns:" + SOAP.METHODNS, + service.getServiceType()); + } + + ArgumentList argList = action.getArgumentList(); + int nArgs = argList.size(); + for (int n=0; n +* - Description: inserted a check at the beginning of the setRequestHost method +* - Problem : If the host does not start with a '/', the device could refuse the control action +* - Error : it is not an error, but adding the '/' when missing allows the integration with the Intel devices +* 09/02/03 +* - Giordano Sassaroli / Suzan Foster +* - Problem : NullpointerException thrown for devices whose description use absolute urls +* - Error : the presence of a base url is not mandatory, the API code makes the assumption that control and event subscription urls are relative. +* If the baseUrl is not present, the request host and port should be extracted from the control/subscription url +* - Description: The method setRequestHost/setService should be changed as follows +* 02/17/04 +* - Rob van den Boomen +* - Fixed to set a URLBase from the SSDP header when the URLBase of the description is null. +* 02/18/04 +* - Andre +* - The xml nodes controlUrl and eventSubUrl can contain absolut urls, but these absolut urls may have +* different ports than the base url! (so seen on my SMC 7004ABR Barricade Router, where xml files are +* requested from port 80, but soap requests are made on port 5440). Therefore whenever a request is made, +* the port specified by the controlUrl or eventSubUrl node should be used, else no response will be returned +* (oddly, there was a response returned even on port 80, but with empty body tags. but the correct response +* finally came from port 5440). +* - Fixed to get the port from the control url when it is absolute. +* 03/20/04 +* - Thanks for Thomas Schulz +* - Fixed setRequestHost() for Sony's UPnP stack when the URLBase has the path. +* +******************************************************************/ + +package org.cybergarage.upnp.control; + +import java.net.*; + +import org.cybergarage.http.*; +import org.cybergarage.soap.*; + +import org.cybergarage.upnp.*; + +public class ControlRequest extends SOAPRequest +{ + //////////////////////////////////////////////// + // Constructor + //////////////////////////////////////////////// + + public ControlRequest() + { + } + + public ControlRequest(HTTPRequest httpReq) + { + set(httpReq); + } + + //////////////////////////////////////////////// + // Query + //////////////////////////////////////////////// + + public boolean isQueryControl() + { + return isSOAPAction(Control.QUERY_SOAPACTION); + } + + public boolean isActionControl() + { + return !isQueryControl(); + } + + //////////////////////////////////////////////// + // setRequest + //////////////////////////////////////////////// + + protected void setRequestHost(Service service) + { + String ctrlURL = service.getControlURL(); + + // Thanks for Thomas Schulz (2004/03/20) + String urlBase = service.getRootDevice().getURLBase(); + if (urlBase != null && 0 < urlBase.length()){ + try { + URL url = new URL(urlBase); + String basePath = url.getPath(); + int baseLen = basePath.length(); + if (0 < baseLen) { + if (1 < baseLen || (basePath.charAt(0) != '/')) + ctrlURL = basePath + ctrlURL; + } + } + catch (MalformedURLException e) {} + } + + // Thanks for Giordano Sassaroli (05/21/03) + setURI(ctrlURL, true); + + // Thanks for Giordano Sassaroli and Suzan Foster (09/02/03) + // Thanks for Andre (02/18/04) + String postURL = ""; + if (HTTP.isAbsoluteURL(ctrlURL) == true) + postURL = ctrlURL; + + if (postURL == null || postURL.length() <= 0) + postURL = service.getRootDevice().getURLBase(); + + // Thanks for Rob van den Boomen (02/17/04) + // BUGFIX, set urlbase from location string if not set in description.xml + if (postURL == null || postURL.length() <= 0) + postURL = service.getRootDevice().getLocation(); + + String reqHost = HTTP.getHost(postURL); + int reqPort = HTTP.getPort(postURL); + + setHost(reqHost, reqPort); + setRequestHost(reqHost); + setRequestPort(reqPort); + } + +} diff --git a/router/java/src/org/cybergarage/upnp/control/ControlResponse.java b/router/java/src/org/cybergarage/upnp/control/ControlResponse.java new file mode 100644 index 000000000..36fcab89d --- /dev/null +++ b/router/java/src/org/cybergarage/upnp/control/ControlResponse.java @@ -0,0 +1,168 @@ +/****************************************************************** +* +* CyberUPnP for Java +* +* Copyright (C) Satoshi Konno 2002 +* +* File: ControlResponse.java +* +* Revision; +* +* 01/29/03 +* - first revision. +* +******************************************************************/ + +package org.cybergarage.upnp.control; + +import org.cybergarage.http.*; +import org.cybergarage.xml.*; +import org.cybergarage.soap.*; + +import org.cybergarage.upnp.*; + +public class ControlResponse extends SOAPResponse +{ + public static final String FAULT_CODE = "Client"; + public static final String FAULT_STRING = "UPnPError"; + + //////////////////////////////////////////////// + // Constructor + //////////////////////////////////////////////// + + public ControlResponse() + { + setServer(UPnP.getServerName()); + } + + public ControlResponse(SOAPResponse soapRes) + { + super(soapRes); + } + + //////////////////////////////////////////////// + // FaultResponse + //////////////////////////////////////////////// + + public void setFaultResponse(int errCode, String errDescr) + { + setStatusCode(HTTPStatus.INTERNAL_SERVER_ERROR); + + Node bodyNode = getBodyNode(); + Node faultNode = createFaultResponseNode(errCode, errDescr); + bodyNode.addNode(faultNode); + + Node envNode = getEnvelopeNode(); + setContent(envNode); + } + + public void setFaultResponse(int errCode) + { + setFaultResponse(errCode, UPnPStatus.code2String(errCode)); + } + + //////////////////////////////////////////////// + // createFaultResponseNode + //////////////////////////////////////////////// + + private Node createFaultResponseNode(int errCode, String errDescr) + { + // + Node faultNode = new Node(SOAP.XMLNS + SOAP.DELIM + SOAP.FAULT); + + // s:Client + Node faultCodeNode = new Node(SOAP.FAULT_CODE); + faultCodeNode.setValue(SOAP.XMLNS + SOAP.DELIM + FAULT_CODE); + faultNode.addNode(faultCodeNode); + + // UPnPError + Node faultStringNode = new Node(SOAP.FAULT_STRING); + faultStringNode.setValue(FAULT_STRING); + faultNode.addNode(faultStringNode); + + // + Node detailNode = new Node(SOAP.DETAIL); + faultNode.addNode(detailNode); + + // + Node upnpErrorNode = new Node(FAULT_STRING); + upnpErrorNode.setAttribute("xmlns", Control.XMLNS); + detailNode.addNode(upnpErrorNode); + + // error code + Node errorCodeNode = new Node(SOAP.ERROR_CODE); + errorCodeNode.setValue(errCode); + upnpErrorNode.addNode(errorCodeNode); + + // error string + Node errorDesctiprionNode = new Node(SOAP.ERROR_DESCRIPTION); + errorDesctiprionNode.setValue(errDescr); + upnpErrorNode.addNode(errorDesctiprionNode); + + return faultNode; + } + + //////////////////////////////////////////////// + // UPnP Error + //////////////////////////////////////////////// + + private UPnPStatus upnpErr = new UPnPStatus(); + + private Node getUPnPErrorNode() + { + Node detailNode = getFaultDetailNode(); + if (detailNode == null) + return null; + return detailNode.getNodeEndsWith(SOAP.UPNP_ERROR); + } + + private Node getUPnPErrorCodeNode() + { + Node errorNode = getUPnPErrorNode(); + if (errorNode == null) + return null; + return errorNode.getNodeEndsWith(SOAP.ERROR_CODE); + } + + private Node getUPnPErrorDescriptionNode() + { + Node errorNode = getUPnPErrorNode(); + if (errorNode == null) + return null; + return errorNode.getNodeEndsWith(SOAP.ERROR_DESCRIPTION); + } + + public int getUPnPErrorCode() + { + Node errorCodeNode = getUPnPErrorCodeNode(); + if (errorCodeNode == null) + return -1; + String errorCodeStr = errorCodeNode.getValue(); + try { + return Integer.parseInt(errorCodeStr); + } + catch (Exception e) { + return -1; + } + } + + public String getUPnPErrorDescription() + { + Node errorDescNode = getUPnPErrorDescriptionNode(); + if (errorDescNode == null) + return ""; + return errorDescNode.getValue(); + } + + public UPnPStatus getUPnPError() + { + int code = 0; + String desc = ""; + code = getUPnPErrorCode(); + desc = getUPnPErrorDescription(); + upnpErr.setCode(code); + upnpErr.setDescription(desc); + return upnpErr; + } + +} diff --git a/router/java/src/org/cybergarage/upnp/control/QueryListener.java b/router/java/src/org/cybergarage/upnp/control/QueryListener.java new file mode 100644 index 000000000..8af1ea13e --- /dev/null +++ b/router/java/src/org/cybergarage/upnp/control/QueryListener.java @@ -0,0 +1,25 @@ +/****************************************************************** +* +* CyberUPnP for Java +* +* Copyright (C) Satoshi Konno 2002-2003 +* +* File: QueryListener.java +* +* Revision; +* +* 01/30/03 +* - first revision. +* 01/04/04 +* - Changed the interface. +* +******************************************************************/ + +package org.cybergarage.upnp.control; + +import org.cybergarage.upnp.*; + +public interface QueryListener +{ + public boolean queryControlReceived(StateVariable stateVar); +} diff --git a/router/java/src/org/cybergarage/upnp/control/QueryRequest.java b/router/java/src/org/cybergarage/upnp/control/QueryRequest.java new file mode 100644 index 000000000..d222051fc --- /dev/null +++ b/router/java/src/org/cybergarage/upnp/control/QueryRequest.java @@ -0,0 +1,117 @@ +/****************************************************************** +* +* CyberUPnP for Java +* +* Copyright (C) Satoshi Konno 2002 +* +* File: QueryRequest.java +* +* Revision; +* +* 01/29/03 +* - first revision. +* 09/02/03 +* - Giordano Sassaroli +* - Error : redundant code, the setRequest method in QueryRequest invokes setURI even if after a couple of rows setRequestHost is invoked +* +******************************************************************/ + +package org.cybergarage.upnp.control; + +import org.cybergarage.http.*; +import org.cybergarage.xml.*; +import org.cybergarage.soap.*; + +import org.cybergarage.upnp.*; + +public class QueryRequest extends ControlRequest +{ + //////////////////////////////////////////////// + // Constructor + //////////////////////////////////////////////// + + public QueryRequest() + { + } + + public QueryRequest(HTTPRequest httpReq) + { + set(httpReq); + } + + //////////////////////////////////////////////// + // Qyery + //////////////////////////////////////////////// + + private Node getVarNameNode() + { + Node bodyNode = getBodyNode(); + if (bodyNode == null) + return null; + if (bodyNode.hasNodes() == false) + return null; + Node queryStateVarNode = bodyNode.getNode(0); + if (queryStateVarNode == null) + return null; + if (queryStateVarNode.hasNodes() == false) + return null; + return queryStateVarNode.getNode(0); + } + + public String getVarName() + { + Node node = getVarNameNode(); + if (node == null) + return ""; + return node.getValue(); + } + + //////////////////////////////////////////////// + // setRequest + //////////////////////////////////////////////// + + public void setRequest(StateVariable stateVar) + { + Service service = stateVar.getService(); + + setRequestHost(service); + + setEnvelopeNode(SOAP.createEnvelopeBodyNode()); + Node envNode = getEnvelopeNode(); + Node bodyNode = getBodyNode(); + Node qeuryNode = createContentNode(stateVar); + bodyNode.addNode(qeuryNode); + setContent(envNode); + + setSOAPAction(Control.QUERY_SOAPACTION); + } + + //////////////////////////////////////////////// + // Contents + //////////////////////////////////////////////// + + private Node createContentNode(StateVariable stateVar) + { + Node queryVarNode = new Node(); + queryVarNode.setName(Control.NS, Control.QUERY_STATE_VARIABLE); + queryVarNode.setNameSpace(Control.NS, Control.XMLNS); + + Node varNode = new Node(); + varNode.setName(Control.NS, Control.VAR_NAME); + varNode.setValue(stateVar.getName()); + queryVarNode.addNode(varNode); + + return queryVarNode; + } + + //////////////////////////////////////////////// + // post + //////////////////////////////////////////////// + + public QueryResponse post() + { + SOAPResponse soapRes = postMessage(getRequestHost(), getRequestPort()); + return new QueryResponse(soapRes); + } +} + diff --git a/router/java/src/org/cybergarage/upnp/control/QueryResponse.java b/router/java/src/org/cybergarage/upnp/control/QueryResponse.java new file mode 100644 index 000000000..75ba30c84 --- /dev/null +++ b/router/java/src/org/cybergarage/upnp/control/QueryResponse.java @@ -0,0 +1,97 @@ +/****************************************************************** +* +* CyberUPnP for Java +* +* Copyright (C) Satoshi Konno 2002 +* +* File: QueryResponse.java +* +* Revision; +* +* 01/30/03 +* - first revision. +* +******************************************************************/ + +package org.cybergarage.upnp.control; + +import org.cybergarage.upnp.*; +import org.cybergarage.http.*; +import org.cybergarage.soap.*; +import org.cybergarage.xml.*; + +public class QueryResponse extends ControlResponse +{ + //////////////////////////////////////////////// + // Constructor + //////////////////////////////////////////////// + + public QueryResponse() + { + } + + public QueryResponse(SOAPResponse soapRes) + { + super(soapRes); + } + + //////////////////////////////////////////////// + // Qyery + //////////////////////////////////////////////// + + private Node getReturnNode() + { + Node bodyNode = getBodyNode(); + if (bodyNode == null) + return null; + if (bodyNode.hasNodes() == false) + return null; + Node queryResNode = bodyNode.getNode(0); + if (queryResNode == null) + return null; + if (queryResNode.hasNodes() == false) + return null; + return queryResNode.getNode(0); + } + + public String getReturnValue() + { + Node node = getReturnNode(); + if (node == null) + return ""; + return node.getValue(); + } + + //////////////////////////////////////////////// + // Response + //////////////////////////////////////////////// + + public void setResponse(StateVariable stateVar) + { + String var = stateVar.getValue(); + + setStatusCode(HTTPStatus.OK); + + Node bodyNode = getBodyNode(); + Node resNode = createResponseNode(var); + bodyNode.addNode(resNode); + + Node envNodee = getEnvelopeNode(); + setContent(envNodee); + + } + + private Node createResponseNode(String var) + { + Node queryResNode = new Node(); + queryResNode.setName(Control.NS, Control.QUERY_STATE_VARIABLE_RESPONSE); + queryResNode.setNameSpace(Control.NS, Control.XMLNS); + + Node returnNode = new Node(); + returnNode.setName(Control.RETURN); + returnNode.setValue(var); + queryResNode.addNode(returnNode); + + return queryResNode; + } +} diff --git a/router/java/src/org/cybergarage/upnp/control/RenewSubscriber.java b/router/java/src/org/cybergarage/upnp/control/RenewSubscriber.java new file mode 100644 index 000000000..7b8d2e059 --- /dev/null +++ b/router/java/src/org/cybergarage/upnp/control/RenewSubscriber.java @@ -0,0 +1,65 @@ +/****************************************************************** +* +* CyberUPnP for Java +* +* Copyright (C) Satoshi Konno 2002 +* +* File: RenewSubscriber.java +* +* Revision: +* +* 07/07/04 +* - first revision. +* +******************************************************************/ + +package org.cybergarage.upnp.control; + +import org.cybergarage.util.*; +import org.cybergarage.upnp.*; + +public class RenewSubscriber extends ThreadCore +{ + public final static long INTERVAL = 120; + + //////////////////////////////////////////////// + // Constructor + //////////////////////////////////////////////// + + public RenewSubscriber(ControlPoint ctrlp) + { + setControlPoint(ctrlp); + } + + //////////////////////////////////////////////// + // Member + //////////////////////////////////////////////// + + private ControlPoint ctrlPoint; + + public void setControlPoint(ControlPoint ctrlp) + { + ctrlPoint = ctrlp; + } + + public ControlPoint getControlPoint() + { + return ctrlPoint; + } + + //////////////////////////////////////////////// + // Thread + //////////////////////////////////////////////// + + public void run() + { + ControlPoint ctrlp = getControlPoint(); + long renewInterval = INTERVAL * 1000; + while (isRunnable() == true) { + try { + Thread.sleep(renewInterval); + } catch (InterruptedException e) {} + ctrlp.renewSubscriberService(); + } + } +} diff --git a/router/java/src/org/cybergarage/upnp/device/Advertiser.java b/router/java/src/org/cybergarage/upnp/device/Advertiser.java new file mode 100644 index 000000000..373fea82d --- /dev/null +++ b/router/java/src/org/cybergarage/upnp/device/Advertiser.java @@ -0,0 +1,68 @@ +/****************************************************************** +* +* CyberUPnP for Java +* +* Copyright (C) Satoshi Konno 2002 +* +* File: Advertiser.java +* +* Revision; +* +* 12/24/03 +* - first revision. +* 06/18/04 +* - Changed to advertise every 25%-50% of the periodic notification cycle for NMPR; +* +******************************************************************/ + +package org.cybergarage.upnp.device; + +import org.cybergarage.util.*; +import org.cybergarage.upnp.*; + +public class Advertiser extends ThreadCore +{ + //////////////////////////////////////////////// + // Constructor + //////////////////////////////////////////////// + + public Advertiser(Device dev) + { + setDevice(dev); + } + + //////////////////////////////////////////////// + // Member + //////////////////////////////////////////////// + + private Device device; + + public void setDevice(Device dev) + { + device = dev; + } + + public Device getDevice() + { + return device; + } + + //////////////////////////////////////////////// + // Thread + //////////////////////////////////////////////// + + public void run() + { + Device dev = getDevice(); + long leaseTime = dev.getLeaseTime(); + long notifyInterval; + while (isRunnable() == true) { + notifyInterval = (leaseTime/4) + (long)((float)leaseTime * (Math.random() * 0.25f)); + notifyInterval *= 1000; + try { + Thread.sleep(notifyInterval); + } catch (InterruptedException e) {} + dev.announce(); + } + } +} diff --git a/router/java/src/org/cybergarage/upnp/device/Description.java b/router/java/src/org/cybergarage/upnp/device/Description.java new file mode 100644 index 000000000..fe42dc5ea --- /dev/null +++ b/router/java/src/org/cybergarage/upnp/device/Description.java @@ -0,0 +1,24 @@ +/****************************************************************** +* +* CyberUPnP for Java +* +* Copyright (C) Satoshi Konno 2002 +* +* File: MAN.java +* +* Revision; +* +* 12/30/02 +* - first revision. +* +******************************************************************/ + +package org.cybergarage.upnp.device; + +public class Description +{ + public final static String LOADING_EXCEPTION = "Couldn't load a specified description file "; + public final static String NOROOT_EXCEPTION = "Couldn't find a root node"; + public final static String NOROOTDEVICE_EXCEPTION = "Couldn't find a root device node"; +} + diff --git a/router/java/src/org/cybergarage/upnp/device/DeviceChangeListener.java b/router/java/src/org/cybergarage/upnp/device/DeviceChangeListener.java new file mode 100644 index 000000000..fc76020ab --- /dev/null +++ b/router/java/src/org/cybergarage/upnp/device/DeviceChangeListener.java @@ -0,0 +1,27 @@ +/****************************************************************** +* +* CyberLink for Java +* +* Copyright (C) Satoshi Konno 2002-2004 +* +* File: DeviceChangeListener.java +* +* Revision; +* +* 09/12/04 +* - Oliver Newell +* - Added this class to allow ControlPoint applications to +* be notified when the ControlPoint base class adds/removes +* a UPnP device +* +******************************************************************/ + +package org.cybergarage.upnp.device; + +import org.cybergarage.upnp.Device; + +public interface DeviceChangeListener +{ + public void deviceAdded( Device dev ); + public void deviceRemoved( Device dev ); +} diff --git a/router/java/src/org/cybergarage/upnp/device/Disposer.java b/router/java/src/org/cybergarage/upnp/device/Disposer.java new file mode 100644 index 000000000..e6c0ddb8e --- /dev/null +++ b/router/java/src/org/cybergarage/upnp/device/Disposer.java @@ -0,0 +1,65 @@ +/****************************************************************** +* +* CyberLink for Java +* +* Copyright (C) Satoshi Konno 2002-2004 +* +* File: Disposer.java +* +* Revision: +* +* 01/05/04 +* - first revision. +* +******************************************************************/ + +package org.cybergarage.upnp.device; + +import org.cybergarage.upnp.*; +import org.cybergarage.util.*; + +public class Disposer extends ThreadCore +{ + //////////////////////////////////////////////// + // Constructor + //////////////////////////////////////////////// + + public Disposer(ControlPoint ctrlp) + { + setControlPoint(ctrlp); + } + + //////////////////////////////////////////////// + // Member + //////////////////////////////////////////////// + + private ControlPoint ctrlPoint; + + public void setControlPoint(ControlPoint ctrlp) + { + ctrlPoint = ctrlp; + } + + public ControlPoint getControlPoint() + { + return ctrlPoint; + } + + //////////////////////////////////////////////// + // Thread + //////////////////////////////////////////////// + + public void run() + { + ControlPoint ctrlp = getControlPoint(); + long monitorInterval = ctrlp.getExpiredDeviceMonitoringInterval() * 1000; + + while (isRunnable() == true) { + try { + Thread.sleep(monitorInterval); + } catch (InterruptedException e) {} + ctrlp.removeExpiredDevices(); + //ctrlp.print(); + } + } +} diff --git a/router/java/src/org/cybergarage/upnp/device/InvalidDescriptionException.java b/router/java/src/org/cybergarage/upnp/device/InvalidDescriptionException.java new file mode 100644 index 000000000..a08b3a393 --- /dev/null +++ b/router/java/src/org/cybergarage/upnp/device/InvalidDescriptionException.java @@ -0,0 +1,43 @@ +/****************************************************************** +* +* CyberUPnP for Java +* +* Copyright (C) Satoshi Konno 2002 +* +* File: InvalidDescriptionException.java +* +* Revision; +* +* 12/26/02 +* - first revision. +* +******************************************************************/ + +package org.cybergarage.upnp.device; + +import java.io.*; + +public class InvalidDescriptionException extends Exception +{ + private static final long serialVersionUID = -3144583349586910509L; + + public InvalidDescriptionException() + { + super(); + } + + public InvalidDescriptionException(String s) + { + super(s); + } + + public InvalidDescriptionException(String s, File file) + { + super(s + " (" + file.toString() + ")"); + } + + public InvalidDescriptionException(Exception e) + { + super(e.getMessage()); + } +} diff --git a/router/java/src/org/cybergarage/upnp/device/MAN.java b/router/java/src/org/cybergarage/upnp/device/MAN.java new file mode 100644 index 000000000..1e0093f74 --- /dev/null +++ b/router/java/src/org/cybergarage/upnp/device/MAN.java @@ -0,0 +1,31 @@ +/****************************************************************** +* +* CyberUPnP for Java +* +* Copyright (C) Satoshi Konno 2002 +* +* File: MAN.java +* +* Revision; +* +* 12/30/02 +* - first revision. +* +******************************************************************/ + +package org.cybergarage.upnp.device; + +public class MAN +{ + public final static String DISCOVER = "ssdp:discover"; + + public final static boolean isDiscover(String value) + { + if (value == null) + return false; + if (value.equals(MAN.DISCOVER) == true) + return true; + return value.equals("\"" + MAN.DISCOVER + "\""); + } +} + diff --git a/router/java/src/org/cybergarage/upnp/device/NT.java b/router/java/src/org/cybergarage/upnp/device/NT.java new file mode 100644 index 000000000..1acb0d490 --- /dev/null +++ b/router/java/src/org/cybergarage/upnp/device/NT.java @@ -0,0 +1,30 @@ +/****************************************************************** +* +* CyberUPnP for Java +* +* Copyright (C) Satoshi Konno 2002 +* +* File: NT.java +* +* Revision; +* +* 12/09/02 +* - first revision. +* +******************************************************************/ + +package org.cybergarage.upnp.device; + +public class NT +{ + public final static String ROOTDEVICE = "upnp:rootdevice"; + public final static String EVENT = "upnp:event"; + + public final static boolean isRootDevice(String ntValue) + { + if (ntValue == null) + return false; + return ntValue.startsWith(ROOTDEVICE); + } +} + diff --git a/router/java/src/org/cybergarage/upnp/device/NTS.java b/router/java/src/org/cybergarage/upnp/device/NTS.java new file mode 100644 index 000000000..7eab5f19c --- /dev/null +++ b/router/java/src/org/cybergarage/upnp/device/NTS.java @@ -0,0 +1,38 @@ +/****************************************************************** +* +* CyberUPnP for Java +* +* Copyright (C) Satoshi Konno 2002 +* +* File: NTS.java +* +* Revision; +* +* 12/09/02 +* - first revision. +* +******************************************************************/ + +package org.cybergarage.upnp.device; + +public class NTS +{ + public final static String ALIVE = "ssdp:alive"; + public final static String BYEBYE = "ssdp:byebye"; + public final static String PROPCHANGE = "upnp:propchange"; + + public final static boolean isAlive(String ntsValue) + { + if (ntsValue == null) + return false; + return ntsValue.startsWith(NTS.ALIVE); + } + + public final static boolean isByeBye(String ntsValue) + { + if (ntsValue == null) + return false; + return ntsValue.startsWith(NTS.BYEBYE); + } +} + diff --git a/router/java/src/org/cybergarage/upnp/device/NotifyListener.java b/router/java/src/org/cybergarage/upnp/device/NotifyListener.java new file mode 100644 index 000000000..bac853ea5 --- /dev/null +++ b/router/java/src/org/cybergarage/upnp/device/NotifyListener.java @@ -0,0 +1,23 @@ +/****************************************************************** +* +* CyberUPnP for Java +* +* Copyright (C) Satoshi Konno 2002 +* +* File: DeviceNotifyListener.java +* +* Revision; +* +* 11/18/02 +* - first revision. +* +******************************************************************/ + +package org.cybergarage.upnp.device; + +import org.cybergarage.upnp.ssdp.*; + +public interface NotifyListener +{ + public void deviceNotifyReceived(SSDPPacket ssdpPacket); +} diff --git a/router/java/src/org/cybergarage/upnp/device/ST.java b/router/java/src/org/cybergarage/upnp/device/ST.java new file mode 100644 index 000000000..dcbfaf8ce --- /dev/null +++ b/router/java/src/org/cybergarage/upnp/device/ST.java @@ -0,0 +1,71 @@ +/****************************************************************** +* +* CyberUPnP for Java +* +* Copyright (C) Satoshi Konno 2002-2003 +* +* File: ST.java +* +* Revision; +* +* 01/07/03 +* - first revision. +* +******************************************************************/ + +package org.cybergarage.upnp.device; + +public class ST +{ + public final static String ALL_DEVICE = "ssdp:all"; + public final static String ROOT_DEVICE = "upnp:rootdevice"; + public final static String UUID_DEVICE = "uuid"; + public final static String URN_DEVICE = "urn:schemas-upnp-org:device:"; + public final static String URN_SERVICE = "urn:schemas-upnp-org:service:"; + + public final static boolean isAllDevice(String value) + { + if (value == null) + return false; + if (value.equals(ALL_DEVICE) == true) + return true; + return value.equals("\"" + ALL_DEVICE + "\""); + } + + public final static boolean isRootDevice(String value) + { + if (value == null) + return false; + if (value.equals(ROOT_DEVICE) == true) + return true; + return value.equals("\"" + ROOT_DEVICE + "\""); + } + + public final static boolean isUUIDDevice(String value) + { + if (value == null) + return false; + if (value.startsWith(UUID_DEVICE) == true) + return true; + return value.startsWith("\"" + UUID_DEVICE); + } + + public final static boolean isURNDevice(String value) + { + if (value == null) + return false; + if (value.startsWith(URN_DEVICE) == true) + return true; + return value.startsWith("\"" + URN_DEVICE); + } + + public final static boolean isURNService(String value) + { + if (value == null) + return false; + if (value.startsWith(URN_SERVICE) == true) + return true; + return value.startsWith("\"" + URN_SERVICE); + } +} + diff --git a/router/java/src/org/cybergarage/upnp/device/SearchListener.java b/router/java/src/org/cybergarage/upnp/device/SearchListener.java new file mode 100644 index 000000000..758a37c27 --- /dev/null +++ b/router/java/src/org/cybergarage/upnp/device/SearchListener.java @@ -0,0 +1,23 @@ +/****************************************************************** +* +* CyberUPnP for Java +* +* Copyright (C) Satoshi Konno 2002 +* +* File: SearchListener.java +* +* Revision; +* +* 11/18/02b +* - first revision. +* +******************************************************************/ + +package org.cybergarage.upnp.device; + +import org.cybergarage.upnp.ssdp.*; + +public interface SearchListener +{ + public void deviceSearchReceived(SSDPPacket ssdpPacket); +} diff --git a/router/java/src/org/cybergarage/upnp/device/SearchResponseListener.java b/router/java/src/org/cybergarage/upnp/device/SearchResponseListener.java new file mode 100644 index 000000000..c87c41a37 --- /dev/null +++ b/router/java/src/org/cybergarage/upnp/device/SearchResponseListener.java @@ -0,0 +1,23 @@ +/****************************************************************** +* +* CyberUPnP for Java +* +* Copyright (C) Satoshi Konno 2002 +* +* File: SearchResponseListener.java +* +* Revision; +* +* 11/18/02 +* - first revision. +* +******************************************************************/ + +package org.cybergarage.upnp.device; + +import org.cybergarage.upnp.ssdp.*; + +public interface SearchResponseListener +{ + public void deviceSearchResponseReceived(SSDPPacket ssdpPacket); +} diff --git a/router/java/src/org/cybergarage/upnp/device/USN.java b/router/java/src/org/cybergarage/upnp/device/USN.java new file mode 100644 index 000000000..74c704027 --- /dev/null +++ b/router/java/src/org/cybergarage/upnp/device/USN.java @@ -0,0 +1,40 @@ +/****************************************************************** +* +* CyberUPnP for Java +* +* Copyright (C) Satoshi Konno 2002 +* +* File: USN.java +* +* Revision; +* +* 12/09/02 +* - first revision. +* +******************************************************************/ + +package org.cybergarage.upnp.device; + +public class USN +{ + public final static String ROOTDEVICE = "upnp:rootdevice"; + + public final static boolean isRootDevice(String usnValue) + { + if (usnValue == null) + return false; + return usnValue.endsWith(ROOTDEVICE); + } + + public final static String getUDN(String usnValue) + { + if (usnValue == null) + return ""; + int idx = usnValue.indexOf("::"); + if (idx < 0) + return usnValue.trim(); + String udnValue = new String(usnValue.getBytes(), 0, idx); + return udnValue.trim(); + } +} + diff --git a/router/java/src/org/cybergarage/upnp/event/EventListener.java b/router/java/src/org/cybergarage/upnp/event/EventListener.java new file mode 100644 index 000000000..900b9307c --- /dev/null +++ b/router/java/src/org/cybergarage/upnp/event/EventListener.java @@ -0,0 +1,21 @@ +/****************************************************************** +* +* CyberUPnP for Java +* +* Copyright (C) Satoshi Konno 2002-2003 +* +* File: EventListener.java +* +* Revision; +* +* 11/18/02 +* - first revision. +* +******************************************************************/ + +package org.cybergarage.upnp.event; + +public interface EventListener +{ + public void eventNotifyReceived(String uuid, long seq, String varName, String value); +} diff --git a/router/java/src/org/cybergarage/upnp/event/NotifyRequest.java b/router/java/src/org/cybergarage/upnp/event/NotifyRequest.java new file mode 100644 index 000000000..c8891e1d2 --- /dev/null +++ b/router/java/src/org/cybergarage/upnp/event/NotifyRequest.java @@ -0,0 +1,187 @@ +/****************************************************************** +* +* CyberUPnP for Java +* +* Copyright (C) Satoshi Konno 2002 +* +* File: SOAPRequest.java +* +* Revision; +* +* 12/11/02 +* - first revision. +* 05/22/03 +* - Giordano Sassaroli +* - Description: removed the xml namespace +* - Problem : Notification messages refer to uncorrect variable names +* - Error : The NotifyRequest class introduces the XML namespace in variable names, too +* 05/22/03 +* - Giordano Sassaroli +* - Problem : Notification messages refer to uncorrect variable names +* - Error : The NotifyRequest class introduces the XML namespace in variable names, too +* - Description : removed the xml namespace +* 09/03/03 +* - Giordano Sassaroli +* - Problem : Notification messages refer to uncorrect variable names +* - Error : The NotifyRequest class introduces the XML namespace in variable names, too +* - Description: removed the xml namespace +* 09/08/03 +* - Giordano Sassaroli +* - Problem : when an event notification message is received and the message +* contains updates on more than one variable, only the first variable update +* is notified. +* - Error : the other xml nodes of the message are ignored +* - Fix : add two methods to the NotifyRequest for extracting the property array +* and modify the httpRequestRecieved method in ControlPoint +* +******************************************************************/ + +package org.cybergarage.upnp.event; + +import org.cybergarage.http.*; +import org.cybergarage.xml.*; +import org.cybergarage.soap.*; + +import org.cybergarage.upnp.device.*; + +public class NotifyRequest extends SOAPRequest +{ + private final static String XMLNS = "e"; + private final static String PROPERTY = "property"; + private final static String PROPERTYSET = "propertyset"; + + //////////////////////////////////////////////// + // Constructor + //////////////////////////////////////////////// + + public NotifyRequest() + { + } + + public NotifyRequest(HTTPRequest httpReq) + { + set(httpReq); + } + + //////////////////////////////////////////////// + // NT + //////////////////////////////////////////////// + + public void setNT(String value) + { + setHeader(HTTP.NT, value); + } + + //////////////////////////////////////////////// + // NTS + //////////////////////////////////////////////// + + public void setNTS(String value) + { + setHeader(HTTP.NTS, value); + } + + //////////////////////////////////////////////// + // SID + //////////////////////////////////////////////// + + public void setSID(String id) + { + setHeader(HTTP.SID, Subscription.toSIDHeaderString(id)); + } + + public String getSID() + { + return Subscription.getSID(getHeaderValue(HTTP.SID)); + } + + //////////////////////////////////////////////// + // SEQ + //////////////////////////////////////////////// + + public void setSEQ(long value) + { + setHeader(HTTP.SEQ, Long.toString(value)); + } + + public long getSEQ() + { + return getLongHeaderValue(HTTP.SEQ); + } + + //////////////////////////////////////////////// + // Constructor + //////////////////////////////////////////////// + + public boolean setRequest(Subscriber sub, String varName, String value) + { + String sid = sub.getSID(); + long notifyCnt = sub.getNotifyCount(); + String host = sub.getDeliveryHost(); + String path = sub.getDeliveryPath(); + int port = sub.getDeliveryPort(); + + setMethod(HTTP.NOTIFY); + setURI(path); + setHost(host, port); + setNT(NT.EVENT); + setNTS(NTS.PROPCHANGE); + setSID(sid); + setSEQ(notifyCnt); + + setContentType(XML.CONTENT_TYPE); + Node propSetNode = createPropertySetNode(varName, value); + setContent(propSetNode); + + return true; + } + + private Node createPropertySetNode(String varName, String value) + { + Node propSetNode = new Node(/*XMLNS + SOAP.DELIM + */PROPERTYSET); + + propSetNode.setNameSpace(XMLNS, Subscription.XMLNS); + + Node propNode = new Node(/*XMLNS + SOAP.DELIM + */PROPERTY); + propSetNode.addNode(propNode); + + // Thanks for Giordano Sassaroli (05/22/03) + //Node varNameNode = new Node(XMLNS + SOAP.DELIM + varName); + Node varNameNode = new Node(varName); + varNameNode.setValue(value); + propNode.addNode(varNameNode); + + return propSetNode; + } + + // Thanks for Giordano Sassaroli (09/08/03) + private Property getProperty(Node varNode) + { + Property prop = new Property(); + if (varNode == null) + return prop; + // remove the event namespace + String variableName = varNode.getName(); + int index = variableName.lastIndexOf(':'); + if (index != -1) + variableName = variableName.substring(index + 1); + prop.setName(variableName); + prop.setValue(varNode.getValue()); + return prop; + } + + // Thanks for Giordano Sassaroli (09/08/03) + public PropertyList getPropertyList() { + PropertyList properties = new PropertyList(); + Node varSetNode = getEnvelopeNode(); + for (int i = 0; i +* - Problem : the setName method does not set the name of the property +* - Error : the method contains a bug: +* 06/18/03 +* - Fixed a bug when a null value is received to the name and the value of property. +* +******************************************************************/ + +package org.cybergarage.upnp.event; + +public class Property +{ + //////////////////////////////////////////////// + // Constructor + //////////////////////////////////////////////// + + public Property() + { + } + + //////////////////////////////////////////////// + // name + //////////////////////////////////////////////// + + private String name = ""; + + public String getName() { + return name; + } + + public void setName(String val) { + if (val == null) + val = ""; + name = val; + } + + //////////////////////////////////////////////// + // value + //////////////////////////////////////////////// + + private String value = ""; + + public String getValue() { + return value; + } + + public void setValue(String val) { + if (val == null) + val = ""; + value = val; + } +} diff --git a/router/java/src/org/cybergarage/upnp/event/PropertyList.java b/router/java/src/org/cybergarage/upnp/event/PropertyList.java new file mode 100644 index 000000000..f890bb3af --- /dev/null +++ b/router/java/src/org/cybergarage/upnp/event/PropertyList.java @@ -0,0 +1,46 @@ +/****************************************************************** +* +* CyberUPnP for Java +* +* Copyright (C) Satoshi Konno 2002 +* +* File: PropertyList.java +* +* Revision; +* +* 09/08/03 +* - first revision. +* +******************************************************************/ + +package org.cybergarage.upnp.event; + +import java.util.*; + +public class PropertyList extends Vector +{ + //////////////////////////////////////////////// + // Constants + //////////////////////////////////////////////// + + private static final long serialVersionUID = 8718064210738306226L; + public final static String ELEM_NAME = "PropertyList"; + + //////////////////////////////////////////////// + // Constructor + //////////////////////////////////////////////// + + public PropertyList() + { + } + + //////////////////////////////////////////////// + // Methods + //////////////////////////////////////////////// + + public Property getProperty(int n) + { + return (Property)get(n); + } +} + diff --git a/router/java/src/org/cybergarage/upnp/event/Subscriber.java b/router/java/src/org/cybergarage/upnp/event/Subscriber.java new file mode 100644 index 000000000..8ade71c72 --- /dev/null +++ b/router/java/src/org/cybergarage/upnp/event/Subscriber.java @@ -0,0 +1,180 @@ +/****************************************************************** +* +* CyberUPnP for Java +* +* Copyright (C) Satoshi Konno 2002 +* +* File: Subscriber.java +* +* Revision; +* +* 01/29/03 +* - first revision. +* 07/31/04 +* - Added isExpired(). +* 10/26/04 +* - Oliver Newell +* - Added support the intinite time and fixed a bug in isExpired(). +* +******************************************************************/ + +package org.cybergarage.upnp.event; + +import java.net.*; + +public class Subscriber +{ + //////////////////////////////////////////////// + // Constructor + //////////////////////////////////////////////// + + public Subscriber() + { + renew(); + } + + //////////////////////////////////////////////// + // SID + //////////////////////////////////////////////// + + private String SID = null; + + public String getSID() { + return SID; + } + + public void setSID(String sid) { + SID = sid; + } + + //////////////////////////////////////////////// + // deliveryURL + //////////////////////////////////////////////// + + private String ifAddr = ""; + + public void setInterfaceAddress(String addr) + { + ifAddr = addr; + } + + public String getInterfaceAddress() + { + return ifAddr; + } + + //////////////////////////////////////////////// + // deliveryURL + //////////////////////////////////////////////// + + private String deliveryURL = ""; + + public String getDeliveryURL() { + return deliveryURL; + } + + public void setDeliveryURL(String deliveryURL) { + this.deliveryURL = deliveryURL; + try { + URL url = new URL(deliveryURL); + deliveryHost = url.getHost(); + deliveryPath = url.getPath(); + deliveryPort = url.getPort(); + } + catch (Exception e) {} + } + + private String deliveryHost = ""; + private String deliveryPath = ""; + private int deliveryPort = 0; + + public String getDeliveryHost() { + return deliveryHost; + } + + public String getDeliveryPath() { + return deliveryPath; + } + + public int getDeliveryPort() { + return deliveryPort; + } + + + //////////////////////////////////////////////// + // Timeout + //////////////////////////////////////////////// + + private long timeOut = 0; + + public long getTimeOut() { + return timeOut; + } + + public void setTimeOut(long value) { + timeOut = value; + } + + public boolean isExpired() + { + long currTime = System.currentTimeMillis(); + + // Thanks for Oliver Newell (10/26/04) + if(timeOut == Subscription.INFINITE_VALUE ) + return false; + + // Thanks for Oliver Newell (10/26/04) + long expiredTime = getSubscriptionTime() + getTimeOut()*1000; + if (expiredTime < currTime) + return true; + + return false; + } + + //////////////////////////////////////////////// + // SubscriptionTIme + //////////////////////////////////////////////// + + private long subscriptionTime = 0; + + public long getSubscriptionTime() { + return subscriptionTime; + } + + public void setSubscriptionTime(long time) { + subscriptionTime = time; + } + + //////////////////////////////////////////////// + // SEQ + //////////////////////////////////////////////// + + private long notifyCount = 0; + + public long getNotifyCount() { + return notifyCount; + } + + public void setNotifyCount(int cnt) { + notifyCount = cnt; + } + + public void incrementNotifyCount() { + if (notifyCount == Long.MAX_VALUE) { + notifyCount = 1; + return; + } + notifyCount++; + } + + //////////////////////////////////////////////// + // renew + //////////////////////////////////////////////// + + public void renew() + { + setSubscriptionTime(System.currentTimeMillis()); + setNotifyCount(0); + } + +} diff --git a/router/java/src/org/cybergarage/upnp/event/SubscriberList.java b/router/java/src/org/cybergarage/upnp/event/SubscriberList.java new file mode 100644 index 000000000..0a991204a --- /dev/null +++ b/router/java/src/org/cybergarage/upnp/event/SubscriberList.java @@ -0,0 +1,48 @@ +/****************************************************************** +* +* CyberUPnP for Java +* +* Copyright (C) Satoshi Konno 2002 +* +* File: SubscriberList.java +* +* Revision; +* +* 01/31/03 +* - first revision. +* 06/18/03 +* - Fixed to catch ArrayIndexOutOfBounds. +* +******************************************************************/ + +package org.cybergarage.upnp.event; + +import java.util.*; + +public class SubscriberList extends Vector +{ + //////////////////////////////////////////////// + // Constructor + //////////////////////////////////////////////// + + private static final long serialVersionUID = -648427977601494972L; + + public SubscriberList() + { + } + + //////////////////////////////////////////////// + // Methods + //////////////////////////////////////////////// + + public Subscriber getSubscriber(int n) + { + Object obj = null; + try { + obj = get(n); + } + catch (Exception e) {} + return (Subscriber)obj; + } +} + diff --git a/router/java/src/org/cybergarage/upnp/event/Subscription.java b/router/java/src/org/cybergarage/upnp/event/Subscription.java new file mode 100644 index 000000000..c03638daa --- /dev/null +++ b/router/java/src/org/cybergarage/upnp/event/Subscription.java @@ -0,0 +1,75 @@ +/****************************************************************** +* +* CyberUPnP for Java +* +* Copyright (C) Satoshi Konno 2002-2003 +* +* File: ST.java +* +* Revision; +* +* 01/31/03 +* - first revision. +* +******************************************************************/ + +package org.cybergarage.upnp.event; + +import org.cybergarage.upnp.*; + +public class Subscription +{ + public final static String XMLNS = "urn:schemas-upnp-org:event-1-0"; + public final static String TIMEOUT_HEADER = "Second-"; + public final static String INFINITE_STRING = "infinite"; + public final static int INFINITE_VALUE = -1; + public final static String UUID = "uuid:"; + public final static String SUBSCRIBE_METHOD = "SUBSCRIBE"; + public final static String UNSUBSCRIBE_METHOD = "UNSUBSCRIBE"; + + //////////////////////////////////////////////// + // Timeout + //////////////////////////////////////////////// + + public final static String toTimeoutHeaderString(long time) + { + if (time == Subscription.INFINITE_VALUE) + return Subscription.INFINITE_STRING; + return Subscription.TIMEOUT_HEADER + Long.toString(time); + } + + public final static long getTimeout(String headerValue) + { + int minusIdx = headerValue.indexOf('-'); + long timeout = Subscription.INFINITE_VALUE; + try { + String timeoutStr = headerValue.substring(minusIdx+1, headerValue.length()); + timeout = Long.parseLong(timeoutStr); + } + catch (Exception e) {} + return timeout; + } + + //////////////////////////////////////////////// + // SID + //////////////////////////////////////////////// + + public static final String createSID() + { + return UPnP.createUUID(); + } + + public final static String toSIDHeaderString(String id) + { + return Subscription.UUID + id; + } + + public final static String getSID(String headerValue) + { + if (headerValue == null) + return ""; + return headerValue.substring(Subscription.UUID.length(), headerValue.length()); + } + +} + diff --git a/router/java/src/org/cybergarage/upnp/event/SubscriptionRequest.java b/router/java/src/org/cybergarage/upnp/event/SubscriptionRequest.java new file mode 100644 index 000000000..a3e11cc65 --- /dev/null +++ b/router/java/src/org/cybergarage/upnp/event/SubscriptionRequest.java @@ -0,0 +1,221 @@ +/****************************************************************** +* +* CyberUPnP for Java +* +* Copyright (C) Satoshi Konno 2002 +* +* File: SubscriptionRequest.java +* +* Revision; +* +* 01/31/03 +* - first revision. +* 05/21/03 +* - Giordano Sassaroli +* - Description: inserted a check at the beginning of the setService method +* - Problem : If the EventSubURL does not start with a '/', the device could refuse event subscription +* - Error : it is not an error, but adding the '/' when missing allows the integration with the Intel devices +* 09/02/03 +* - Giordano Sassaroli +* - Problem : NullpointerException thrown for devices whose description use absolute urls +* - Error : the presence of a base url is not mandatory, the API code makes the assumption that control and event subscription urls are relative. If the baseUrl is not present, the request host and port should be extracted from the control/subscription url +* - Description: The method setRequestHost/setService should be changed as follows +* 06/11/04 +* - Markus Thurner (06/11/2004) +* - Changed setServie() to get the host address from the SSDP Location field when the URLBase is null. +* 12/06/04 +* - Grzegorz Lehmann +* - Stefano Lenzi +* - Fixed getSID() to loop between getSID() and hasSID(); +* +********************************************************************/ + +package org.cybergarage.upnp.event; + +import org.cybergarage.http.*; + +import org.cybergarage.upnp.*; +import org.cybergarage.upnp.device.*; + +public class SubscriptionRequest extends HTTPRequest +{ + //////////////////////////////////////////////// + // Constructor + //////////////////////////////////////////////// + + public SubscriptionRequest() + { + } + + public SubscriptionRequest(HTTPRequest httpReq) + { + set(httpReq); + } + + //////////////////////////////////////////////// + // setRequest + //////////////////////////////////////////////// + + private void setService(Service service) + { + String eventSubURL = service.getEventSubURL(); + + // Thanks for Giordano Sassaroli (05/21/03) + setURI(eventSubURL, true); + + String urlBaseStr = ""; + Device dev = service.getDevice(); + if (dev != null) + urlBaseStr = dev.getURLBase(); + + if (urlBaseStr == null || urlBaseStr.length() <= 0) { + Device rootDev = service.getRootDevice(); + if (rootDev != null) + urlBaseStr = rootDev.getURLBase(); + } + + // Thansk for Markus Thurner (06/11/2004) + if (urlBaseStr == null || urlBaseStr.length() <= 0) { + Device rootDev = service.getRootDevice(); + if (rootDev != null) + urlBaseStr = rootDev.getLocation(); + } + + // Thanks for Giordano Sassaroli (09/02/03) + if (urlBaseStr == null || urlBaseStr.length() <= 0) { + if (HTTP.isAbsoluteURL(eventSubURL)) + urlBaseStr = eventSubURL; + } + + String reqHost = HTTP.getHost(urlBaseStr); + int reqPort = HTTP.getPort(urlBaseStr); + + setHost(reqHost, reqPort); + setRequestHost(reqHost); + setRequestPort(reqPort); + } + + public void setSubscribeRequest(Service service, String callback, long timeout) + { + setMethod(Subscription.SUBSCRIBE_METHOD); + setService(service); + setCallback(callback); + setNT(NT.EVENT); + setTimeout(timeout); + } + + public void setRenewRequest(Service service, String uuid, long timeout) + { + setMethod(Subscription.SUBSCRIBE_METHOD); + setService(service); + setSID(uuid); + setTimeout(timeout); + } + + public void setUnsubscribeRequest(Service service) + { + setMethod(Subscription.UNSUBSCRIBE_METHOD); + setService(service); + setSID(service.getSID()); + } + + //////////////////////////////////////////////// + // NT + //////////////////////////////////////////////// + + public void setNT(String value) + { + setHeader(HTTP.NT, value); + } + + public String getNT() + { + return getHeaderValue(HTTP.NT); + } + + public boolean hasNT() + { + String nt = getNT(); + return (nt != null && 0 < nt.length()) ? true : false; + } + + //////////////////////////////////////////////// + // CALLBACK + //////////////////////////////////////////////// + + private final static String CALLBACK_START_WITH = "<"; + private final static String CALLBACK_END_WITH = ">"; + + public void setCallback(String value) + { + setStringHeader(HTTP.CALLBACK, value, CALLBACK_START_WITH, CALLBACK_END_WITH); + } + + public String getCallback() + { + return getStringHeaderValue(HTTP.CALLBACK, CALLBACK_START_WITH, CALLBACK_END_WITH); + } + + public boolean hasCallback() + { + String callback = getCallback(); + return (callback != null && 0 < callback.length()) ? true : false; + } + + //////////////////////////////////////////////// + // SID + //////////////////////////////////////////////// + + public void setSID(String id) + { + setHeader(HTTP.SID, Subscription.toSIDHeaderString(id)); + } + + public String getSID() + { + // Thanks for Grzegorz Lehmann and Stefano Lenzi(12/06/04) + String sid = Subscription.getSID(getHeaderValue(HTTP.SID)); + if (sid == null) + return ""; + return sid; + } + + public boolean hasSID() + { + String sid = getSID(); + return (sid != null && 0 < sid.length()) ? true : false; + } + + //////////////////////////////////////////////// + // Timeout + //////////////////////////////////////////////// + + public final void setTimeout(long value) + { + setHeader(HTTP.TIMEOUT, Subscription.toTimeoutHeaderString(value)); + } + + public long getTimeout() + { + return Subscription.getTimeout(getHeaderValue(HTTP.TIMEOUT)); + } + + //////////////////////////////////////////////// + // post (Response) + //////////////////////////////////////////////// + + public void post(SubscriptionResponse subRes) + { + super.post(subRes); + } + + //////////////////////////////////////////////// + // post + //////////////////////////////////////////////// + + public SubscriptionResponse post() + { + HTTPResponse httpRes = post(getRequestHost(), getRequestPort()); + return new SubscriptionResponse(httpRes); + } +} diff --git a/router/java/src/org/cybergarage/upnp/event/SubscriptionResponse.java b/router/java/src/org/cybergarage/upnp/event/SubscriptionResponse.java new file mode 100644 index 000000000..cf60ecd56 --- /dev/null +++ b/router/java/src/org/cybergarage/upnp/event/SubscriptionResponse.java @@ -0,0 +1,84 @@ +/****************************************************************** +* +* CyberUPnP for Java +* +* Copyright (C) Satoshi Konno 2002 +* +* File: SubscriptionResponse.java +* +* Revision; +* +* 01/29/03 +* - first revision. +* +******************************************************************/ + +package org.cybergarage.upnp.event; + +import org.cybergarage.upnp.*; +import org.cybergarage.http.*; + +public class SubscriptionResponse extends HTTPResponse +{ + //////////////////////////////////////////////// + // Constructor + //////////////////////////////////////////////// + + public SubscriptionResponse() + { + setServer(UPnP.getServerName()); + } + + public SubscriptionResponse(HTTPResponse httpRes) + { + super(httpRes); + } + + //////////////////////////////////////////////// + // Error + //////////////////////////////////////////////// + + public void setResponse(int code) + { + setStatusCode(code); + setContentLength(0); + } + + //////////////////////////////////////////////// + // Error + //////////////////////////////////////////////// + + public void setErrorResponse(int code) + { + setStatusCode(code); + setContentLength(0); + } + + //////////////////////////////////////////////// + // SID + //////////////////////////////////////////////// + + public void setSID(String id) + { + setHeader(HTTP.SID, Subscription.toSIDHeaderString(id)); + } + + public String getSID() + { + return Subscription.getSID(getHeaderValue(HTTP.SID)); + } + + //////////////////////////////////////////////// + // Timeout + //////////////////////////////////////////////// + + public void setTimeout(long value) + { + setHeader(HTTP.TIMEOUT, Subscription.toTimeoutHeaderString(value)); + } + + public long getTimeout() + { + return Subscription.getTimeout(getHeaderValue(HTTP.TIMEOUT)); + } +} diff --git a/router/java/src/org/cybergarage/upnp/ssdp/HTTPMUSocket.java b/router/java/src/org/cybergarage/upnp/ssdp/HTTPMUSocket.java new file mode 100644 index 000000000..4f6361f59 --- /dev/null +++ b/router/java/src/org/cybergarage/upnp/ssdp/HTTPMUSocket.java @@ -0,0 +1,198 @@ +/****************************************************************** +* +* CyberLink for Java +* +* Copyright (C) Satoshi Konno 2002-2004 +* +* File: HTTPMU.java +* +* Revision; +* +* 11/18/02 +* - first revision. +* 09/03/03 +* - Changed to open the socket using setReuseAddress(). +* 12/10/03 +* - Fixed getLocalAddress() to return a valid interface address. +* 02/28/04 +* - Added getMulticastInetAddress(), getMulticastAddress(). +* 11/19/04 +* - Theo Beisch +* - Changed send() to set the TTL as 4. +* +******************************************************************/ + +package org.cybergarage.upnp.ssdp; + +import java.net.*; +import java.util.*; + +import org.cybergarage.http.*; +import org.cybergarage.util.*; + +public class HTTPMUSocket +{ + //////////////////////////////////////////////// + // Member + //////////////////////////////////////////////// + + private InetSocketAddress ssdpMultiGroup = null; + private MulticastSocket ssdpMultiSock = null; + private NetworkInterface ssdpMultiIf = null; + + //////////////////////////////////////////////// + // Constructor + //////////////////////////////////////////////// + + public HTTPMUSocket() + { + } + + public HTTPMUSocket(String addr, int port, String bindAddr) + { + open(addr, port, bindAddr); + } + + protected void finalize() + { + close(); + } + + //////////////////////////////////////////////// + // bindAddr + //////////////////////////////////////////////// + + public String getLocalAddress() + { + InetAddress mcastAddr = ssdpMultiGroup.getAddress(); + Enumeration addrs = ssdpMultiIf.getInetAddresses(); + while (addrs.hasMoreElements()) { + InetAddress addr = (InetAddress)addrs.nextElement(); + if (mcastAddr instanceof Inet6Address && addr instanceof Inet6Address) + return addr.getHostAddress(); + if (mcastAddr instanceof Inet4Address && addr instanceof Inet4Address) + return addr.getHostAddress(); + } + return ""; + } + + //////////////////////////////////////////////// + // MulticastAddr + //////////////////////////////////////////////// + + public InetAddress getMulticastInetAddress() + { + return ssdpMultiGroup.getAddress(); + } + + public String getMulticastAddress() + { + return getMulticastInetAddress().getHostAddress(); + } + + //////////////////////////////////////////////// + // open/close + //////////////////////////////////////////////// + + public boolean open(String addr, int port, String bindAddr) + { + try { + ssdpMultiSock = new MulticastSocket(null); + ssdpMultiSock.setReuseAddress(true); + InetSocketAddress bindSockAddr = new InetSocketAddress(port); + ssdpMultiSock.bind(bindSockAddr); + ssdpMultiGroup = new InetSocketAddress(InetAddress.getByName(addr), port); + ssdpMultiIf = NetworkInterface.getByInetAddress(InetAddress.getByName(bindAddr)); + ssdpMultiSock.joinGroup(ssdpMultiGroup, ssdpMultiIf); + } + catch (Exception e) { + Debug.warning(e); + return false; + } + + return true; + } + + public boolean close() + { + if (ssdpMultiSock == null) + return true; + + try { + ssdpMultiSock.leaveGroup(ssdpMultiGroup, ssdpMultiIf); + ssdpMultiSock = null; + } + catch (Exception e) { + //Debug.warning(e); + return false; + } + + return true; + } + + //////////////////////////////////////////////// + // send + //////////////////////////////////////////////// + + public boolean send(String msg, String bindAddr, int bindPort) + { + try { + MulticastSocket msock; + if ((bindAddr) != null && (0 < bindPort)) { + msock = new MulticastSocket(null); + msock.bind(new InetSocketAddress(bindAddr, bindPort)); + } + else + msock = new MulticastSocket(); + DatagramPacket dgmPacket = new DatagramPacket(msg.getBytes(), msg.length(), ssdpMultiGroup); + // Thnaks for Tho Beisch (11/09/04) + msock.setTimeToLive(4); + msock.send(dgmPacket); + msock.close(); + } + catch (Exception e) { + Debug.warning(e); + return false; + } + return true; + } + + public boolean send(String msg) + { + return send(msg, null, -1); + } + + //////////////////////////////////////////////// + // post (HTTPRequest) + //////////////////////////////////////////////// + + public boolean post(HTTPRequest req, String bindAddr, int bindPort) + { + return send(req.toString(), bindAddr, bindPort); + } + + public boolean post(HTTPRequest req) + { + return send(req.toString(), null, -1); + } + + //////////////////////////////////////////////// + // reveive + //////////////////////////////////////////////// + + public SSDPPacket receive() + { + byte ssdvRecvBuf[] = new byte[SSDP.RECV_MESSAGE_BUFSIZE]; + SSDPPacket recvPacket = new SSDPPacket(ssdvRecvBuf, ssdvRecvBuf.length); + recvPacket.setLocalAddress(getLocalAddress()); + try { + ssdpMultiSock.receive(recvPacket.getDatagramPacket()); + recvPacket.setTimeStamp(System.currentTimeMillis()); + } + catch (Exception e) { + //Debug.warning(e); + } + return recvPacket; + } +} + diff --git a/router/java/src/org/cybergarage/upnp/ssdp/HTTPUSocket.java b/router/java/src/org/cybergarage/upnp/ssdp/HTTPUSocket.java new file mode 100644 index 000000000..221311c55 --- /dev/null +++ b/router/java/src/org/cybergarage/upnp/ssdp/HTTPUSocket.java @@ -0,0 +1,239 @@ +/****************************************************************** +* +* CyberLink for Java +* +* Copyright (C) Satoshi Konno 2002-2003 +* +* File: HTTPMU.java +* +* Revision; +* +* 11/20/02 +* - first revision. +* 12/12/03 +* - Inma Mar?n +* - Changed open(addr, port) to send IPv6 SSDP packets. +* - The socket binds only the port without the interface address. +* - The full binding socket can send SSDP IPv4 packets. Is it a bug of J2SE v.1.4.2-b28 ?. +* 01/06/04 +* - Oliver Newell +* - Added to set a current timestamp when the packet are received. +* +******************************************************************/ + +package org.cybergarage.upnp.ssdp; + +import java.net.*; + +import org.cybergarage.util.*; + +public class HTTPUSocket +{ + //////////////////////////////////////////////// + // Member + //////////////////////////////////////////////// + + private DatagramSocket ssdpUniSock = null; + //private MulticastSocket ssdpUniSock = null; + + public DatagramSocket getDatagramSocket() + { + return ssdpUniSock; + } + + //////////////////////////////////////////////// + // Constructor + //////////////////////////////////////////////// + + public HTTPUSocket() + { + open(); + } + + public HTTPUSocket(String bindAddr, int bindPort) + { + open(bindAddr, bindPort); + } + + public HTTPUSocket(int bindPort) + { + open(bindPort); + } + + protected void finalize() + { + close(); + } + + //////////////////////////////////////////////// + // bindAddr + //////////////////////////////////////////////// + + private String localAddr = ""; + + public void setLocalAddress(String addr) + { + localAddr = addr; + } + + public String getLocalAddress() + { + if (0 < localAddr.length()) + return localAddr; + return ssdpUniSock.getLocalAddress().getHostAddress(); + } + + //////////////////////////////////////////////// + // open + //////////////////////////////////////////////// + + public boolean open() + { + close(); + + try { + ssdpUniSock = new DatagramSocket(); + } + catch (Exception e) { + Debug.warning(e); + return false; + } + + return true; + } + + public boolean open(String bindAddr, int bindPort) + { + close(); + + try { + // Bind only using the port without the interface address. (2003/12/12) + InetSocketAddress bindSock = new InetSocketAddress(/*InetAddress.getByName(bindAddr), */ bindPort); + ssdpUniSock = new DatagramSocket(null); + ssdpUniSock.setReuseAddress(true); + ssdpUniSock.bind(bindSock); + } + catch (Exception e) { + Debug.warning(e); + return false; + } + + setLocalAddress(bindAddr); + + return true; + } + + public boolean open(int bindPort) + { + close(); + + try { + InetSocketAddress bindSock = new InetSocketAddress(bindPort); + ssdpUniSock = new DatagramSocket(null); + ssdpUniSock.setReuseAddress(true); + ssdpUniSock.bind(bindSock); + } + catch (Exception e) { + //Debug.warning(e); + return false; + } + + return true; + } + + //////////////////////////////////////////////// + // close + //////////////////////////////////////////////// + + public boolean close() + { + if (ssdpUniSock == null) + return true; + + try { + ssdpUniSock.close(); + ssdpUniSock = null; + } + catch (Exception e) { + Debug.warning(e); + return false; + } + + return true; + } + + //////////////////////////////////////////////// + // send + //////////////////////////////////////////////// + + public boolean post(String addr, int port, String msg) + { + try { + InetAddress inetAddr = InetAddress.getByName(addr); + DatagramPacket dgmPacket = new DatagramPacket(msg.getBytes(), msg.length(), inetAddr, port); + ssdpUniSock.send(dgmPacket); + } + catch (Exception e) { + Debug.warning("addr = " +ssdpUniSock.getLocalAddress().getHostName()); + Debug.warning("port = " + ssdpUniSock.getLocalPort()); + Debug.warning(e); + return false; + } + return true; + } + + //////////////////////////////////////////////// + // reveive + //////////////////////////////////////////////// + + public SSDPPacket receive() + { + byte ssdvRecvBuf[] = new byte[SSDP.RECV_MESSAGE_BUFSIZE]; + SSDPPacket recvPacket = new SSDPPacket(ssdvRecvBuf, ssdvRecvBuf.length); + recvPacket.setLocalAddress(getLocalAddress()); + try { + ssdpUniSock.receive(recvPacket.getDatagramPacket()); + recvPacket.setTimeStamp(System.currentTimeMillis()); + } + catch (Exception e) { + //Debug.warning(e); + return null; + } + return recvPacket; + } + + //////////////////////////////////////////////// + // join/leave + //////////////////////////////////////////////// + +/* + boolean joinGroup(String mcastAddr, int mcastPort, String bindAddr) + { + try { + InetSocketAddress mcastGroup = new InetSocketAddress(InetAddress.getByName(mcastAddr), mcastPort); + NetworkInterface mcastIf = NetworkInterface.getByInetAddress(InetAddress.getByName(bindAddr)); + ssdpUniSock.joinGroup(mcastGroup, mcastIf); + } + catch (Exception e) { + Debug.warning(e); + return false; + } + return true; + } + + boolean leaveGroup(String mcastAddr, int mcastPort, String bindAddr) + { + try { + InetSocketAddress mcastGroup = new InetSocketAddress(InetAddress.getByName(mcastAddr), mcastPort); + NetworkInterface mcastIf = NetworkInterface.getByInetAddress(InetAddress.getByName(bindAddr)); + ssdpUniSock.leaveGroup(mcastGroup, mcastIf); + } + catch (Exception e) { + Debug.warning(e); + return false; + } + return true; + } +*/ +} + diff --git a/router/java/src/org/cybergarage/upnp/ssdp/SSDP.java b/router/java/src/org/cybergarage/upnp/ssdp/SSDP.java new file mode 100644 index 000000000..8f692355f --- /dev/null +++ b/router/java/src/org/cybergarage/upnp/ssdp/SSDP.java @@ -0,0 +1,77 @@ +/****************************************************************** +* +* CyberUPnP for Java +* +* Copyright (C) Satoshi Konno 2002 +* +* File: SSDP.java +* +* Revision; +* +* 11/18/02 +* - first revision. +* 05/13/03 +* - Added constants for IPv6. +* +******************************************************************/ + +package org.cybergarage.upnp.ssdp; + +public class SSDP +{ + //////////////////////////////////////////////// + // Constants + //////////////////////////////////////////////// + + public static final int PORT = 1900; + + public static final String ADDRESS = "239.255.255.250"; + + public static final String IPV6_LINK_LOCAL_ADDRESS = "FF02::C"; + public static final String IPV6_SUBNET_ADDRESS = "FF03::C"; + public static final String IPV6_ADMINISTRATIVE_ADDRESS = "FF04::C"; + public static final String IPV6_SITE_LOCAL_ADDRESS = "FF05::C"; + public static final String IPV6_GLOBAL_ADDRESS = "FF0E::C"; + + private static String IPV6_ADDRESS; + + public static final void setIPv6Address(String addr) + { + IPV6_ADDRESS = addr; + } + + public static final String getIPv6Address() + { + return IPV6_ADDRESS; + } + + public static final int DEFAULT_MSEARCH_MX = 3; + + public static final int RECV_MESSAGE_BUFSIZE = 1024; + + //////////////////////////////////////////////// + // Initialize + //////////////////////////////////////////////// + + static + { + setIPv6Address(IPV6_LINK_LOCAL_ADDRESS); + } + + //////////////////////////////////////////////// + // LeaseTime + //////////////////////////////////////////////// + + public final static int getLeaseTime(String cacheCont) + { + int equIdx = cacheCont.indexOf('='); + int mx = 0; + try { + String mxStr = new String(cacheCont.getBytes(), equIdx+1, cacheCont.length() - (equIdx+1)); + mx = Integer.parseInt(mxStr); + } + catch (Exception e) {} + return mx; + } +} + diff --git a/router/java/src/org/cybergarage/upnp/ssdp/SSDPNotifyRequest.java b/router/java/src/org/cybergarage/upnp/ssdp/SSDPNotifyRequest.java new file mode 100644 index 000000000..b2fb3c5c0 --- /dev/null +++ b/router/java/src/org/cybergarage/upnp/ssdp/SSDPNotifyRequest.java @@ -0,0 +1,31 @@ +/****************************************************************** +* +* CyberUPnP for Java +* +* Copyright (C) Satoshi Konno 2002 +* +* File: SSDPMSearchRequest.java +* +* Revision; +* +* 01/14/03 +* - first revision. +* +******************************************************************/ + +package org.cybergarage.upnp.ssdp; + +import org.cybergarage.http.*; + +public class SSDPNotifyRequest extends SSDPRequest +{ + //////////////////////////////////////////////// + // Constructor + //////////////////////////////////////////////// + + public SSDPNotifyRequest() + { + setMethod(HTTP.NOTIFY); + setURI("*"); + } +} diff --git a/router/java/src/org/cybergarage/upnp/ssdp/SSDPNotifySocket.java b/router/java/src/org/cybergarage/upnp/ssdp/SSDPNotifySocket.java new file mode 100644 index 000000000..6a33af7c3 --- /dev/null +++ b/router/java/src/org/cybergarage/upnp/ssdp/SSDPNotifySocket.java @@ -0,0 +1,131 @@ +/****************************************************************** +* +* CyberUPnP for Java +* +* Copyright (C) Satoshi Konno 2002-2003 +* +* File: SSDPNotifySocket.java +* +* Revision; +* +* 11/20/02 +* - first revision. +* 05/13/03 +* - Added support for IPv6. +* 02/20/04 +* - Inma Marin Lopez +* - Added a multicast filter using the SSDP pakcet. +* 04/20/05 +* - Mikael Hakman +* - Handle receive() returning null. +* - Added close() in stop(). +* +******************************************************************/ + +package org.cybergarage.upnp.ssdp; + +import java.net.*; + +import org.cybergarage.net.*; +import org.cybergarage.util.*; +import org.cybergarage.http.*; +import org.cybergarage.upnp.*; + +public class SSDPNotifySocket extends HTTPMUSocket implements Runnable +{ + private boolean useIPv6Address; + + //////////////////////////////////////////////// + // Constructor + //////////////////////////////////////////////// + + public SSDPNotifySocket(String bindAddr) + { + String addr = SSDP.ADDRESS; + useIPv6Address = false; + if (HostInterface.isIPv6Address(bindAddr) == true) { + addr = SSDP.getIPv6Address(); + useIPv6Address = true; + } + open(addr, SSDP.PORT, bindAddr); + setControlPoint(null); + } + + //////////////////////////////////////////////// + // ControlPoint + //////////////////////////////////////////////// + + private ControlPoint controlPoint = null; + + public void setControlPoint(ControlPoint ctrlp) + { + this.controlPoint = ctrlp; + } + + public ControlPoint getControlPoint() + { + return controlPoint; + } + + //////////////////////////////////////////////// + // post (SSDPNotifySocket) + //////////////////////////////////////////////// + + public boolean post(SSDPNotifyRequest req) + { + String ssdpAddr = SSDP.ADDRESS; + if (useIPv6Address == true) + ssdpAddr = SSDP.getIPv6Address(); + req.setHost(ssdpAddr, SSDP.PORT); + return post((HTTPRequest)req); + } + + //////////////////////////////////////////////// + // run + //////////////////////////////////////////////// + + private Thread deviceNotifyThread = null; + + public void run() + { + Thread thisThread = Thread.currentThread(); + + ControlPoint ctrlPoint = getControlPoint(); + + while (deviceNotifyThread == thisThread) { + Thread.yield(); + SSDPPacket packet = receive(); + + // Thanks for Mikael Hakman (04/20/05) + if (packet == null) + continue; + + // Thanks for Inma (02/20/04) + InetAddress maddr = getMulticastInetAddress(); + InetAddress pmaddr = packet.getHostInetAddress(); + if (maddr.equals(pmaddr) == false) { + Debug.warning("Invalidate Multicast Recieved : " + maddr + "," + pmaddr); + continue; + } + + if (ctrlPoint != null) + ctrlPoint.notifyReceived(packet); + } + } + + public void start() + { + deviceNotifyThread = new Thread(this, "UPnP-SSDPNotifySocket"); + deviceNotifyThread.setDaemon(true); + deviceNotifyThread.start(); + } + + public void stop() + { + // Thanks for Mikael Hakman (04/20/05) + close(); + + deviceNotifyThread = null; + } +} + diff --git a/router/java/src/org/cybergarage/upnp/ssdp/SSDPNotifySocketList.java b/router/java/src/org/cybergarage/upnp/ssdp/SSDPNotifySocketList.java new file mode 100644 index 000000000..d0541510c --- /dev/null +++ b/router/java/src/org/cybergarage/upnp/ssdp/SSDPNotifySocketList.java @@ -0,0 +1,106 @@ +/****************************************************************** +* +* CyberUPnP for Java +* +* Copyright (C) Satoshi Konno 2002-2003 +* +* File: HTTPServerList.java +* +* Revision; +* +* 05/11/03 +* - first revision. +* +******************************************************************/ + +package org.cybergarage.upnp.ssdp; + +import java.util.*; + +import org.cybergarage.net.*; + +import org.cybergarage.upnp.*; + +public class SSDPNotifySocketList extends Vector +{ + //////////////////////////////////////////////// + // Constructor + //////////////////////////////////////////////// + + private static final long serialVersionUID = -7066290881503106399L; + + public SSDPNotifySocketList() + { + } + + //////////////////////////////////////////////// + // Methods + //////////////////////////////////////////////// + + public SSDPNotifySocket getSSDPNotifySocket(int n) + { + return (SSDPNotifySocket)get(n); + } + + //////////////////////////////////////////////// + // ControlPoint + //////////////////////////////////////////////// + + public void setControlPoint(ControlPoint ctrlPoint) + { + int nSockets = size(); + for (int n=0; n +* - Fixed isRootDevice() to check the ST header. +* 11/19/04 +* - Theo Beisch +* - Changed getRemoteAddress() to return the adresss instead of the host name. +* +******************************************************************/ + +package org.cybergarage.upnp.ssdp; + +import java.net.*; + +import org.cybergarage.http.*; + +import org.cybergarage.upnp.device.*; + +public class SSDPPacket +{ + //////////////////////////////////////////////// + // Constructor + //////////////////////////////////////////////// + + public SSDPPacket(byte[] buf, int length) + { + dgmPacket = new DatagramPacket(buf, length); + } + + //////////////////////////////////////////////// + // DatagramPacket + //////////////////////////////////////////////// + + private DatagramPacket dgmPacket = null; + + public DatagramPacket getDatagramPacket() + { + return dgmPacket; + } + + //////////////////////////////////////////////// + // addr + //////////////////////////////////////////////// + + private String localAddr = ""; + + public void setLocalAddress(String addr) + { + localAddr = addr; + } + + public String getLocalAddress() + { + return localAddr; + } + + + //////////////////////////////////////////////// + // Time + //////////////////////////////////////////////// + + private long timeStamp; + + public void setTimeStamp(long value) + { + timeStamp = value; + } + + public long getTimeStamp() + { + return timeStamp; + } + + //////////////////////////////////////////////// + // Remote host + //////////////////////////////////////////////// + + public InetAddress getRemoteInetAddress() + { + return getDatagramPacket().getAddress(); + } + + public String getRemoteAddress() + { + // Thanks for Theo Beisch (11/09/04) + return getDatagramPacket().getAddress().getHostAddress(); + } + + public int getRemotePort() + { + return getDatagramPacket().getPort(); + } + + //////////////////////////////////////////////// + // Access Methods + //////////////////////////////////////////////// + + public byte[] packetBytes = null; + + public byte[] getData() + { + if (packetBytes != null) + return packetBytes; + + DatagramPacket packet = getDatagramPacket(); + int packetLen = packet.getLength(); + String packetData = new String(packet.getData(), 0, packetLen); + packetBytes = packetData.getBytes(); + + return packetBytes; + } + + //////////////////////////////////////////////// + // Access Methods + //////////////////////////////////////////////// + + public String getHost() + { + return HTTPHeader.getValue(getData(), HTTP.HOST); + } + + public String getCacheControl() + { + return HTTPHeader.getValue(getData(), HTTP.CACHE_CONTROL); + } + + public String getLocation() + { + return HTTPHeader.getValue(getData(), HTTP.LOCATION); + } + + public String getMAN() + { + return HTTPHeader.getValue(getData(), HTTP.MAN); + } + + public String getST() + { + return HTTPHeader.getValue(getData(), HTTP.ST); + } + + public String getNT() + { + return HTTPHeader.getValue(getData(), HTTP.NT); + } + + public String getNTS() + { + return HTTPHeader.getValue(getData(), HTTP.NTS); + } + + public String getServer() + { + return HTTPHeader.getValue(getData(), HTTP.SERVER); + } + + public String getUSN() + { + return HTTPHeader.getValue(getData(), HTTP.USN); + } + + public int getMX() + { + return HTTPHeader.getIntegerValue(getData(), HTTP.MX); + } + + //////////////////////////////////////////////// + // Access Methods + //////////////////////////////////////////////// + + public InetAddress getHostInetAddress() + { + String addrStr = "127.0.0.1"; + String host = getHost(); + int canmaIdx = host.lastIndexOf(":"); + if (0 <= canmaIdx) { + addrStr = host.substring(0, canmaIdx); + if (addrStr.charAt(0) == '[') + addrStr = addrStr.substring(1, addrStr.length()); + if (addrStr.charAt(addrStr.length()-1) == ']') + addrStr = addrStr.substring(0, addrStr.length()-1); + } + InetSocketAddress isockaddr = new InetSocketAddress(addrStr, 0); + return isockaddr.getAddress(); + } + + //////////////////////////////////////////////// + // Access Methods (Extension) + //////////////////////////////////////////////// + + public boolean isRootDevice() + { + if (NT.isRootDevice(getNT()) == true) + return true; + // Thanks for Theo Beisch (11/01/04) + if (ST.isRootDevice(getST()) == true) + return true; + return USN.isRootDevice(getUSN()); + } + + public boolean isDiscover() + { + return MAN.isDiscover(getMAN()); + } + + public boolean isAlive() + { + return NTS.isAlive(getNTS()); + } + + public boolean isByeBye() + { + return NTS.isByeBye(getNTS()); + } + + public int getLeaseTime() + { + return SSDP.getLeaseTime(getCacheControl()); + } + + //////////////////////////////////////////////// + // toString + //////////////////////////////////////////////// + + public String toString() + { + return new String(getData()); + } +} + diff --git a/router/java/src/org/cybergarage/upnp/ssdp/SSDPRequest.java b/router/java/src/org/cybergarage/upnp/ssdp/SSDPRequest.java new file mode 100644 index 000000000..f40442f18 --- /dev/null +++ b/router/java/src/org/cybergarage/upnp/ssdp/SSDPRequest.java @@ -0,0 +1,104 @@ +/****************************************************************** +* +* CyberUPnP for Java +* +* Copyright (C) Satoshi Konno 2002 +* +* File: SSDPRequest.java +* +* Revision; +* +* 01/14/03 +* - first revision. +* 03/16/04 +* - Thanks for Darrell Young +* - Fixed to set v1.1 to the HTTP version.; +* +******************************************************************/ + +package org.cybergarage.upnp.ssdp; + +import org.cybergarage.http.*; + +public class SSDPRequest extends HTTPRequest +{ + //////////////////////////////////////////////// + // Constructor + //////////////////////////////////////////////// + + public SSDPRequest() + { + setVersion(HTTP.VERSION_11); + } + + //////////////////////////////////////////////// + // NT + //////////////////////////////////////////////// + + public void setNT(String value) + { + setHeader(HTTP.NT, value); + } + + public String getNT() + { + return getHeaderValue(HTTP.NT); + } + + //////////////////////////////////////////////// + // NTS + //////////////////////////////////////////////// + + public void setNTS(String value) + { + setHeader(HTTP.NTS, value); + } + + public String getNTS() + { + return getHeaderValue(HTTP.NTS); + } + + //////////////////////////////////////////////// + // Location + //////////////////////////////////////////////// + + public void setLocation(String value) + { + setHeader(HTTP.LOCATION, value); + } + + public String getLocation() + { + return getHeaderValue(HTTP.LOCATION); + } + + //////////////////////////////////////////////// + // USN + //////////////////////////////////////////////// + + public void setUSN(String value) + { + setHeader(HTTP.USN, value); + } + + public String getUSN() + { + return getHeaderValue(HTTP.USN); + } + + //////////////////////////////////////////////// + // CacheControl + //////////////////////////////////////////////// + + public void setLeaseTime(int len) + { + setHeader(HTTP.CACHE_CONTROL, "max-age=" + Integer.toString(len)); + } + + public int getLeaseTime() + { + String cacheCtrl = getHeaderValue(HTTP.CACHE_CONTROL); + return SSDP.getLeaseTime(cacheCtrl); + } +} diff --git a/router/java/src/org/cybergarage/upnp/ssdp/SSDPResponse.java b/router/java/src/org/cybergarage/upnp/ssdp/SSDPResponse.java new file mode 100644 index 000000000..31b4ed280 --- /dev/null +++ b/router/java/src/org/cybergarage/upnp/ssdp/SSDPResponse.java @@ -0,0 +1,126 @@ +/****************************************************************** +* +* CyberUPnP for Java +* +* Copyright (C) Satoshi Konno 2002 +* +* File: SSDPResponse.java +* +* Revision; +* +* 01/14/03 +* - first revision. +* 01/23/04 +* - Oliver Newell +* - Overided HTTPResponse::getHeader() for Intel UPnP control points. +* 03/16/04 +* - Thanks for Darrell Young +* - Fixed to set v1.1 to the HTTP version. +* 10/20/04 +* - Brent Hills +* - Added setMYNAME() and getMYNAME(). +* +******************************************************************/ + +package org.cybergarage.upnp.ssdp; + +import org.cybergarage.http.*; + +public class SSDPResponse extends HTTPResponse +{ + //////////////////////////////////////////////// + // Constructor + //////////////////////////////////////////////// + + public SSDPResponse() + { + setVersion(HTTP.VERSION_11); + } + + //////////////////////////////////////////////// + // ST (SearchTarget) + //////////////////////////////////////////////// + + public void setST(String value) + { + setHeader(HTTP.ST, value); + } + + public String getST() + { + return getHeaderValue(HTTP.ST); + } + + //////////////////////////////////////////////// + // Location + //////////////////////////////////////////////// + + public void setLocation(String value) + { + setHeader(HTTP.LOCATION, value); + } + + public String getLocation() + { + return getHeaderValue(HTTP.LOCATION); + } + + //////////////////////////////////////////////// + // USN + //////////////////////////////////////////////// + + public void setUSN(String value) + { + setHeader(HTTP.USN, value); + } + + public String getUSN() + { + return getHeaderValue(HTTP.USN); + } + + //////////////////////////////////////////////// + // MYNAME + //////////////////////////////////////////////// + + public void setMYNAME(String value) + { + setHeader(HTTP.MYNAME, value); + } + + public String getMYNAME() + { + return getHeaderValue(HTTP.MYNAME); + } + + //////////////////////////////////////////////// + // CacheControl + //////////////////////////////////////////////// + + public void setLeaseTime(int len) + { + setHeader(HTTP.CACHE_CONTROL, "max-age=" + Integer.toString(len)); + } + + public int getLeaseTime() + { + String cacheCtrl = getHeaderValue(HTTP.CACHE_CONTROL); + return SSDP.getLeaseTime(cacheCtrl); + } + + //////////////////////////////////////////////// + // getHeader (Override) + //////////////////////////////////////////////// + + public String getHeader() + { + StringBuilder str = new StringBuilder(); + + str.append(getStatusLineString()); + str.append(getHeaderString()); + str.append(HTTP.CRLF); // for Intel UPnP control points. + + return str.toString(); + } + +} diff --git a/router/java/src/org/cybergarage/upnp/ssdp/SSDPSearchRequest.java b/router/java/src/org/cybergarage/upnp/ssdp/SSDPSearchRequest.java new file mode 100644 index 000000000..fbe7cf812 --- /dev/null +++ b/router/java/src/org/cybergarage/upnp/ssdp/SSDPSearchRequest.java @@ -0,0 +1,61 @@ +/****************************************************************** +* +* CyberUPnP for Java +* +* Copyright (C) Satoshi Konno 2002 +* +* File: SSDPMSearchRequest.java +* +* Revision; +* +* 11/19/02 +* - first revision. +* +******************************************************************/ + +package org.cybergarage.upnp.ssdp; + +import org.cybergarage.net.*; +import org.cybergarage.http.*; + +import org.cybergarage.upnp.device.*; + +public class SSDPSearchRequest extends SSDPRequest +{ + //////////////////////////////////////////////// + // Constructor + //////////////////////////////////////////////// + + public SSDPSearchRequest(String serachTarget, int mx) + { + setMethod(HTTP.M_SEARCH); + setURI("*"); + + setHeader(HTTP.ST, serachTarget); + setHeader(HTTP.MX, Integer.toString(mx)); + setHeader(HTTP.MAN, "\"" + MAN.DISCOVER + "\""); + } + + public SSDPSearchRequest(String serachTarget) + { + this(serachTarget, SSDP.DEFAULT_MSEARCH_MX); + } + + public SSDPSearchRequest() + { + this(ST.ROOT_DEVICE); + } + + //////////////////////////////////////////////// + // HOST + //////////////////////////////////////////////// + + public void setLocalAddress(String bindAddr) + { + String ssdpAddr = SSDP.ADDRESS; + if (HostInterface.isIPv6Address(bindAddr) == true) + ssdpAddr = SSDP.getIPv6Address(); + setHost(ssdpAddr, SSDP.PORT); + } + +} diff --git a/router/java/src/org/cybergarage/upnp/ssdp/SSDPSearchResponse.java b/router/java/src/org/cybergarage/upnp/ssdp/SSDPSearchResponse.java new file mode 100644 index 000000000..264f54429 --- /dev/null +++ b/router/java/src/org/cybergarage/upnp/ssdp/SSDPSearchResponse.java @@ -0,0 +1,35 @@ +/****************************************************************** +* +* CyberUPnP for Java +* +* Copyright (C) Satoshi Konno 2002 +* +* File: SSDPSearchResponse.java +* +* Revision; +* +* 01/14/03 +* - first revision. +* +******************************************************************/ + +package org.cybergarage.upnp.ssdp; + +import org.cybergarage.http.*; + +import org.cybergarage.upnp.*; + +public class SSDPSearchResponse extends SSDPResponse +{ + //////////////////////////////////////////////// + // Constructor + //////////////////////////////////////////////// + + public SSDPSearchResponse() + { + setStatusCode(HTTPStatus.OK); + setCacheControl(Device.DEFAULT_LEASE_TIME); + setHeader(HTTP.SERVER, UPnP.getServerName()); + setHeader(HTTP.EXT, ""); + } +} diff --git a/router/java/src/org/cybergarage/upnp/ssdp/SSDPSearchResponseSocket.java b/router/java/src/org/cybergarage/upnp/ssdp/SSDPSearchResponseSocket.java new file mode 100644 index 000000000..61668872a --- /dev/null +++ b/router/java/src/org/cybergarage/upnp/ssdp/SSDPSearchResponseSocket.java @@ -0,0 +1,107 @@ +/****************************************************************** +* +* CyberUPnP for Java +* +* Copyright (C) Satoshi Konno 2002 +* +* File: SSDPSearchResponseSocket.java +* +* Revision; +* +* 11/20/02 +* - first revision. +* 05/28/03 +* - Added post() to send a SSDPSearchRequest. +* +******************************************************************/ + +package org.cybergarage.upnp.ssdp; + +import org.cybergarage.upnp.*; + +public class SSDPSearchResponseSocket extends HTTPUSocket implements Runnable +{ + //////////////////////////////////////////////// + // Constructor + //////////////////////////////////////////////// + + public SSDPSearchResponseSocket() + { + setControlPoint(null); + } + + public SSDPSearchResponseSocket(String bindAddr, int port) + { + super(bindAddr, port); + setControlPoint(null); + } + + //////////////////////////////////////////////// + // ControlPoint + //////////////////////////////////////////////// + + private ControlPoint controlPoint = null; + + public void setControlPoint(ControlPoint ctrlp) + { + this.controlPoint = ctrlp; + } + + public ControlPoint getControlPoint() + { + return controlPoint; + } + + //////////////////////////////////////////////// + // run + //////////////////////////////////////////////// + + private Thread deviceSearchResponseThread = null; + + public void run() + { + Thread thisThread = Thread.currentThread(); + + ControlPoint ctrlPoint = getControlPoint(); + + while (deviceSearchResponseThread == thisThread) { + Thread.yield(); + SSDPPacket packet = receive(); + if (packet == null) + break; + if (ctrlPoint != null) + ctrlPoint.searchResponseReceived(packet); + } + } + + public void start() + { + deviceSearchResponseThread = new Thread(this, "UPnP-SSDPSearchResponseSocket"); + deviceSearchResponseThread.setDaemon(true); + deviceSearchResponseThread.start(); + } + + public void stop() + { + deviceSearchResponseThread = null; + } + + //////////////////////////////////////////////// + // post + //////////////////////////////////////////////// + + public boolean post(String addr, int port, SSDPSearchResponse res) + { + return post(addr, port, res.getHeader()); + } + + //////////////////////////////////////////////// + // post + //////////////////////////////////////////////// + + public boolean post(String addr, int port, SSDPSearchRequest req) + { + return post(addr, port, req.toString()); + } +} + diff --git a/router/java/src/org/cybergarage/upnp/ssdp/SSDPSearchResponseSocketList.java b/router/java/src/org/cybergarage/upnp/ssdp/SSDPSearchResponseSocketList.java new file mode 100644 index 000000000..e9a758244 --- /dev/null +++ b/router/java/src/org/cybergarage/upnp/ssdp/SSDPSearchResponseSocketList.java @@ -0,0 +1,144 @@ +/****************************************************************** +* +* CyberUPnP for Java +* +* Copyright (C) Satoshi Konno 2002-2003 +* +* File: SSDPSearchResponseSocketList.java +* +* Revision; +* +* 05/08/03 +* - first revision. +* 05/28/03 +* - Added post() to send a SSDPSearchRequest. +* +******************************************************************/ + +package org.cybergarage.upnp.ssdp; + +import java.util.*; + +import org.cybergarage.net.*; + +import org.cybergarage.upnp.*; + +public class SSDPSearchResponseSocketList extends Vector +{ + //////////////////////////////////////////////// + // Constructor + //////////////////////////////////////////////// + + private static final long serialVersionUID = 4509857798038125744L; + + public SSDPSearchResponseSocketList() + { + } + + //////////////////////////////////////////////// + // ControlPoint + //////////////////////////////////////////////// + + public void setControlPoint(ControlPoint ctrlPoint) + { + int nSockets = size(); + for (int n=0; n +* - Added close() in stop(). +* - Added test for null return from receive() in run(). +* +******************************************************************/ + +package org.cybergarage.upnp.ssdp; + +import org.cybergarage.net.*; +import org.cybergarage.util.*; + +import org.cybergarage.upnp.device.*; + +public class SSDPSearchSocket extends HTTPMUSocket implements Runnable +{ + public SSDPSearchSocket() + { + } + + public SSDPSearchSocket(String bindAddr) + { + open(bindAddr); + } + + //////////////////////////////////////////////// + // Constructor + //////////////////////////////////////////////// + + public boolean open(String bindAddr) + { + String addr = SSDP.ADDRESS; + if (HostInterface.isIPv6Address(bindAddr) == true) { + addr = SSDP.getIPv6Address(); + } + return open(addr, SSDP.PORT, bindAddr); + } + + //////////////////////////////////////////////// + // deviceSearch + //////////////////////////////////////////////// + + private ListenerList deviceSearchListenerList = new ListenerList(); + + public void addSearchListener(SearchListener listener) + { + deviceSearchListenerList.add(listener); + } + + public void removeSearchListener(SearchListener listener) + { + deviceSearchListenerList.remove(listener); + } + + public void performSearchListener(SSDPPacket ssdpPacket) + { + int listenerSize = deviceSearchListenerList.size(); + for (int n=0; n +* - Added "&" and "\"" "\\" to toXMLString(). +* 11/19/04 +* - Theo Beisch +* - Changed XML::output() to use short notation when the tag value is null. +* 12/02/04 +* - Brian Owens +* - Fixed toXMLString() to convert from "'" to "'" instead of "\". +* +******************************************************************/ + +package org.cybergarage.xml; + +import java.io.ByteArrayOutputStream; +import java.io.PrintWriter; + +public class Node +{ + + public Node() + { + setUserData(null); + setParentNode(null); + } + + public Node(String name) + { + this(); + setName(name); + } + + public Node(String ns, String name) + { + this(); + setName(ns, name); + } + + //////////////////////////////////////////////// + // parent node + //////////////////////////////////////////////// + + private Node parentNode = null; + + public void setParentNode(Node node) + { + parentNode = node; + } + + public Node getParentNode() + { + return parentNode; + } + + //////////////////////////////////////////////// + // root node + //////////////////////////////////////////////// + + public Node getRootNode() + { + Node rootNode = null; + Node parentNode = getParentNode(); + while (parentNode != null) { + rootNode = parentNode; + parentNode = rootNode.getParentNode(); + } + return rootNode; + } + + //////////////////////////////////////////////// + // name + //////////////////////////////////////////////// + + private String name = new String(); + + public void setName(String name) + { + this.name = name; + } + + public void setName(String ns, String name) + { + this.name = ns + ":" + name; + } + + public String getName() + { + return name; + } + + public boolean isName(String value) + { + return name.equals(value); + } + + //////////////////////////////////////////////// + // value + //////////////////////////////////////////////// + + private String value = ""; + + public void setValue(String value) + { + this.value = value; + } + + public void setValue(int value) + { + setValue(Integer.toString(value)); + } + + public String getValue() + { + return value; + } + + //////////////////////////////////////////////// + // Attribute (Basic) + //////////////////////////////////////////////// + + private AttributeList attrList = new AttributeList(); + + public int getNAttributes() { + return attrList.size(); + } + + public Attribute getAttribute(int index) { + return attrList.getAttribute(index); + } + + public Attribute getAttribute(String name) + { + return attrList.getAttribute(name); + } + + public void addAttribute(Attribute attr) { + attrList.add(attr); + } + + public void insertAttributeAt(Attribute attr, int index) { + attrList.insertElementAt(attr, index); + } + + public void addAttribute(String name, String value) { + Attribute attr = new Attribute(name, value); + addAttribute(attr); + } + + public boolean removeAttribute(Attribute attr) { + return attrList.remove(attr); + } + + public boolean removeAttribute(String name) { + return removeAttribute(getAttribute(name)); + } + + public boolean hasAttributes() + { + if (0 < getNAttributes()) + return true; + return false; + } + + //////////////////////////////////////////////// + // Attribute (Extention) + //////////////////////////////////////////////// + + public void setAttribute(String name, String value) { + Attribute attr = getAttribute(name); + if (attr != null) { + attr.setValue(value); + return; + } + attr = new Attribute(name, value); + addAttribute(attr); + } + + public void setAttribute(String name, int value) { + setAttribute(name, Integer.toString(value)); + } + + public String getAttributeValue(String name) { + Attribute attr = getAttribute(name); + if (attr != null) + return attr.getValue(); + return ""; + } + + public int getAttributeIntegerValue(String name) { + String val = getAttributeValue(name); + try { + return Integer.parseInt(val); + } + catch (Exception e) {} + return 0; + } + + //////////////////////////////////////////////// + // Attribute (xmlns) + //////////////////////////////////////////////// + + public void setNameSpace(String ns, String value) + { + setAttribute("xmlns:" + ns, value); + } + + //////////////////////////////////////////////// + // Child node + //////////////////////////////////////////////// + + private NodeList nodeList = new NodeList(); + + public int getNNodes() { + return nodeList.size(); + } + + public Node getNode(int index) { + return nodeList.getNode(index); + } + + public Node getNode(String name) + { + return nodeList.getNode(name); + } + + public Node getNodeEndsWith(String name) + { + return nodeList.getEndsWith(name); + } + + public void addNode(Node node) { + node.setParentNode(this); + nodeList.add(node); + } + + public void insertNode(Node node, int index) { + node.setParentNode(this); + nodeList.insertElementAt(node, index); + } + + public boolean removeNode(Node node) { + node.setParentNode(null); + return nodeList.remove(node); + } + + public boolean removeNode(String name) { + return nodeList.remove(getNode(name)); + } + + public void removeAllNodes() + { + nodeList.clear(); + } + + public boolean hasNodes() + { + if (0 < getNNodes()) + return true; + return false; + } + + //////////////////////////////////////////////// + // Element (Child Node) + //////////////////////////////////////////////// + + public void setNode(String name, String value) { + Node node = getNode(name); + if (node != null) { + node.setValue(value); + return; + } + node = new Node(name); + node.setValue(value); + addNode(node); + } + + public String getNodeValue(String name) { + Node node = getNode(name); + if (node != null) + return node.getValue(); + return ""; + } + + //////////////////////////////////////////////// + // userData + //////////////////////////////////////////////// + + private Object userData = null; + + public void setUserData(Object data) + { + userData = data; + } + + public Object getUserData() + { + return userData; + } + + + //////////////////////////////////////////////// + // toString + //////////////////////////////////////////////// + + public String getIndentLevelString(int nIndentLevel) + { + char indentString[] = new char[nIndentLevel]; + for (int n=0; n + ps.println(" />"); + } else { + ps.println(">" + XML.escapeXMLChars(value) + ""); + } + + return; + } + + ps.print(indentString + "<" + name); + outputAttributes(ps); + ps.println(">"); + + int nChildNodes = getNNodes(); + for (int n=0; n"); + } + + public String toString(boolean hasChildNode) + { + ByteArrayOutputStream byteOut = new ByteArrayOutputStream(); + PrintWriter pr = new PrintWriter(byteOut); + output(pr, 0, hasChildNode); + pr.flush(); + return byteOut.toString(); + } + + @Override + public String toString() + { + return toString(true); + } + + public String toXMLString(boolean hasChildNode) + { + String xmlStr = toString(); + xmlStr = xmlStr.replaceAll("<", "<"); + xmlStr = xmlStr.replaceAll(">", ">"); + // Thanks for Theo Beisch (11/09/04) + xmlStr = xmlStr.replaceAll("&", "&"); + xmlStr = xmlStr.replaceAll("\"", """); + // Thanks for Brian Owens (12/02/04) + xmlStr = xmlStr.replaceAll("'", "'"); + return xmlStr; + } + + public String toXMLString() + { + return toXMLString(true); + } + + public void print(boolean hasChildNode) + { + PrintWriter pr = new PrintWriter(System.out); + output(pr, 0, hasChildNode); + pr.flush(); + } + + public void print() + { + print(true); + } +} diff --git a/router/java/src/org/cybergarage/xml/NodeList.java b/router/java/src/org/cybergarage/xml/NodeList.java new file mode 100644 index 000000000..53ac9bce8 --- /dev/null +++ b/router/java/src/org/cybergarage/xml/NodeList.java @@ -0,0 +1,65 @@ +/****************************************************************** +* +* CyberXML for Java +* +* Copyright (C) Satoshi Konno 2002 +* +* File: NodeList.java +* +* Revision; +* +* 11/27/02 +* - first revision. +* +******************************************************************/ + +package org.cybergarage.xml; + +import java.util.*; + +public class NodeList extends Vector +{ + private static final long serialVersionUID = 1528884682346143213L; + + public NodeList() + { + } + + public Node getNode(int n) + { + return (Node)get(n); + } + + public Node getNode(String name) + { + if (name == null) + return null; + + int nLists = size(); + for (int n=0; n': entity=">"; break; + case '\'': if (quote) { entity="'"; break; } + case '"': if (quote) { entity="""; break; } + } + if (entity != null) { + out.append(old,selstart,i-selstart); + out.append(entity); + selstart=i+1; + entity=null; + } + } + if (selstart == 0) + return input; + out.append(old,selstart,oldsize-selstart); + return out.toString(); + } + + public final static String escapeXMLChars(String input) + { + return escapeXMLChars(input, true); + } +} + diff --git a/router/java/src/org/cybergarage/xml/parser/JaxpParser.java b/router/java/src/org/cybergarage/xml/parser/JaxpParser.java new file mode 100644 index 000000000..8de6b06b8 --- /dev/null +++ b/router/java/src/org/cybergarage/xml/parser/JaxpParser.java @@ -0,0 +1,127 @@ +/****************************************************************** +* +* CyberXML for Java +* +* Copyright (C) Satoshi Konno 2004 +* +* Author: Markus Thurner (http://thoean.com) +* +* File: JaxpParser.java +* +* Revision; +* +* 06/15/04 +* - first revision. +* +******************************************************************/ + +package org.cybergarage.xml.parser; + +import java.io.InputStream; + +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; + +import org.cybergarage.xml.Node; +import org.cybergarage.xml.Parser; +import org.cybergarage.xml.ParserException; +import org.w3c.dom.Document; +import org.w3c.dom.NamedNodeMap; +import org.xml.sax.InputSource; + + +public class JaxpParser extends Parser +{ + + public JaxpParser() + { + super(); + } + + //////////////////////////////////////////////// + // parse (Node) + //////////////////////////////////////////////// + + public org.cybergarage.xml.Node parse(org.cybergarage.xml.Node parentNode, org.w3c.dom.Node domNode, int rank) + { + int domNodeType = domNode.getNodeType(); +// if (domNodeType != Node.ELEMENT_NODE) +// return; + + String domNodeName = domNode.getNodeName(); + String domNodeValue = domNode.getNodeValue(); + +// Debug.message("[" + rank + "] ELEM : " + domNodeName + ", " + domNodeValue + ", type = " + domNodeType + ", attrs = " + arrrsLen); + + if (domNodeType == org.w3c.dom.Node.TEXT_NODE) { + parentNode.setValue(domNodeValue); + return parentNode; + } + + if (domNodeType != org.w3c.dom.Node.ELEMENT_NODE) + return parentNode; + + org.cybergarage.xml.Node node = new org.cybergarage.xml.Node(); + node.setName(domNodeName); + node.setValue(domNodeValue); + + if (parentNode != null) + parentNode.addNode(node); + + NamedNodeMap attrMap = domNode.getAttributes(); + int attrLen = attrMap.getLength(); + //Debug.message("attrLen = " + attrLen); + for (int n = 0; n statuses); + +} diff --git a/router/java/src/org/freenetproject/ForwardPortStatus.java b/router/java/src/org/freenetproject/ForwardPortStatus.java new file mode 100644 index 000000000..88090da40 --- /dev/null +++ b/router/java/src/org/freenetproject/ForwardPortStatus.java @@ -0,0 +1,33 @@ +package org.freenetproject; + +public class ForwardPortStatus { + + public final int status; + /** The port forward definitely succeeded. */ + public static final int DEFINITE_SUCCESS = 3; + /** The port forward probably succeeded. I.e. it succeeded unless there was + * for example hostile action on the part of the router. */ + public static final int PROBABLE_SUCCESS = 2; + /** The port forward may have succeeded. Or it may not have. We should + * definitely try to check out of band. See UP&P: Many routers say they've + * forwarded the port when they haven't. */ + public static final int MAYBE_SUCCESS = 1; + /** The port forward is in progress */ + public static final int IN_PROGRESS = 0; + /** The port forward probably failed */ + public static final int PROBABLE_FAILURE = -1; + /** The port forward definitely failed. */ + public static final int DEFINITE_FAILURE = -2; + + public final String reasonString; + + /** Some plugins may need to change the external port. They can return it + * to the node here. */ + public final int externalPort; + + public ForwardPortStatus(int status, String reason, int externalPort) { + this.status = status; + this.reasonString = reason; + this.externalPort = externalPort; + } +} diff --git a/router/java/src/org/imports b/router/java/src/org/imports new file mode 100644 index 000000000..6fd39288b --- /dev/null +++ b/router/java/src/org/imports @@ -0,0 +1,57 @@ + * import java.io.IOException; + * import java.io.StringReader; + * import plugins.JabberLinker.org.xmlpull.v1.XmlPullParserException.html; + * import plugins.JabberLinker.org.xmlpull.v1.XmlPullParserFactory; + * import plugins.JabberLinker.org.xmlpull.v1.XmlPullParser; +//import plugins.UPnP.org.cybergarage.util.*; +import java.io.*; +import java.io.*; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.PrintWriter; +import java.io.Reader; +import java.io.Writer; +import java.net.*; +import java.net.*; +import java.util.*; +import java.util.*; +import java.util.Calendar; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.TimeZone; +import java.util.Vector; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import org.w3c.dom.Document; +import org.w3c.dom.NamedNodeMap; +import org.xml.sax.InputSource; +import plugins.UPnP.org.cybergarage.http.*; +import plugins.UPnP.org.cybergarage.http.*; +import plugins.UPnP.org.cybergarage.net.*; +import plugins.UPnP.org.cybergarage.net.*; +import plugins.UPnP.org.cybergarage.soap.*; +import plugins.UPnP.org.cybergarage.soap.*; +import plugins.UPnP.org.cybergarage.upnp.*; +import plugins.UPnP.org.cybergarage.upnp.*; +import plugins.UPnP.org.cybergarage.upnp.Device; +import plugins.UPnP.org.cybergarage.upnp.control.*; +import plugins.UPnP.org.cybergarage.upnp.control.*; +import plugins.UPnP.org.cybergarage.upnp.device.*; +import plugins.UPnP.org.cybergarage.upnp.device.*; +import plugins.UPnP.org.cybergarage.upnp.event.*; +import plugins.UPnP.org.cybergarage.upnp.event.*; +import plugins.UPnP.org.cybergarage.upnp.ssdp.*; +import plugins.UPnP.org.cybergarage.upnp.ssdp.*; +import plugins.UPnP.org.cybergarage.upnp.xml.*; +import plugins.UPnP.org.cybergarage.upnp.xml.*; +import plugins.UPnP.org.cybergarage.util.*; +import plugins.UPnP.org.cybergarage.util.*; +import plugins.UPnP.org.cybergarage.xml.*; +import plugins.UPnP.org.cybergarage.xml.*; +import plugins.UPnP.org.cybergarage.xml.Node; +import plugins.UPnP.org.cybergarage.xml.Parser; +import plugins.UPnP.org.cybergarage.xml.ParserException; +import plugins.UPnP.org.cybergarage.xml.parser.*; diff --git a/router/java/src/org/xmlpull/v1/XmlPullParser.java b/router/java/src/org/xmlpull/v1/XmlPullParser.java new file mode 100644 index 000000000..24a34d2de --- /dev/null +++ b/router/java/src/org/xmlpull/v1/XmlPullParser.java @@ -0,0 +1,1116 @@ +/* -*- c-basic-offset: 4; indent-tabs-mode: nil; -*- //------100-columns-wide------>|*/ +// for license please see accompanying LICENSE.txt file (available also at http://www.xmlpull.org/) + +package org.xmlpull.v1; + +import java.io.InputStream; +import java.io.IOException; +import java.io.Reader; + +/** + * XML Pull Parser is an interface that defines parsing functionlity provided + * in XMLPULL V1 API (visit this website to + * learn more about API and its implementations). + * + *

There are following different + * kinds of parser depending on which features are set:

    + *
  • non-validating parser as defined in XML 1.0 spec when + * FEATURE_PROCESS_DOCDECL is set to true + *
  • validating parser as defined in XML 1.0 spec when + * FEATURE_VALIDATION is true (and that implies that FEATURE_PROCESS_DOCDECL is true) + *
  • when FEATURE_PROCESS_DOCDECL is false (this is default and + * if different value is required necessary must be changed before parsing is started) + * then parser behaves like XML 1.0 compliant non-validating parser under condition that + * no DOCDECL is present in XML documents + * (internal entites can still be defined with defineEntityReplacementText()). + * This mode of operation is intened for operation in constrained environments such as J2ME. + *
+ * + * + *

There are two key methods: next() and nextToken(). While next() provides + * access to high level parsing events, nextToken() allows access to lower + * level tokens. + * + *

The current event state of the parser + * can be determined by calling the + * getEventType() method. + * Initially, the parser is in the START_DOCUMENT + * state. + * + *

The method next() advances the parser to the + * next event. The int value returned from next determines the current parser + * state and is identical to the value returned from following calls to + * getEventType (). + * + *

Th following event types are seen by next()

+ *
START_TAG
An XML start tag was read. + *
TEXT
Text content was read; + * the text content can be retreived using the getText() method. + * (when in validating mode next() will not report ignorable whitespaces, use nextToken() instead) + *
END_TAG
An end tag was read + *
END_DOCUMENT
No more events are available + *
+ * + *

after first next() or nextToken() (or any other next*() method) + * is called user application can obtain + * XML version, standalone and encoding from XML declaration + * in following ways:

    + *
  • version: + * getProperty("http://xmlpull.org/v1/doc/properties.html#xmldecl-version") + * returns String ("1.0") or null if XMLDecl was not read or if property is not supported + *
  • standalone: + * getProperty("http://xmlpull.org/v1/doc/features.html#xmldecl-standalone") + * returns Boolean: null if there was no standalone declaration + * or if property is not supported + * otherwise returns Boolean(true) if standalon="yes" and Boolean(false) when standalone="no" + *
  • encoding: obtained from getInputEncoding() + * null if stream had unknown encoding (not set in setInputStream) + * and it was not declared in XMLDecl + *
+ * + * A minimal example for using this API may look as follows: + * 
+ * import java.io.IOException;
+ * import java.io.StringReader;
+ *
+ * import plugins.JabberLinker.org.xmlpull.v1.XmlPullParser;
+ * import plugins.JabberLinker.org.xmlpull.v1.XmlPullParserException.html;
+ * import plugins.JabberLinker.org.xmlpull.v1.XmlPullParserFactory;
+ *
+ * public class SimpleXmlPullApp
+ * {
+ *
+ *     public static void main (String args[])
+ *         throws XmlPullParserException, IOException
+ *     {
+ *         XmlPullParserFactory factory = XmlPullParserFactory.newInstance();
+ *         factory.setNamespaceAware(true);
+ *         XmlPullParser xpp = factory.newPullParser();
+ *
+ *         xpp.setInput( new StringReader ( "<foo>Hello World!</foo>" ) );
+ *         int eventType = xpp.getEventType();
+ *         while (eventType != XmlPullParser.END_DOCUMENT) {
+ *          if(eventType == XmlPullParser.START_DOCUMENT) {
+ *              System.out.println("Start document");
+ *          } else if(eventType == XmlPullParser.END_DOCUMENT) {
+ *              System.out.println("End document");
+ *          } else if(eventType == XmlPullParser.START_TAG) {
+ *              System.out.println("Start tag "+xpp.getName());
+ *          } else if(eventType == XmlPullParser.END_TAG) {
+ *              System.out.println("End tag "+xpp.getName());
+ *          } else if(eventType == XmlPullParser.TEXT) {
+ *              System.out.println("Text "+xpp.getText());
+ *          }
+ *          eventType = xpp.next();
+ *         }
+ *     }
+ * }
+ *
+ * + *

The above example will generate the following output: + * 

+ * Start document
+ * Start tag foo
+ * Text Hello World!
+ * End tag foo
+ *
+ * + *

For more details on API usage, please refer to the + * quick Introduction available at http://www.xmlpull.org + * + * @see XmlPullParserFactory + * @see #defineEntityReplacementText + * @see #getName + * @see #getNamespace + * @see #getText + * @see #next + * @see #nextToken + * @see #setInput + * @see #FEATURE_PROCESS_DOCDECL + * @see #FEATURE_VALIDATION + * @see #START_DOCUMENT + * @see #START_TAG + * @see #TEXT + * @see #END_TAG + * @see #END_DOCUMENT + * + * @author Stefan Haustein + * @author Aleksander Slominski + */ + +public interface XmlPullParser { + + /** This constant represents the default namespace (empty string "") */ + String NO_NAMESPACE = ""; + + // ---------------------------------------------------------------------------- + // EVENT TYPES as reported by next() + + /** + * Signalize that parser is at the very beginning of the document + * and nothing was read yet. + * This event type can only be observed by calling getEvent() + * before the first call to next(), nextToken, or nextTag()). + * + * @see #next + * @see #nextToken + */ + int START_DOCUMENT = 0; + + /** + * Logical end of the xml document. Returned from getEventType, next() + * and nextToken() + * when the end of the input document has been reached. + *

NOTE: calling again + * next() or nextToken() + * will result in exception being thrown. + * + * @see #next + * @see #nextToken + */ + int END_DOCUMENT = 1; + + /** + * Returned from getEventType(), + * next(), nextToken() when + * a start tag was read. + * The name of start tag is available from getName(), its namespace and prefix are + * available from getNamespace() and getPrefix() + * if namespaces are enabled. + * See getAttribute* methods to retrieve element attributes. + * See getNamespace* methods to retrieve newly declared namespaces. + * + * @see #next + * @see #nextToken + * @see #getName + * @see #getPrefix + * @see #getNamespace + * @see #getAttributeCount + * @see #getDepth + * @see #getNamespaceCount + * @see #getNamespace + * @see #FEATURE_PROCESS_NAMESPACES + */ + int START_TAG = 2; + + /** + * Returned from getEventType(), next(), or + * nextToken() when an end tag was read. + * The name of start tag is available from getName(), its + * namespace and prefix are + * available from getNamespace() and getPrefix(). + * + * @see #next + * @see #nextToken + * @see #getName + * @see #getPrefix + * @see #getNamespace + * @see #FEATURE_PROCESS_NAMESPACES + */ + int END_TAG = 3; + + + /** + * Character data was read and will is available by calling getText(). + *

Please note: next() will + * accumulate multiple + * events into one TEXT event, skipping IGNORABLE_WHITESPACE, + * PROCESSING_INSTRUCTION and COMMENT events, + * In contrast, nextToken() will stop reading + * text when any other event is observed. + * Also, when the state was reached by calling next(), the text value will + * be normalized, whereas getText() will + * return unnormalized content in the case of nextToken(). This allows + * an exact roundtrip without chnanging line ends when examining low + * level events, whereas for high level applications the text is + * normalized apropriately. + * + * @see #next + * @see #nextToken + * @see #getText + */ + int TEXT = 4; + + // ---------------------------------------------------------------------------- + // additional events exposed by lower level nextToken() + + /** + * A CDATA sections was just read; + * this token is available only from calls to nextToken(). + * A call to next() will accumulate various text events into a single event + * of type TEXT. The text contained in the CDATA section is available + * by callling getText(). + * + * @see #nextToken + * @see #getText + */ + int CDSECT = 5; + + /** + * An entity reference was just read; + * this token is available from nextToken() + * only. The entity name is available by calling getName(). If available, + * the replacement text can be obtained by calling getTextt(); otherwise, + * the user is responsibile for resolving the entity reference. + * This event type is never returned from next(); next() will + * accumulate the replacement text and other text + * events to a single TEXT event. + * + * @see #nextToken + * @see #getText + */ + int ENTITY_REF = 6; + + /** + * Ignorable whitespace was just read. + * This token is available only from nextToken()). + * For non-validating + * parsers, this event is only reported by nextToken() when outside + * the root element. + * Validating parsers may be able to detect ignorable whitespace at + * other locations. + * The ignorable whitespace string is available by calling getText() + * + *

NOTE: this is different from calling the + * isWhitespace() method, since text content + * may be whitespace but not ignorable. + * + * Ignorable whitespace is skipped by next() automatically; this event + * type is never returned from next(). + * + * @see #nextToken + * @see #getText + */ + int IGNORABLE_WHITESPACE = 7; + + /** + * An XML processing instruction declaration was just read. This + * event type is available only via nextToken(). + * getText() will return text that is inside the processing instruction. + * Calls to next() will skip processing instructions automatically. + * @see #nextToken + * @see #getText + */ + int PROCESSING_INSTRUCTION = 8; + + /** + * An XML comment was just read. This event type is this token is + * available via nextToken() only; + * calls to next() will skip comments automatically. + * The content of the comment can be accessed using the getText() + * method. + * + * @see #nextToken + * @see #getText + */ + int COMMENT = 9; + + /** + * An XML document type declaration was just read. This token is + * available from nextToken() only. + * The unparsed text inside the doctype is available via + * the getText() method. + * + * @see #nextToken + * @see #getText + */ + int DOCDECL = 10; + + /** + * This array can be used to convert the event type integer constants + * such as START_TAG or TEXT to + * to a string. For example, the value of TYPES[START_TAG] is + * the string "START_TAG". + * + * This array is intended for diagnostic output only. Relying + * on the contents of the array may be dangerous since malicous + * applications may alter the array, although it is final, due + * to limitations of the Java language. + */ + String [] TYPES = { + "START_DOCUMENT", + "END_DOCUMENT", + "START_TAG", + "END_TAG", + "TEXT", + "CDSECT", + "ENTITY_REF", + "IGNORABLE_WHITESPACE", + "PROCESSING_INSTRUCTION", + "COMMENT", + "DOCDECL" + }; + + + // ---------------------------------------------------------------------------- + // namespace related features + + /** + * This feature determines whether the parser processes + * namespaces. As for all features, the default value is false. + *

NOTE: The value can not be changed during + * parsing an must be set before parsing. + * + * @see #getFeature + * @see #setFeature + */ + String FEATURE_PROCESS_NAMESPACES = + "http://xmlpull.org/v1/doc/features.html#process-namespaces"; + + /** + * This feature determines whether namespace attributes are + * exposed via the attribute access methods. Like all features, + * the default value is false. This feature cannot be changed + * during parsing. + * + * @see #getFeature + * @see #setFeature + */ + String FEATURE_REPORT_NAMESPACE_ATTRIBUTES = + "http://xmlpull.org/v1/doc/features.html#report-namespace-prefixes"; + + /** + * This feature determines whether the document declaration + * is processed. If set to false, + * the DOCDECL event type is reported by nextToken() + * and ignored by next(). + * + * If this featue is activated, then the document declaration + * must be processed by the parser. + * + *

Please note: If the document type declaration + * was ignored, entity references may cause exceptions + * later in the parsing process. + * The default value of this feature is false. It cannot be changed + * during parsing. + * + * @see #getFeature + * @see #setFeature + */ + String FEATURE_PROCESS_DOCDECL = + "http://xmlpull.org/v1/doc/features.html#process-docdecl"; + + /** + * If this feature is activated, all validation errors as + * defined in the XML 1.0 sepcification are reported. + * This implies that FEATURE_PROCESS_DOCDECL is true and both, the + * internal and external document type declaration will be processed. + *

Please Note: This feature can not be changed + * during parsing. The default value is false. + * + * @see #getFeature + * @see #setFeature + */ + String FEATURE_VALIDATION = + "http://xmlpull.org/v1/doc/features.html#validation"; + + /** + * Use this call to change the general behaviour of the parser, + * such as namespace processing or doctype declaration handling. + * This method must be called before the first call to next or + * nextToken. Otherwise, an exception is thrown. + *

Example: call setFeature(FEATURE_PROCESS_NAMESPACES, true) in order + * to switch on namespace processing. The initial settings correspond + * to the properties requested from the XML Pull Parser factory. + * If none were requested, all feautures are deactivated by default. + * + * @exception XmlPullParserException If the feature is not supported or can not be set + * @exception IllegalArgumentException If string with the feature name is null + */ + void setFeature(String name, + boolean state) throws XmlPullParserException; + + /** + * Returns the current value of the given feature. + *

Please note: unknown features are + * always returned as false. + * + * @param name The name of feature to be retrieved. + * @return The value of the feature. + * @exception IllegalArgumentException if string the feature name is null + */ + + boolean getFeature(String name); + + /** + * Set the value of a property. + * + * The property name is any fully-qualified URI. + * + * @exception XmlPullParserException If the property is not supported or can not be set + * @exception IllegalArgumentException If string with the property name is null + */ + void setProperty(String name, + Object value) throws XmlPullParserException; + + /** + * Look up the value of a property. + * + * The property name is any fully-qualified URI. + *

NOTE: unknown properties are always + * returned as null. + * + * @param name The name of property to be retrieved. + * @return The value of named property. + */ + Object getProperty(String name); + + + /** + * Set the input source for parser to the given reader and + * resets the parser. The event type is set to the initial value + * START_DOCUMENT. + * Setting the reader to null will just stop parsing and + * reset parser state, + * allowing the parser to free internal resources + * such as parsing buffers. + */ + void setInput(Reader in) throws XmlPullParserException; + + + /** + * Sets the input stream the parser is going to process. + * This call resets the parser state and sets the event type + * to the initial value START_DOCUMENT. + * + *

NOTE: If an input encoding string is passed, + * it MUST be used. Otherwise, + * if inputEncoding is null, the parser SHOULD try to determine + * input encoding following XML 1.0 specification (see below). + * If encoding detection is supported then following feature + * http://xmlpull.org/v1/doc/features.html#detect-encoding + * MUST be true amd otherwise it must be false + * + * @param inputStream contains a raw byte input stream of possibly + * unknown encoding (when inputEncoding is null). + * + * @param inputEncoding if not null it MUST be used as encoding for inputStream + */ + void setInput(InputStream inputStream, String inputEncoding) + throws XmlPullParserException; + + /** + * Returns the input encoding if known, null otherwise. + * If setInput(InputStream, inputEncoding) was called with an inputEncoding + * value other than null, this value must be returned + * from this method. Otherwise, if inputEncoding is null and + * the parser suppports the encoding detection feature + * (http://xmlpull.org/v1/doc/features.html#detect-encoding), + * it must return the detected encoding. + * If setInput(Reader) was called, null is returned. + * After first call to next if XML declaration was present this method + * will return encoding declared. + */ + String getInputEncoding(); + + /** + * Set new value for entity replacement text as defined in + * XML 1.0 Section 4.5 + * Construction of Internal Entity Replacement Text. + * If FEATURE_PROCESS_DOCDECL or FEATURE_VALIDATION are set, calling this + * function will result in an exception -- when processing of DOCDECL is + * enabled, there is no need to the entity replacement text manually. + * + *

The motivation for this function is to allow very small + * implementations of XMLPULL that will work in J2ME environments. + * Though these implementations may not be able to process the document type + * declaration, they still can work with known DTDs by using this function. + * + *

Please notes: The given value is used literally as replacement text + * and it corresponds to declaring entity in DTD that has all special characters + * escaped: left angle bracket is replaced with &lt;, ampersnad with &amp; + * and so on. + * + *

Note: The given value is the literal replacement text and must not + * contain any other entity reference (if it contains any entity reference + * there will be no further replacement). + * + *

Note: The list of pre-defined entity names will + * always contain standard XML entities such as + * amp (&amp;), lt (&lt;), gt (&gt;), quot (&quot;), and apos (&apos;). + * Those cannot be redefined by this method! + * + * @see #setInput + * @see #FEATURE_PROCESS_DOCDECL + * @see #FEATURE_VALIDATION + */ + void defineEntityReplacementText( String entityName, + String replacementText ) throws XmlPullParserException; + + /** + * Returns the numbers of elements in the namespace stack for the given + * depth. + * If namespaces are not enabled, 0 is returned. + * + *

NOTE: when parser is on END_TAG then it is allowed to call + * this function with getDepth()+1 argument to retrieve position of namespace + * prefixes and URIs that were declared on corresponding START_TAG. + *

NOTE: to retrieve lsit of namespaces declared in current element:

+     *       XmlPullParser pp = ...
+     *       int nsStart = pp.getNamespaceCount(pp.getDepth()-1);
+     *       int nsEnd = pp.getNamespaceCount(pp.getDepth());
+     *       for (int i = nsStart; i < nsEnd; i++) {
+     *          String prefix = pp.getNamespacePrefix(i);
+     *          String ns = pp.getNamespaceUri(i);
+     *           // ...
+     *      }
+     *
+ * + * @see #getNamespacePrefix + * @see #getNamespaceUri + * @see #getNamespace() + * @see #getNamespace(String) + */ + int getNamespaceCount(int depth) throws XmlPullParserException; + + /** + * Returns the namespace prefixe for the given position + * in the namespace stack. + * Default namespace declaration (xmlns='...') will have null as prefix. + * If the given index is out of range, an exception is thrown. + *

Please note: when the parser is on an END_TAG, + * namespace prefixes that were declared + * in the corresponding START_TAG are still accessible + * although they are no longer in scope. + */ + String getNamespacePrefix(int pos) throws XmlPullParserException; + + /** + * Returns the namespace URI for the given position in the + * namespace stack + * If the position is out of range, an exception is thrown. + *

NOTE: when parser is on END_TAG then namespace prefixes that were declared + * in corresponding START_TAG are still accessible even though they are not in scope + */ + String getNamespaceUri(int pos) throws XmlPullParserException; + + /** + * Returns the URI corresponding to the given prefix, + * depending on current state of the parser. + * + *

If the prefix was not declared in the current scope, + * null is returned. The default namespace is included + * in the namespace table and is available via + * getNamespace (null). + * + *

This method is a convenience method for + * + * 

+     *  for (int i = getNamespaceCount(getDepth ())-1; i >= 0; i--) {
+     *   if (getNamespacePrefix(i).equals( prefix )) {
+     *     return getNamespaceUri(i);
+     *   }
+     *  }
+     *  return null;
+     *
+ * + *

Please note: parser implementations + * may provide more efifcient lookup, e.g. using a Hashtable. + * The 'xml' prefix is bound to "http://www.w3.org/XML/1998/namespace", as + * defined in the + * Namespaces in XML + * specification. Analogous, the 'xmlns' prefix is resolved to + * http://www.w3.org/2000/xmlns/ + * + * @see #getNamespaceCount + * @see #getNamespacePrefix + * @see #getNamespaceUri + */ + String getNamespace (String prefix); + + + // -------------------------------------------------------------------------- + // miscellaneous reporting methods + + /** + * Returns the current depth of the element. + * Outside the root element, the depth is 0. The + * depth is incremented by 1 when a start tag is reached. + * The depth is decremented AFTER the end tag + * event was observed. + * + * 

+     * <!-- outside -->     0
+     * <root>                  1
+     *   sometext                 1
+     *     <foobar>         2
+     *     </foobar>        2
+     * </root>              1
+     * <!-- outside -->     0
+     *
+ */ + int getDepth(); + + /** + * Returns a short text describing the current parser state, including + * the position, a + * description of the current event and the data source if known. + * This method is especially useful to provide meaningful + * error messages and for debugging purposes. + */ + String getPositionDescription (); + + + /** + * Returns the current line number, starting from 1. + * When the parser does not know the current line number + * or can not determine it, -1 is returned (e.g. for WBXML). + * + * @return current line number or -1 if unknown. + */ + int getLineNumber(); + + /** + * Returns the current column number, starting from 0. + * When the parser does not know the current column number + * or can not determine it, -1 is returned (e.g. for WBXML). + * + * @return current column number or -1 if unknown. + */ + int getColumnNumber(); + + + // -------------------------------------------------------------------------- + // TEXT related methods + + /** + * Checks whether the current TEXT event contains only whitespace + * characters. + * For IGNORABLE_WHITESPACE, this is always true. + * For TEXT and CDSECT, false is returned when the current event text + * contains at least one non-white space character. For any other + * event type an exception is thrown. + * + *

Please note: non-validating parsers are not + * able to distinguish whitespace and ignorable whitespace, + * except from whitespace outside the root element. Ignorable + * whitespace is reported as separate event, which is exposed + * via nextToken only. + * + */ + boolean isWhitespace() throws XmlPullParserException; + + /** + * Returns the text content of the current event as String. + * The value returned depends on current event type, + * for example for TEXT event it is element content + * (this is typical case when next() is used). + * + * See description of nextToken() for detailed description of + * possible returned values for different types of events. + * + *

NOTE: in case of ENTITY_REF, this method returns + * the entity replacement text (or null if not available). This is + * the only case where + * getText() and getTextCharacters() return different values. + * + * @see #getEventType + * @see #next + * @see #nextToken + */ + String getText (); + + + /** + * Returns the buffer that contains the text of the current event, + * as well as the start offset and length relevant for the current + * event. See getText(), next() and nextToken() for description of possible returned values. + * + *

Please note: this buffer must not + * be modified and its content MAY change after a call to + * next() or nextToken(). This method will always return the + * same value as getText(), except for ENTITY_REF. In the case + * of ENTITY ref, getText() returns the replacement text and + * this method returns the actual input buffer containing the + * entity name. + * If getText() returns null, this method returns null as well and + * the values returned in the holder array MUST be -1 (both start + * and length). + * + * @see #getText + * @see #next + * @see #nextToken + * + * @param holderForStartAndLength Must hold an 2-element int array + * into which the start offset and length values will be written. + * @return char buffer that contains the text of the current event + * (null if the current event has no text associated). + */ + char[] getTextCharacters(int [] holderForStartAndLength); + + // -------------------------------------------------------------------------- + // START_TAG / END_TAG shared methods + + /** + * Returns the namespace URI of the current element. + * The default namespace is represented + * as empty string. + * If namespaces are not enabled, an empty String ("") is always returned. + * The current event must be START_TAG or END_TAG; otherwise, + * null is returned. + */ + String getNamespace (); + + /** + * For START_TAG or END_TAG events, the (local) name of the current + * element is returned when namespaces are enabled. When namespace + * processing is disabled, the raw name is returned. + * For ENTITY_REF events, the entity name is returned. + * If the current event is not START_TAG, END_TAG, or ENTITY_REF, + * null is returned. + *

Please note: To reconstruct the raw element name + * when namespaces are enabled and the prefix is not null, + * you will need to add the prefix and a colon to localName.. + * + */ + String getName(); + + /** + * Returns the prefix of the current element. + * If the element is in the default namespace (has no prefix), + * null is returned. + * If namespaces are not enabled, or the current event + * is not START_TAG or END_TAG, null is returned. + */ + String getPrefix(); + + /** + * Returns true if the current event is START_TAG and the tag + * is degenerated + * (e.g. <foobar/>). + *

NOTE: if the parser is not on START_TAG, an exception + * will be thrown. + */ + boolean isEmptyElementTag() throws XmlPullParserException; + + // -------------------------------------------------------------------------- + // START_TAG Attributes retrieval methods + + /** + * Returns the number of attributes of the current start tag, or + * -1 if the current event type is not START_TAG + * + * @see #getAttributeNamespace + * @see #getAttributeName + * @see #getAttributePrefix + * @see #getAttributeValue + */ + int getAttributeCount(); + + /** + * Returns the namespace URI of the attribute + * with the given index (starts from 0). + * Returns an empty string ("") if namespaces are not enabled + * or the attribute has no namespace. + * Throws an IndexOutOfBoundsException if the index is out of range + * or the current event type is not START_TAG. + * + *

NOTE: if FEATURE_REPORT_NAMESPACE_ATTRIBUTES is set + * then namespace attributes (xmlns:ns='...') must be reported + * with namespace + * http://www.w3.org/2000/xmlns/ + * (visit this URL for description!). + * The default namespace attribute (xmlns="...") will be reported with empty namespace. + *

NOTE:The xml prefix is bound as defined in + * Namespaces in XML + * specification to "http://www.w3.org/XML/1998/namespace". + * + * @param zero based index of attribute + * @return attribute namespace, + * empty string ("") is returned if namesapces processing is not enabled or + * namespaces processing is enabled but attribute has no namespace (it has no prefix). + */ + String getAttributeNamespace (int index); + + /** + * Returns the local name of the specified attribute + * if namespaces are enabled or just attribute name if namespaces are disabled. + * Throws an IndexOutOfBoundsException if the index is out of range + * or current event type is not START_TAG. + * + * @param zero based index of attribute + * @return attribute name (null is never returned) + */ + String getAttributeName (int index); + + /** + * Returns the prefix of the specified attribute + * Returns null if the element has no prefix. + * If namespaces are disabled it will always return null. + * Throws an IndexOutOfBoundsException if the index is out of range + * or current event type is not START_TAG. + * + * @param zero based index of attribute + * @return attribute prefix or null if namespaces processing is not enabled. + */ + String getAttributePrefix(int index); + + /** + * Returns the type of the specified attribute + * If parser is non-validating it MUST return CDATA. + * + * @param zero based index of attribute + * @return attribute type (null is never returned) + */ + String getAttributeType(int index); + + /** + * Returns if the specified attribute was not in input was declared in XML. + * If parser is non-validating it MUST always return false. + * This information is part of XML infoset: + * + * @param zero based index of attribute + * @return false if attribute was in input + */ + boolean isAttributeDefault(int index); + + /** + * Returns the given attributes value. + * Throws an IndexOutOfBoundsException if the index is out of range + * or current event type is not START_TAG. + * + *

NOTE: attribute value must be normalized + * (including entity replacement text if PROCESS_DOCDECL is false) as described in + * XML 1.0 section + * 3.3.3 Attribute-Value Normalization + * + * @see #defineEntityReplacementText + * + * @param zero based index of attribute + * @return value of attribute (null is never returned) + */ + String getAttributeValue(int index); + + /** + * Returns the attributes value identified by namespace URI and namespace localName. + * If namespaces are disabled namespace must be null. + * If current event type is not START_TAG then IndexOutOfBoundsException will be thrown. + * + *

NOTE: attribute value must be normalized + * (including entity replacement text if PROCESS_DOCDECL is false) as described in + * XML 1.0 section + * 3.3.3 Attribute-Value Normalization + * + * @see #defineEntityReplacementText + * + * @param namespace Namespace of the attribute if namespaces are enabled otherwise must be null + * @param name If namespaces enabled local name of attribute otherwise just attribute name + * @return value of attribute or null if attribute with given name does not exist + */ + String getAttributeValue(String namespace, + String name); + + // -------------------------------------------------------------------------- + // actual parsing methods + + /** + * Returns the type of the current event (START_TAG, END_TAG, TEXT, etc.) + * + * @see #next() + * @see #nextToken() + */ + int getEventType() + throws XmlPullParserException; + + /** + * Get next parsing event - element content wil be coalesced and only one + * TEXT event must be returned for whole element content + * (comments and processing instructions will be ignored and emtity references + * must be expanded or exception mus be thrown if entity reerence can not be exapnded). + * If element content is empty (content is "") then no TEXT event will be reported. + * + *

NOTE: empty element (such as <tag/>) will be reported + * with two separate events: START_TAG, END_TAG - it must be so to preserve + * parsing equivalency of empty element to <tag></tag>. + * (see isEmptyElementTag ()) + * + * @see #isEmptyElementTag + * @see #START_TAG + * @see #TEXT + * @see #END_TAG + * @see #END_DOCUMENT + */ + + int next() + throws XmlPullParserException, IOException; + + + /** + * This method works similarly to next() but will expose + * additional event types (COMMENT, CDSECT, DOCDECL, ENTITY_REF, PROCESSING_INSTRUCTION, or + * IGNORABLE_WHITESPACE) if they are available in input. + * + *

If special feature + * FEATURE_XML_ROUNDTRIP + * (identified by URI: http://xmlpull.org/v1/doc/features.html#xml-roundtrip) + * is enabled it is possible to do XML document round trip ie. reproduce + * exectly on output the XML input using getText(): + * returned content is always unnormalized (exactly as in input). + * Otherwise returned content is end-of-line normalized as described + * XML 1.0 End-of-Line Handling + * and. Also when this feature is enabled exact content of START_TAG, END_TAG, + * DOCDECL and PROCESSING_INSTRUCTION is available. + * + *

Here is the list of tokens that can be returned from nextToken() + * and what getText() and getTextCharacters() returns:

+ *
START_DOCUMENT
null + *
END_DOCUMENT
null + *
START_TAG
null unless FEATURE_XML_ROUNDTRIP + * enabled and then returns XML tag, ex: <tag attr='val'> + *
END_TAG
null unless FEATURE_XML_ROUNDTRIP + * id enabled and then returns XML tag, ex: </tag> + *
TEXT
return element content. + *
Note: that element content may be delivered in multiple consecutive TEXT events. + *
IGNORABLE_WHITESPACE
return characters that are determined to be ignorable white + * space. If the FEATURE_XML_ROUNDTRIP is enabled all whitespace content outside root + * element will always reported as IGNORABLE_WHITESPACE otherise rteporting is optional. + *
Note: that element content may be delevered in multiple consecutive IGNORABLE_WHITESPACE events. + *
CDSECT
+ * return text inside CDATA + * (ex. 'fo<o' from <!CDATA[fo<o]]>) + *
PROCESSING_INSTRUCTION
+ * if FEATURE_XML_ROUNDTRIP is true + * return exact PI content ex: 'pi foo' from <?pi foo?> + * otherwise it may be exact PI content or concatenation of PI target, + * space and data so for example for + * <?target data?> string "target data" may + * be returned if FEATURE_XML_ROUNDTRIP is false. + *
COMMENT
return comment content ex. 'foo bar' from <!--foo bar--> + *
ENTITY_REF
getText() MUST return entity replacement text if PROCESS_DOCDECL is false + * otherwise getText() MAY return null, + * additionally getTextCharacters() MUST return entity name + * (for example 'entity_name' for &entity_name;). + *
NOTE: this is the only place where value returned from getText() and + * getTextCharacters() are different + *
NOTE: it is user responsibility to resolve entity reference + * if PROCESS_DOCDECL is false and there is no entity replacement text set in + * defineEntityReplacementText() method (getText() will be null) + *
NOTE: character entities (ex. &#32;) and standard entities such as + * &amp; &lt; &gt; &quot; &apos; are reported as well + * and are not reported as TEXT tokens but as ENTITY_REF tokens! + * This requirement is added to allow to do roundtrip of XML documents! + *
DOCDECL
+ * if FEATURE_XML_ROUNDTRIP is true or PROCESS_DOCDECL is false + * then return what is inside of DOCDECL for example it returns:
+     * " titlepage SYSTEM "http://www.foo.bar/dtds/typo.dtd"
+     * [<!ENTITY % active.links "INCLUDE">]"
+ *

for input document that contained:

+     * <!DOCTYPE titlepage SYSTEM "http://www.foo.bar/dtds/typo.dtd"
+     * [<!ENTITY % active.links "INCLUDE">]>
+ * otherwise if FEATURE_XML_ROUNDTRIP is false and PROCESS_DOCDECL is true + * then what is returned is undefined (it may be even null) + *
+ *
+ * + *

NOTE: there is no gurantee that there will only one TEXT or + * IGNORABLE_WHITESPACE event from nextToken() as parser may chose to deliver element content in + * multiple tokens (dividing element content into chunks) + * + *

NOTE: whether returned text of token is end-of-line normalized + * is depending on FEATURE_XML_ROUNDTRIP. + * + *

NOTE: XMLDecl (<?xml ...?>) is not reported but its content + * is available through optional properties (see class description above). + * + * @see #next + * @see #START_TAG + * @see #TEXT + * @see #END_TAG + * @see #END_DOCUMENT + * @see #COMMENT + * @see #DOCDECL + * @see #PROCESSING_INSTRUCTION + * @see #ENTITY_REF + * @see #IGNORABLE_WHITESPACE + */ + int nextToken() + throws XmlPullParserException, IOException; + + //----------------------------------------------------------------------------- + // utility methods to mak XML parsing easier ... + + /** + * Test if the current event is of the given type and if the + * namespace and name do match. null will match any namespace + * and any name. If the test is not passed, an exception is + * thrown. The exception text indicates the parser position, + * the expected event and the current event that is not meeting the + * requirement. + * + *

Essentially it does this + * 

+     *  if (type != getEventType()
+     *  || (namespace != null &&  !namespace.equals( getNamespace () ) )
+     *  || (name != null &&  !name.equals( getName() ) ) )
+     *     throw new XmlPullParserException( "expected "+ TYPES[ type ]+getPositionDescription());
+     *
+ */ + void require(int type, String namespace, String name) + throws XmlPullParserException, IOException; + + /** + * If current event is START_TAG then if next element is TEXT then element content is returned + * or if next event is END_TAG then empty string is returned, otherwise exception is thrown. + * After calling this function successfully parser will be positioned on END_TAG. + * + *

The motivation for this function is to allow to parse consistently both + * empty elements and elements that has non empty content, for example for input:

    + *
  1. <tag>foo</tag> + *
  2. <tag></tag> (which is equivalent to <tag/> + * both input can be parsed with the same code: + * 
    +     *   p.nextTag()
+     *   p.requireEvent(p.START_TAG, "", "tag");
+     *   String content = p.nextText();
+     *   p.requireEvent(p.END_TAG, "", "tag");
+     *
    + * This function together with nextTag make it very easy to parse XML that has + * no mixed content. + * + * + *

    Essentially it does this + * 

    +     *  if(getEventType() != START_TAG) {
+     *     throw new XmlPullParserException(
+     *       "parser must be on START_TAG to read next text", this, null);
+     *  }
+     *  int eventType = next();
+     *  if(eventType == TEXT) {
+     *     String result = getText();
+     *     eventType = next();
+     *     if(eventType != END_TAG) {
+     *       throw new XmlPullParserException(
+     *          "event TEXT it must be immediately followed by END_TAG", this, null);
+     *      }
+     *      return result;
+     *  } else if(eventType == END_TAG) {
+     *     return "";
+     *  } else {
+     *     throw new XmlPullParserException(
+     *       "parser must be on START_TAG or TEXT to read text", this, null);
+     *  }
+     *
    + */ + String nextText() throws XmlPullParserException, IOException; + + /** + * Call next() and return event if it is START_TAG or END_TAG + * otherwise throw an exception. + * It will skip whitespace TEXT before actual tag if any. + * + *

    essentially it does this + * 

    +     *   int eventType = next();
+     *   if(eventType == TEXT &&  isWhitespace()) {   // skip whitespace
+     *      eventType = next();
+     *   }
+     *   if (eventType != START_TAG &&  eventType != END_TAG) {
+     *      throw new XmlPullParserException("expected start or end tag", this, null);
+     *   }
+     *   return eventType;
+     *
    + */ + int nextTag() throws XmlPullParserException, IOException; + +} + diff --git a/router/java/src/org/xmlpull/v1/XmlPullParserException.java b/router/java/src/org/xmlpull/v1/XmlPullParserException.java new file mode 100644 index 000000000..0faba7e20 --- /dev/null +++ b/router/java/src/org/xmlpull/v1/XmlPullParserException.java @@ -0,0 +1,80 @@ +/* -*- c-basic-offset: 4; indent-tabs-mode: nil; -*- //------100-columns-wide------>|*/ +// for license please see accompanying LICENSE.txt file (available also at http://www.xmlpull.org/) + +package org.xmlpull.v1; + +/** + * This exception is thrown to signal XML Pull Parser related faults. + * + * @author Aleksander Slominski + */ +public class XmlPullParserException extends Exception { + /** + * + */ + private static final long serialVersionUID = 1L; + protected Throwable detail; + protected int row = -1; + protected int column = -1; + + /* public XmlPullParserException() { + }*/ + + public XmlPullParserException(String s) { + super(s); + } + + /* + public XmlPullParserException(String s, Throwable thrwble) { + super(s); + this.detail = thrwble; + } + + public XmlPullParserException(String s, int row, int column) { + super(s); + this.row = row; + this.column = column; + } + */ + + public XmlPullParserException(String msg, XmlPullParser parser, Throwable chain) { + super ((msg == null ? "" : msg+" ") + + (parser == null ? "" : "(position:"+parser.getPositionDescription()+") ") + + (chain == null ? "" : "caused by: "+chain)); + + if (parser != null) { + this.row = parser.getLineNumber(); + this.column = parser.getColumnNumber(); + } + this.detail = chain; + } + + public Throwable getDetail() { return detail; } + // public void setDetail(Throwable cause) { this.detail = cause; } + public int getLineNumber() { return row; } + public int getColumnNumber() { return column; } + + /* + public String getMessage() { + if(detail == null) + return super.getMessage(); + else + return super.getMessage() + "; nested exception is: \n\t" + + detail.getMessage(); + } + */ + + //NOTE: code that prints this and detail is difficult in J2ME + public void printStackTrace() { + if (detail == null) { + super.printStackTrace(); + } else { + synchronized(System.err) { + System.err.println(super.getMessage() + "; nested exception is:"); + detail.printStackTrace(); + } + } + } + +} + diff --git a/router/java/src/org/xmlpull/v1/XmlPullParserFactory.java b/router/java/src/org/xmlpull/v1/XmlPullParserFactory.java new file mode 100644 index 000000000..af6c27adb --- /dev/null +++ b/router/java/src/org/xmlpull/v1/XmlPullParserFactory.java @@ -0,0 +1,356 @@ +/* -*- c-basic-offset: 4; indent-tabs-mode: nil; -*- //------100-columns-wide------>|*/ +// for license please see accompanying LICENSE.txt file (available also at http://www.xmlpull.org/) + +package org.xmlpull.v1; + +import java.io.InputStream; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; + +/** + * This class is used to create implementations of XML Pull Parser defined in XMPULL V1 API. + * The name of actual factory class will be determined based on several parameters. + * It works similar to JAXP but tailored to work in J2ME environments + * (no access to system properties or file system) so name of parser class factory to use + * and its class used for loading (no class loader - on J2ME no access to context class loaders) + * must be passed explicitly. If no name of parser factory was passed (or is null) + * it will try to find name by searching in CLASSPATH for + * META-INF/services/plugins.JabberLinker.org.xmlpull.v1.XmlPullParserFactory resource that should contain + * a comma separated list of class names of factories or parsers to try (in order from + * left to the right). If none found, it will throw an exception. + * + *
    NOTE:In J2SE or J2EE environments, you may want to use + * newInstance(property, classLoaderCtx) + * where first argument is + * System.getProperty(XmlPullParserFactory.PROPERTY_NAME) + * and second is Thread.getContextClassLoader().getClass() . + * + * @see XmlPullParser + * + * @author Aleksander Slominski + * @author Stefan Haustein + */ + +public class XmlPullParserFactory { + /** used as default class to server as context class in newInstance() */ + final static Class referenceContextClass; + + static { + XmlPullParserFactory f = new XmlPullParserFactory(); + referenceContextClass = f.getClass(); + } + + /** Name of the system or midlet property that should be used for + a system property containing a comma separated list of factory + or parser class names (value: + plugins.JabberLinker.org.xmlpull.v1.XmlPullParserFactory). */ + + + public static final String PROPERTY_NAME = + "plugins.JabberLinker.org.xmlpull.v1.XmlPullParserFactory"; + + private static final String RESOURCE_NAME = + "/META-INF/services/" + PROPERTY_NAME; + + + // public static final String DEFAULT_PROPERTY = + // "plugins.JabberLinker.org.xmlpull.xpp3.XmlPullParser,org.kxml2.io.KXmlParser"; + + + protected Vector parserClasses; + protected String classNamesLocation; + + protected Vector serializerClasses; + + + // features are kept there + protected Hashtable features = new Hashtable(); + + + /** + * Protected constructor to be called by factory implementations. + */ + + protected XmlPullParserFactory() { + } + + + + /** + * Set the features to be set when XML Pull Parser is created by this factory. + *

    NOTE: factory features are not used for XML Serializer. + * + * @param name string with URI identifying feature + * @param state if true feature will be set; if false will be ignored + */ + + public void setFeature(String name, + boolean state) throws XmlPullParserException { + + features.put(name, new Boolean(state)); + } + + + /** + * Return the current value of the feature with given name. + *

    NOTE: factory features are not used for XML Serializer. + * + * @param name The name of feature to be retrieved. + * @return The value of named feature. + * Unknown features are always returned as false + */ + + public boolean getFeature (String name) { + Boolean value = (Boolean) features.get(name); + return value != null ? value.booleanValue() : false; + } + + /** + * Specifies that the parser produced by this factory will provide + * support for XML namespaces. + * By default the value of this is set to false. + * + * @param awareness true if the parser produced by this code + * will provide support for XML namespaces; false otherwise. + */ + + public void setNamespaceAware(boolean awareness) { + features.put (XmlPullParser.FEATURE_PROCESS_NAMESPACES, new Boolean (awareness)); + } + + /** + * Indicates whether or not the factory is configured to produce + * parsers which are namespace aware + * (it simply set feature XmlPullParser.FEATURE_PROCESS_NAMESPACES to true or false). + * + * @return true if the factory is configured to produce parsers + * which are namespace aware; false otherwise. + */ + + public boolean isNamespaceAware() { + return getFeature (XmlPullParser.FEATURE_PROCESS_NAMESPACES); + } + + + /** + * Specifies that the parser produced by this factory will be validating + * (it simply set feature XmlPullParser.FEATURE_VALIDATION to true or false). + * + * By default the value of this is set to false. + * + * @param validating - if true the parsers created by this factory must be validating. + */ + + public void setValidating(boolean validating) { + features.put (XmlPullParser.FEATURE_VALIDATION, new Boolean (validating)); + } + + /** + * Indicates whether or not the factory is configured to produce parsers + * which validate the XML content during parse. + * + * @return true if the factory is configured to produce parsers + * which validate the XML content during parse; false otherwise. + */ + + public boolean isValidating() { + return getFeature (XmlPullParser.FEATURE_VALIDATION); + } + + /** + * Creates a new instance of a XML Pull Parser + * using the currently configured factory features. + * + * @return A new instance of a XML Pull Parser. + * @throws XmlPullParserException if a parser cannot be created which satisfies the + * requested configuration. + */ + + public XmlPullParser newPullParser() throws XmlPullParserException { + + if (parserClasses == null) throw new XmlPullParserException + ("Factory initialization was incomplete - has not tried "+classNamesLocation); + + if (parserClasses.size() == 0) throw new XmlPullParserException + ("No valid parser classes found in "+classNamesLocation); + + final StringBuilder issues = new StringBuilder (); + + for (int i = 0; i < parserClasses.size (); i++) { + final Class ppClass = (Class) parserClasses.elementAt (i); + try { + final XmlPullParser pp = (XmlPullParser) ppClass.newInstance(); + // if( ! features.isEmpty() ) { + //Enumeration keys = features.keys(); + // while(keys.hasMoreElements()) { + + for (Enumeration e = features.keys (); e.hasMoreElements ();) { + final String key = (String) e.nextElement(); + final Boolean value = (Boolean) features.get(key); + if(value != null && value.booleanValue()) { + pp.setFeature(key, true); + } + } + return pp; + + } catch(Exception ex) { + issues.append (ppClass.getName () + ": "+ ex.toString ()+"; "); + } + } + + throw new XmlPullParserException ("could not create parser: "+issues); + } + + + /** + * Creates a new instance of a XML Serializer. + * + *

    NOTE: factory features are not used for XML Serializer. + * + * @return A new instance of a XML Serializer. + * @throws XmlPullParserException if a parser cannot be created which satisfies the + * requested configuration. + */ + + public XmlSerializer newSerializer() throws XmlPullParserException { + + if (serializerClasses == null) { + throw new XmlPullParserException + ("Factory initialization incomplete - has not tried "+classNamesLocation); + } + if(serializerClasses.size() == 0) { + throw new XmlPullParserException + ("No valid serializer classes found in "+classNamesLocation); + } + + final StringBuilder issues = new StringBuilder (); + + for (int i = 0; i < serializerClasses.size (); i++) { + final Class ppClass = (Class) serializerClasses.elementAt (i); + try { + final XmlSerializer ser = (XmlSerializer) ppClass.newInstance(); + + // for (Enumeration e = features.keys (); e.hasMoreElements ();) { + // String key = (String) e.nextElement(); + // Boolean value = (Boolean) features.get(key); + // if(value != null && value.booleanValue()) { + // ser.setFeature(key, true); + // } + // } + return ser; + + } catch(Exception ex) { + issues.append (ppClass.getName () + ": "+ ex.toString ()+"; "); + } + } + + throw new XmlPullParserException ("could not create serializer: "+issues); + } + + /** + * Create a new instance of a PullParserFactory that can be used + * to create XML pull parsers (see class description for more + * details). + * + * @return a new instance of a PullParserFactory, as returned by newInstance (null, null); + */ + public static XmlPullParserFactory newInstance () throws XmlPullParserException { + return newInstance(null, null); + } + + public static XmlPullParserFactory newInstance (String classNames, Class context) + throws XmlPullParserException { + + if (context == null) { + //NOTE: make sure context uses the same class loader as API classes + // this is the best we can do without having access to context classloader in J2ME + // if API is in the same classloader as implementation then this will work + context = referenceContextClass; + } + + String classNamesLocation = null; + + if (classNames == null || classNames.length() == 0 || "DEFAULT".equals(classNames)) { + try { + InputStream is = context.getResourceAsStream (RESOURCE_NAME); + + if (is == null) throw new XmlPullParserException + ("resource not found: "+RESOURCE_NAME + +" make sure that parser implementing XmlPull API is available"); + final StringBuilder sb = new StringBuilder(); + + while (true) { + final int ch = is.read(); + if (ch < 0) break; + else if (ch > ' ') + sb.append((char) ch); + } + is.close (); + + classNames = sb.toString (); + } + catch (Exception e) { + throw new XmlPullParserException (null, null, e); + } + classNamesLocation = "resource "+RESOURCE_NAME+" that contained '"+classNames+"'"; + } else { + classNamesLocation = + "parameter classNames to newInstance() that contained '"+classNames+"'"; + } + + XmlPullParserFactory factory = null; + final Vector parserClasses = new Vector (); + final Vector serializerClasses = new Vector (); + int pos = 0; + + while (pos < classNames.length ()) { + int cut = classNames.indexOf (',', pos); + + if (cut == -1) cut = classNames.length (); + final String name = classNames.substring (pos, cut); + + Class candidate = null; + Object instance = null; + + try { + candidate = Class.forName (name); + // necessary because of J2ME .class issue + instance = candidate.newInstance (); + } + catch (Exception e) {} + + if (candidate != null) { + boolean recognized = false; + if (instance instanceof XmlPullParser) { + parserClasses.addElement (candidate); + recognized = true; + } + if (instance instanceof XmlSerializer) { + serializerClasses.addElement (candidate); + recognized = true; + } + if (instance instanceof XmlPullParserFactory) { + if (factory == null) { + factory = (XmlPullParserFactory) instance; + } + recognized = true; + } + if (!recognized) { + throw new XmlPullParserException ("incompatible class: "+name); + } + } + pos = cut + 1; + } + + if (factory == null) { + factory = new XmlPullParserFactory (); + } + factory.parserClasses = parserClasses; + factory.serializerClasses = serializerClasses; + factory.classNamesLocation = classNamesLocation; + return factory; + } +} + + diff --git a/router/java/src/org/xmlpull/v1/XmlSerializer.java b/router/java/src/org/xmlpull/v1/XmlSerializer.java new file mode 100644 index 000000000..8e85e2f0e --- /dev/null +++ b/router/java/src/org/xmlpull/v1/XmlSerializer.java @@ -0,0 +1,326 @@ +package org.xmlpull.v1; + +import java.io.IOException; +import java.io.OutputStream; +import java.io.Writer; + +/** + * Define an interface to serialziation of XML Infoset. + * This interface abstracts away if serialized XML is XML 1.0 comaptible text or + * other formats of XML 1.0 serializations (such as binary XML for example with WBXML). + * + *

    PLEASE NOTE: This interface will be part of XmlPull 1.2 API. + * It is included as basis for discussion. It may change in any way. + * + *

    Exceptions that may be thrown are: IOException or runtime exception + * (more runtime exceptions can be thrown but are not declared and as such + * have no semantics defined for this interface): + *

      + *
    • IllegalArgumentException - for almost all methods to signal that + * argument is illegal + *
    • IllegalStateException - to signal that call has good arguments but + * is not expected here (violation of contract) and for features/properties + * when requesting setting unimplemented feature/property + * (UnsupportedOperationException would be better but it is not in MIDP) + *
    + * + *

    NOTE: writing CDSECT, ENTITY_REF, IGNORABLE_WHITESPACE, + * PROCESSING_INSTRUCTION, COMMENT, and DOCDECL in some implementations + * may not be supported (for example when serializing to WBXML). + * In such case IllegalStateException will be thrown and it is recommened + * to use an optional feature to signal that implementation is not + * supporting this kind of output. + */ + +public interface XmlSerializer { + + /** + * Set feature identified by name (recommended to be URI for uniqueness). + * Some well known optional features are defined in + * + * http://www.xmlpull.org/v1/doc/features.html. + * + * If feature is not recocgnized or can not be set + * then IllegalStateException MUST be thrown. + * + * @exception IllegalStateException If the feature is not supported or can not be set + */ + void setFeature(String name, + boolean state) + throws IllegalArgumentException, IllegalStateException; + + + /** + * Return the current value of the feature with given name. + *

    NOTE: unknown properties are always returned as null + * + * @param name The name of feature to be retrieved. + * @return The value of named feature. + * @exception IllegalArgumentException if feature string is null + */ + boolean getFeature(String name); + + + /** + * Set the value of a property. + * (the property name is recommened to be URI for uniqueness). + * Some well known optional properties are defined in + * + * http://www.xmlpull.org/v1/doc/properties.html. + * + * If property is not recocgnized or can not be set + * then IllegalStateException MUST be thrown. + * + * @exception IllegalStateException if the property is not supported or can not be set + */ + void setProperty(String name, + Object value) + throws IllegalArgumentException, IllegalStateException; + + /** + * Look up the value of a property. + * + * The property name is any fully-qualified URI. I + *

    NOTE: unknown properties are always returned as null + * + * @param name The name of property to be retrieved. + * @return The value of named property. + */ + Object getProperty(String name); + + /** + * Set to use binary output stream with given encoding. + */ + void setOutput (OutputStream os, String encoding) + throws IOException, IllegalArgumentException, IllegalStateException; + + /** + * Set the output to the given writer. + *

    WARNING no information about encoding is available! + */ + void setOutput (Writer writer) + throws IOException, IllegalArgumentException, IllegalStateException; + + /** + * Write <?xml declaration with encoding (if encoding not null) + * and standalone flag (if standalone not null) + * This method can only be called just after setOutput. + */ + void startDocument (String encoding, Boolean standalone) + throws IOException, IllegalArgumentException, IllegalStateException; + + /** + * Finish writing. All unclosed start tags will be closed and output + * will be flushed. After calling this method no more output can be + * serialized until next call to setOutput() + */ + void endDocument () + throws IOException, IllegalArgumentException, IllegalStateException; + + /** + * Binds the given prefix to the given namespace. + * This call is valid for the next element including child elements. + * The prefix and namespace MUST be always declared even if prefix + * is not used in element (startTag() or attribute()) - for XML 1.0 + * it must result in declaring xmlns:prefix='namespace' + * (or xmlns:prefix="namespace" depending what character is used + * to quote attribute value). + * + *

    NOTE: this method MUST be called directly before startTag() + * and if anything but startTag() or setPrefix() is called next there will be exception. + *

    NOTE: prefixes "xml" and "xmlns" are already bound + * and can not be redefined see: + * Namespaces in XML Errata. + *

    NOTE: to set default namespace use as prefix empty string. + * + * @param prefix must be not null (or IllegalArgumentException is thrown) + * @param namespace must be not null + */ + void setPrefix (String prefix, String namespace) + throws IOException, IllegalArgumentException, IllegalStateException; + + /** + * Return namespace that corresponds to given prefix + * If there is no prefix bound to this namespace return null + * but if generatePrefix is false then return generated prefix. + * + *

    NOTE: if the prefix is empty string "" and defualt namespace is bound + * to this prefix then empty string ("") is returned. + * + *

    NOTE: prefixes "xml" and "xmlns" are already bound + * will have values as defined + * Namespaces in XML specification + */ + String getPrefix (String namespace, boolean generatePrefix) + throws IllegalArgumentException; + + /** + * Returns the current depth of the element. + * Outside the root element, the depth is 0. The + * depth is incremented by 1 when startTag() is called. + * The depth is decremented after the call to endTag() + * event was observed. + * + * 

    +     * <!-- outside -->     0
+     * <root>               1
+     *   sometext                 1
+     *     <foobar>         2
+     *     </foobar>        2
+     * </root>              1
+     * <!-- outside -->     0
+     *
    + */ + int getDepth(); + + /** + * Returns the namespace URI of the current element as set by startTag(). + * + *

    NOTE: that measn in particaulr that:

      + *
    • if there was startTag("", ...) then getNamespace() returns "" + *
    • if there was startTag(null, ...) then getNamespace() returns null + *
    + * + * @return namespace set by startTag() that is currently in scope + */ + String getNamespace (); + + /** + * Returns the name of the current element as set by startTag(). + * It can only be null before first call to startTag() + * or when last endTag() is called to close first startTag(). + * + * @return namespace set by startTag() that is currently in scope + */ + String getName(); + + /** + * Writes a start tag with the given namespace and name. + * If there is no prefix defined for the given namespace, + * a prefix will be defined automatically. + * The explicit prefixes for namespaces can be established by calling setPrefix() + * immediately before this method. + * If namespace is null no namespace prefix is printed but just name. + * If namespace is empty string then serialzier will make sure that + * default empty namespace is declared (in XML 1.0 xmlns='') + * or throw IllegalStateException if default namespace is already bound + * to non-empty string. + */ + XmlSerializer startTag (String namespace, String name) + throws IOException, IllegalArgumentException, IllegalStateException; + + /** + * Write an attribute. Calls to attribute() MUST follow a call to + * startTag() immediately. If there is no prefix defined for the + * given namespace, a prefix will be defined automatically. + * If namespace is null or empty string + * no namespace prefix is printed but just name. + */ + XmlSerializer attribute (String namespace, String name, String value) + throws IOException, IllegalArgumentException, IllegalStateException; + + /** + * Write end tag. Repetition of namespace and name is just for avoiding errors. + *

    Background: in kXML endTag had no arguments, and non matching tags were + * very difficult to find... + * If namespace is null no namespace prefix is printed but just name. + * If namespace is empty string then serialzier will make sure that + * default empty namespace is declared (in XML 1.0 xmlns=''). + */ + XmlSerializer endTag (String namespace, String name) + throws IOException, IllegalArgumentException, IllegalStateException; + + + // /** + // * Writes a start tag with the given namespace and name. + // *
    If there is no prefix defined (prefix == null) for the given namespace, + // * a prefix will be defined automatically. + // *
    If explicit prefixes is passed (prefix != null) then it will be used + // *and namespace declared if not already declared or + // * throw IllegalStateException the same prefix was already set on this + // * element (setPrefix()) and was bound to different namespace. + // *
    If namespace is null then prefix must be null too or IllegalStateException is thrown. + // *
    If namespace is null then no namespace prefix is printed but just name. + // *
    If namespace is empty string then serializer will make sure that + // * default empty namespace is declared (in XML 1.0 xmlns='') + // * or throw IllegalStateException if default namespace is already bound + // * to non-empty string. + // */ + // XmlSerializer startTag (String prefix, String namespace, String name) + // throws IOException, IllegalArgumentException, IllegalStateException; + // + // /** + // * Write an attribute. Calls to attribute() MUST follow a call to + // * startTag() immediately. + // *
    If there is no prefix defined (prefix == null) for the given namespace, + // * a prefix will be defined automatically. + // *
    If explicit prefixes is passed (prefix != null) then it will be used + // * and namespace declared if not already declared or + // * throw IllegalStateException the same prefix was already set on this + // * element (setPrefix()) and was bound to different namespace. + // *
    If namespace is null then prefix must be null too or IllegalStateException is thrown. + // *
    If namespace is null then no namespace prefix is printed but just name. + // *
    If namespace is empty string then serializer will make sure that + // * default empty namespace is declared (in XML 1.0 xmlns='') + // * or throw IllegalStateException if default namespace is already bound + // * to non-empty string. + // */ + // XmlSerializer attribute (String prefix, String namespace, String name, String value) + // throws IOException, IllegalArgumentException, IllegalStateException; + // + // /** + // * Write end tag. Repetition of namespace, prefix, and name is just for avoiding errors. + // *
    If namespace or name arguments are different from corresponding startTag call + // * then IllegalArgumentException is thrown, if prefix argument is not null and is different + // * from corresponding starTag then IllegalArgumentException is thrown. + // *
    If namespace is null then prefix must be null too or IllegalStateException is thrown. + // *
    If namespace is null then no namespace prefix is printed but just name. + // *
    If namespace is empty string then serializer will make sure that + // * default empty namespace is declared (in XML 1.0 xmlns=''). + // *

    Background: in kXML endTag had no arguments, and non matching tags were + // * very difficult to find...

    + // */ + // ALEK: This is really optional as prefix in end tag MUST correspond to start tag but good for error checking + // XmlSerializer endTag (String prefix, String namespace, String name) + // throws IOException, IllegalArgumentException, IllegalStateException; + + /** + * Writes text, where special XML chars are escaped automatically + */ + XmlSerializer text (String text) + throws IOException, IllegalArgumentException, IllegalStateException; + + /** + * Writes text, where special XML chars are escaped automatically + */ + XmlSerializer text (char [] buf, int start, int len) + throws IOException, IllegalArgumentException, IllegalStateException; + + void cdsect (String text) + throws IOException, IllegalArgumentException, IllegalStateException; + void entityRef (String text) throws IOException, + IllegalArgumentException, IllegalStateException; + void processingInstruction (String text) + throws IOException, IllegalArgumentException, IllegalStateException; + void comment (String text) + throws IOException, IllegalArgumentException, IllegalStateException; + void docdecl (String text) + throws IOException, IllegalArgumentException, IllegalStateException; + void ignorableWhitespace (String text) + throws IOException, IllegalArgumentException, IllegalStateException; + + /** + * Write all pending output to the stream. + * If method startTag() or attribute() was called then start tag is closed (final >) + * before flush() is called on underlying output stream. + * + *

    NOTE: if there is need to close start tag + * (so no more attribute() calls are allowed) but without flushinging output + * call method text() with empty string (text("")). + * + */ + void flush () + throws IOException; + +} + From 78075cb3aaf08ad6ef5c9e7ad0796944cc26e7dd Mon Sep 17 00:00:00 2001 From: zzz Date: Fri, 20 Feb 2009 18:51:39 +0000 Subject: [PATCH 02/23] Add upnp html output, fix up logging --- .../transport/FIFOBandwidthLimiter.java | 6 +- .../router/transport/TransportManager.java | 4 +- .../src/net/i2p/router/transport/UPnP.java | 172 ++++++++---------- .../net/i2p/router/transport/UPnPManager.java | 51 ++++-- 4 files changed, 121 insertions(+), 112 deletions(-) diff --git a/router/java/src/net/i2p/router/transport/FIFOBandwidthLimiter.java b/router/java/src/net/i2p/router/transport/FIFOBandwidthLimiter.java index 86ba394e4..63bf73653 100644 --- a/router/java/src/net/i2p/router/transport/FIFOBandwidthLimiter.java +++ b/router/java/src/net/i2p/router/transport/FIFOBandwidthLimiter.java @@ -619,8 +619,8 @@ public class FIFOBandwidthLimiter { public void renderStatusHTML(Writer out) throws IOException { long now = now(); StringBuffer buf = new StringBuffer(4096); - buf.append("
    Limiter status: ").append(getStatus().toString()).append("
    \n"); - buf.append("Pending bandwidth requests:

      "); + buf.append("

      Limiter Status:
      ").append(getStatus().toString()).append("

      \n"); + buf.append("

      Pending bandwidth requests:

        "); buf.append("
      • Inbound requests:
          "); synchronized (_pendingInboundRequests) { for (int i = 0; i < _pendingInboundRequests.size(); i++) { @@ -643,7 +643,7 @@ public class FIFOBandwidthLimiter { buf.append("ms ago\n"); } } - buf.append("
      \n"); + buf.append("

\n"); out.write(buf.toString()); out.flush(); } diff --git a/router/java/src/net/i2p/router/transport/TransportManager.java b/router/java/src/net/i2p/router/transport/TransportManager.java index 0b7d8d547..813f7aa26 100644 --- a/router/java/src/net/i2p/router/transport/TransportManager.java +++ b/router/java/src/net/i2p/router/transport/TransportManager.java @@ -369,7 +369,7 @@ public class TransportManager implements TransportEventListener { t.renderStatusHTML(out, urlBase, sortFlags); } StringBuffer buf = new StringBuffer(4*1024); - buf.append("Listening on: 
\n");
+        buf.append("
Router Transport Addresses:
\n");
         for (int i = 0; i < _transports.size(); i++) {
             Transport t = (Transport)_transports.get(i);
             if (t.getCurrentAddress() != null)
@@ -379,6 +379,8 @@ public class TransportManager implements TransportEventListener {
         }
         buf.append("
\n");
         out.write(buf.toString());
+        out.write(_upnpManager.renderStatusHTML());
+        buf.append("
\n");
         out.flush();
     }
 }
diff --git a/router/java/src/net/i2p/router/transport/UPnP.java b/router/java/src/net/i2p/router/transport/UPnP.java
index aef65adc5..61ce5183b 100644
--- a/router/java/src/net/i2p/router/transport/UPnP.java
+++ b/router/java/src/net/i2p/router/transport/UPnP.java
@@ -108,11 +108,17 @@ public class UPnP extends ControlPoint implements DeviceChangeListener {
 		
 		DetectedIP result = null;
 		final String natAddress = getNATAddress();
+                if (natAddress == null || natAddress.length() <= 0) {
+			_log.warn("No external address returned");
+			return null;
+		}
 		try {
 			InetAddress detectedIP = InetAddress.getByName(natAddress);
+
 			short status = DetectedIP.NOT_SUPPORTED;
 			thinksWeAreDoubleNatted = !TransportImpl.isPubliclyRoutable(detectedIP.getAddress());
 			// If we have forwarded a port AND we don't have a private address
+			_log.warn("NATAddress: \"" + natAddress + "\" detectedIP: " + detectedIP + " double? " + thinksWeAreDoubleNatted);
 			if((portsForwarded.size() > 1) && (!thinksWeAreDoubleNatted))
 				status = DetectedIP.FULL_INTERNET;
 			
@@ -291,6 +297,7 @@ public class UPnP extends ControlPoint implements DeviceChangeListener {
 		return Integer.valueOf(getIP.getOutputArgumentList().getArgument("NewDownstreamMaxBitRate").getValue());
 	}
 	
+/***
 	private void listStateTable(Service serv, StringBuilder sb) {
 		ServiceStateTable table = serv.getServiceStateTable();
 		sb.append("
");
@@ -320,6 +327,7 @@ public class UPnP extends ControlPoint implements DeviceChangeListener {
 			sb.append("
");
 		}
 	}
+***/
 	
 	private String toString(String action, String Argument, Service serv) {
 		Action getIP = serv.getAction(action);
@@ -333,122 +341,103 @@ public class UPnP extends ControlPoint implements DeviceChangeListener {
 	// TODO: extend it! RTFM
 	private void listSubServices(Device dev, StringBuilder sb) {
 		ServiceList sl = dev.getServiceList();
+		if (sl.size() <= 0)
+			return;
+		sb.append("
    \n");
 		for(int i=0; iservice ("+i+") : "+serv.getServiceType()+"
    ");
+			sb.append("
  • Service: ");
 			if("urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1".equals(serv.getServiceType())){
-				sb.append("WANCommonInterfaceConfig");
-				sb.append(" status: " + toString("GetCommonLinkProperties", "NewPhysicalLinkStatus", serv));
-				sb.append(" type: " + toString("GetCommonLinkProperties", "NewWANAccessType", serv));
-				sb.append(" upstream: " + toString("GetCommonLinkProperties", "NewLayer1UpstreamMaxBitRate", serv));
-				sb.append(" downstream: " + toString("GetCommonLinkProperties", "NewLayer1DownstreamMaxBitRate", serv) + "
    ");
+				sb.append("WAN Common Interface Config
      ");
+				sb.append("
    • Status: " + toString("GetCommonLinkProperties", "NewPhysicalLinkStatus", serv));
+				sb.append("
    • Type: " + toString("GetCommonLinkProperties", "NewWANAccessType", serv));
+				sb.append("
    • Upstream: " + toString("GetCommonLinkProperties", "NewLayer1UpstreamMaxBitRate", serv));
+				sb.append("
    • Downstream: " + toString("GetCommonLinkProperties", "NewLayer1DownstreamMaxBitRate", serv) + "
      ");
 			}else if("urn:schemas-upnp-org:service:WANPPPConnection:1".equals(serv.getServiceType())){
-				sb.append("WANPPPConnection");
-				sb.append(" status: " + toString("GetStatusInfo", "NewConnectionStatus", serv));
-				sb.append(" type: " + toString("GetConnectionTypeInfo", "NewConnectionType", serv));
-				sb.append(" upstream: " + toString("GetLinkLayerMaxBitRates", "NewUpstreamMaxBitRate", serv));
-				sb.append(" downstream: " + toString("GetLinkLayerMaxBitRates", "NewDownstreamMaxBitRate", serv) + "
      ");
-				sb.append(" external IP: " + toString("GetExternalIPAddress", "NewExternalIPAddress", serv) + "
      ");
+				sb.append("WAN PPP Connection
        ");
+				sb.append("
      • Status: " + toString("GetStatusInfo", "NewConnectionStatus", serv));
+				sb.append("
      • Type: " + toString("GetConnectionTypeInfo", "NewConnectionType", serv));
+				sb.append("
      • Upstream: " + toString("GetLinkLayerMaxBitRates", "NewUpstreamMaxBitRate", serv));
+				sb.append("
      • Downstream: " + toString("GetLinkLayerMaxBitRates", "NewDownstreamMaxBitRate", serv) + "
        ");
+				sb.append("
      • External IP: " + toString("GetExternalIPAddress", "NewExternalIPAddress", serv) + "
        ");
 			}else if("urn:schemas-upnp-org:service:Layer3Forwarding:1".equals(serv.getServiceType())){
-				sb.append("Layer3Forwarding");
-				sb.append("DefaultConnectionService: " + toString("GetDefaultConnectionService", "NewDefaultConnectionService", serv));
+				sb.append("Layer 3 Forwarding
          ");
+				sb.append("
        • Default Connection Service: " + toString("GetDefaultConnectionService", "NewDefaultConnectionService", serv));
 			}else if(WAN_IP_CONNECTION.equals(serv.getServiceType())){
-				sb.append("WANIPConnection");
-				sb.append(" status: " + toString("GetStatusInfo", "NewConnectionStatus", serv));
-				sb.append(" type: " + toString("GetConnectionTypeInfo", "NewConnectionType", serv));
-				sb.append(" external IP: " + toString("GetExternalIPAddress", "NewExternalIPAddress", serv) + "
          ");
+				sb.append("WAN IP Connection
            ");
+				sb.append("
          • Status: " + toString("GetStatusInfo", "NewConnectionStatus", serv));
+				sb.append("
          • Type: " + toString("GetConnectionTypeInfo", "NewConnectionType", serv));
+				sb.append("
          • External IP: " + toString("GetExternalIPAddress", "NewExternalIPAddress", serv) + "
            ");
 			}else if("urn:schemas-upnp-org:service:WANEthernetLinkConfig:1".equals(serv.getServiceType())){
-				sb.append("WANEthernetLinkConfig");
-				sb.append(" status: " + toString("GetEthernetLinkStatus", "NewEthernetLinkStatus", serv) + "
            ");
+				sb.append("WAN Ethernet Link Config
              ");
+				sb.append("
            1. Status: " + toString("GetEthernetLinkStatus", "NewEthernetLinkStatus", serv) + "
              ");
 			}else
-				sb.append("~~~~~~~ "+serv.getServiceType());
-			listActions(serv, sb);
-			listStateTable(serv, sb);
-			sb.append("");
+				sb.append("~~~~~~~ "+serv.getServiceType() + "
                ");
+			//listActions(serv, sb);
+			//listStateTable(serv, sb);
+			sb.append("
              \n");
 		}
+		sb.append("
          \n");
 	}
 	
 	private void listSubDev(String prefix, Device dev, StringBuilder sb){
-		sb.append("
          Device : "+dev.getFriendlyName()+" - "+ dev.getDeviceType()+"
          ");
+                if (prefix == null)
+			sb.append("Device: ");
+		else
+			sb.append("
        • Subdevice: ");
+		sb.append(dev.getFriendlyName());
 		listSubServices(dev, sb);
 		
 		DeviceList dl = dev.getDeviceList();
+		if (dl.size() <= 0)
+			return;
+		sb.append("
            \n");
 		for(int j=0; j");
 			listSubDev(dev.getFriendlyName(), subDev, sb);
-			sb.append("");
 		}
-		sb.append("
            ");
+		sb.append("
          \n");
 	}
 	
-/*****
-	public String handleHTTPGet(HTTPRequest request) throws PluginHTTPException {
-		if(request.isParameterSet("getDeviceCapabilities")) {
-			final StringBuilder sb = new StringBuilder();
-			sb.append("UPnP report");
-			listSubDev("WANDevice", _router, sb);
-			sb.append("");
+	public String renderStatusHTML() {
+		final StringBuilder sb = new StringBuilder();
+		sb.append("UPnP Status:
          ");
+		
+		if(isDisabled) {
+			sb.append("The plugin has been disabled; Do you have more than one UPnP Internet Gateway Device on your LAN ?");
+			return sb.toString();
+		} else if(!isNATPresent()) {
+			sb.append("The plugin hasn't found any UPnP aware, compatible device on your LAN.");
 			return sb.toString();
 		}
 		
-		HTMLNode pageNode = pr.getPageMaker().getPageNode("UP&P plugin configuration page", false, null);
-		HTMLNode contentNode = pr.getPageMaker().getContentNode(pageNode);
-		
-		if(isDisabled) {
-			HTMLNode disabledInfobox = contentNode.addChild("div", "class", "infobox infobox-error");
-			HTMLNode disabledInfoboxHeader = disabledInfobox.addChild("div", "class", "infobox-header");
-			HTMLNode disabledInfoboxContent = disabledInfobox.addChild("div", "class", "infobox-content");
-
-			disabledInfoboxHeader.addChild("#", "UP&P plugin report");
-			disabledInfoboxContent.addChild("#", "The plugin has been disabled; Do you have more than one UP&P IGD on your LAN ?");
-			return pageNode.generate();
-		} else if(!isNATPresent()) {
-			HTMLNode notFoundInfobox = contentNode.addChild("div", "class", "infobox infobox-warning");
-			HTMLNode notFoundInfoboxHeader = notFoundInfobox.addChild("div", "class", "infobox-header");
-			HTMLNode notFoundInfoboxContent = notFoundInfobox.addChild("div", "class", "infobox-content");
-
-			notFoundInfoboxHeader.addChild("#", "UP&P plugin report");
-			notFoundInfoboxContent.addChild("#", "The plugin hasn't found any UP&P aware, compatible device on your LAN.");
-			return pageNode.generate();			
-		}
-		
-		HTMLNode foundInfobox = contentNode.addChild("div", "class", "infobox infobox-normal");
-		HTMLNode foundInfoboxHeader = foundInfobox.addChild("div", "class", "infobox-header");
-		HTMLNode foundInfoboxContent = foundInfobox.addChild("div", "class", "infobox-content");
-		
 		// FIXME L10n!
-		foundInfoboxHeader.addChild("#", "UP&P plugin report");
-		foundInfoboxContent.addChild("p", "The following device has been found : ").addChild("a", "href", "?getDeviceCapabilities").addChild("#", _router.getFriendlyName());
-		foundInfoboxContent.addChild("p", "Our current external ip address is : " + getNATAddress());
+		sb.append("
          Found ");
+		listSubDev(null, _router, sb);
+		sb.append("
          The current external IP address reported by UPnP is " + getNATAddress());
 		int downstreamMaxBitRate = getDownstreamMaxBitRate();
 		int upstreamMaxBitRate = getUpstramMaxBitRate();
 		if(downstreamMaxBitRate > 0)
-			foundInfoboxContent.addChild("p", "Our reported max downstream bit rate is : " + getDownstreamMaxBitRate()+ " bits/sec");
+			sb.append("
          UPnP reports the max downstream bit rate is : " + getDownstreamMaxBitRate()+ " bits/sec\n");
 		if(upstreamMaxBitRate > 0)
-			foundInfoboxContent.addChild("p", "Our reported max upstream bit rate is : " + getUpstramMaxBitRate()+ " bits/sec");
+			sb.append("
          UPnP reports the max upstream bit rate is : " + getUpstramMaxBitRate()+ " bits/sec\n");
 		synchronized(lock) {
 			if(portsToForward != null) {
 				for(ForwardPort port : portsToForward) {
-					if(portsForwarded.contains(port)) {
-						foundInfoboxContent.addChild("p", "The "+port.name+" port "+port.portNumber+" / "+port.protocol+" has been forwarded successfully.");
-					} else {
-						foundInfoboxContent.addChild("p", "The "+port.name+" port "+port.portNumber+" / "+port.protocol+" has not been forwarded.");
-					}
+					sb.append("
          " + protoToString(port.protocol) + " port " + port.portNumber + " for " + port.name);
+					if(portsForwarded.contains(port))
+						sb.append(" has been forwarded successfully by UPnP.\n");
+					else
+						sb.append(" has not been forwarded UPnP.\n");
 				}
 			}
 		}
 		
-		return pageNode.generate();
+		sb.append("
          ");
+		return sb.toString();
 	}
-
-	public String handleHTTPPost(HTTPRequest request) throws PluginHTTPException {
-		return null;
-	}
-***/
 	
 	private boolean addMapping(String protocol, int port, String description, ForwardPort fp) {
 		if(isDisabled || !isNATPresent() || _router == null) {
@@ -457,8 +446,8 @@ public class UPnP extends ControlPoint implements DeviceChangeListener {
                 }
 		
 		// Just in case...
-                // this confuses my linksys - zzz
-		// removeMapping(protocol, port, fp, true);
+                // this confuses my linksys? - zzz
+		removeMapping(protocol, port, fp, true);
 		
 		Action add = _service.getAction("AddPortMapping");
 		if(add == null) {
@@ -557,14 +546,18 @@ public class UPnP extends ControlPoint implements DeviceChangeListener {
 			registerPorts(portsToForwardNow);
 	}
 
+        private static String protoToString(int p) {
+		if(p == ForwardPort.PROTOCOL_UDP_IPV4)
+			return "UDP";
+		if(p == ForwardPort.PROTOCOL_TCP_IPV4)
+			return "TCP";
+		return "?";
+	}
+
 	private void registerPorts(Set portsToForwardNow) {
 		for(ForwardPort port : portsToForwardNow) {
-			String proto;
-			if(port.protocol == ForwardPort.PROTOCOL_UDP_IPV4)
-				proto = "UDP";
-			else if(port.protocol == ForwardPort.PROTOCOL_TCP_IPV4)
-				proto = "TCP";
-			else {
+			String proto = protoToString(port.protocol);
+			if (proto.length() <= 1) {
 				HashMap map = new HashMap();
 				map.put(port, new ForwardPortStatus(ForwardPortStatus.DEFINITE_FAILURE, "Protocol not supported", port.portNumber));
 				forwardCallback.portForwardStatus(map);
@@ -586,15 +579,10 @@ public class UPnP extends ControlPoint implements DeviceChangeListener {
 
 	private void unregisterPorts(Set portsToForwardNow) {
 		for(ForwardPort port : portsToForwardNow) {
-			String proto;
-			if(port.protocol == ForwardPort.PROTOCOL_UDP_IPV4)
-				proto = "UDP";
-			else if(port.protocol == ForwardPort.PROTOCOL_TCP_IPV4)
-				proto = "TCP";
-			else {
+			String proto = protoToString(port.protocol);
+			if (proto.length() <= 1)
 				// Ignore, we've already complained about it
 				continue;
-			}
 			removeMapping(proto, port.portNumber, port, false);
 		}
 	}
diff --git a/router/java/src/net/i2p/router/transport/UPnPManager.java b/router/java/src/net/i2p/router/transport/UPnPManager.java
index 4deaebc4d..a508cabef 100644
--- a/router/java/src/net/i2p/router/transport/UPnPManager.java
+++ b/router/java/src/net/i2p/router/transport/UPnPManager.java
@@ -45,15 +45,18 @@ public class UPnPManager {
     }
     
     public synchronized void start() {
-        _log.error("UPnP Start");
-        Debug.on();  // UPnP stuff -> wrapper log
+        if (_log.shouldLog(Log.DEBUG)) {
+            _log.debug("UPnP Start");
+            Debug.on();  // UPnP stuff -> wrapper log
+        }
         if (!_isRunning)
             _upnp.runPlugin();
         _isRunning = true;
     }
 
     public synchronized void stop() {
-        _log.error("UPnP Stop");
+        if (_log.shouldLog(Log.DEBUG))
+            _log.debug("UPnP Stop");
         if (_isRunning)
             _upnp.terminate();
         _isRunning = false;
@@ -61,7 +64,8 @@ public class UPnPManager {
     
     /** call when the ports might have changed */
     public void update(Map addresses) {
-        _log.error("UPnP Update:");
+        if (_log.shouldLog(Log.DEBUG))
+            _log.debug("UPnP Update:");
         if (!_isRunning)
             return;
         Set forwards = new HashSet(addresses.size());
@@ -86,7 +90,8 @@ public class UPnPManager {
                 protocol = ForwardPort.PROTOCOL_TCP_IPV4;
             else
                 continue;
-            _log.error("Adding: " + style + " " + port);
+            if (_log.shouldLog(Log.DEBUG))
+                _log.debug("Adding: " + style + " " + port);
             ForwardPort fp = new ForwardPort(style, false, protocol, port);
             forwards.add(fp);
         }
@@ -98,18 +103,32 @@ public class UPnPManager {
 	
         /** Called to indicate status on one or more forwarded ports. */
         public void portForwardStatus(Map statuses) {
-             _log.error("UPnP Callback:");
+            if (_log.shouldLog(Log.DEBUG))
+                 _log.debug("UPnP Callback:");
 
-             DetectedIP[] ips = _upnp.getAddress();
-             for (DetectedIP ip : ips) {
-                 _log.error("External address: " + ip.publicAddress + " type: " + ip.natType);
-             }
+            DetectedIP[] ips = _upnp.getAddress();
+            if (ips != null) {
+                for (DetectedIP ip : ips) {
+                    if (_log.shouldLog(Log.DEBUG))
+                        _log.debug("External address: " + ip.publicAddress + " type: " + ip.natType);
+                }
+            } else {
+                if (_log.shouldLog(Log.DEBUG))
+                    _log.debug("No external address returned");
+            }
 
-             for (ForwardPort fp : statuses.keySet()) {
-                 ForwardPortStatus fps = statuses.get(fp);
-                 _log.error(fp.name + " " + fp.protocol + " " + fp.portNumber +
-                            " status: " + fps.status + " reason: " + fps.reasonString + " ext port: " + fps.externalPort);
-             }
-         }
+            for (ForwardPort fp : statuses.keySet()) {
+                ForwardPortStatus fps = statuses.get(fp);
+                if (_log.shouldLog(Log.DEBUG))
+                    _log.debug(fp.name + " " + fp.protocol + " " + fp.portNumber +
+                               " status: " + fps.status + " reason: " + fps.reasonString + " ext port: " + fps.externalPort);
+            }
+        }
+    }
+
+    public String renderStatusHTML() {
+        if (!_isRunning)
+            return "UPnP is not enabled\n";
+        return _upnp.renderStatusHTML();
     }
 }

From 06aeff9a3057a5642f4c06f963eac68e548071c8 Mon Sep 17 00:00:00 2001
From: zzz 
Date: Fri, 20 Feb 2009 19:00:01 +0000
Subject: [PATCH 03/23] drop file accidentally checked in

---
 router/java/src/org/imports | 57 -------------------------------------
 1 file changed, 57 deletions(-)
 delete mode 100644 router/java/src/org/imports

diff --git a/router/java/src/org/imports b/router/java/src/org/imports
deleted file mode 100644
index 6fd39288b..000000000
--- a/router/java/src/org/imports
+++ /dev/null
@@ -1,57 +0,0 @@
- * import java.io.IOException;
- * import java.io.StringReader;
- * import plugins.JabberLinker.org.xmlpull.v1.XmlPullParserException.html;
- * import plugins.JabberLinker.org.xmlpull.v1.XmlPullParserFactory;
- * import plugins.JabberLinker.org.xmlpull.v1.XmlPullParser;
-//import plugins.UPnP.org.cybergarage.util.*;
-import java.io.*;
-import java.io.*;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.io.Reader;
-import java.io.Writer;
-import java.net.*;
-import java.net.*;
-import java.util.*;
-import java.util.*;
-import java.util.Calendar;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.TimeZone;
-import java.util.Vector;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import org.w3c.dom.Document;
-import org.w3c.dom.NamedNodeMap;
-import org.xml.sax.InputSource;
-import plugins.UPnP.org.cybergarage.http.*;
-import plugins.UPnP.org.cybergarage.http.*;
-import plugins.UPnP.org.cybergarage.net.*;
-import plugins.UPnP.org.cybergarage.net.*;
-import plugins.UPnP.org.cybergarage.soap.*;
-import plugins.UPnP.org.cybergarage.soap.*;
-import plugins.UPnP.org.cybergarage.upnp.*;
-import plugins.UPnP.org.cybergarage.upnp.*;
-import plugins.UPnP.org.cybergarage.upnp.Device;
-import plugins.UPnP.org.cybergarage.upnp.control.*;
-import plugins.UPnP.org.cybergarage.upnp.control.*;
-import plugins.UPnP.org.cybergarage.upnp.device.*;
-import plugins.UPnP.org.cybergarage.upnp.device.*;
-import plugins.UPnP.org.cybergarage.upnp.event.*;
-import plugins.UPnP.org.cybergarage.upnp.event.*;
-import plugins.UPnP.org.cybergarage.upnp.ssdp.*;
-import plugins.UPnP.org.cybergarage.upnp.ssdp.*;
-import plugins.UPnP.org.cybergarage.upnp.xml.*;
-import plugins.UPnP.org.cybergarage.upnp.xml.*;
-import plugins.UPnP.org.cybergarage.util.*;
-import plugins.UPnP.org.cybergarage.util.*;
-import plugins.UPnP.org.cybergarage.xml.*;
-import plugins.UPnP.org.cybergarage.xml.*;
-import plugins.UPnP.org.cybergarage.xml.Node;
-import plugins.UPnP.org.cybergarage.xml.Parser;
-import plugins.UPnP.org.cybergarage.xml.ParserException;
-import plugins.UPnP.org.cybergarage.xml.parser.*;

From c2fedf85386ce160053ae3ed0dabf23a33091953 Mon Sep 17 00:00:00 2001
From: zzz 
Date: Tue, 28 Apr 2009 19:01:52 +0000
Subject: [PATCH 04/23] - Add UDP Port configuration to config.jsp - Don't
 restart router when configs change on config.jsp;   simply rebuild router
 info. - Clean up some port config code in UDP

---
 .../net/i2p/router/web/ConfigNetHandler.java  | 20 +++++++-------
 .../net/i2p/router/web/ConfigNetHelper.java   |  6 +++--
 apps/routerconsole/jsp/config.jsp             |  7 +++--
 .../src/net/i2p/router/RouterVersion.java     |  2 +-
 .../router/transport/udp/UDPTransport.java    | 26 +++++--------------
 5 files changed, 27 insertions(+), 34 deletions(-)

diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java
index a4fe7483e..adb63df33 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java
@@ -157,12 +157,9 @@ public class ConfigNetHandler extends FormHandler {
             }
 
             if ( (_udpPort != null) && (_udpPort.length() > 0) ) {
-                String oldPort = _context.router().getConfigSetting(ConfigNetHelper.PROP_I2NP_UDP_PORT);
-                if ( (oldPort == null) && (_udpPort.equals("8887")) ) {
-                    // still on default.. noop
-                } else if ( (oldPort == null) || (!oldPort.equalsIgnoreCase(_udpPort)) ) {
-                    // its not the default OR it has changed
-                    _context.router().setConfigSetting(ConfigNetHelper.PROP_I2NP_UDP_PORT, _udpPort);
+                String oldPort = "" + _context.getProperty(UDPTransport.PROP_INTERNAL_PORT, UDPTransport.DEFAULT_INTERNAL_PORT);
+                if (!oldPort.equals(_udpPort)) {
+                    _context.router().setConfigSetting(UDPTransport.PROP_INTERNAL_PORT, _udpPort);
                     addFormNotice("Updating UDP port from " + oldPort + " to " + _udpPort);
                     restartRequired = true;
                 }
@@ -229,9 +226,14 @@ public class ConfigNetHandler extends FormHandler {
         }
         
         if (restartRequired) {
-            addFormNotice("Performing a soft restart");
-            _context.router().restart();
-            addFormNotice("Soft restart complete");
+            //addFormNotice("Performing a soft restart");
+            //_context.router().restart();
+            //addFormNotice("Soft restart complete");
+            // Most of the time we aren't changing addresses, just enabling or disabling
+            // things, so let's try just a new routerInfo and see how that works.
+            // Maybe we should restart if we change addresses though?
+            _context.router().rebuildRouterInfo();
+            addFormNotice("Router Info rebuilt");
         }
     }
 
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java
index 5d7e412bf..6a563b7a9 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java
@@ -14,8 +14,6 @@ public class ConfigNetHelper extends HelperBase {
     public ConfigNetHelper() {}
     
     /** copied from various private components */
-    public final static String PROP_I2NP_UDP_PORT = "i2np.udp.port";
-    public final static String PROP_I2NP_INTERNAL_UDP_PORT = "i2np.udp.internalPort";
     public final static String PROP_I2NP_NTCP_HOSTNAME = "i2np.ntcp.hostname";
     public final static String PROP_I2NP_NTCP_PORT = "i2np.ntcp.port";
     public final static String PROP_I2NP_NTCP_AUTO_PORT = "i2np.ntcp.autoport";
@@ -63,6 +61,10 @@ public class ConfigNetHelper extends HelperBase {
         return "" + ua.getPort();
     }
 
+    public String getConfiguredUdpPort() {
+        return "" + _context.getProperty(UDPTransport.PROP_INTERNAL_PORT, UDPTransport.DEFAULT_INTERNAL_PORT);
+    }
+
     public String getEnableTimeSyncChecked() {
         String disabled = _context.getProperty(Timestamper.PROP_DISABLED, "false");
         if ( (disabled != null) && ("true".equalsIgnoreCase(disabled)) )
diff --git a/apps/routerconsole/jsp/config.jsp b/apps/routerconsole/jsp/config.jsp
index 53c919263..529bb81aa 100644
--- a/apps/routerconsole/jsp/config.jsp
+++ b/apps/routerconsole/jsp/config.jsp
@@ -67,8 +67,11 @@
  test.rtt and related stats.
          
  
          
 -->
- External UDP address: 
          
- Require SSU introductions? 
+ UDP Configuration:
          
+ Internal UDP port:
+ " />
          
+ External UDP address: 
          
+ Require SSU introductions?
  />
          
  
          If you can, please poke a hole in your NAT or firewall to allow unsolicited UDP packets to reach
     you on your external UDP address.  If you can't, I2P now includes supports UDP hole punching
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 46331081d..4922b069a 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -20,7 +20,7 @@ public class RouterVersion {
     public final static String VERSION = CoreVersion.VERSION;
     public final static long BUILD = 5;
     /** for example "-test" */
-    public final static String EXTRA = "";
+    public final static String EXTRA = "-upnp";
     public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;
     public static void main(String args[]) {
         System.out.println("I2P Router version: " + FULL_VERSION);
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 45de86244..69e5190fb 100644
--- a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java
+++ b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java
@@ -99,6 +99,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
     
     public static final String STYLE = "SSU";
     public static final String PROP_INTERNAL_PORT = "i2np.udp.internalPort";
+    public static final int DEFAULT_INTERNAL_PORT = 8887;
 
     /** define this to explicitly set an external IP address */
     public static final String PROP_EXTERNAL_HOST = "i2np.udp.host";
@@ -215,20 +216,12 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
         int port = -1;
         if (_externalListenPort <= 0) {
             // no explicit external port, so lets try an internal one
-            String portStr = _context.getProperty(PROP_INTERNAL_PORT);
-            if (portStr != null) {
-                try {
-                    port = Integer.parseInt(portStr);
-                } catch (NumberFormatException nfe) {
-                    if (_log.shouldLog(Log.ERROR))
-                        _log.error("Invalid port specified [" + portStr + "]");
-                }
-            }
+            port = _context.getProperty(PROP_INTERNAL_PORT, DEFAULT_INTERNAL_PORT);
             if (port <= 0) {
-                port = 8887;
+                port = DEFAULT_INTERNAL_PORT;
                 //port = 1024 + _context.random().nextInt(31*1024);
-                if (_log.shouldLog(Log.INFO))
-                    _log.info("Selecting an arbitrary port to bind to: " + port);
+                //if (_log.shouldLog(Log.INFO))
+                //    _log.info("Selecting an arbitrary port to bind to: " + port);
                 _context.router().setConfigSetting(PROP_INTERNAL_PORT, port+"");
             }
             // attempt to use it as our external port - this will be overridden by
@@ -1013,14 +1006,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
     void rebuildExternalAddress(boolean allowRebuildRouterInfo) {
         // if the external port is specified, we want to use that to bind to even
         // if we don't know the external host.
-        String port = _context.getProperty(PROP_EXTERNAL_PORT);
-        if (port != null) { 
-            try {
-                _externalListenPort = Integer.parseInt(port);    
-            } catch (NumberFormatException nfe) {
-                _externalListenPort = -1;
-            }
-        }
+        _externalListenPort = _context.getProperty(PROP_EXTERNAL_PORT, -1);
         
         if (explicitAddressSpecified()) {
             try {

From accf3dbf3fca6100e4f7f5f009aa1f697b55dff8 Mon Sep 17 00:00:00 2001
From: zzz 
Date: Tue, 28 Apr 2009 19:49:09 +0000
Subject: [PATCH 05/23] - Implement UPnP enable/disable

---
 .../net/i2p/router/web/ConfigNetHandler.java  | 27 ++++++++++---------
 .../net/i2p/router/web/ConfigNetHelper.java   |  7 +++++
 apps/routerconsole/jsp/config.jsp             |  5 ++++
 .../router/transport/TransportManager.java    | 16 +++++++----
 4 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java
index adb63df33..d933d1f9e 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java
@@ -4,6 +4,7 @@ import net.i2p.data.RouterInfo;
 import net.i2p.router.LoadTestManager;
 import net.i2p.router.Router;
 import net.i2p.router.transport.FIFOBandwidthRefiller;
+import net.i2p.router.transport.TransportManager;
 import net.i2p.router.transport.udp.UDPTransport;
 import net.i2p.router.web.ConfigServiceHandler.UpdateWrapperManagerAndRekeyTask;
 import net.i2p.time.Timestamper;
@@ -28,6 +29,7 @@ public class ConfigNetHandler extends FormHandler {
     private String _udpPort;
     private boolean _ntcpAutoIP;
     private boolean _ntcpAutoPort;
+    private boolean _upnp;
     private String _inboundRate;
     private String _inboundBurstRate;
     private String _inboundBurst;
@@ -37,7 +39,7 @@ public class ConfigNetHandler extends FormHandler {
     private String _reseedFrom;
     private boolean _enableLoadTesting;
     private String _sharePct;
-    private boolean _ratesOnly;
+    private boolean _ratesOnly; // always false
     
     protected void processForm() {
         if (_saveRequested || ( (_action != null) && ("Save changes".equals(_action)) )) {
@@ -55,10 +57,10 @@ public class ConfigNetHandler extends FormHandler {
     public void setRequireIntroductions(String moo) { _requireIntroductions = true; }
     public void setHiddenMode(String moo) { _hiddenMode = true; }
     public void setDynamicKeys(String moo) { _dynamicKeys = true; }
-    public void setUpdateratesonly(String moo) { _ratesOnly = true; }
     public void setEnableloadtesting(String moo) { _enableLoadTesting = true; }
     public void setNtcpAutoIP(String moo) { _ntcpAutoIP = true; }
     public void setNtcpAutoPort(String moo) { _ntcpAutoPort = true; }
+    public void setUpnp(String moo) { _upnp = true; }
     
     public void setHostname(String hostname) { 
         _hostname = (hostname != null ? hostname.trim() : null); 
@@ -194,11 +196,16 @@ public class ConfigNetHandler extends FormHandler {
                 hiddenSwitch();
             }
 
-            if (_dynamicKeys) {
-                _context.router().setConfigSetting(Router.PROP_DYNAMIC_KEYS, "true");
-            } else {
-                _context.router().removeConfigSetting(Router.PROP_DYNAMIC_KEYS);
+            _context.router().setConfigSetting(Router.PROP_DYNAMIC_KEYS, "" + _dynamicKeys);
+
+            if (Boolean.valueOf(_context.getProperty(TransportManager.PROP_ENABLE_UPNP)).booleanValue() !=
+                _upnp) {
+                if (_upnp)
+                    addFormNotice("Enabling UPnP, restart required to take effect");
+                else
+                    addFormNotice("Disabling UPnP, restart required to take effect");
             }
+            _context.router().setConfigSetting(TransportManager.PROP_ENABLE_UPNP, "" + _upnp);
 
             if (_requireIntroductions) {
                 _context.router().setConfigSetting(UDPTransport.PROP_FORCE_INTRODUCERS, "true");
@@ -207,12 +214,8 @@ public class ConfigNetHandler extends FormHandler {
                 _context.router().removeConfigSetting(UDPTransport.PROP_FORCE_INTRODUCERS);
             }
 
-            if (true || _timeSyncEnabled) {
-                // Time sync enable, means NOT disabled 
-                _context.router().setConfigSetting(Timestamper.PROP_DISABLED, "false");
-            } else {
-                _context.router().setConfigSetting(Timestamper.PROP_DISABLED, "true");
-            }
+            // Time sync enable, means NOT disabled 
+            _context.router().setConfigSetting(Timestamper.PROP_DISABLED, "false");
             
             LoadTestManager.setEnableLoadTesting(_context, _enableLoadTesting);
         }
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java
index 6a563b7a9..f77ce4372 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java
@@ -109,6 +109,13 @@ public class ConfigNetHelper extends HelperBase {
             return "";
     }
 
+    public String getUpnpChecked() {
+        if (Boolean.valueOf(_context.getProperty(TransportManager.PROP_ENABLE_UPNP)).booleanValue())
+            return " checked ";
+        else
+            return "";
+    }
+
     public String getRequireIntroductionsChecked() {
         short status = _context.commSystem().getReachabilityStatus();
         switch (status) {
diff --git a/apps/routerconsole/jsp/config.jsp b/apps/routerconsole/jsp/config.jsp
index 529bb81aa..550cdeb55 100644
--- a/apps/routerconsole/jsp/config.jsp
+++ b/apps/routerconsole/jsp/config.jsp
@@ -104,6 +104,11 @@
     in your NAT or firewall for unsolicited TCP connections.  If you specify the wrong IP address or
     hostname, or do not properly configure your NAT or firewall, your network performance will degrade
     substantially.  When in doubt, leave the hostname and port number blank.
          
+ 
          
+ UPnP Configuration:
          
+ Open firewall port using UPnP:
+     />
          
+ 
          
  
          Note: changing any of these settings will terminate all of your connections and effectively
     restart your router.
  
          
diff --git a/router/java/src/net/i2p/router/transport/TransportManager.java b/router/java/src/net/i2p/router/transport/TransportManager.java
index c1b9ed0f4..e0eefe9a5 100644
--- a/router/java/src/net/i2p/router/transport/TransportManager.java
+++ b/router/java/src/net/i2p/router/transport/TransportManager.java
@@ -41,6 +41,7 @@ public class TransportManager implements TransportEventListener {
     private final static String PROP_ENABLE_NTCP = "i2np.ntcp.enable";
     private final static String DEFAULT_ENABLE_NTCP = "true";
     private final static String DEFAULT_ENABLE_UDP = "true";
+    public final static String PROP_ENABLE_UPNP = "i2np.upnp.enable";
     
     public TransportManager(RouterContext context) {
         _context = context;
@@ -52,7 +53,8 @@ public class TransportManager implements TransportEventListener {
         _context.statManager().createRateStat("transport.bidFailNoTransports", "Could not attempt to bid on message, as none of the transports could attempt it", "Transport", new long[] { 60*1000, 10*60*1000, 60*60*1000 });
         _context.statManager().createRateStat("transport.bidFailAllTransports", "Could not attempt to bid on message, as all of the transports had failed", "Transport", new long[] { 60*1000, 10*60*1000, 60*60*1000 });
         _transports = new ArrayList();
-        _upnpManager = new UPnPManager(context);
+        if (Boolean.valueOf(_context.getProperty(PROP_ENABLE_UPNP)).booleanValue())
+            _upnpManager = new UPnPManager(context);
     }
     
     public void addTransport(Transport transport) {
@@ -93,7 +95,8 @@ public class TransportManager implements TransportEventListener {
     }
     
     public void startListening() {
-        _upnpManager.start();
+        if (_upnpManager != null)
+            _upnpManager.start();
         configTransports();
         _log.debug("Starting up the transport manager");
         for (int i = 0; i < _transports.size(); i++) {
@@ -112,7 +115,8 @@ public class TransportManager implements TransportEventListener {
     }
     
     public void stopListening() {
-        _upnpManager.stop();
+        if (_upnpManager != null)
+            _upnpManager.stop();
         for (int i = 0; i < _transports.size(); i++) {
             ((Transport)_transports.get(i)).stopListening();
         }
@@ -359,7 +363,8 @@ public class TransportManager implements TransportEventListener {
     }
     
     public void transportAddressChanged() {
-        _upnpManager.update(getAddresses());
+        if (_upnpManager != null)
+            _upnpManager.update(getAddresses());
     }
 
     public List getMostRecentErrorMessages() { 
@@ -392,7 +397,8 @@ public class TransportManager implements TransportEventListener {
         }
         buf.append("
\n"); out.write(buf.toString()); - out.write(_upnpManager.renderStatusHTML()); + if (_upnpManager != null) + out.write(_upnpManager.renderStatusHTML()); buf.append("

\n"); out.flush(); } From fc10031ff010c7d0de44cb01add263f7318b9d02 Mon Sep 17 00:00:00 2001 From: zzz Date: Tue, 28 Apr 2009 22:45:26 +0000 Subject: [PATCH 06/23] - Start to rework inbound configuration --- .../net/i2p/router/web/ConfigNetHandler.java | 22 +++++- .../net/i2p/router/web/ConfigNetHelper.java | 76 +++++++++---------- apps/routerconsole/jsp/config.jsp | 24 ++++-- 3 files changed, 71 insertions(+), 51 deletions(-) diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java index d933d1f9e..26e03feff 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java @@ -29,6 +29,7 @@ public class ConfigNetHandler extends FormHandler { private String _udpPort; private boolean _ntcpAutoIP; private boolean _ntcpAutoPort; + private boolean _ntcpInboundDisabled; private boolean _upnp; private String _inboundRate; private String _inboundBurstRate; @@ -58,8 +59,16 @@ public class ConfigNetHandler extends FormHandler { public void setHiddenMode(String moo) { _hiddenMode = true; } public void setDynamicKeys(String moo) { _dynamicKeys = true; } public void setEnableloadtesting(String moo) { _enableLoadTesting = true; } - public void setNtcpAutoIP(String moo) { _ntcpAutoIP = true; } - public void setNtcpAutoPort(String moo) { _ntcpAutoPort = true; } + public void setNtcpAutoIP(String mode) { + _ntcpAutoIP = mode.equals("2"); + if (mode.equals("0")) + _ntcpInboundDisabled = true; + } + public void setNtcpAutoPort(String mode) { + _ntcpAutoPort = mode.equals("2"); + if (mode.equals("0")) + _ntcpInboundDisabled = true; + } public void setUpnp(String moo) { _upnp = true; } public void setHostname(String hostname) { @@ -122,8 +131,12 @@ public class ConfigNetHandler extends FormHandler { String sAutoPort = _context.router().getConfigSetting(ConfigNetHelper.PROP_I2NP_NTCP_AUTO_PORT); boolean oldAutoHost = "true".equalsIgnoreCase(sAutoHost); boolean oldAutoPort = "true".equalsIgnoreCase(sAutoPort); - if (_ntcpHostname == null) _ntcpHostname = ""; - if (_ntcpPort == null) _ntcpPort = ""; + if (_ntcpHostname == null || _ntcpInboundDisabled) _ntcpHostname = ""; + if (_ntcpPort == null || _ntcpInboundDisabled) _ntcpPort = ""; + if (_ntcpInboundDisabled) { + _ntcpAutoIP = false; + _ntcpAutoPort = false; + } if (oldAutoHost != _ntcpAutoIP || ! oldNHost.equalsIgnoreCase(_ntcpHostname)) { if (_ntcpAutoIP) { @@ -162,6 +175,7 @@ public class ConfigNetHandler extends FormHandler { String oldPort = "" + _context.getProperty(UDPTransport.PROP_INTERNAL_PORT, UDPTransport.DEFAULT_INTERNAL_PORT); if (!oldPort.equals(_udpPort)) { _context.router().setConfigSetting(UDPTransport.PROP_INTERNAL_PORT, _udpPort); + _context.router().setConfigSetting(UDPTransport.PROP_EXTERNAL_PORT, _udpPort); addFormNotice("Updating UDP port from " + oldPort + " to " + _udpPort); restartRequired = true; } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java index f77ce4372..0814df38e 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java @@ -18,6 +18,8 @@ public class ConfigNetHelper extends HelperBase { public final static String PROP_I2NP_NTCP_PORT = "i2np.ntcp.port"; public final static String PROP_I2NP_NTCP_AUTO_PORT = "i2np.ntcp.autoport"; public final static String PROP_I2NP_NTCP_AUTO_IP = "i2np.ntcp.autoip"; + private final static String CHECKED = " checked=\"true\" "; + private final static String DISABLED = " disabled=\"true\" "; public String getNtcphostname() { if (!TransportManager.enableNTCP(_context)) return "\" disabled=\"true"; @@ -70,68 +72,64 @@ public class ConfigNetHelper extends HelperBase { if ( (disabled != null) && ("true".equalsIgnoreCase(disabled)) ) return ""; else - return " checked "; + return CHECKED; } + /** @param prop must default to false */ + public String getChecked(String prop) { + if (Boolean.valueOf(_context.getProperty(prop)).booleanValue()) + return CHECKED; + return ""; + } + public String getHiddenModeChecked() { - String enabled = _context.getProperty(Router.PROP_HIDDEN, "false"); - if ( (enabled != null) && ("true".equalsIgnoreCase(enabled)) ) - return " checked "; - else - return ""; + return getChecked(Router.PROP_HIDDEN); } public String getDynamicKeysChecked() { - String enabled = _context.getProperty(Router.PROP_DYNAMIC_KEYS, "false"); - if ( (enabled != null) && ("true".equalsIgnoreCase(enabled)) ) - return " checked "; - else - return ""; + return getChecked(Router.PROP_DYNAMIC_KEYS); } - public String getTcpAutoPortChecked() { + public String getTcpAutoPortChecked(int mode) { if (!TransportManager.enableNTCP(_context)) - return " disabled=\"true\" "; - String enabled = _context.getProperty(PROP_I2NP_NTCP_AUTO_PORT, "false"); - if ( (enabled != null) && ("true".equalsIgnoreCase(enabled)) ) - return " checked "; - else - return ""; + return DISABLED; + String port = _context.getProperty(PROP_I2NP_NTCP_PORT); + boolean specified = port != null && port.length() > 0; + boolean auto = Boolean.valueOf(_context.getProperty(PROP_I2NP_NTCP_AUTO_PORT)).booleanValue(); + if ((mode == 0 && (!specified) && !auto) || + (mode == 1 && specified && !auto) || + (mode == 2 && auto)) + return CHECKED; + return ""; } - public String getTcpAutoIPChecked() { + public String getTcpAutoIPChecked(int mode) { if (!TransportManager.enableNTCP(_context)) - return " disabled=\"true\" "; - String enabled = _context.getProperty(PROP_I2NP_NTCP_AUTO_IP, "false"); - if ( (enabled != null) && ("true".equalsIgnoreCase(enabled)) ) - return " checked "; - else - return ""; + return DISABLED; + String hostname = _context.getProperty(PROP_I2NP_NTCP_HOSTNAME); + boolean specified = hostname != null && hostname.length() > 0; + boolean auto = Boolean.valueOf(_context.getProperty(PROP_I2NP_NTCP_AUTO_IP)).booleanValue(); + if ((mode == 0 && (!specified) && !auto) || + (mode == 1 && specified && !auto) || + (mode == 2 && auto)) + return CHECKED; + return ""; } public String getUpnpChecked() { - if (Boolean.valueOf(_context.getProperty(TransportManager.PROP_ENABLE_UPNP)).booleanValue()) - return " checked "; - else - return ""; + return getChecked(TransportManager.PROP_ENABLE_UPNP); } public String getRequireIntroductionsChecked() { short status = _context.commSystem().getReachabilityStatus(); switch (status) { case CommSystemFacade.STATUS_OK: - if ("true".equalsIgnoreCase(_context.getProperty(UDPTransport.PROP_FORCE_INTRODUCERS, "false"))) - return "checked=\"true\""; - return ""; + case CommSystemFacade.STATUS_UNKNOWN: + return getChecked(UDPTransport.PROP_FORCE_INTRODUCERS); case CommSystemFacade.STATUS_DIFFERENT: case CommSystemFacade.STATUS_REJECT_UNSOLICITED: - return "checked=\"true\""; - case CommSystemFacade.STATUS_UNKNOWN: - if ("true".equalsIgnoreCase(_context.getProperty(UDPTransport.PROP_FORCE_INTRODUCERS, "false"))) - return "checked=\"true\""; - return ""; default: - return "checked=\"true\""; + return CHECKED; } } @@ -191,7 +189,7 @@ public class ConfigNetHelper extends HelperBase { public String getEnableLoadTesting() { if (LoadTestManager.isEnabled(_context)) - return " checked "; + return CHECKED; else return ""; } diff --git a/apps/routerconsole/jsp/config.jsp b/apps/routerconsole/jsp/config.jsp index 550cdeb55..4bcf6880c 100644 --- a/apps/routerconsole/jsp/config.jsp +++ b/apps/routerconsole/jsp/config.jsp @@ -83,18 +83,26 @@

Inbound TCP connection configuration:
- Externally reachable hostname or IP address: + Externally reachable hostname or IP address:
+ /> + Disable
+ /> + Use IP address detected by SSU + (currently )
+ /> + Specify hostname or IP: " /> (dyndns and the like are fine)
- OR use IP address detected by SSU - (currently )? - />

- Externally reachable TCP port: + Externally reachable TCP port:
+ /> + Disable
+ /> + Use the same port configured for SSU + (currently )?
+ /> + Specify Port: " />
- OR use the same port configured for SSU - (currently )? - />

A hostname entered here will be published in the network database. It is not private. Also, do not enter a private IP address like 127.0.0.1 or 192.168.1.1. From 35b5eb74f6df3883cf4e988809151491bc6e8fd2 Mon Sep 17 00:00:00 2001 From: zzz Date: Wed, 29 Apr 2009 03:12:19 +0000 Subject: [PATCH 07/23] start of new address configuration --- .../net/i2p/router/web/ConfigNetHelper.java | 24 ++++++ apps/routerconsole/jsp/config.jsp | 43 ++++++++-- .../net/i2p/router/transport/Addresses.java | 80 +++++++++++++++++++ 3 files changed, 140 insertions(+), 7 deletions(-) create mode 100644 router/java/src/net/i2p/router/transport/Addresses.java diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java index 0814df38e..2c90b805c 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java @@ -5,6 +5,7 @@ import net.i2p.router.CommSystemFacade; import net.i2p.router.LoadTestManager; import net.i2p.router.Router; import net.i2p.router.RouterContext; +import net.i2p.router.transport.Addresses; import net.i2p.router.transport.TransportManager; import net.i2p.router.transport.udp.UDPAddress; import net.i2p.router.transport.udp.UDPTransport; @@ -20,6 +21,13 @@ public class ConfigNetHelper extends HelperBase { public final static String PROP_I2NP_NTCP_AUTO_IP = "i2np.ntcp.autoip"; private final static String CHECKED = " checked=\"true\" "; private final static String DISABLED = " disabled=\"true\" "; + + public String getUdphostname() { + String hostname = _context.getProperty(UDPTransport.PROP_EXTERNAL_HOST); + if (hostname == null) return ""; + return hostname; + } + public String getNtcphostname() { if (!TransportManager.enableNTCP(_context)) return "\" disabled=\"true"; @@ -116,6 +124,18 @@ public class ConfigNetHelper extends HelperBase { return ""; } +//////////////// FIXME + public String getUdpAutoIPChecked(int mode) { + String hostname = _context.getProperty(PROP_I2NP_NTCP_HOSTNAME); + boolean specified = hostname != null && hostname.length() > 0; + boolean auto = Boolean.valueOf(_context.getProperty(PROP_I2NP_NTCP_AUTO_IP)).booleanValue(); + if ((mode == 0 && (!specified) && !auto) || + (mode == 1 && specified && !auto) || + (mode == 2 && auto)) + return CHECKED; + return ""; + } + public String getUpnpChecked() { return getChecked(TransportManager.PROP_ENABLE_UPNP); } @@ -133,6 +153,10 @@ public class ConfigNetHelper extends HelperBase { } } + public String[] getAddresses() { + return Addresses.getAddresses(); + } + public String getInboundRate() { return "" + _context.bandwidthLimiter().getInboundKBytesPerSecond(); } diff --git a/apps/routerconsole/jsp/config.jsp b/apps/routerconsole/jsp/config.jsp index 4bcf6880c..10232ec73 100644 --- a/apps/routerconsole/jsp/config.jsp +++ b/apps/routerconsole/jsp/config.jsp @@ -68,17 +68,46 @@

--> UDP Configuration:
+ Externally reachable hostname or IP address:
+ /> + Use SSU detection only
+ /> + Use local public address if available, then UPnP detection, then SSU detection
+ /> + Use local public address if available, then SSU detection
+ /> + Use UPnP detection if available, then SSU detection
+ /> + Specify hostname or IP: + " /> + <% String[] ips = nethelper.getAddresses(); + if (ips.length > 0) { + out.print(" or \n"); + } + %> +
+ /> + Hidden mode - do not publish IP(not recommended)
Internal UDP port: " />
- External UDP address:
- Require SSU introductions? - />
+ /> + Require SSU introductions + (Enable if you cannot open your firewall)
+ Current External UDP address:

If you can, please poke a hole in your NAT or firewall to allow unsolicited UDP packets to reach you on your external UDP address. If you can't, I2P now includes supports UDP hole punching with "SSU introductions" - peers who will relay a request from someone you don't know to your router for your router so that you can make an outbound connection to them. I2P will use these introductions automatically if it detects that the port is not forwarded (as shown by - the Status: Firewalled line), or you can manually require them here. + the Reachability: Firewalled line), or you can manually require them here. Users behind symmetric NATs, such as OpenBSD's pf, are not currently supported.

@@ -88,18 +117,18 @@ Disable
/> Use IP address detected by SSU - (currently )
+ (currently )
/> Specify hostname or IP: " /> - (dyndns and the like are fine)
+ (dyndns and the like are fine)

Externally reachable TCP port:
/> Disable
/> Use the same port configured for SSU - (currently )?
+ (currently )
/> Specify Port: " />
diff --git a/router/java/src/net/i2p/router/transport/Addresses.java b/router/java/src/net/i2p/router/transport/Addresses.java new file mode 100644 index 000000000..cd82a9086 --- /dev/null +++ b/router/java/src/net/i2p/router/transport/Addresses.java @@ -0,0 +1,80 @@ +package net.i2p.router.transport; + +/* + * public domain + */ + +import java.net.InetAddress; +import java.net.Inet4Address; +import java.net.NetworkInterface; +import java.net.SocketException; +import java.net.UnknownHostException; +import java.util.Enumeration; +import java.util.HashSet; +import java.util.Set; + + +/** + * Get the local addresses + * + * @author zzz + */ +public class Addresses { + + /** return the first non-local address it finds, or null */ + public static String getAnyAddress() { + String[] a = getAddresses(); + if (a.length > 0) + return a[0]; + return null; + } + + /** + * Return an array of all addresses, excluding + * IPv6, local, broadcast, multicast, etc. + */ + public static String[] getAddresses() { + Set rv = new HashSet(4); + try { + InetAddress localhost = InetAddress.getLocalHost(); + InetAddress[] allMyIps = InetAddress.getAllByName(localhost.getCanonicalHostName()); + if (allMyIps != null) { + for (int i = 0; i < allMyIps.length; i++) + add(rv, allMyIps[i]); + } + } catch (UnknownHostException e) {} + + try { + for(Enumeration ifcs = NetworkInterface.getNetworkInterfaces(); ifcs.hasMoreElements();) { + NetworkInterface ifc = ifcs.nextElement(); + for(Enumeration addrs = ifc.getInetAddresses(); addrs.hasMoreElements();) { + InetAddress addr = addrs.nextElement(); + add(rv, addr); + } + } + } catch (SocketException e) {} + + return rv.toArray(new String[rv.size()]); + } + + private static void add(Set set, InetAddress ia) { + if (ia.isAnyLocalAddress() || + ia.isLinkLocalAddress() || + ia.isLoopbackAddress() || + ia.isMulticastAddress() || + ia.isSiteLocalAddress() || + !(ia instanceof Inet4Address)) { +///////// testing +// System.err.println("Skipping: " + ia.getHostAddress()); +// return; + } + String ip = ia.getHostAddress(); + set.add(ip); + } + + public static void main(String[] args) { + String[] a = getAddresses(); + for (String s : a) + System.err.println("Address: " + s); + } +} From b61861f840b94e570047371b6ef3b53fd937741c Mon Sep 17 00:00:00 2001 From: zzz Date: Wed, 29 Apr 2009 18:23:15 +0000 Subject: [PATCH 08/23] - Tweak UPnP warning messages - Remove unused verifyupdate.jsp - Start of callbacks from UPnP to transports - Tell UDP local addresses at startup --- apps/routerconsole/jsp/config.jsp | 5 +- apps/routerconsole/jsp/verifyupdate.jsp | 12 ---- .../transport/CommSystemFacadeImpl.java | 2 +- .../net/i2p/router/transport/Transport.java | 5 ++ .../i2p/router/transport/TransportImpl.java | 23 ++++++++ .../router/transport/TransportManager.java | 57 +++++++++++++++---- .../net/i2p/router/transport/UPnPManager.java | 36 ++++++++++-- .../router/transport/ntcp/NTCPTransport.java | 13 +++++ .../router/transport/udp/UDPTransport.java | 9 +++ .../java/src/org/cybergarage/util/Debug.java | 36 ++++++------ 10 files changed, 148 insertions(+), 50 deletions(-) delete mode 100644 apps/routerconsole/jsp/verifyupdate.jsp diff --git a/apps/routerconsole/jsp/config.jsp b/apps/routerconsole/jsp/config.jsp index 10232ec73..5eb809ed5 100644 --- a/apps/routerconsole/jsp/config.jsp +++ b/apps/routerconsole/jsp/config.jsp @@ -100,9 +100,10 @@ " />
/> Require SSU introductions - (Enable if you cannot open your firewall)
+ (Enable if you cannot open your firewall) +

Current External UDP address:
-

If you can, please poke a hole in your NAT or firewall to allow unsolicited UDP packets to reach +

If you can, please poke a hole in your NAT or firewall to allow unsolicited UDP packets to reach you on your external UDP address. If you can't, I2P now includes supports UDP hole punching with "SSU introductions" - peers who will relay a request from someone you don't know to your router for your router so that you can make an outbound connection to them. I2P will use these diff --git a/apps/routerconsole/jsp/verifyupdate.jsp b/apps/routerconsole/jsp/verifyupdate.jsp deleted file mode 100644 index 2d13d3508..000000000 --- a/apps/routerconsole/jsp/verifyupdate.jsp +++ /dev/null @@ -1,12 +0,0 @@ -<%@page contentType="text/html" %> - - - -I2P Router Console - verify update file signature - - - - - - - diff --git a/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java b/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java index 217054d40..9060ede84 100644 --- a/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java +++ b/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java @@ -241,7 +241,7 @@ public class CommSystemFacadeImpl extends CommSystemFacade { public void notifyReplaceAddress(RouterAddress UDPAddr) { if (UDPAddr == null) return; - NTCPTransport t = (NTCPTransport) _manager.getNTCPTransport(); + NTCPTransport t = (NTCPTransport) _manager.getTransport(NTCPTransport.STYLE); if (t == null) return; Properties UDPProps = UDPAddr.getOptions(); diff --git a/router/java/src/net/i2p/router/transport/Transport.java b/router/java/src/net/i2p/router/transport/Transport.java index f95d2dc8f..145129651 100644 --- a/router/java/src/net/i2p/router/transport/Transport.java +++ b/router/java/src/net/i2p/router/transport/Transport.java @@ -35,6 +35,11 @@ public interface Transport { public RouterAddress startListening(); public void stopListening(); public RouterAddress getCurrentAddress(); + public static final String SOURCE_UPNP = "UPnP"; + public static final String SOURCE_INTERFACE = "Local interface"; + public static final String SOURCE_CONFIG = "Configuration change"; + public void externalAddressReceived(String source, byte[] ip, int port); + public void forwardPortStatus(int port, boolean success, String reason); public void setListener(TransportEventListener listener); public String getStyle(); diff --git a/router/java/src/net/i2p/router/transport/TransportImpl.java b/router/java/src/net/i2p/router/transport/TransportImpl.java index cff0d9a46..685f6189e 100644 --- a/router/java/src/net/i2p/router/transport/TransportImpl.java +++ b/router/java/src/net/i2p/router/transport/TransportImpl.java @@ -422,6 +422,29 @@ public abstract class TransportImpl implements Transport { _context.commSystem().notifyReplaceAddress(address); } + /** + * Notify a transport of an external address change. + * This may be from a local interface, UPnP, a config change, etc. + * This should not be called if the ip didn't change + * (from that source's point of view), or is a local address, + * or if the ip is IPv6, but the transport should check anyway. + * The transport should also do its own checking on whether to accept + * notifications from this source. + * + * This can be called before startListening() to set an initial address, + * or after the transport is running. + * + * @param source defined in Transport.java + * @param ip typ. IPv4 non-local + * @param port 0 for unknown or unchanged + */ + public void externalAddressReceived(String source, byte[] ip, int port) {} + + /** + * Notify a transport of the results of trying to forward a port + */ + public void forwardPortStatus(int port, boolean success, String reason) {} + /** Who to notify on message availability */ public void setListener(TransportEventListener listener) { _listener = listener; } /** Make this stuff pretty (only used in the old console) */ diff --git a/router/java/src/net/i2p/router/transport/TransportManager.java b/router/java/src/net/i2p/router/transport/TransportManager.java index e0eefe9a5..ea3e09b82 100644 --- a/router/java/src/net/i2p/router/transport/TransportManager.java +++ b/router/java/src/net/i2p/router/transport/TransportManager.java @@ -10,6 +10,8 @@ package net.i2p.router.transport; import java.io.IOException; import java.io.Writer; +import java.net.InetAddress; +import java.net.UnknownHostException; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -54,7 +56,7 @@ public class TransportManager implements TransportEventListener { _context.statManager().createRateStat("transport.bidFailAllTransports", "Could not attempt to bid on message, as all of the transports had failed", "Transport", new long[] { 60*1000, 10*60*1000, 60*60*1000 }); _transports = new ArrayList(); if (Boolean.valueOf(_context.getProperty(PROP_ENABLE_UPNP)).booleanValue()) - _upnpManager = new UPnPManager(context); + _upnpManager = new UPnPManager(context, this); } public void addTransport(Transport transport) { @@ -75,14 +77,11 @@ public class TransportManager implements TransportEventListener { enableUDP = DEFAULT_ENABLE_UDP; if ("true".equalsIgnoreCase(enableUDP)) { UDPTransport udp = new UDPTransport(_context); - udp.setListener(this); - _transports.add(udp); - } - if (enableNTCP(_context)) { - NTCPTransport ntcp = new NTCPTransport(_context); - ntcp.setListener(this); - _transports.add(ntcp); + addTransport(udp); + initializeAddress(udp); } + if (enableNTCP(_context)) + addTransport(new NTCPTransport(_context)); if (_transports.size() <= 0) _log.log(Log.CRIT, "No transports are enabled"); } @@ -94,6 +93,41 @@ public class TransportManager implements TransportEventListener { return "true".equalsIgnoreCase(enableNTCP); } + private static void initializeAddress(Transport t) { + String ips = Addresses.getAnyAddress(); + if (ips == null) + return; + InetAddress ia = null; + try { + ia = InetAddress.getByName(ips); + } catch (UnknownHostException e) {return;} + if (ia == null) + return; + byte[] ip = ia.getAddress(); + t.externalAddressReceived(Transport.SOURCE_INTERFACE, ip, 0); + } + + /** + * callback from UPnP + * Only tell SSU, it will tell NTCP + * + */ + public void externalAddressReceived(String source, byte[] ip, int port) { + Transport t = getTransport(UDPTransport.STYLE); + if (t != null) + t.externalAddressReceived(source, ip, port); + } + + /** + * callback from UPnP + * + */ + public void forwardPortStatus(String style, int port, boolean success, String reason) { + Transport t = getTransport(style); + if (t != null) + t.forwardPortStatus(port, success, reason); + } + public void startListening() { if (_upnpManager != null) _upnpManager.start(); @@ -102,7 +136,8 @@ public class TransportManager implements TransportEventListener { for (int i = 0; i < _transports.size(); i++) { Transport t = (Transport)_transports.get(i); RouterAddress addr = t.startListening(); - _log.debug("Transport " + i + " (" + t.getStyle() + ") started"); + if (_log.shouldLog(Log.DEBUG)) + _log.debug("Transport " + i + " (" + t.getStyle() + ") started"); } _log.debug("Done start listening on transports"); _context.router().rebuildRouterInfo(); @@ -123,10 +158,10 @@ public class TransportManager implements TransportEventListener { _transports.clear(); } - public Transport getNTCPTransport() { + public Transport getTransport(String style) { for (int i = 0; i < _transports.size(); i++) { Transport t = (Transport)_transports.get(i); - if("NTCP".equals(t.getStyle())) + if(style.equals(t.getStyle())) return t; } return null; diff --git a/router/java/src/net/i2p/router/transport/UPnPManager.java b/router/java/src/net/i2p/router/transport/UPnPManager.java index a508cabef..ca7873903 100644 --- a/router/java/src/net/i2p/router/transport/UPnPManager.java +++ b/router/java/src/net/i2p/router/transport/UPnPManager.java @@ -4,6 +4,7 @@ package net.i2p.router.transport; * public domain */ +import java.net.InetAddress; import java.util.HashSet; import java.util.Map; import java.util.Properties; @@ -23,9 +24,7 @@ import org.freenetproject.ForwardPortStatus; * Bridge from the I2P RouterAddress data structure to * the freenet data structures * - * No disable option yet. * UPnP listens on ports 1900, 8008, and 8058 - no config option yet. - * No routerconsole support yet. * * @author zzz */ @@ -35,9 +34,12 @@ public class UPnPManager { private UPnP _upnp; private UPnPCallback _upnpCallback; private boolean _isRunning; + private InetAddress _detectedAddress; + private TransportManager _manager; - public UPnPManager(RouterContext context) { + public UPnPManager(RouterContext context, TransportManager manager) { _context = context; + _manager = manager; _log = _context.logManager().getLog(UPnPManager.class); _upnp = new UPnP(context); _upnpCallback = new UPnPCallback(); @@ -60,6 +62,7 @@ public class UPnPManager { if (_isRunning) _upnp.terminate(); _isRunning = false; + _detectedAddress = null; } /** call when the ports might have changed */ @@ -98,7 +101,10 @@ public class UPnPManager { _upnp.onChangePublicPorts(forwards, _upnpCallback); } - /** just logs for now */ + /** + * This is the callback from UPnP. + * It calls the TransportManager callbacks. + */ private class UPnPCallback implements ForwardPortCallback { /** Called to indicate status on one or more forwarded ports. */ @@ -107,10 +113,19 @@ public class UPnPManager { _log.debug("UPnP Callback:"); DetectedIP[] ips = _upnp.getAddress(); + byte[] detected = null; if (ips != null) { for (DetectedIP ip : ips) { - if (_log.shouldLog(Log.DEBUG)) - _log.debug("External address: " + ip.publicAddress + " type: " + ip.natType); + // store the first public one and tell the transport manager if it changed + if (TransportImpl.isPubliclyRoutable(ip.publicAddress.getAddress())) { + if (_log.shouldLog(Log.DEBUG)) + _log.debug("External address: " + ip.publicAddress + " type: " + ip.natType); + if (!ip.publicAddress.equals(_detectedAddress)) { + _detectedAddress = ip.publicAddress; + _manager.externalAddressReceived(Transport.SOURCE_UPNP, _detectedAddress.getAddress(), 0); + } + break; + } } } else { if (_log.shouldLog(Log.DEBUG)) @@ -122,6 +137,15 @@ public class UPnPManager { if (_log.shouldLog(Log.DEBUG)) _log.debug(fp.name + " " + fp.protocol + " " + fp.portNumber + " status: " + fps.status + " reason: " + fps.reasonString + " ext port: " + fps.externalPort); + String style; + if (fp.protocol == ForwardPort.PROTOCOL_UDP_IPV4) + style = "SSU"; + else if (fp.protocol == ForwardPort.PROTOCOL_TCP_IPV4) + style = "NTCP"; + else + continue; + boolean success = fps.status >= ForwardPortStatus.PROBABLE_SUCCESS; + _manager.forwardPortStatus(style, fp.portNumber, success, fps.reasonString); } } } diff --git a/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java b/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java index 4464e5f2d..32a108ec0 100644 --- a/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java +++ b/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java @@ -539,6 +539,19 @@ public class NTCPTransport extends TransportImpl { } } + /** + * If we didn't used to be forwarded, and we have an address, + * and we are configured to use UPnP, update our RouterAddress + */ + public void forwardPortStatus(int port, boolean success, String reason) { + if (_log.shouldLog(Log.WARN)) { + if (success) + _log.warn("UPnP has opened the NTCP port: " + port); + else + _log.warn("UPnP has failed to open the NTCP port: " + port + " reason: " + reason); + } + } + /** * This doesn't (completely) block, caller should check isAlive() * before calling startListening() or restartListening() 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 69e5190fb..9e4289e38 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java @@ -326,6 +326,15 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority _lastInboundReceivedOn = System.currentTimeMillis(); } + /** + * From config, UPnP, local i/f, ... + */ + public void externalAddressReceived(String source, byte[] ip, int port) { + String s = RemoteHostId.toString(ip); + if (_log.shouldLog(Log.WARN)) + _log.warn("Received address: " + s + " port: " + port + " from: " + source); + } + /** * Someone we tried to contact gave us what they think our IP address is. * Right now, we just blindly trust them, changing our IP and port on a diff --git a/router/java/src/org/cybergarage/util/Debug.java b/router/java/src/org/cybergarage/util/Debug.java index 6cd9d939e..caf6352ec 100644 --- a/router/java/src/org/cybergarage/util/Debug.java +++ b/router/java/src/org/cybergarage/util/Debug.java @@ -3,7 +3,7 @@ * CyberUtil for Java * * Copyright (C) Satoshi Konno 2002 -* +* * File: Debug.java * * Revision; @@ -12,40 +12,40 @@ * - first revision. * ******************************************************************/ - + package org.cybergarage.util; - + public final class Debug { public static boolean enabled = false; public static final void on() { enabled = true; - } + } public static final void off() { enabled = false; - } + } public static boolean isOn() { return enabled; - } - public static final void message(String s) { - if (enabled == true) - System.out.println("CyberGarage message : " + s); - } + } + public static final void message(String s) { + if (enabled == true) + System.out.println("UPnP message : " + s); + } public static final void message(String m1, String m2) { if (enabled == true) - System.out.println("CyberGarage message : "); + System.out.println("UPnP message : "); System.out.println(m1); System.out.println(m2); } - public static final void warning(String s) { - System.out.println("CyberGarage warning : " + s); - } + public static final void warning(String s) { + System.out.println("UPnP warning : " + s); + } public static final void warning(String m, Exception e) { - System.out.println("CyberGarage warning : " + m + " (" + e.getMessage() + ")"); + System.out.println("UPnP warning : " + m + " (" + e.getMessage() + ")"); } public static final void warning(Exception e) { - warning(e.getMessage()); + warning(e.getMessage()); e.printStackTrace(); - } -} \ No newline at end of file + } +} From 4929a7e63514e51f852a6e96e3da8b5d8cf0bf64 Mon Sep 17 00:00:00 2001 From: zzz Date: Wed, 29 Apr 2009 20:42:42 +0000 Subject: [PATCH 09/23] - Add getRequestedPort() to transports --- .../net/i2p/router/transport/Addresses.java | 3 +- .../net/i2p/router/transport/Transport.java | 1 + .../i2p/router/transport/TransportImpl.java | 9 ++++ .../router/transport/TransportManager.java | 44 ++++++++++++++++--- .../net/i2p/router/transport/UPnPManager.java | 23 +++------- .../router/transport/ntcp/NTCPTransport.java | 8 ++++ .../router/transport/udp/UDPTransport.java | 14 +++--- 7 files changed, 69 insertions(+), 33 deletions(-) diff --git a/router/java/src/net/i2p/router/transport/Addresses.java b/router/java/src/net/i2p/router/transport/Addresses.java index cd82a9086..53278af78 100644 --- a/router/java/src/net/i2p/router/transport/Addresses.java +++ b/router/java/src/net/i2p/router/transport/Addresses.java @@ -64,9 +64,8 @@ public class Addresses { ia.isMulticastAddress() || ia.isSiteLocalAddress() || !(ia instanceof Inet4Address)) { -///////// testing // System.err.println("Skipping: " + ia.getHostAddress()); -// return; + return; } String ip = ia.getHostAddress(); set.add(ip); diff --git a/router/java/src/net/i2p/router/transport/Transport.java b/router/java/src/net/i2p/router/transport/Transport.java index 145129651..d7d73b77b 100644 --- a/router/java/src/net/i2p/router/transport/Transport.java +++ b/router/java/src/net/i2p/router/transport/Transport.java @@ -40,6 +40,7 @@ public interface Transport { public static final String SOURCE_CONFIG = "Configuration change"; public void externalAddressReceived(String source, byte[] ip, int port); public void forwardPortStatus(int port, boolean success, String reason); + public int getRequestedPort(); public void setListener(TransportEventListener listener); public String getStyle(); diff --git a/router/java/src/net/i2p/router/transport/TransportImpl.java b/router/java/src/net/i2p/router/transport/TransportImpl.java index 685f6189e..be31d35f8 100644 --- a/router/java/src/net/i2p/router/transport/TransportImpl.java +++ b/router/java/src/net/i2p/router/transport/TransportImpl.java @@ -445,6 +445,15 @@ public abstract class TransportImpl implements Transport { */ public void forwardPortStatus(int port, boolean success, String reason) {} + /** + * What port would the transport like to have forwarded by UPnP. + * This can't be passed via getCurrentAddress(), as we have to open the port + * before we can publish the address. + * + * @return port or -1 for none or 0 for any + */ + public int getRequestedPort() { return -1; } + /** Who to notify on message availability */ public void setListener(TransportEventListener listener) { _listener = listener; } /** Make this stuff pretty (only used in the old console) */ diff --git a/router/java/src/net/i2p/router/transport/TransportManager.java b/router/java/src/net/i2p/router/transport/TransportManager.java index ea3e09b82..8e4e50405 100644 --- a/router/java/src/net/i2p/router/transport/TransportManager.java +++ b/router/java/src/net/i2p/router/transport/TransportManager.java @@ -18,6 +18,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.Properties; import java.util.Set; import java.util.TreeMap; import java.util.Vector; @@ -139,6 +140,8 @@ public class TransportManager implements TransportEventListener { if (_log.shouldLog(Log.DEBUG)) _log.debug("Transport " + i + " (" + t.getStyle() + ") started"); } + // kick UPnP - Do this to get the ports opened even before UDP registers an address + transportAddressChanged(); _log.debug("Done start listening on transports"); _context.router().rebuildRouterInfo(); } @@ -285,16 +288,47 @@ public class TransportManager implements TransportEventListener { return TransportImpl.getIP(dest); } - Map getAddresses() { - Map rv = new HashMap(_transports.size()); - for (int i = 0; i < _transports.size(); i++) { - Transport t = (Transport)_transports.get(i); + public Map getAddresses() { + Map rv = new HashMap(_transports.size()); + for (Transport t : _transports) { if (t.getCurrentAddress() != null) rv.put(t.getStyle(), t.getCurrentAddress()); } return rv; } + /** + * Include the published port, or the requested port, for each transport + * which we will pass along to UPnP + */ + private Map getPorts() { + Map rv = new HashMap(_transports.size()); + for (Transport t : _transports) { + int port = t.getRequestedPort(); + if (t.getCurrentAddress() != null) { + Properties opts = t.getCurrentAddress().getOptions(); + if (opts != null) { + String s = opts.getProperty("port"); + if (s != null) { + try { + port = Integer.parseInt(s); + } catch (NumberFormatException nfe) {} + } + } + } + // Use UDP port for NTCP too - see comment in NTCPTransport.getRequestedPort() for why this is here + if (t.getStyle().equals(NTCPTransport.STYLE) && port <= 0 && + Boolean.valueOf(_context.getProperty(CommSystemFacadeImpl.PROP_I2NP_NTCP_AUTO_PORT)).booleanValue()) { + Transport udp = getTransport(UDPTransport.STYLE); + if (udp != null) + port = t.getRequestedPort(); + } + if (port > 0) + rv.put(t.getStyle(), Integer.valueOf(port)); + } + return rv; + } + public TransportBid getBid(OutNetMessage msg) { List bids = getBids(msg); if ( (bids == null) || (bids.size() <= 0) ) @@ -399,7 +433,7 @@ public class TransportManager implements TransportEventListener { public void transportAddressChanged() { if (_upnpManager != null) - _upnpManager.update(getAddresses()); + _upnpManager.update(getPorts()); } public List getMostRecentErrorMessages() { diff --git a/router/java/src/net/i2p/router/transport/UPnPManager.java b/router/java/src/net/i2p/router/transport/UPnPManager.java index ca7873903..f402d9c07 100644 --- a/router/java/src/net/i2p/router/transport/UPnPManager.java +++ b/router/java/src/net/i2p/router/transport/UPnPManager.java @@ -7,7 +7,6 @@ package net.i2p.router.transport; import java.net.InetAddress; import java.util.HashSet; import java.util.Map; -import java.util.Properties; import java.util.Set; import net.i2p.data.RouterAddress; @@ -66,26 +65,14 @@ public class UPnPManager { } /** call when the ports might have changed */ - public void update(Map addresses) { + public void update(Map ports) { if (_log.shouldLog(Log.DEBUG)) _log.debug("UPnP Update:"); if (!_isRunning) return; - Set forwards = new HashSet(addresses.size()); - for (String style : addresses.keySet()) { - RouterAddress ra = addresses.get(style); - if (ra == null) - continue; - Properties opts = ra.getOptions(); - if (opts == null) - continue; - String s = opts.getProperty("port"); - if (s == null) - continue; - int port = -1; - try { - port = Integer.parseInt(s); - } catch (NumberFormatException nfe) { continue; } + Set forwards = new HashSet(ports.size()); + for (String style : ports.keySet()) { + int port = ports.get(style).intValue(); int protocol = -1; if ("SSU".equals(style)) protocol = ForwardPort.PROTOCOL_UDP_IPV4; @@ -144,7 +131,7 @@ public class UPnPManager { style = "NTCP"; else continue; - boolean success = fps.status >= ForwardPortStatus.PROBABLE_SUCCESS; + boolean success = fps.status >= ForwardPortStatus.MAYBE_SUCCESS; _manager.forwardPortStatus(style, fp.portNumber, success, fps.reasonString); } } diff --git a/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java b/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java index 32a108ec0..21bbcdda1 100644 --- a/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java +++ b/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java @@ -552,6 +552,14 @@ public class NTCPTransport extends TransportImpl { } } + public int getRequestedPort() { + // would be nice to do this here but we can't easily get to the UDP transport.getRequested_Port() + // from here, so we do it in TransportManager. + // if (Boolean.valueOf(_context.getProperty(CommSystemFacadeImpl.PROP_I2NP_NTCP_AUTO_PORT)).booleanValue()) + // return foo; + return _context.getProperty(CommSystemFacadeImpl.PROP_I2NP_NTCP_PORT, -1); + } + /** * This doesn't (completely) block, caller should check isAlive() * before calling startListening() or restartListening() 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 9e4289e38..c9e4bc538 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java @@ -217,13 +217,6 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority if (_externalListenPort <= 0) { // no explicit external port, so lets try an internal one port = _context.getProperty(PROP_INTERNAL_PORT, DEFAULT_INTERNAL_PORT); - if (port <= 0) { - port = DEFAULT_INTERNAL_PORT; - //port = 1024 + _context.random().nextInt(31*1024); - //if (_log.shouldLog(Log.INFO)) - // _log.info("Selecting an arbitrary port to bind to: " + port); - _context.router().setConfigSetting(PROP_INTERNAL_PORT, port+""); - } // attempt to use it as our external port - this will be overridden by // externalAddressReceived(...) _context.router().setConfigSetting(PROP_EXTERNAL_PORT, port+""); @@ -314,7 +307,12 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority public int getLocalPort() { return _externalListenPort; } public InetAddress getLocalAddress() { return _externalListenHost; } public int getExternalPort() { return _externalListenPort; } - + public int getRequestedPort() { + if (_externalListenPort > 0) + return _externalListenPort; + return _context.getProperty(PROP_INTERNAL_PORT, DEFAULT_INTERNAL_PORT); + } + /** * If we have received an inbound connection in the last 2 minutes, don't allow * our IP to change. From 5b44bcb44f0dcfa9f687c623fae36f30c7459106 Mon Sep 17 00:00:00 2001 From: zzz Date: Thu, 30 Apr 2009 16:50:47 +0000 Subject: [PATCH 10/23] - NTCP Port must now be either auto or configured; now defaults to auto; and configured now trumps auto. Port configuration now does not affect whether inbound NTCP is enabled - the host configuration alone can do that. --- .../net/i2p/router/web/ConfigNetHandler.java | 13 ++---- .../net/i2p/router/web/ConfigNetHelper.java | 6 +-- apps/routerconsole/jsp/config.jsp | 2 - .../transport/CommSystemFacadeImpl.java | 41 ++++++++++++------- 4 files changed, 32 insertions(+), 30 deletions(-) diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java index 26e03feff..d3c52a53f 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java @@ -66,8 +66,6 @@ public class ConfigNetHandler extends FormHandler { } public void setNtcpAutoPort(String mode) { _ntcpAutoPort = mode.equals("2"); - if (mode.equals("0")) - _ntcpInboundDisabled = true; } public void setUpnp(String moo) { _upnp = true; } @@ -155,19 +153,14 @@ public class ConfigNetHandler extends FormHandler { restartRequired = true; } if (oldAutoPort != _ntcpAutoPort || ! oldNPort.equals(_ntcpPort)) { - if ( _ntcpAutoPort ) { - _context.router().setConfigSetting(ConfigNetHelper.PROP_I2NP_NTCP_AUTO_PORT, "true"); - _context.router().removeConfigSetting(ConfigNetHelper.PROP_I2NP_NTCP_PORT); - addFormNotice("Updating inbound TCP port to auto"); - } else if (_ntcpPort.length() > 0) { + if (_ntcpPort.length() > 0 && !_ntcpAutoPort) { _context.router().setConfigSetting(ConfigNetHelper.PROP_I2NP_NTCP_PORT, _ntcpPort); - _context.router().removeConfigSetting(ConfigNetHelper.PROP_I2NP_NTCP_AUTO_PORT); addFormNotice("Updating inbound TCP port to " + _ntcpPort); } else { _context.router().removeConfigSetting(ConfigNetHelper.PROP_I2NP_NTCP_PORT); - _context.router().removeConfigSetting(ConfigNetHelper.PROP_I2NP_NTCP_AUTO_PORT); - addFormNotice("Disabling inbound TCP"); + addFormNotice("Updating inbound TCP port to auto"); } + _context.router().setConfigSetting(ConfigNetHelper.PROP_I2NP_NTCP_AUTO_PORT, "" + _ntcpAutoPort); restartRequired = true; } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java index 2c90b805c..95a370efc 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java @@ -103,10 +103,8 @@ public class ConfigNetHelper extends HelperBase { return DISABLED; String port = _context.getProperty(PROP_I2NP_NTCP_PORT); boolean specified = port != null && port.length() > 0; - boolean auto = Boolean.valueOf(_context.getProperty(PROP_I2NP_NTCP_AUTO_PORT)).booleanValue(); - if ((mode == 0 && (!specified) && !auto) || - (mode == 1 && specified && !auto) || - (mode == 2 && auto)) + if ((mode == 1 && specified) || + (mode == 2 && !specified)) return CHECKED; return ""; } diff --git a/apps/routerconsole/jsp/config.jsp b/apps/routerconsole/jsp/config.jsp index 5eb809ed5..298414e22 100644 --- a/apps/routerconsole/jsp/config.jsp +++ b/apps/routerconsole/jsp/config.jsp @@ -125,8 +125,6 @@ (dyndns and the like are fine)

Externally reachable TCP port:
- /> - Disable
/> Use the same port configured for SSU (currently )
diff --git a/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java b/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java index 9060ede84..fa62fdc31 100644 --- a/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java +++ b/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java @@ -193,6 +193,9 @@ public class CommSystemFacadeImpl extends CommSystemFacade { public final static String PROP_I2NP_NTCP_AUTO_PORT = "i2np.ntcp.autoport"; public final static String PROP_I2NP_NTCP_AUTO_IP = "i2np.ntcp.autoip"; + /** + * This should really be moved to ntcp/NTCPTransport.java, why is it here? + */ public static RouterAddress createNTCPAddress(RouterContext ctx) { if (!TransportManager.enableNTCP(ctx)) return null; RouterAddress addr = new RouterAddress(); @@ -236,6 +239,7 @@ public class CommSystemFacadeImpl extends CommSystemFacade { /** * UDP changed addresses, tell NTCP and restart + * This should really be moved to ntcp/NTCPTransport.java, why is it here? */ @Override public void notifyReplaceAddress(RouterAddress UDPAddr) { @@ -249,7 +253,8 @@ public class CommSystemFacadeImpl extends CommSystemFacade { return; Properties newProps; RouterAddress oldAddr = t.getCurrentAddress(); - //_log.warn("Changing NTCP Address? was " + oldAddr); + if (_log.shouldLog(Log.INFO)) + _log.info("Changing NTCP Address? was " + oldAddr); RouterAddress newAddr = oldAddr; if (newAddr == null) { newAddr = new RouterAddress(); @@ -264,23 +269,27 @@ public class CommSystemFacadeImpl extends CommSystemFacade { } boolean changed = false; + // old behavior (<= 0.7.3): auto-port defaults to false, and true trumps explicit setting + // new behavior (>= 0.7.4): auto-port defaults to true, but explicit setting trumps auto String oport = newProps.getProperty(NTCPAddress.PROP_PORT); - String enabled = _context.getProperty(PROP_I2NP_NTCP_AUTO_PORT, "false"); - if ( (enabled != null) && ("true".equalsIgnoreCase(enabled)) ) { - String nport = UDPProps.getProperty(UDPAddress.PROP_PORT); - if (nport == null || nport.length() <= 0) - return; - if (oport == null || ! oport.equals(nport)) { - newProps.setProperty(NTCPAddress.PROP_PORT, nport); - changed = true; - } - } else if (oport == null || oport.length() <= 0) { + String nport = null; + String cport = _context.getProperty(PROP_I2NP_NTCP_PORT); + if (cport != null && cport.length() > 0) { + nport = cport; + } else if (Boolean.valueOf(_context.getProperty(PROP_I2NP_NTCP_AUTO_PORT, "true")).booleanValue()) { + nport = UDPProps.getProperty(UDPAddress.PROP_PORT); + } + if (_log.shouldLog(Log.INFO)) + _log.info("old: " + oport + " config: " + cport + " new: " + nport); + if (nport == null || nport.length() <= 0) return; + if (oport == null || ! oport.equals(nport)) { + newProps.setProperty(NTCPAddress.PROP_PORT, nport); + changed = true; } String ohost = newProps.getProperty(NTCPAddress.PROP_HOST); - enabled = _context.getProperty(PROP_I2NP_NTCP_AUTO_IP, "false"); - if ( (enabled != null) && ("true".equalsIgnoreCase(enabled)) ) { + if (Boolean.valueOf(_context.getProperty(PROP_I2NP_NTCP_AUTO_IP)).booleanValue()) { String nhost = UDPProps.getProperty(UDPAddress.PROP_HOST); if (nhost == null || nhost.length() <= 0) return; @@ -293,12 +302,16 @@ public class CommSystemFacadeImpl extends CommSystemFacade { } if (!changed) { - //_log.warn("No change to NTCP Address"); + _log.warn("No change to NTCP Address"); return; } // stopListening stops the pumper, readers, and writers, so required even if // oldAddr == null since startListening starts them all again + // + // really need to fix this so that we can change or create an inbound address + // without tearing down everything + // _log.warn("Halting NTCP to change address"); t.stopListening(); newAddr.setOptions(newProps); From b21e0112034d5c63f1ef39681427f5ff695ed4f3 Mon Sep 17 00:00:00 2001 From: zzz Date: Thu, 30 Apr 2009 21:03:00 +0000 Subject: [PATCH 11/23] - i2np.ntcp.autoip=true redefined to enable inbound only if SSU reachability is OK. i2np.ntcp.autoip=always for the old behavior. autoip default is now "true". i2np.ntcp.hostname=xxx now trumps i2np.tcp.autoip. - SSU always tells NTCP when status changes. --- .../net/i2p/router/web/ConfigNetHandler.java | 32 +++++++------------ .../net/i2p/router/web/ConfigNetHelper.java | 11 ++++--- apps/routerconsole/jsp/config.jsp | 12 ++++--- .../transport/CommSystemFacadeImpl.java | 21 +++++++++++- .../router/transport/udp/UDPTransport.java | 5 ++- 5 files changed, 49 insertions(+), 32 deletions(-) diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java index d3c52a53f..8700f1845 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java @@ -27,9 +27,8 @@ public class ConfigNetHandler extends FormHandler { private String _ntcpPort; private String _tcpPort; private String _udpPort; - private boolean _ntcpAutoIP; + private String _ntcpAutoIP; private boolean _ntcpAutoPort; - private boolean _ntcpInboundDisabled; private boolean _upnp; private String _inboundRate; private String _inboundBurstRate; @@ -60,9 +59,7 @@ public class ConfigNetHandler extends FormHandler { public void setDynamicKeys(String moo) { _dynamicKeys = true; } public void setEnableloadtesting(String moo) { _enableLoadTesting = true; } public void setNtcpAutoIP(String mode) { - _ntcpAutoIP = mode.equals("2"); - if (mode.equals("0")) - _ntcpInboundDisabled = true; + _ntcpAutoIP = mode; } public void setNtcpAutoPort(String mode) { _ntcpAutoPort = mode.equals("2"); @@ -125,31 +122,24 @@ public class ConfigNetHandler extends FormHandler { if (oldNHost == null) oldNHost = ""; String oldNPort = _context.router().getConfigSetting(ConfigNetHelper.PROP_I2NP_NTCP_PORT); if (oldNPort == null) oldNPort = ""; - String sAutoHost = _context.router().getConfigSetting(ConfigNetHelper.PROP_I2NP_NTCP_AUTO_IP); + String oldAutoHost = _context.router().getConfigSetting(ConfigNetHelper.PROP_I2NP_NTCP_AUTO_IP); String sAutoPort = _context.router().getConfigSetting(ConfigNetHelper.PROP_I2NP_NTCP_AUTO_PORT); - boolean oldAutoHost = "true".equalsIgnoreCase(sAutoHost); boolean oldAutoPort = "true".equalsIgnoreCase(sAutoPort); - if (_ntcpHostname == null || _ntcpInboundDisabled) _ntcpHostname = ""; - if (_ntcpPort == null || _ntcpInboundDisabled) _ntcpPort = ""; - if (_ntcpInboundDisabled) { - _ntcpAutoIP = false; - _ntcpAutoPort = false; - } + if (_ntcpHostname == null) _ntcpHostname = ""; + if (_ntcpPort == null) _ntcpPort = ""; if (oldAutoHost != _ntcpAutoIP || ! oldNHost.equalsIgnoreCase(_ntcpHostname)) { - if (_ntcpAutoIP) { - _context.router().setConfigSetting(ConfigNetHelper.PROP_I2NP_NTCP_AUTO_IP, "true"); - _context.router().removeConfigSetting(ConfigNetHelper.PROP_I2NP_NTCP_HOSTNAME); - addFormNotice("Updating inbound TCP address to auto"); - } else if (_ntcpHostname.length() > 0) { + if ("false".equals(_ntcpAutoIP) && _ntcpHostname.length() > 0) { _context.router().setConfigSetting(ConfigNetHelper.PROP_I2NP_NTCP_HOSTNAME, _ntcpHostname); - _context.router().removeConfigSetting(ConfigNetHelper.PROP_I2NP_NTCP_AUTO_IP); addFormNotice("Updating inbound TCP address to " + _ntcpHostname); } else { _context.router().removeConfigSetting(ConfigNetHelper.PROP_I2NP_NTCP_HOSTNAME); - _context.router().removeConfigSetting(ConfigNetHelper.PROP_I2NP_NTCP_AUTO_IP); - addFormNotice("Disabling inbound TCP"); + if ("false".equals(_ntcpAutoIP)) + addFormNotice("Disabling inbound TCP"); + else + addFormNotice("Updating inbound TCP address to auto"); } + _context.router().setConfigSetting(ConfigNetHelper.PROP_I2NP_NTCP_AUTO_IP, _ntcpAutoIP); restartRequired = true; } if (oldAutoPort != _ntcpAutoPort || ! oldNPort.equals(_ntcpPort)) { diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java index 95a370efc..10ce76061 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java @@ -114,10 +114,13 @@ public class ConfigNetHelper extends HelperBase { return DISABLED; String hostname = _context.getProperty(PROP_I2NP_NTCP_HOSTNAME); boolean specified = hostname != null && hostname.length() > 0; - boolean auto = Boolean.valueOf(_context.getProperty(PROP_I2NP_NTCP_AUTO_IP)).booleanValue(); - if ((mode == 0 && (!specified) && !auto) || - (mode == 1 && specified && !auto) || - (mode == 2 && auto)) + String auto = _context.getProperty(PROP_I2NP_NTCP_AUTO_IP); + if (auto == null) + auto = "false"; + if ((mode == 0 && (!specified) && auto.equals("false")) || + (mode == 1 && specified && auto.equals("false")) || + (mode == 2 && auto.equals("true")) || + (mode == 3 && auto.equals("always"))) return CHECKED; return ""; } diff --git a/apps/routerconsole/jsp/config.jsp b/apps/routerconsole/jsp/config.jsp index 298414e22..37ace064f 100644 --- a/apps/routerconsole/jsp/config.jsp +++ b/apps/routerconsole/jsp/config.jsp @@ -114,12 +114,14 @@

Inbound TCP connection configuration:
Externally reachable hostname or IP address:
- /> - Disable
- /> - Use IP address detected by SSU + /> + Disable (Firewalled)
+ /> + Use IP address detected by SSU (Not firewalled) (currently )
- /> + /> + Use IP address detected by SSU, only if we do not appear to be firewalled
+ /> Specify hostname or IP: " /> (dyndns and the like are fine)
diff --git a/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java b/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java index fa62fdc31..ce8c6fb29 100644 --- a/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java +++ b/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java @@ -269,6 +269,8 @@ public class CommSystemFacadeImpl extends CommSystemFacade { } boolean changed = false; + + // Auto Port Setting // old behavior (<= 0.7.3): auto-port defaults to false, and true trumps explicit setting // new behavior (>= 0.7.4): auto-port defaults to true, but explicit setting trumps auto String oport = newProps.getProperty(NTCPAddress.PROP_PORT); @@ -288,9 +290,26 @@ public class CommSystemFacadeImpl extends CommSystemFacade { changed = true; } + // Auto IP Setting + // old behavior (<= 0.7.3): auto-ip defaults to false, and trumps configured hostname, + // and ignores reachability status - leading to + // "firewalled with inbound TCP enabled" warnings. + // new behavior (>= 0.7.4): auto-ip defaults to true, and explicit setting trumps auto, + // and only takes effect if reachability is OK. + // And new "always" setting ignores reachability status, like + // "true" was in 0.7.3 String ohost = newProps.getProperty(NTCPAddress.PROP_HOST); - if (Boolean.valueOf(_context.getProperty(PROP_I2NP_NTCP_AUTO_IP)).booleanValue()) { + String enabled = _context.getProperty(PROP_I2NP_NTCP_AUTO_IP, "true"); + String name = _context.getProperty(PROP_I2NP_NTCP_HOSTNAME); + if (name != null && name.length() > 0) + enabled = "false"; + if (_log.shouldLog(Log.INFO)) + _log.info("old: " + ohost + " config: " + name + " auto: " + enabled + " status: " + getReachabilityStatus()); + if (enabled.equalsIgnoreCase("always") || + (enabled.equalsIgnoreCase("true") && getReachabilityStatus() == CommSystemFacade.STATUS_OK)) { String nhost = UDPProps.getProperty(UDPAddress.PROP_HOST); + if (_log.shouldLog(Log.INFO)) + _log.info("old: " + ohost + " config: " + name + " new: " + nhost); if (nhost == null || nhost.length() <= 0) return; if (ohost == null || ! ohost.equalsIgnoreCase(nhost)) { 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 c9e4bc538..a43213a9c 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java @@ -2102,7 +2102,10 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority if ( (status != old) && (status != CommSystemFacade.STATUS_UNKNOWN) ) { if (_log.shouldLog(Log.INFO)) _log.info("Old status: " + old + " New status: " + status + " from: ", new Exception("traceback")); - if (needsRebuild()) + // Always rebuild when the status changes, even if our address hasn't changed, + // as rebuildExternalAddress() calls replaceAddress() which calls CSFI.notifyReplaceAddress() + // which will start up NTCP inbound when we transition to OK. + // if (needsRebuild()) rebuildExternalAddress(); } } From 79a963fcab6ab7a7f0466d6b95085c0c26c2e84e Mon Sep 17 00:00:00 2001 From: zzz Date: Fri, 1 May 2009 00:42:31 +0000 Subject: [PATCH 12/23] - Implement config save of new IP address options - Implement local address and UPnP configuration of UDP address - Limit received port to 1024 minimum --- .../net/i2p/router/web/ConfigNetHandler.java | 62 ++++++++++++++----- .../net/i2p/router/web/ConfigNetHelper.java | 32 ++++------ apps/routerconsole/jsp/config.jsp | 46 +++++++------- router/java/src/net/i2p/router/Router.java | 5 +- .../net/i2p/router/transport/Transport.java | 6 +- .../router/transport/ntcp/NTCPTransport.java | 6 ++ .../router/transport/udp/UDPTransport.java | 60 ++++++++++++++---- 7 files changed, 146 insertions(+), 71 deletions(-) diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java index 8700f1845..8a671632f 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java @@ -26,7 +26,10 @@ public class ConfigNetHandler extends FormHandler { private String _ntcpHostname; private String _ntcpPort; private String _tcpPort; + private String _udpHost1; + private String _udpHost2; private String _udpPort; + private String _udpAutoIP; private String _ntcpAutoIP; private boolean _ntcpAutoPort; private boolean _upnp; @@ -40,6 +43,7 @@ public class ConfigNetHandler extends FormHandler { private boolean _enableLoadTesting; private String _sharePct; private boolean _ratesOnly; // always false + private static final String PROP_HIDDEN = Router.PROP_HIDDEN_HIDDEN; // see Router for other choice protected void processForm() { if (_saveRequested || ( (_action != null) && ("Save changes".equals(_action)) )) { @@ -55,9 +59,12 @@ public class ConfigNetHandler extends FormHandler { public void setEnabletimesync(String moo) { _timeSyncEnabled = true; } public void setRecheckReachability(String moo) { _recheckReachabilityRequested = true; } public void setRequireIntroductions(String moo) { _requireIntroductions = true; } - public void setHiddenMode(String moo) { _hiddenMode = true; } public void setDynamicKeys(String moo) { _dynamicKeys = true; } public void setEnableloadtesting(String moo) { _enableLoadTesting = true; } + public void setUdpAutoIP(String mode) { + _udpAutoIP = mode; + _hiddenMode = "hidden".equals(mode); + } public void setNtcpAutoIP(String mode) { _ntcpAutoIP = mode; } @@ -78,6 +85,12 @@ public class ConfigNetHandler extends FormHandler { public void setNtcpport(String port) { _ntcpPort = (port != null ? port.trim() : null); } + public void setUdpHost1(String host) { + _udpHost1 = (host != null ? host.trim() : null); + } + public void setUdpHost2(String host) { + _udpHost2 = (host != null ? host.trim() : null); + } public void setUdpPort(String port) { _udpPort = (port != null ? port.trim() : null); } @@ -117,6 +130,28 @@ public class ConfigNetHandler extends FormHandler { boolean restartRequired = false; if (!_ratesOnly) { + // IP Settings + String oldUdp = _context.getProperty(UDPTransport.PROP_SOURCES, UDPTransport.DEFAULT_SOURCES); + String oldUHost = _context.getProperty(UDPTransport.PROP_EXTERNAL_HOST, ""); + if (_udpAutoIP != null) { + String uhost = ""; + if (_udpAutoIP.equals("fixed")) { + if (_udpHost1 != null && _udpHost1.length() > 0) + uhost = _udpHost1; + else if (_udpHost2 != null && _udpHost2.length() > 0) + uhost = _udpHost1; + else + _udpAutoIP = UDPTransport.DEFAULT_SOURCES; + } + _context.router().setConfigSetting(UDPTransport.PROP_SOURCES, _udpAutoIP); + _context.router().setConfigSetting(UDPTransport.PROP_EXTERNAL_HOST, uhost); + if ((!oldUdp.equals(_udpAutoIP)) || (!oldUHost.equals(uhost))) { + addFormNotice("Updating IP address"); + restartRequired = true; + } + } + + // NTCP Settings // Normalize some things to make the following code a little easier... String oldNHost = _context.router().getConfigSetting(ConfigNetHelper.PROP_I2NP_NTCP_HOSTNAME); if (oldNHost == null) oldNHost = ""; @@ -154,6 +189,7 @@ public class ConfigNetHandler extends FormHandler { restartRequired = true; } + // UDP Settings if ( (_udpPort != null) && (_udpPort.length() > 0) ) { String oldPort = "" + _context.getProperty(UDPTransport.PROP_INTERNAL_PORT, UDPTransport.DEFAULT_INTERNAL_PORT); if (!oldPort.equals(_udpPort)) { @@ -168,6 +204,7 @@ public class ConfigNetHandler extends FormHandler { updateRates(); + boolean switchRequired = false; if (!_ratesOnly) { if (_sharePct != null) { String old = _context.router().getConfigSetting(Router.PROP_BANDWIDTH_SHARE_PERCENTAGE); @@ -178,19 +215,14 @@ public class ConfigNetHandler extends FormHandler { } // If hidden mode value changes, restart is required - if (_hiddenMode && "false".equalsIgnoreCase(_context.getProperty(Router.PROP_HIDDEN, "false"))) { - _context.router().setConfigSetting(Router.PROP_HIDDEN, "true"); - _context.router().addCapabilities(_context.router().getRouterInfo()); - addFormNotice("Gracefully restarting into Hidden Router Mode. Make sure you have no 0-1 length " + switchRequired = _hiddenMode != _context.router().isHidden(); + if (switchRequired) { + _context.router().setConfigSetting(PROP_HIDDEN, "" + _hiddenMode); + if (_hiddenMode) + addFormNotice("Gracefully restarting into Hidden Router Mode. Make sure you have no 0-1 length " + "tunnels!"); - hiddenSwitch(); - } - - if (!_hiddenMode && "true".equalsIgnoreCase(_context.getProperty(Router.PROP_HIDDEN, "false"))) { - _context.router().removeConfigSetting(Router.PROP_HIDDEN); - _context.router().getRouterInfo().delCapability(RouterInfo.CAPABILITY_HIDDEN); - addFormNotice("Gracefully restarting to exit Hidden Router Mode"); - hiddenSwitch(); + else + addFormNotice("Gracefully restarting to exit Hidden Router Mode"); } _context.router().setConfigSetting(Router.PROP_DYNAMIC_KEYS, "" + _dynamicKeys); @@ -225,7 +257,9 @@ public class ConfigNetHandler extends FormHandler { addFormNotice("Error saving the configuration (applied but not saved) - please see the error logs"); } - if (restartRequired) { + if (switchRequired) { + hiddenSwitch(); + } else if (restartRequired) { //addFormNotice("Performing a soft restart"); //_context.router().restart(); //addFormNotice("Soft restart complete"); diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java index 10ce76061..92e502d3e 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java @@ -23,24 +23,19 @@ public class ConfigNetHelper extends HelperBase { private final static String DISABLED = " disabled=\"true\" "; public String getUdphostname() { - String hostname = _context.getProperty(UDPTransport.PROP_EXTERNAL_HOST); - if (hostname == null) return ""; - return hostname; + return _context.getProperty(UDPTransport.PROP_EXTERNAL_HOST, ""); } public String getNtcphostname() { if (!TransportManager.enableNTCP(_context)) return "\" disabled=\"true"; - String hostname = _context.getProperty(PROP_I2NP_NTCP_HOSTNAME); - if (hostname == null) return ""; - return hostname; + return _context.getProperty(PROP_I2NP_NTCP_HOSTNAME, ""); } + public String getNtcpport() { if (!TransportManager.enableNTCP(_context)) return "\" disabled=\"true"; - String port = _context.getProperty(PROP_I2NP_NTCP_PORT); - if (port == null) return ""; - return port; + return _context.getProperty(PROP_I2NP_NTCP_PORT, ""); } public String getUdpAddress() { @@ -90,10 +85,6 @@ public class ConfigNetHelper extends HelperBase { return ""; } - public String getHiddenModeChecked() { - return getChecked(Router.PROP_HIDDEN); - } - public String getDynamicKeysChecked() { return getChecked(Router.PROP_DYNAMIC_KEYS); } @@ -125,14 +116,17 @@ public class ConfigNetHelper extends HelperBase { return ""; } -//////////////// FIXME public String getUdpAutoIPChecked(int mode) { - String hostname = _context.getProperty(PROP_I2NP_NTCP_HOSTNAME); + String hostname = _context.getProperty(UDPTransport.PROP_EXTERNAL_HOST); boolean specified = hostname != null && hostname.length() > 0; - boolean auto = Boolean.valueOf(_context.getProperty(PROP_I2NP_NTCP_AUTO_IP)).booleanValue(); - if ((mode == 0 && (!specified) && !auto) || - (mode == 1 && specified && !auto) || - (mode == 2 && auto)) + boolean hidden = _context.router().isHidden(); + String sources = _context.getProperty(UDPTransport.PROP_SOURCES, UDPTransport.DEFAULT_SOURCES); + if ((mode == 0 && sources.equals("ssu") && !hidden) || + (mode == 1 && specified && !hidden) || + (mode == 2 && hidden) || + (mode == 3 && sources.equals("local,upnp,ssu") && !hidden) || + (mode == 4 && sources.equals("local,ssu") && !hidden) || + (mode == 5 && sources.equals("upnp,ssu") && !hidden)) return CHECKED; return ""; } diff --git a/apps/routerconsole/jsp/config.jsp b/apps/routerconsole/jsp/config.jsp index 37ace064f..a13da220c 100644 --- a/apps/routerconsole/jsp/config.jsp +++ b/apps/routerconsole/jsp/config.jsp @@ -67,22 +67,27 @@ test.rtt and related stats.

--> - UDP Configuration:
+

+ UPnP Configuration:
+ /> + Enable UPnP to open firewall ports +

+ IP Configuration:
Externally reachable hostname or IP address:
- /> - Use SSU detection only
- /> + /> Use local public address if available, then UPnP detection, then SSU detection
- /> + /> Use local public address if available, then SSU detection
- /> + /> Use UPnP detection if available, then SSU detection
- /> + /> + Use SSU detection only
+ /> Specify hostname or IP: - " /> + " /> <% String[] ips = nethelper.getAddresses(); if (ips.length > 0) { - out.print(" or \n"); for (int i = 0; i < ips.length; i++) { out.print("

+ UDP Configuration:
Internal UDP port: " />
/> Require SSU introductions (Enable if you cannot open your firewall) -

+

Current External UDP address:

If you can, please poke a hole in your NAT or firewall to allow unsolicited UDP packets to reach you on your external UDP address. If you can't, I2P now includes supports UDP hole punching @@ -111,8 +118,8 @@ the Reachability: Firewalled line), or you can manually require them here. Users behind symmetric NATs, such as OpenBSD's pf, are not currently supported.

-

- Inbound TCP connection configuration:
+

+ Inbound TCP Configuration:
Externally reachable hostname or IP address:
/> Disable (Firewalled)
@@ -125,7 +132,7 @@ Specify hostname or IP: " /> (dyndns and the like are fine)
-

+

Externally reachable TCP port:
/> Use the same port configured for SSU @@ -133,8 +140,8 @@ /> Specify Port: " />
-

A hostname entered here will be published in the network database. - It is not private. +

Hostnames entered here will be published in the network database. + They are not private. Also, do not enter a private IP address like 127.0.0.1 or 192.168.1.1.

You do not need to allow inbound TCP connections - outbound connections work with no @@ -142,11 +149,6 @@ in your NAT or firewall for unsolicited TCP connections. If you specify the wrong IP address or hostname, or do not properly configure your NAT or firewall, your network performance will degrade substantially. When in doubt, leave the hostname and port number blank.

-

- UPnP Configuration:
- Open firewall port using UPnP: - />
-

Note: changing any of these settings will terminate all of your connections and effectively restart your router.

diff --git a/router/java/src/net/i2p/router/Router.java b/router/java/src/net/i2p/router/Router.java index 2c9a1319e..a849e385c 100644 --- a/router/java/src/net/i2p/router/Router.java +++ b/router/java/src/net/i2p/router/Router.java @@ -73,7 +73,10 @@ public class Router { /** used to differentiate routerInfo files on different networks */ public static final int NETWORK_ID = 2; + /** this puts an 'H' in your routerInfo **/ public final static String PROP_HIDDEN = "router.hiddenMode"; + /** this does not put an 'H' in your routerInfo **/ + public final static String PROP_HIDDEN_HIDDEN = "router.isHidden"; public final static String PROP_DYNAMIC_KEYS = "router.dynamicKeys"; public final static String PROP_INFO_FILENAME = "router.info.location"; public final static String PROP_INFO_FILENAME_DEFAULT = "router.info"; @@ -423,7 +426,7 @@ public class Router { RouterInfo ri = _routerInfo; if ( (ri != null) && (ri.isHidden()) ) return true; - return Boolean.valueOf(_context.getProperty("router.isHidden", "false")).booleanValue(); + return Boolean.valueOf(_context.getProperty(PROP_HIDDEN_HIDDEN)).booleanValue(); } public Certificate createCertificate() { Certificate cert = new Certificate(); diff --git a/router/java/src/net/i2p/router/transport/Transport.java b/router/java/src/net/i2p/router/transport/Transport.java index d7d73b77b..fc5c32153 100644 --- a/router/java/src/net/i2p/router/transport/Transport.java +++ b/router/java/src/net/i2p/router/transport/Transport.java @@ -35,9 +35,9 @@ public interface Transport { public RouterAddress startListening(); public void stopListening(); public RouterAddress getCurrentAddress(); - public static final String SOURCE_UPNP = "UPnP"; - public static final String SOURCE_INTERFACE = "Local interface"; - public static final String SOURCE_CONFIG = "Configuration change"; + public static final String SOURCE_UPNP = "upnp"; + public static final String SOURCE_INTERFACE = "local"; + public static final String SOURCE_CONFIG = "config"; // unused public void externalAddressReceived(String source, byte[] ip, int port); public void forwardPortStatus(int port, boolean success, String reason); public int getRequestedPort(); diff --git a/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java b/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java index 21bbcdda1..a6020ae34 100644 --- a/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java +++ b/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java @@ -542,6 +542,12 @@ public class NTCPTransport extends TransportImpl { /** * If we didn't used to be forwarded, and we have an address, * and we are configured to use UPnP, update our RouterAddress + * + * Don't do anything now. If it fails, we don't know if it's + * because there is no firewall, or if the firewall rejected the request. + * So we just use the SSU reachability status + * to decide whether to enable inbound NTCP. SSU will have CSFI build a new + * NTCP address when it transitions to OK. */ public void forwardPortStatus(int port, boolean success, String reason) { if (_log.shouldLog(Log.WARN)) { 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 a43213a9c..e2bae885d 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java @@ -100,6 +100,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority public static final String STYLE = "SSU"; public static final String PROP_INTERNAL_PORT = "i2np.udp.internalPort"; public static final int DEFAULT_INTERNAL_PORT = 8887; + private static final int MIN_EXTERNAL_PORT = 1024; /** define this to explicitly set an external IP address */ public static final String PROP_EXTERNAL_HOST = "i2np.udp.host"; @@ -118,9 +119,14 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority public static final String PROP_PREFER_UDP = "i2np.udp.preferred"; private static final String DEFAULT_PREFER_UDP = "false"; + /** if true (default), we don't change our advertised port no matter what our peers tell us */ public static final String PROP_FIXED_PORT = "i2np.udp.fixedPort"; private static final String DEFAULT_FIXED_PORT = "true"; + /** allowed sources of address updates */ + public static final String PROP_SOURCES = "i2np.udp.addressSources"; + public static final String DEFAULT_SOURCES = "local,upnp,ssu"; + /** do we require introducers, regardless of our status? */ public static final String PROP_FORCE_INTRODUCERS = "i2np.udp.forceIntroducers"; /** do we allow direct SSU connections, sans introducers? */ @@ -326,11 +332,21 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority /** * From config, UPnP, local i/f, ... + * + * @param source used for logging only + * @param ip publicly routable IPv4 only + * @param port 0 if unknown */ public void externalAddressReceived(String source, byte[] ip, int port) { String s = RemoteHostId.toString(ip); if (_log.shouldLog(Log.WARN)) _log.warn("Received address: " + s + " port: " + port + " from: " + source); + if (explicitAddressSpecified()) + return; + String sources = _context.getProperty(PROP_SOURCES, DEFAULT_SOURCES); + if (!sources.contains(source)) + return; + changeAddress(ip, port); } /** @@ -338,9 +354,15 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority * Right now, we just blindly trust them, changing our IP and port on a * whim. this is not good ;) * + * Todo: + * - Much better tracking of troublemakers + * - Disable if we have good local address or UPnP + * + * @param ip publicly routable IPv4 only + * @param ourPort >= 1024 */ void externalAddressReceived(Hash from, byte ourIP[], int ourPort) { - boolean isValid = isValid(ourIP); + boolean isValid = isValid(ourIP) && ourPort >= MIN_EXTERNAL_PORT; boolean explicitSpecified = explicitAddressSpecified(); boolean inboundRecent = _lastInboundReceivedOn + ALLOW_IP_CHANGE_INTERVAL > System.currentTimeMillis(); if (_log.shouldLog(Log.INFO)) @@ -350,15 +372,15 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority if (explicitSpecified) return; + String sources = _context.getProperty(PROP_SOURCES, DEFAULT_SOURCES); + if (!sources.contains("ssu")) + return; - boolean fixedPort = getIsPortFixed(); - boolean updated = false; - boolean fireTest = false; if (!isValid) { // ignore them if (_log.shouldLog(Log.ERROR)) _log.error("The router " + from.toBase64() + " told us we have an invalid IP - " - + RemoteHostId.toString(ourIP) + ". Lets throw tomatoes at them"); + + RemoteHostId.toString(ourIP) + " port " + ourPort + ". Lets throw tomatoes at them"); markUnreachable(from); //_context.shitlist().shitlistRouter(from, "They said we had an invalid IP", STYLE); return; @@ -367,6 +389,19 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority if (_log.shouldLog(Log.INFO)) _log.info("Ignoring IP address suggestion, since we have received an inbound con recently"); } else { + changeAddress(ourIP, ourPort); + } + + } + + /** + * @param ourPort >= 1024 or 0 for no change + */ + private void changeAddress(byte ourIP[], int ourPort) { + boolean fixedPort = getIsPortFixed(); + boolean updated = false; + boolean fireTest = false; + synchronized (this) { if ( (_externalListenHost == null) || (!eq(_externalListenHost.getAddress(), _externalListenPort, ourIP, ourPort)) ) { @@ -378,11 +413,13 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority _log.info("Trying to change our external address..."); try { _externalListenHost = InetAddress.getByAddress(ourIP); - if (!fixedPort) + if (ourPort >= MIN_EXTERNAL_PORT && !fixedPort) _externalListenPort = ourPort; - rebuildExternalAddress(); - replaceAddress(_externalAddress); - updated = true; + if (_externalListenPort >= MIN_EXTERNAL_PORT) { + rebuildExternalAddress(); + replaceAddress(_externalAddress); + updated = true; + } } catch (UnknownHostException uhe) { _externalListenHost = null; if (_log.shouldLog(Log.INFO)) @@ -401,8 +438,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority _log.info("Same address as the current one"); } } - } - + if (fireTest) { _context.statManager().addRateData("udp.addressTestInsteadOfUpdate", 1, 0); _testEvent.forceRun(); @@ -417,7 +453,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority SimpleTimer.getInstance().addEvent(_testEvent, 5*1000); } } - + private static final boolean eq(byte laddr[], int lport, byte raddr[], int rport) { return (rport == lport) && DataHelper.eq(laddr, raddr); } From 0e4c84694274902e4400f23d7cdb030a0775d820 Mon Sep 17 00:00:00 2001 From: zzz Date: Fri, 1 May 2009 15:26:49 +0000 Subject: [PATCH 13/23] - Simplify bw form - Add config link to UPnP status --- .../net/i2p/router/web/ConfigNetHelper.java | 15 +++++++++- apps/routerconsole/jsp/config.jsp | 30 ++++++++++++------- .../src/net/i2p/router/transport/UPnP.java | 2 +- .../net/i2p/router/transport/UPnPManager.java | 2 +- 4 files changed, 35 insertions(+), 14 deletions(-) diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java index 92e502d3e..62552212c 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java @@ -1,5 +1,6 @@ package net.i2p.router.web; +import net.i2p.data.DataHelper; import net.i2p.data.RouterAddress; import net.i2p.router.CommSystemFacade; import net.i2p.router.LoadTestManager; @@ -158,6 +159,18 @@ public class ConfigNetHelper extends HelperBase { public String getOutboundRate() { return "" + _context.bandwidthLimiter().getOutboundKBytesPerSecond(); } + public String getInboundRateBits() { + return kbytesToBits(_context.bandwidthLimiter().getInboundKBytesPerSecond()); + } + public String getOutboundRateBits() { + return kbytesToBits(_context.bandwidthLimiter().getOutboundKBytesPerSecond()); + } + public String getShareRateBits() { + return kbytesToBits(getShareBandwidth()); + } + private String kbytesToBits(int kbytes) { + return DataHelper.formatSize(kbytes * 8 * 1024) + " bits per second"; + } public String getInboundBurstRate() { return "" + _context.bandwidthLimiter().getInboundBurstKBytesPerSecond(); } @@ -231,7 +244,7 @@ public class ConfigNetHelper extends HelperBase { buf.append("selected=\"true\" "); found = true; } - buf.append(">Up to ").append(val).append("%\n"); + buf.append(">").append(val).append("%\n"); } buf.append("\n"); return buf.toString(); diff --git a/apps/routerconsole/jsp/config.jsp b/apps/routerconsole/jsp/config.jsp index a13da220c..1f4390ad6 100644 --- a/apps/routerconsole/jsp/config.jsp +++ b/apps/routerconsole/jsp/config.jsp @@ -29,20 +29,28 @@ Bandwidth limiter
- Inbound rate: - " /> KBps +

+ +
" /> KBps + In ()
+ +
" /> KBps + Out ()
+ +
+ Share ()
+
+

<% int share = nethelper.getShareBandwidth(); if (share < 12) { out.print("NOTE: You have configured I2P to share only " + share + "KBps. "); @@ -54,7 +62,7 @@ out.print("The higher the share bandwidth the more you improve your anonymity and help the network.
"); } %> -

+


- Inbound TCP Configuration:
+ TCP Configuration:
Externally reachable hostname or IP address:
/> Use auto-detected IP address @@ -128,11 +130,12 @@ /> Always use auto-detected IP address (Not firewalled)
/> - Disable (Firewalled)
+ Disable inbound (Firewalled)
/> Specify hostname or IP: - " /> -
+ " />
+ /> + Completely disable (select only if behind a firewall that throttles or blocks outbound TCP - restart required)

Externally reachable TCP port:
/> @@ -152,9 +155,11 @@ with "SSU introductions" - peers who will relay a request from someone you don't know to your router for your router so that you can make an outbound connection to them. I2P will use these introductions automatically if it detects that the port is not forwarded (as shown by - the Reachability: Firewalled line), or you can manually require them here. + the Reachability: Firewalled line). Users behind symmetric NATs, such as OpenBSD's pf, are not currently supported.

+

Hostnames entered here will be published in the network database. They are not private. Also, do not enter a private IP address like 127.0.0.1 or 192.168.1.1. diff --git a/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java b/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java index ce8c6fb29..871c9eb4c 100644 --- a/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java +++ b/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java @@ -27,6 +27,7 @@ import net.i2p.router.RouterContext; import net.i2p.router.transport.ntcp.NTCPAddress; import net.i2p.router.transport.ntcp.NTCPTransport; import net.i2p.router.transport.udp.UDPAddress; +import net.i2p.router.transport.udp.UDPTransport; import net.i2p.util.Log; public class CommSystemFacadeImpl extends CommSystemFacade { @@ -151,8 +152,8 @@ public class CommSystemFacadeImpl extends CommSystemFacade { @Override public short getReachabilityStatus() { - if (_manager == null) return CommSystemFacade.STATUS_UNKNOWN; - if (_context.router().isHidden()) return CommSystemFacade.STATUS_OK; + if (_manager == null) return STATUS_UNKNOWN; + if (_context.router().isHidden()) return STATUS_OK; return _manager.getReachabilityStatus(); } @Override @@ -303,10 +304,14 @@ public class CommSystemFacadeImpl extends CommSystemFacade { String name = _context.getProperty(PROP_I2NP_NTCP_HOSTNAME); if (name != null && name.length() > 0) enabled = "false"; + Transport udp = _manager.getTransport(UDPTransport.STYLE); + short status = STATUS_UNKNOWN; + if (udp != null) + status = udp.getReachabilityStatus(); if (_log.shouldLog(Log.INFO)) - _log.info("old: " + ohost + " config: " + name + " auto: " + enabled + " status: " + getReachabilityStatus()); + _log.info("old: " + ohost + " config: " + name + " auto: " + enabled + " status: " + status); if (enabled.equalsIgnoreCase("always") || - (enabled.equalsIgnoreCase("true") && getReachabilityStatus() == CommSystemFacade.STATUS_OK)) { + (enabled.equalsIgnoreCase("true") && status == STATUS_OK)) { String nhost = UDPProps.getProperty(UDPAddress.PROP_HOST); if (_log.shouldLog(Log.INFO)) _log.info("old: " + ohost + " config: " + name + " new: " + nhost); diff --git a/router/java/src/net/i2p/router/transport/TransportManager.java b/router/java/src/net/i2p/router/transport/TransportManager.java index 40b23e062..291e2f6c1 100644 --- a/router/java/src/net/i2p/router/transport/TransportManager.java +++ b/router/java/src/net/i2p/router/transport/TransportManager.java @@ -40,10 +40,10 @@ public class TransportManager implements TransportEventListener { private RouterContext _context; private UPnPManager _upnpManager; - private final static String PROP_ENABLE_UDP = "i2np.udp.enable"; - private final static String PROP_ENABLE_NTCP = "i2np.ntcp.enable"; - private final static String DEFAULT_ENABLE_NTCP = "true"; - private final static String DEFAULT_ENABLE_UDP = "true"; + public final static String PROP_ENABLE_UDP = "i2np.udp.enable"; + public final static String PROP_ENABLE_NTCP = "i2np.ntcp.enable"; + public final static String DEFAULT_ENABLE_NTCP = "true"; + public final static String DEFAULT_ENABLE_UDP = "true"; /** default true */ public final static String PROP_ENABLE_UPNP = "i2np.upnp.enable"; 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 ee9c7d9b7..720eaed46 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java @@ -100,6 +100,8 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority public static final String STYLE = "SSU"; public static final String PROP_INTERNAL_PORT = "i2np.udp.internalPort"; public static final int DEFAULT_INTERNAL_PORT = 8887; + /** since fixed port defaults to true, this doesnt do anything at the moment. + * We should have an exception if it matches the existing low port. */ private static final int MIN_EXTERNAL_PORT = 1024; /** define this to explicitly set an external IP address */ @@ -386,7 +388,8 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority * @param ourPort >= 1024 */ void externalAddressReceived(Hash from, byte ourIP[], int ourPort) { - boolean isValid = isValid(ourIP) && ourPort >= MIN_EXTERNAL_PORT; + boolean isValid = isValid(ourIP) && + (ourPort >= MIN_EXTERNAL_PORT || ourPort == _externalListenPort || _externalListenPort <= 0); boolean explicitSpecified = explicitAddressSpecified(); boolean inboundRecent = _lastInboundReceivedOn + ALLOW_IP_CHANGE_INTERVAL > System.currentTimeMillis(); if (_log.shouldLog(Log.INFO)) @@ -422,6 +425,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority * @param ourPort >= 1024 or 0 for no change */ private boolean changeAddress(byte ourIP[], int ourPort) { + /** this defaults to true, which means we never change our external port based on what somebody tells us */ boolean fixedPort = getIsPortFixed(); boolean updated = false; boolean fireTest = false; @@ -437,9 +441,10 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority _log.info("Trying to change our external address..."); try { _externalListenHost = InetAddress.getByAddress(ourIP); + // fixed port defaults to true so we never do this if (ourPort >= MIN_EXTERNAL_PORT && !fixedPort) _externalListenPort = ourPort; - if (_externalListenPort >= MIN_EXTERNAL_PORT) { + if (_externalListenPort > 0) { rebuildExternalAddress(); replaceAddress(_externalAddress); updated = true; @@ -1171,12 +1176,18 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority } public boolean introducersRequired() { + /****************** + * Don't do this anymore, as we are removing the checkbox from the UI, + * and we rarely if ever see the problem of false negatives for firewall detection - + * it's usually false positives. + ****************** String forceIntroducers = _context.getProperty(PROP_FORCE_INTRODUCERS); if ( (forceIntroducers != null) && (Boolean.valueOf(forceIntroducers).booleanValue()) ) { if (_log.shouldLog(Log.INFO)) _log.info("Force introducers specified"); return true; } + *******************/ short status = getReachabilityStatus(); switch (status) { case CommSystemFacade.STATUS_REJECT_UNSOLICITED: @@ -1194,6 +1205,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority } } + /** default true */ private boolean allowDirectUDP() { String allowDirect = _context.getProperty(PROP_ALLOW_DIRECT); return ( (allowDirect == null) || (Boolean.valueOf(allowDirect).booleanValue()) ); From ee7e70b98a792bc404f4f4b2d6db4d2bacf8dd12 Mon Sep 17 00:00:00 2001 From: zzz Date: Wed, 6 May 2009 03:47:38 +0000 Subject: [PATCH 21/23] more config ui tweaks --- apps/routerconsole/jsp/config.jsp | 11 ++++++++--- apps/routerconsole/jsp/confignav.jsp | 25 +++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/apps/routerconsole/jsp/config.jsp b/apps/routerconsole/jsp/config.jsp index c5c579f77..6318cbf69 100644 --- a/apps/routerconsole/jsp/config.jsp +++ b/apps/routerconsole/jsp/config.jsp @@ -28,8 +28,10 @@ " /> - Bandwidth limiter
+

Bandwidth limiter

+ I2P will work best if you configure your rates to match the speed of your internet connection. +

\n"); - buf.append(" "); + buf.append("\n"); + buf.append(" "); buf.append(" ");
" /> KBps In ()
@@ -75,7 +77,10 @@ test.rtt and related stats.

--> +

IP and Transport Configuration

+ The default settings will work for most people. There is help below. +

UPnP Configuration:
/> Enable UPnP to open firewall ports UPnP status @@ -108,7 +113,7 @@ %>
/> - Hidden mode - do not publish IP(not recommended; change restarts router)
+ Hidden mode - do not publish IP(prevents participating traffic; change restarts router)

UDP Configuration:
UDP port: @@ -135,7 +140,7 @@ Specify hostname or IP: " />
/> - Completely disable (select only if behind a firewall that throttles or blocks outbound TCP - restart required)
+ Completely disable (select only if behind a firewall that throttles or blocks outbound TCP - change requires restart)

Externally reachable TCP port:
/> diff --git a/apps/routerconsole/jsp/confignav.jsp b/apps/routerconsole/jsp/confignav.jsp index 851ab79b5..ec1e7f5c1 100644 --- a/apps/routerconsole/jsp/confignav.jsp +++ b/apps/routerconsole/jsp/confignav.jsp @@ -1,3 +1,26 @@ +

+

+<% if (request.getRequestURI().indexOf("config.jsp") != -1) { + %>Network<% } + else if (request.getRequestURI().indexOf("configservice.jsp") != -1) { + %>Service<% } + else if (request.getRequestURI().indexOf("configupdate.jsp") != -1) { + %>Update<% } + else if (request.getRequestURI().indexOf("configtunnels.jsp") != -1) { + %>Tunnels<% } + else if (request.getRequestURI().indexOf("configclients.jsp") != -1) { + %>Clients<% } + else if (request.getRequestURI().indexOf("configpeer.jsp") != -1) { + %>Peers<% } + else if (request.getRequestURI().indexOf("configkeyring.jsp") != -1) { + %>Keyring<% } + else if (request.getRequestURI().indexOf("configlogging.jsp") != -1) { + %>Logging<% } + else if (request.getRequestURI().indexOf("configstats.jsp") != -1) { + %>Stats<% } + else if (request.getRequestURI().indexOf("configadvanced.jsp") != -1) { + %>Advanced<% }%> +Configuration

<% if (request.getRequestURI().indexOf("config.jsp") != -1) { %>Network | <% } else { %>Network | <% } if (request.getRequestURI().indexOf("configservice.jsp") != -1) { @@ -18,3 +41,5 @@ %>Stats | <% } else { %>Stats | <% } if (request.getRequestURI().indexOf("configadvanced.jsp") != -1) { %>Advanced<% } else { %>Advanced<% } %>

+
+
From 47fc3b0d0bae81901e683a5ae0eeb23240ff8a97 Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 10 May 2009 15:40:50 +0000 Subject: [PATCH 22/23] - Don't start UPnP if we have a public interface address - Fix setting IP to a local interface address - Work on the configuration help some more --- .../net/i2p/router/web/ConfigNetHandler.java | 6 ++- apps/routerconsole/jsp/config.jsp | 51 ++++++++++++------- .../router/transport/TransportManager.java | 7 ++- 3 files changed, 43 insertions(+), 21 deletions(-) diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java index ea4d6b03b..7167c893a 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java @@ -42,7 +42,7 @@ public class ConfigNetHandler extends FormHandler { private String _reseedFrom; private boolean _enableLoadTesting; private String _sharePct; - private boolean _ratesOnly; // always false + private static final boolean _ratesOnly = false; // always false - delete me private static final String PROP_HIDDEN = Router.PROP_HIDDEN_HIDDEN; // see Router for other choice protected void processForm() { @@ -139,11 +139,12 @@ public class ConfigNetHandler extends FormHandler { if (_udpHost1 != null && _udpHost1.length() > 0) uhost = _udpHost1; else if (_udpHost2 != null && _udpHost2.length() > 0) - uhost = _udpHost1; + uhost = _udpHost2; else _udpAutoIP = UDPTransport.DEFAULT_SOURCES; } _context.router().setConfigSetting(UDPTransport.PROP_SOURCES, _udpAutoIP); + // Todo: Catch local IPs right here rather than complaining later _context.router().setConfigSetting(UDPTransport.PROP_EXTERNAL_HOST, uhost); if ((!oldUdp.equals(_udpAutoIP)) || (!oldUHost.equals(uhost))) { addFormNotice("Updating IP address"); @@ -166,6 +167,7 @@ public class ConfigNetHandler extends FormHandler { if ("disabled".equals(_ntcpAutoIP)) { addFormNotice("Disabling TCP completely"); } else if ("false".equals(_ntcpAutoIP) && _ntcpHostname.length() > 0) { + // Todo: Catch local IPs right here rather than complaining later _context.router().setConfigSetting(ConfigNetHelper.PROP_I2NP_NTCP_HOSTNAME, _ntcpHostname); addFormNotice("Updating inbound TCP address to " + _ntcpHostname); } else { diff --git a/apps/routerconsole/jsp/config.jsp b/apps/routerconsole/jsp/config.jsp index 6318cbf69..10417dba0 100644 --- a/apps/routerconsole/jsp/config.jsp +++ b/apps/routerconsole/jsp/config.jsp @@ -83,7 +83,7 @@

UPnP Configuration:
/> - Enable UPnP to open firewall ports UPnP status + Enable UPnP to open firewall ports - UPnP status

IP Configuration:
Externally reachable hostname or IP address:
@@ -134,11 +134,11 @@ if we are not firewalled
/> Always use auto-detected IP address (Not firewalled)
- /> - Disable inbound (Firewalled)
/> Specify hostname or IP: " />
+ /> + Disable inbound (Firewalled)
/> Completely disable (select only if behind a firewall that throttles or blocks outbound TCP - change requires restart)

@@ -155,30 +155,45 @@

Configuration Help: -

If you can, please poke a hole in your NAT or firewall to allow unsolicited UDP packets to reach - you on your external UDP address. If you can't, I2P now includes supports UDP hole punching - with "SSU introductions" - peers who will relay a request from someone you don't know to your - router for your router so that you can make an outbound connection to them. I2P will use these - introductions automatically if it detects that the port is not forwarded (as shown by - the Reachability: Firewalled line). - Users behind symmetric NATs, such as OpenBSD's pf, are not currently supported.

+

+ While I2P will work fine behind most firewalls, your speeds and network integration will generally improve + if the I2P port (generally 8887) is forwarded for both UDP and TCP. +

+ If you can, please poke a hole in your firewall to allow unsolicited UDP and TCP packets to reach + you. If you can't, I2P supports UPnP (Universal Plug and Play) and UDP hole punching + with "SSU introductions" to relay traffic. Most of the options above are for special situations, + for example where UPnP does not work correctly, or a firewall not under your control is doing + harm. Certain firewalls such as symmetric NATs may not work well with I2P. +

-

Hostnames entered here will be published in the network database. +

+ UPnP is used to communicate with Internet Gateway Devices (IGDs) to detect the external IP address + and forward ports. + UPnP support is beta, and may not work for any number of reasons: +

    +
  • No UPnP-compatible device present +
  • UPnP disabled on the device +
  • Software firewall interference with UPnP +
  • Bugs in the device's UPnP implementation +
  • Multiple firewall/routers in the internet connection path +
  • UPnP device change, reset, or address change +
+ Reviewing the UPnP status may help. + UPnP may be enabled or disabled above, but a change requires a router restart to take effect. +

Hostnames entered above will be published in the network database. They are not private. Also, do not enter a private IP address like 127.0.0.1 or 192.168.1.1. -

-

You do not need to allow inbound TCP connections - outbound connections work with no - configuration. However, if you want to receive inbound TCP connections, you must poke a hole - in your NAT or firewall for unsolicited TCP connections. If you specify the wrong IP address or + If you specify the wrong IP address or hostname, or do not properly configure your NAT or firewall, your network performance will degrade - substantially. When in doubt, leave the hostname and port number blank.

+ substantially. When in doubt, leave the settings at the defaults.

+

Reachability Help:

- While I2P will work adequately behind a firewall, your speeds and network integration will generally improve - if you open up your port (generally 8887) to both UDP and TCP, and enable inbound TCP above. + While I2P will work fine behind most firewalls, your speeds and network integration will generally improve + if the I2P port (generally 8887) to both UDP and TCP. If you think you have opened up your firewall and I2P still thinks you are firewalled, remember that you may have multiple firewalls, for example both software packages and external hardware routers. If there is an error, the logs may also help diagnose the problem. diff --git a/router/java/src/net/i2p/router/transport/TransportManager.java b/router/java/src/net/i2p/router/transport/TransportManager.java index 291e2f6c1..aa66ae068 100644 --- a/router/java/src/net/i2p/router/transport/TransportManager.java +++ b/router/java/src/net/i2p/router/transport/TransportManager.java @@ -131,7 +131,12 @@ public class TransportManager implements TransportEventListener { } public void startListening() { - if (_upnpManager != null) + // For now, only start UPnP if we have no publicly-routable addresses + // so we don't open the listener ports to the world. + // Maybe we need a config option to force on? Probably not. + // What firewall supports UPnP and is configured with a public address on the LAN side? + // Unlikely. + if (_upnpManager != null && Addresses.getAnyAddress() == null) _upnpManager.start(); configTransports(); _log.debug("Starting up the transport manager"); From aa2f9e34c012ba7d2447c851597ea7c368b941ce Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 17 May 2009 11:52:49 +0000 Subject: [PATCH 23/23] - Rework UDP peers.jsp table a little - Don't let UDP bid on messages that are too long - Clean up the max fragments code in UDP --- .../transport/udp/InboundMessageState.java | 2 +- .../transport/udp/OutboundMessageState.java | 11 +++-- .../i2p/router/transport/udp/PeerState.java | 10 +---- .../router/transport/udp/UDPTransport.java | 41 ++++++------------- 4 files changed, 22 insertions(+), 42 deletions(-) diff --git a/router/java/src/net/i2p/router/transport/udp/InboundMessageState.java b/router/java/src/net/i2p/router/transport/udp/InboundMessageState.java index 6c85b9fb7..71ce7d081 100644 --- a/router/java/src/net/i2p/router/transport/udp/InboundMessageState.java +++ b/router/java/src/net/i2p/router/transport/udp/InboundMessageState.java @@ -30,7 +30,7 @@ public class InboundMessageState { /** expire after 10s */ private static final long MAX_RECEIVE_TIME = 10*1000; - private static final int MAX_FRAGMENTS = 64; + public static final int MAX_FRAGMENTS = 64; private static final ByteCache _fragmentCache = ByteCache.getInstance(64, 2048); diff --git a/router/java/src/net/i2p/router/transport/udp/OutboundMessageState.java b/router/java/src/net/i2p/router/transport/udp/OutboundMessageState.java index c9e7db02c..052ff2b4f 100644 --- a/router/java/src/net/i2p/router/transport/udp/OutboundMessageState.java +++ b/router/java/src/net/i2p/router/transport/udp/OutboundMessageState.java @@ -34,8 +34,11 @@ public class OutboundMessageState { private short _maxSends; private int _nextSendFragment; - public static final int MAX_FRAGMENTS = 32; - private static final ByteCache _cache = ByteCache.getInstance(64, MAX_FRAGMENTS*1024); + public static final int MAX_MSG_SIZE = 32 * 1024; + /** is this enough for a high-bandwidth router? */ + private static final int MAX_ENTRIES = 64; + /** would two caches, one for small and one for large messages, be better? */ + private static final ByteCache _cache = ByteCache.getInstance(MAX_ENTRIES, MAX_MSG_SIZE); public OutboundMessageState(I2PAppContext context) { _context = context; @@ -226,7 +229,9 @@ public class OutboundMessageState { int numFragments = totalSize / fragmentSize; if (numFragments * fragmentSize < totalSize) numFragments++; - + // This should never happen, as 534 bytes * 64 fragments > 32KB, and we won't bid on > 32KB + if (numFragments > InboundMessageState.MAX_FRAGMENTS) + throw new IllegalArgumentException("Fragmenting a " + totalSize + " message into " + numFragments + " fragments - too many!"); if (_log.shouldLog(Log.DEBUG)) _log.debug("Fragmenting a " + totalSize + " message into " + numFragments + " fragments"); diff --git a/router/java/src/net/i2p/router/transport/udp/PeerState.java b/router/java/src/net/i2p/router/transport/udp/PeerState.java index ff1f64f11..74608069c 100644 --- a/router/java/src/net/i2p/router/transport/udp/PeerState.java +++ b/router/java/src/net/i2p/router/transport/udp/PeerState.java @@ -287,15 +287,7 @@ public class PeerState { } private int getDefaultMTU() { - String mtu = _context.getProperty(PROP_DEFAULT_MTU); - if (mtu != null) { - try { - return Integer.valueOf(mtu).intValue(); - } catch (NumberFormatException nfe) { - // ignore - } - } - return DEFAULT_MTU; + return _context.getProperty(PROP_DEFAULT_MTU, DEFAULT_MTU); } /** 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 720eaed46..38a82d7d1 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java @@ -929,6 +929,10 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority } public TransportBid bid(RouterInfo toAddress, long dataSize) { + if (dataSize > OutboundMessageState.MAX_MSG_SIZE) { + // NTCP max is lower, so msg will get dropped + return null; + } Hash to = toAddress.getIdentity().calculateHash(); PeerState peer = getPeerState(to); if (peer != null) { @@ -1753,7 +1757,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority buf.append(" V "); else buf.append(" V "); - buf.append("

idle"); + buf.append("dir/introidle"); appendSortLinks(buf, urlBase, sortFlags, "Sort by idle inbound", FLAG_IDLE_IN); buf.append("/"); appendSortLinks(buf, urlBase, sortFlags, "Sort by idle outbound", FLAG_IDLE_OUT); @@ -1809,32 +1813,11 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority buf.append(name); buf.append("\">"); buf.append(name); -/* - buf.append("@"); - byte ip[] = peer.getRemoteIP(); - for (int j = 0; j < ip.length; j++) { - int num = ip[j] & 0xFF; - if (num < 10) - buf.append("00"); - else if (num < 100) - buf.append("0"); - buf.append(num); - if (j + 1 < ip.length) - buf.append('.'); - } - buf.append(':'); - int port = peer.getRemotePort(); - if (port < 10) - buf.append("0000"); - else if (port < 100) - buf.append("000"); - else if (port < 1000) - buf.append("00"); - else if (port < 10000) - buf.append("0"); - buf.append(port); -*/ - buf.append(" "); + buf.append(""); + //byte ip[] = peer.getRemoteIP(); + //if (ip != null) + // buf.append(' ').append(_context.blocklist().toStr(ip)); + buf.append(""); if (peer.isInbound()) buf.append("in "); else @@ -1990,8 +1973,8 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority numPeers++; } - buf.append("
Total
Total"); buf.append(formatKBps(bpsIn)).append("/").append(formatKBps(bpsOut)); buf.append("KBps