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

Cyberlink for Java v3.0 + (2015-02-15) from github:

Browse Source 
Unmodified cybergarage-upnp from github rev 9499b03 2015-02-05
https://github.com/cybergarage/cybergarage-upnp/commits/master
which is the same as rev 3ed1af9 2014-07-28 except for
the addition of README.md which we aren't using.
This is post-version 3.0.

Omitted files:
  router/java/src/org/cybergarage/xml/parser/XercesParser.java
  router/java/src/org/cybergarage/xml/parser/XmlPullParser.java
  router/java/src/org/cybergarage/xml/parser/kXML2Parser.java
chmod all files back to 644.

Diverging from 2.1 checkin rev 59eae97dbb470d8c4a1e4dba3a9763e134bb0c53
in prep for merging.

License unchanged.
Compile tested only.
This commit is contained in:
zzz
2015-03-17 14:36:05 +00:00
parent 14ac5ac03e
commit 92daf4a8df
86 changed files with 6707 additions and 6311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

256
router/java/src/org/cybergarage/upnp/control/ControlRequest.java
View File

@@ -1,128 +1,128 @@
/******************************************************************
*
* CyberUPnP for Java
*
* Copyright (C) Satoshi Konno 2002
*
* File: ControlRequest.java
*
* Revision:
*
* 01/29/03
* - first revision.
* 05/22/03
* - Giordano Sassaroli <sassarol@cefriel.it>
* - 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 <sassarol@cefriel.it> / 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 <rob.van.den.boomen@philips.com>
* - Fixed to set a URLBase from the SSDP header when the URLBase of the description is null.
* 02/18/04
* - Andre <andre@antiheld.net>
* - 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 <tsroyale at users.sourceforge.net>
* - 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 <sassarol@cefriel.it> (05/21/03)
setURI(ctrlURL, true);
// Thanks for Giordano Sassaroli <sassarol@cefriel.it> and Suzan Foster (09/02/03)
// Thanks for Andre <andre@antiheld.net> (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 <rob.van.den.boomen@philips.com> (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);
}
}
/******************************************************************
*
* CyberUPnP for Java
*
* Copyright (C) Satoshi Konno 2002
*
* File: ControlRequest.java
*
* Revision:
*
* 01/29/03
* - first revision.
* 05/22/03
* - Giordano Sassaroli <sassarol@cefriel.it>
* - 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 <sassarol@cefriel.it> / 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 <rob.van.den.boomen@philips.com>
* - Fixed to set a URLBase from the SSDP header when the URLBase of the description is null.
* 02/18/04
* - Andre <andre@antiheld.net>
* - 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 <tsroyale at users.sourceforge.net>
* - 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 <sassarol@cefriel.it> (05/21/03)
setURI(ctrlURL, true);
// Thanks for Giordano Sassaroli <sassarol@cefriel.it> and Suzan Foster (09/02/03)
// Thanks for Andre <andre@antiheld.net> (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 <rob.van.den.boomen@philips.com> (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);
}
}