Add UPnP support.
Feedback is in logs as suggested by skid_au. The checkbox is still there, but mostly for people who would like to opt out (unfortunately, I can not be sure how this feature may behave for some routers - there's a hell of a lot of bad UPnP implementations.) The Visual Studio stuff is a little messy, so I apologize if anything is a bit off. I tested most configurations and it worked. I also tested CMake on Debian Wheezy, Ubuntu Saucy, and Mac OS X Mountain Lion. All seemed to be OK.
This commit is contained in:
John Chadwick
parent
379a15ba3b
commit
16cd26d177
|
|
@ -9,6 +9,7 @@ option(USE_X11 "Enables X11 Support" ON)
|
||||||
option(USE_WAYLAND "Enables Wayland Support" OFF)
|
option(USE_WAYLAND "Enables Wayland Support" OFF)
|
||||||
option(USE_GLES "Enables GLES2 And EGL, disables OGL" OFF)
|
option(USE_GLES "Enables GLES2 And EGL, disables OGL" OFF)
|
||||||
option(USE_GLES3 "Enables GLES3 and EGL" OFF)
|
option(USE_GLES3 "Enables GLES3 and EGL" OFF)
|
||||||
|
option(USE_UPNP "Enables UPnP port mapping support" ON)
|
||||||
option(DISABLE_WX "Disable wxWidgets (use CLI interface)" OFF)
|
option(DISABLE_WX "Disable wxWidgets (use CLI interface)" OFF)
|
||||||
|
|
||||||
option(FASTLOG "Enable all logs" OFF)
|
option(FASTLOG "Enable all logs" OFF)
|
||||||
|
|
@ -549,6 +550,13 @@ else()
|
||||||
include_directories(Externals/SFML/include)
|
include_directories(Externals/SFML/include)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if(USE_UPNP)
|
||||||
|
message("Using static MiniUPnP client from Externals")
|
||||||
|
add_subdirectory(Externals/miniupnpc)
|
||||||
|
include_directories(Externals/miniupnpc/src)
|
||||||
|
add_definitions(-DUSE_UPNP)
|
||||||
|
endif()
|
||||||
|
|
||||||
if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT ANDROID)
|
if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT ANDROID)
|
||||||
check_lib(SOIL SOIL SOIL/SOIL.h QUIET)
|
check_lib(SOIL SOIL SOIL/SOIL.h QUIET)
|
||||||
endif()
|
endif()
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,37 @@
|
||||||
|
cmake_minimum_required(VERSION 2.6)
|
||||||
|
|
||||||
|
project(miniupnpc C)
|
||||||
|
set(MINIUPNPC_VERSION 1.7)
|
||||||
|
set(MINIUPNPC_API_VERSION 9)
|
||||||
|
|
||||||
|
if(UNIX)
|
||||||
|
add_definitions(-DMINIUPNPC_SET_SOCKET_TIMEOUT)
|
||||||
|
add_definitions(-D_BSD_SOURCE -D_POSIX_C_SOURCE=1)
|
||||||
|
elseif(WIN32)
|
||||||
|
add_definitions(-D_WIN32_WINNT=0x0501)
|
||||||
|
find_library(WINSOCK2_LIBRARY NAMES ws2_32 WS2_32 Ws2_32)
|
||||||
|
find_library(IPHLPAPI_LIBRARY NAMES iphlpapi)
|
||||||
|
set(LDLIBS ${WINSOCK2_LIBRARY} ${IPHLPAPI_LIBRARY} ${LDLIBS})
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
|
||||||
|
add_definitions(-DMACOSX -D_DARWIN_C_SOURCE)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
include_directories(include)
|
||||||
|
|
||||||
|
set(SRCS src/igd_desc_parse.c
|
||||||
|
src/miniupnpc.c
|
||||||
|
src/minixml.c
|
||||||
|
src/minisoap.c
|
||||||
|
src/miniwget.c
|
||||||
|
src/upnpc.c
|
||||||
|
src/upnpcommands.c
|
||||||
|
src/upnpreplyparse.c
|
||||||
|
src/upnperrors.c
|
||||||
|
src/connecthostport.c
|
||||||
|
src/portlistingparse.c
|
||||||
|
src/receivedata.c)
|
||||||
|
|
||||||
|
add_library(miniupnpc STATIC ${SRCS})
|
||||||
|
|
||||||
|
|
@ -0,0 +1,556 @@
|
||||||
|
$Id: Changelog.txt,v 1.185 2013/05/03 09:05:38 nanard Exp $
|
||||||
|
miniUPnP client Changelog.
|
||||||
|
|
||||||
|
2013/05/03:
|
||||||
|
Fix Solaris build thanks to Maciej Małecki
|
||||||
|
|
||||||
|
2013/04/27:
|
||||||
|
Fix testminiwget.sh for BSD
|
||||||
|
|
||||||
|
2013/03/23:
|
||||||
|
Fixed Makefile for *BSD
|
||||||
|
|
||||||
|
2013/03/11:
|
||||||
|
Update Makefile to use JNAerator version 0.11
|
||||||
|
|
||||||
|
2013/02/11:
|
||||||
|
Fix testminiwget.sh for use with dash
|
||||||
|
Use $(DESTDIR) in Makefile
|
||||||
|
|
||||||
|
VERSION 1.8 : released 2013/02/06
|
||||||
|
|
||||||
|
2012/10/16:
|
||||||
|
fix testminiwget with no IPv6 support
|
||||||
|
|
||||||
|
2012/09/27:
|
||||||
|
Rename all include guards to not clash with C99
|
||||||
|
(7.1.3 Reserved identifiers).
|
||||||
|
|
||||||
|
2012/08/30:
|
||||||
|
Added -e option to upnpc program (set description for port mappings)
|
||||||
|
|
||||||
|
2012/08/29:
|
||||||
|
Python 3 support (thanks to Christopher Foo)
|
||||||
|
|
||||||
|
2012/08/11:
|
||||||
|
Fix a memory link in UPNP_GetValidIGD()
|
||||||
|
Try to handle scope id in link local IPv6 URL under MS Windows
|
||||||
|
|
||||||
|
2012/07/20:
|
||||||
|
Disable HAS_IP_MREQN on DragonFly BSD
|
||||||
|
|
||||||
|
2012/06/28:
|
||||||
|
GetUPNPUrls() now inserts scope into link-local IPv6 addresses
|
||||||
|
|
||||||
|
2012/06/23:
|
||||||
|
More error return checks in upnpc.c
|
||||||
|
#define MINIUPNPC_GET_SRC_ADDR enables receivedata() to get scope_id
|
||||||
|
parseURL() now parses IPv6 addresses scope
|
||||||
|
new parameter for miniwget() : IPv6 address scope
|
||||||
|
increment API_VERSION to 9
|
||||||
|
|
||||||
|
2012/06/20:
|
||||||
|
fixed CMakeLists.txt
|
||||||
|
|
||||||
|
2012/05/29
|
||||||
|
Improvements in testminiwget.sh
|
||||||
|
|
||||||
|
VERSION 1.7 : released 2012/05/24
|
||||||
|
|
||||||
|
2012/05/01:
|
||||||
|
Cleanup settings of CFLAGS in Makefile
|
||||||
|
Fix signed/unsigned integer comparaisons
|
||||||
|
|
||||||
|
2012/04/20:
|
||||||
|
Allow to specify protocol with TCP or UDP for -A option
|
||||||
|
|
||||||
|
2012/04/09:
|
||||||
|
Only try to fetch XML description once in UPNP_GetValidIGD()
|
||||||
|
Added -ansi flag to compilation, and fixed C++ comments to ANSI C comments.
|
||||||
|
|
||||||
|
2012/04/05:
|
||||||
|
minor improvements to minihttptestserver.c
|
||||||
|
|
||||||
|
2012/03/15:
|
||||||
|
upnperrors.c returns valid error string for unrecognized error codes
|
||||||
|
|
||||||
|
2012/03/08:
|
||||||
|
make minihttptestserver listen on loopback interface instead of 0.0.0.0
|
||||||
|
|
||||||
|
2012/01/25:
|
||||||
|
Maven installation thanks to Alexey Kuznetsov
|
||||||
|
|
||||||
|
2012/01/21:
|
||||||
|
Replace WIN32 macro by _WIN32
|
||||||
|
|
||||||
|
2012/01/19:
|
||||||
|
Fixes in java wrappers thanks to Alexey Kuznetsov :
|
||||||
|
https://github.com/axet/miniupnp/tree/fix-javatest/miniupnpc
|
||||||
|
Make and install .deb packages (python) thanks to Alexey Kuznetsov :
|
||||||
|
https://github.com/axet/miniupnp/tree/feature-debbuild/miniupnpc
|
||||||
|
|
||||||
|
2012/01/07:
|
||||||
|
The multicast interface can now be specified by name with IPv4.
|
||||||
|
|
||||||
|
2012/01/02:
|
||||||
|
Install man page
|
||||||
|
|
||||||
|
2011/11/25:
|
||||||
|
added header to Port Mappings list in upnpc.c
|
||||||
|
|
||||||
|
2011/10/09:
|
||||||
|
Makefile : make clean now removes jnaerator generated files.
|
||||||
|
MINIUPNPC_VERSION in miniupnpc.h (updated by make)
|
||||||
|
|
||||||
|
2011/09/12:
|
||||||
|
added rootdescURL to UPNPUrls structure.
|
||||||
|
|
||||||
|
VERSION 1.6 : released 2011/07/25
|
||||||
|
|
||||||
|
2011/07/25:
|
||||||
|
Update doc for version 1.6 release
|
||||||
|
|
||||||
|
2011/06/18:
|
||||||
|
Fix for windows in miniwget.c
|
||||||
|
|
||||||
|
2011/06/04:
|
||||||
|
display remote host in port mapping listing
|
||||||
|
|
||||||
|
2011/06/03:
|
||||||
|
Fix in make install : there were missing headers
|
||||||
|
|
||||||
|
2011/05/26:
|
||||||
|
Fix the socket leak in miniwget thanks to Richard Marsh.
|
||||||
|
Permit to add leaseduration in -a command. Display lease duration.
|
||||||
|
|
||||||
|
2011/05/15:
|
||||||
|
Try both LinkLocal and SiteLocal multicast address for SSDP in IPv6
|
||||||
|
|
||||||
|
2011/05/09:
|
||||||
|
add a test in testminiwget.sh.
|
||||||
|
more error checking in miniwget.c
|
||||||
|
|
||||||
|
2011/05/06:
|
||||||
|
Adding some tool to test and validate miniwget.c
|
||||||
|
simplified and debugged miniwget.c
|
||||||
|
|
||||||
|
2011/04/11:
|
||||||
|
moving ReceiveData() to a receivedata.c file.
|
||||||
|
parsing presentation url
|
||||||
|
adding IGD v2 WANIPv6FirewallControl commands
|
||||||
|
|
||||||
|
2011/04/10:
|
||||||
|
update of miniupnpcmodule.c
|
||||||
|
comments in miniwget.c, update in testminiwget
|
||||||
|
Adding errors codes from IGD v2
|
||||||
|
new functions in upnpc.c for IGD v2
|
||||||
|
|
||||||
|
2011/04/09:
|
||||||
|
Support for litteral ip v6 address in miniwget
|
||||||
|
|
||||||
|
2011/04/08:
|
||||||
|
Adding support for urn:schemas-upnp-org:service:WANIPv6FirewallControl:1
|
||||||
|
Updating APIVERSION
|
||||||
|
Supporting IPV6 in upnpDiscover()
|
||||||
|
Adding a -6 option to upnpc command line tool
|
||||||
|
|
||||||
|
2011/03/18:
|
||||||
|
miniwget/parseURL() : return an error when url param is null.
|
||||||
|
fixing GetListOfPortMappings()
|
||||||
|
|
||||||
|
2011/03/14:
|
||||||
|
upnpDiscover() now reporting an error code.
|
||||||
|
improvements in comments.
|
||||||
|
|
||||||
|
2011/03/11:
|
||||||
|
adding miniupnpcstrings.h.cmake and CMakeLists.txt files.
|
||||||
|
|
||||||
|
2011/02/15:
|
||||||
|
Implementation of GetListOfPortMappings()
|
||||||
|
|
||||||
|
2011/02/07:
|
||||||
|
updates to minixml to support character data starting with spaces
|
||||||
|
minixml now support CDATA
|
||||||
|
upnpreplyparse treats <NewPortListing> specificaly
|
||||||
|
change in simpleUPnPcommand to return the buffer (simplification)
|
||||||
|
|
||||||
|
2011/02/06:
|
||||||
|
Added leaseDuration argument to AddPortMapping()
|
||||||
|
Starting to implement GetListOfPortMappings()
|
||||||
|
|
||||||
|
2011/01/11:
|
||||||
|
updating wingenminiupnpcstrings.c
|
||||||
|
|
||||||
|
2011/01/04:
|
||||||
|
improving updateminiupnpcstrings.sh
|
||||||
|
|
||||||
|
VERSION 1.5 : released 2011/01/01
|
||||||
|
|
||||||
|
2010/12/21:
|
||||||
|
use NO_GETADDRINFO macro to disable the use of getaddrinfo/freeaddrinfo
|
||||||
|
|
||||||
|
2010/12/11:
|
||||||
|
Improvements on getHTTPResponse() code.
|
||||||
|
|
||||||
|
2010/12/09:
|
||||||
|
new code for miniwget that handle Chunked transfer encoding
|
||||||
|
using getHTTPResponse() in SOAP call code
|
||||||
|
Adding MANIFEST.in for 'python setup.py bdist_rpm'
|
||||||
|
|
||||||
|
2010/11/25:
|
||||||
|
changes to minissdpc.c to compile under Win32.
|
||||||
|
see http://miniupnp.tuxfamily.org/forum/viewtopic.php?t=729
|
||||||
|
|
||||||
|
2010/09/17:
|
||||||
|
Various improvement to Makefile from Michał Górny
|
||||||
|
|
||||||
|
2010/08/05:
|
||||||
|
Adding the script "external-ip.sh" from Reuben Hawkins
|
||||||
|
|
||||||
|
2010/06/09:
|
||||||
|
update to python module to match modification made on 2010/04/05
|
||||||
|
update to Java test code to match modification made on 2010/04/05
|
||||||
|
all UPNP_* function now return an error if the SOAP request failed
|
||||||
|
at HTTP level.
|
||||||
|
|
||||||
|
2010/04/17:
|
||||||
|
Using GetBestRoute() under win32 in order to find the
|
||||||
|
right interface to use.
|
||||||
|
|
||||||
|
2010/04/12:
|
||||||
|
Retrying with HTTP/1.1 if HTTP/1.0 failed. see
|
||||||
|
http://miniupnp.tuxfamily.org/forum/viewtopic.php?p=1703
|
||||||
|
|
||||||
|
2010/04/07:
|
||||||
|
avoid returning duplicates in upnpDiscover()
|
||||||
|
|
||||||
|
2010/04/05:
|
||||||
|
Create a connecthostport.h/.c with connecthostport() function
|
||||||
|
and use it in miniwget and miniupnpc.
|
||||||
|
Use getnameinfo() instead of inet_ntop or inet_ntoa
|
||||||
|
Work to make miniupnpc IPV6 compatible...
|
||||||
|
Add java test code.
|
||||||
|
Big changes in order to support device having both WANIPConnection
|
||||||
|
and WANPPPConnection.
|
||||||
|
|
||||||
|
2010/04/04:
|
||||||
|
Use getaddrinfo() instead of gethostbyname() in miniwget.
|
||||||
|
|
||||||
|
2010/01/06:
|
||||||
|
#define _DARWIN_C_SOURCE for Mac OS X
|
||||||
|
|
||||||
|
2009/12/19:
|
||||||
|
Improve MinGW32 build
|
||||||
|
|
||||||
|
2009/12/11:
|
||||||
|
adding a MSVC9 project to build the static library and executable
|
||||||
|
|
||||||
|
2009/12/10:
|
||||||
|
Fixing some compilation stuff for Windows/MinGW
|
||||||
|
|
||||||
|
2009/12/07:
|
||||||
|
adaptations in Makefile and updateminiupnpcstring.sh for AmigaOS
|
||||||
|
some fixes for Windows when using virtual ethernet adapters (it is the
|
||||||
|
case with VMWare installed).
|
||||||
|
|
||||||
|
2009/12/04:
|
||||||
|
some fixes for AmigaOS compilation
|
||||||
|
Changed HTTP version to HTTP/1.0 for Soap too (to prevent chunked
|
||||||
|
transfer encoding)
|
||||||
|
|
||||||
|
2009/12/03:
|
||||||
|
updating printIDG and testigddescparse.c for debug.
|
||||||
|
modifications to compile under AmigaOS
|
||||||
|
adding a testminiwget program
|
||||||
|
Changed miniwget to advertise itself as HTTP/1.0 to prevent chunked
|
||||||
|
transfer encoding
|
||||||
|
|
||||||
|
2009/11/26:
|
||||||
|
fixing updateminiupnpcstrings.sh to take into account
|
||||||
|
which command that does not return an error code.
|
||||||
|
|
||||||
|
VERSION 1.4 : released 2009/10/30
|
||||||
|
|
||||||
|
2009/10/16:
|
||||||
|
using Py_BEGIN_ALLOW_THREADS and Py_END_ALLOW_THREADS in python module.
|
||||||
|
|
||||||
|
2009/10/10:
|
||||||
|
Some fixes for compilation under Solaris
|
||||||
|
compilation fixes : http://miniupnp.tuxfamily.org/forum/viewtopic.php?p=1464
|
||||||
|
|
||||||
|
2009/09/21:
|
||||||
|
fixing the code to ignore EINTR during connect() calls.
|
||||||
|
|
||||||
|
2009/08/07:
|
||||||
|
Set socket timeout for connect()
|
||||||
|
Some cleanup in miniwget.c
|
||||||
|
|
||||||
|
2009/08/04:
|
||||||
|
remove multiple redirections with -d in upnpc.c
|
||||||
|
Print textual error code in upnpc.c
|
||||||
|
Ignore EINTR during the connect() and poll() calls.
|
||||||
|
|
||||||
|
2009/07/29:
|
||||||
|
fix in updateminiupnpcstrings.sh if OS name contains "/"
|
||||||
|
Sending a correct value for MX: field in SSDP request
|
||||||
|
|
||||||
|
2009/07/20:
|
||||||
|
Change the Makefile to compile under Mac OS X
|
||||||
|
Fixed a stackoverflow in getDevicesFromMiniSSDPD()
|
||||||
|
|
||||||
|
2009/07/09:
|
||||||
|
Compile under Haiku
|
||||||
|
generate miniupnpcstrings.h.in from miniupnpcstrings.h
|
||||||
|
|
||||||
|
2009/06/04:
|
||||||
|
patching to compile under CygWin and cross compile for minGW
|
||||||
|
|
||||||
|
VERSION 1.3 :
|
||||||
|
|
||||||
|
2009/04/17:
|
||||||
|
updating python module
|
||||||
|
Use strtoull() when using C99
|
||||||
|
|
||||||
|
2009/02/28:
|
||||||
|
Fixed miniwget.c for compiling under sun
|
||||||
|
|
||||||
|
2008/12/18:
|
||||||
|
cleanup in Makefile (thanks to Paul de Weerd)
|
||||||
|
minissdpc.c : win32 compatibility
|
||||||
|
miniupnpc.c : changed xmlns prefix from 'm' to 'u'
|
||||||
|
Removed NDEBUG (using DEBUG)
|
||||||
|
|
||||||
|
2008/10/14:
|
||||||
|
Added the ExternalHost argument to DeletePortMapping()
|
||||||
|
|
||||||
|
2008/10/11:
|
||||||
|
Added the ExternalHost argument to AddPortMapping()
|
||||||
|
Put a correct User-Agent: header in HTTP requests.
|
||||||
|
|
||||||
|
VERSION 1.2 :
|
||||||
|
|
||||||
|
2008/10/07:
|
||||||
|
Update docs
|
||||||
|
|
||||||
|
2008/09/25:
|
||||||
|
Integrated sameport patch from Dario Meloni : Added a "sameport"
|
||||||
|
argument to upnpDiscover().
|
||||||
|
|
||||||
|
2008/07/18:
|
||||||
|
small modif to make Clang happy :)
|
||||||
|
|
||||||
|
2008/07/17:
|
||||||
|
#define SOAPPREFIX "s" in miniupnpc.c in order to remove SOAP-ENV...
|
||||||
|
|
||||||
|
2008/07/14:
|
||||||
|
include declspec.h in installation (to /usr/include/miniupnpc)
|
||||||
|
|
||||||
|
VERSION 1.1 :
|
||||||
|
|
||||||
|
2008/07/04:
|
||||||
|
standard options for install/ln instead of gnu-specific stuff.
|
||||||
|
|
||||||
|
2008/07/03:
|
||||||
|
now builds a .dll and .lib with win32. (mingw32)
|
||||||
|
|
||||||
|
2008/04/28:
|
||||||
|
make install now install the binary of the upnpc tool
|
||||||
|
|
||||||
|
2008/04/27:
|
||||||
|
added testupnpigd.py
|
||||||
|
added error strings for miniupnpc "internal" errors
|
||||||
|
improved python module error/exception reporting.
|
||||||
|
|
||||||
|
2008/04/23:
|
||||||
|
Completely rewrite igd_desc_parse.c in order to be compatible with
|
||||||
|
Linksys WAG200G
|
||||||
|
Added testigddescparse
|
||||||
|
updated python module
|
||||||
|
|
||||||
|
VERSION 1.0 :
|
||||||
|
|
||||||
|
2008/02/21:
|
||||||
|
put some #ifdef DEBUG around DisplayNameValueList()
|
||||||
|
|
||||||
|
2008/02/18:
|
||||||
|
Improved error reporting in upnpcommands.c
|
||||||
|
UPNP_GetStatusInfo() returns LastConnectionError
|
||||||
|
|
||||||
|
2008/02/16:
|
||||||
|
better error handling in minisoap.c
|
||||||
|
improving display of "valid IGD found" in upnpc.c
|
||||||
|
|
||||||
|
2008/02/03:
|
||||||
|
Fixing UPNP_GetValidIGD()
|
||||||
|
improved make install :)
|
||||||
|
|
||||||
|
2007/12/22:
|
||||||
|
Adding upnperrors.c/h to provide a strupnperror() function
|
||||||
|
used to translate UPnP error codes to string.
|
||||||
|
|
||||||
|
2007/12/19:
|
||||||
|
Fixing getDevicesFromMiniSSDPD()
|
||||||
|
improved error reporting of UPnP functions
|
||||||
|
|
||||||
|
2007/12/18:
|
||||||
|
It is now possible to specify a different location for MiniSSDPd socket.
|
||||||
|
working with MiniSSDPd is now more efficient.
|
||||||
|
python module improved.
|
||||||
|
|
||||||
|
2007/12/16:
|
||||||
|
improving error reporting
|
||||||
|
|
||||||
|
2007/12/13:
|
||||||
|
Try to improve compatibility by using HTTP/1.0 instead of 1.1 and
|
||||||
|
XML a bit different for SOAP.
|
||||||
|
|
||||||
|
2007/11/25:
|
||||||
|
fixed select() call for linux
|
||||||
|
|
||||||
|
2007/11/15:
|
||||||
|
Added -fPIC to CFLAG for better shared library code.
|
||||||
|
|
||||||
|
2007/11/02:
|
||||||
|
Fixed a potential socket leak in miniwget2()
|
||||||
|
|
||||||
|
2007/10/16:
|
||||||
|
added a parameter to upnpDiscover() in order to allow the use of another
|
||||||
|
interface than the default multicast interface.
|
||||||
|
|
||||||
|
2007/10/12:
|
||||||
|
Fixed the creation of symbolic link in Makefile
|
||||||
|
|
||||||
|
2007/10/08:
|
||||||
|
Added man page
|
||||||
|
|
||||||
|
2007/10/02:
|
||||||
|
fixed memory bug in GetUPNPUrls()
|
||||||
|
|
||||||
|
2007/10/01:
|
||||||
|
fixes in the Makefile
|
||||||
|
Added UPNP_GetIGDFromUrl() and adapted the sample program accordingly.
|
||||||
|
Added SONAME in the shared library to please debian :)
|
||||||
|
fixed MS Windows compilation (minissdpd is not available under MS Windows).
|
||||||
|
|
||||||
|
2007/09/25:
|
||||||
|
small change to Makefile to be able to install in a different location
|
||||||
|
(default is /usr)
|
||||||
|
|
||||||
|
2007/09/24:
|
||||||
|
now compiling both shared and static library
|
||||||
|
|
||||||
|
2007/09/19:
|
||||||
|
Cosmetic changes on upnpc.c
|
||||||
|
|
||||||
|
2007/09/02:
|
||||||
|
adapting to new miniSSDPd (release version ?)
|
||||||
|
|
||||||
|
2007/08/31:
|
||||||
|
Usage of miniSSDPd to skip discovery process.
|
||||||
|
|
||||||
|
2007/08/27:
|
||||||
|
fixed python module to allow compilation with Python older than Python 2.4
|
||||||
|
|
||||||
|
2007/06/12:
|
||||||
|
Added a python module.
|
||||||
|
|
||||||
|
2007/05/19:
|
||||||
|
Fixed compilation under MinGW
|
||||||
|
|
||||||
|
2007/05/15:
|
||||||
|
fixed a memory leak in AddPortMapping()
|
||||||
|
Added testupnpreplyparse executable to check the parsing of
|
||||||
|
upnp soap messages
|
||||||
|
minixml now ignore namespace prefixes.
|
||||||
|
|
||||||
|
2007/04/26:
|
||||||
|
upnpc now displays external ip address with -s or -l
|
||||||
|
|
||||||
|
2007/04/11:
|
||||||
|
changed MINIUPNPC_URL_MAXSIZE to 128 to accomodate the "BT Voyager 210"
|
||||||
|
|
||||||
|
2007/03/19:
|
||||||
|
cleanup in miniwget.c
|
||||||
|
|
||||||
|
2007/03/01:
|
||||||
|
Small typo fix...
|
||||||
|
|
||||||
|
2007/01/30:
|
||||||
|
Now parsing the HTTP header from SOAP responses in order to
|
||||||
|
get content-length value.
|
||||||
|
|
||||||
|
2007/01/29:
|
||||||
|
Fixed the Soap Query to speedup the HTTP request.
|
||||||
|
added some Win32 DLL stuff...
|
||||||
|
|
||||||
|
2007/01/27:
|
||||||
|
Fixed some WIN32 compatibility issues
|
||||||
|
|
||||||
|
2006/12/14:
|
||||||
|
Added UPNPIGD_IsConnected() function in miniupnp.c/.h
|
||||||
|
Added UPNP_GetValidIGD() in miniupnp.c/.h
|
||||||
|
cleaned upnpc.c main(). now using UPNP_GetValidIGD()
|
||||||
|
|
||||||
|
2006/12/07:
|
||||||
|
Version 1.0-RC1 released
|
||||||
|
|
||||||
|
2006/12/03:
|
||||||
|
Minor changes to compile under SunOS/Solaris
|
||||||
|
|
||||||
|
2006/11/30:
|
||||||
|
made a minixml parser validator program
|
||||||
|
updated minixml to handle attributes correctly
|
||||||
|
|
||||||
|
2006/11/22:
|
||||||
|
Added a -r option to the upnpc sample thanks to Alexander Hubmann.
|
||||||
|
|
||||||
|
2006/11/19:
|
||||||
|
Cleanup code to make it more ANSI C compliant
|
||||||
|
|
||||||
|
2006/11/10:
|
||||||
|
detect and display local lan address.
|
||||||
|
|
||||||
|
2006/11/04:
|
||||||
|
Packets and Bytes Sent/Received are now unsigned int.
|
||||||
|
|
||||||
|
2006/11/01:
|
||||||
|
Bug fix thanks to Giuseppe D'Angelo
|
||||||
|
|
||||||
|
2006/10/31:
|
||||||
|
C++ compatibility for .h files.
|
||||||
|
Added a way to get ip Address on the LAN used to reach the IGD.
|
||||||
|
|
||||||
|
2006/10/25:
|
||||||
|
Added M-SEARCH to the services in the discovery process.
|
||||||
|
|
||||||
|
2006/10/22:
|
||||||
|
updated the Makefile to use makedepend, added a "make install"
|
||||||
|
update Makefile
|
||||||
|
|
||||||
|
2006/10/20:
|
||||||
|
fixing the description url parsing thanks to patch sent by
|
||||||
|
Wayne Dawe.
|
||||||
|
Fixed/translated some comments.
|
||||||
|
Implemented a better discover process, first looking
|
||||||
|
for IGD then for root devices (as some devices only reply to
|
||||||
|
M-SEARCH for root devices).
|
||||||
|
|
||||||
|
2006/09/02:
|
||||||
|
added freeUPNPDevlist() function.
|
||||||
|
|
||||||
|
2006/08/04:
|
||||||
|
More command line arguments checking
|
||||||
|
|
||||||
|
2006/08/01:
|
||||||
|
Added the .bat file to compile under Win32 with minGW32
|
||||||
|
|
||||||
|
2006/07/31:
|
||||||
|
Fixed the rootdesc parser (igd_desc_parse.c)
|
||||||
|
|
||||||
|
2006/07/20:
|
||||||
|
parseMSEARCHReply() is now returning the ST: line as well
|
||||||
|
starting changes to detect several UPnP devices on the network
|
||||||
|
|
||||||
|
2006/07/19:
|
||||||
|
using GetCommonLinkProperties to get down/upload bitrate
|
||||||
|
|
||||||
|
|
@ -0,0 +1,27 @@
|
||||||
|
MiniUPnPc
|
||||||
|
Copyright (c) 2005-2011, Thomas BERNARD
|
||||||
|
All rights reserved.
|
||||||
|
|
||||||
|
Redistribution and use in source and binary forms, with or without
|
||||||
|
modification, are permitted provided that the following conditions are met:
|
||||||
|
|
||||||
|
* Redistributions of source code must retain the above copyright notice,
|
||||||
|
this list of conditions and the following disclaimer.
|
||||||
|
* 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.
|
||||||
|
* 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 COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
|
||||||
|
|
||||||
|
|
@ -0,0 +1,66 @@
|
||||||
|
Project: miniupnp
|
||||||
|
Project web page: http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
|
||||||
|
github: https://github.com/miniupnp/miniupnp
|
||||||
|
freecode: http://freecode.com/projects/miniupnp
|
||||||
|
Author: Thomas Bernard
|
||||||
|
Copyright (c) 2005-2012 Thomas Bernard
|
||||||
|
This software is subject to the conditions detailed in the
|
||||||
|
LICENSE file provided within this distribution.
|
||||||
|
|
||||||
|
|
||||||
|
For the comfort of Win32 users, bsdqueue.h is included in the distribution.
|
||||||
|
Its licence is included in the header of the file.
|
||||||
|
bsdqueue.h is a copy of the sys/queue.h of an OpenBSD system.
|
||||||
|
|
||||||
|
|
||||||
|
* miniUPnP Client - miniUPnPc *
|
||||||
|
|
||||||
|
To compile, simply run 'gmake' (could be 'make' on your system).
|
||||||
|
Under win32, to compile with MinGW, type "mingw32make.bat".
|
||||||
|
MS Visual C solution and project files are supplied in the msvc/ subdirectory.
|
||||||
|
|
||||||
|
The compilation is known to work under linux, FreeBSD,
|
||||||
|
OpenBSD, MacOS X, AmigaOS and cygwin.
|
||||||
|
The official AmigaOS4.1 SDK was used for AmigaOS4 and GeekGadgets for AmigaOS3.
|
||||||
|
upx (http://upx.sourceforge.net) is used to compress the win32 .exe files.
|
||||||
|
|
||||||
|
To install the library and headers on the system use :
|
||||||
|
> su
|
||||||
|
> make install
|
||||||
|
> exit
|
||||||
|
|
||||||
|
alternatively, to install into a specific location, use :
|
||||||
|
> INSTALLPREFIX=/usr/local make install
|
||||||
|
|
||||||
|
upnpc.c is a sample client using the libminiupnpc.
|
||||||
|
To use the libminiupnpc in your application, link it with
|
||||||
|
libminiupnpc.a (or .so) and use the following functions found in miniupnpc.h,
|
||||||
|
upnpcommands.h and miniwget.h :
|
||||||
|
- upnpDiscover()
|
||||||
|
- miniwget()
|
||||||
|
- parserootdesc()
|
||||||
|
- GetUPNPUrls()
|
||||||
|
- UPNP_* (calling UPNP methods)
|
||||||
|
|
||||||
|
Note : use #include <miniupnpc/miniupnpc.h> etc... for the includes
|
||||||
|
and -lminiupnpc for the link
|
||||||
|
|
||||||
|
Discovery process is speeded up when MiniSSDPd is running on the machine.
|
||||||
|
|
||||||
|
|
||||||
|
* Python module *
|
||||||
|
|
||||||
|
you can build a python module with 'make pythonmodule'
|
||||||
|
and install it with 'make installpythonmodule'.
|
||||||
|
setup.py (and setupmingw32.py) are included in the distribution.
|
||||||
|
|
||||||
|
|
||||||
|
Feel free to contact me if you have any problem :
|
||||||
|
e-mail : miniupnp@free.fr
|
||||||
|
|
||||||
|
If you are using libminiupnpc in your application, please
|
||||||
|
send me an email !
|
||||||
|
|
||||||
|
For any question, you can use the web forum :
|
||||||
|
http://miniupnp.tuxfamily.org/forum/
|
||||||
|
|
||||||
|
|
@ -0,0 +1 @@
|
||||||
|
1.8
|
||||||
|
|
@ -0,0 +1,117 @@
|
||||||
|
$Id: apiversions.txt,v 1.2 2013/03/29 14:45:09 nanard Exp $
|
||||||
|
|
||||||
|
Differences in API between miniUPnPc versions
|
||||||
|
|
||||||
|
|
||||||
|
====================== miniUPnPc version 1.8 ======================
|
||||||
|
API version 9
|
||||||
|
|
||||||
|
miniupnpc.h:
|
||||||
|
updated macros :
|
||||||
|
#define MINIUPNPC_VERSION "1.8"
|
||||||
|
#define MINIUPNPC_API_VERSION 9
|
||||||
|
added "unsigned int scope_id;" to struct UPNPDev
|
||||||
|
added scope_id argument to GetUPNPUrls()
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
====================== miniUPnPc version 1.7 ======================
|
||||||
|
API version 8
|
||||||
|
|
||||||
|
miniupnpc.h :
|
||||||
|
add new macros :
|
||||||
|
#define MINIUPNPC_VERSION "1.7"
|
||||||
|
#define MINIUPNPC_API_VERSION 8
|
||||||
|
add rootdescURL to struct UPNPUrls
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
====================== miniUPnPc version 1.6 ======================
|
||||||
|
API version 8
|
||||||
|
|
||||||
|
Adding support for IPv6.
|
||||||
|
igd_desc_parse.h :
|
||||||
|
struct IGDdatas_service :
|
||||||
|
add char presentationurl[MINIUPNPC_URL_MAXSIZE];
|
||||||
|
struct IGDdatas :
|
||||||
|
add struct IGDdatas_service IPv6FC;
|
||||||
|
miniupnpc.h :
|
||||||
|
new macros :
|
||||||
|
#define UPNPDISCOVER_SUCCESS (0)
|
||||||
|
#define UPNPDISCOVER_UNKNOWN_ERROR (-1)
|
||||||
|
#define UPNPDISCOVER_SOCKET_ERROR (-101)
|
||||||
|
#define UPNPDISCOVER_MEMORY_ERROR (-102)
|
||||||
|
simpleUPnPcommand() prototype changed (but is normaly not used by API users)
|
||||||
|
add arguments ipv6 and error to upnpDiscover() :
|
||||||
|
struct UPNPDev *
|
||||||
|
upnpDiscover(int delay, const char * multicastif,
|
||||||
|
const char * minissdpdsock, int sameport,
|
||||||
|
int ipv6,
|
||||||
|
int * error);
|
||||||
|
add controlURL_6FC member to struct UPNPUrls :
|
||||||
|
struct UPNPUrls {
|
||||||
|
char * controlURL;
|
||||||
|
char * ipcondescURL;
|
||||||
|
char * controlURL_CIF;
|
||||||
|
char * controlURL_6FC;
|
||||||
|
};
|
||||||
|
|
||||||
|
upnpcommands.h :
|
||||||
|
add leaseDuration argument to UPNP_AddPortMapping()
|
||||||
|
add desc, enabled and leaseDuration arguments to UPNP_GetSpecificPortMappingEntry()
|
||||||
|
add UPNP_GetListOfPortMappings() function (IGDv2)
|
||||||
|
add IGDv2 IPv6 related functions :
|
||||||
|
UPNP_GetFirewallStatus()
|
||||||
|
UPNP_GetOutboundPinholeTimeout()
|
||||||
|
UPNP_AddPinhole()
|
||||||
|
UPNP_UpdatePinhole()
|
||||||
|
UPNP_DeletePinhole()
|
||||||
|
UPNP_CheckPinholeWorking()
|
||||||
|
UPNP_GetPinholePackets()
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
====================== miniUPnPc version 1.5 ======================
|
||||||
|
API version 5
|
||||||
|
|
||||||
|
new function :
|
||||||
|
int UPNPIGD_IsConnected(struct UPNPUrls *, struct IGDdatas *);
|
||||||
|
new macro in upnpcommands.h :
|
||||||
|
#define UPNPCOMMAND_HTTP_ERROR
|
||||||
|
|
||||||
|
====================== miniUPnPc version 1.4 ======================
|
||||||
|
Same API as version 1.3
|
||||||
|
|
||||||
|
====================== miniUPnPc version 1.3 ======================
|
||||||
|
API version 4
|
||||||
|
|
||||||
|
Use UNSIGNED_INTEGER type for
|
||||||
|
UPNP_GetTotalBytesSent(), UPNP_GetTotalBytesReceived(),
|
||||||
|
UPNP_GetTotalPacketsSent(), UPNP_GetTotalPacketsReceived()
|
||||||
|
Add remoteHost argument to UPNP_AddPortMapping() and UPNP_DeletePortMapping()
|
||||||
|
|
||||||
|
====================== miniUPnPc version 1.2 ======================
|
||||||
|
API version 3
|
||||||
|
|
||||||
|
added sameport argument to upnpDiscover()
|
||||||
|
struct UPNPDev *
|
||||||
|
upnpDiscover(int delay, const char * multicastif,
|
||||||
|
const char * minissdpdsock, int sameport);
|
||||||
|
|
||||||
|
====================== miniUPnPc Version 1.1 ======================
|
||||||
|
Same API as 1.0
|
||||||
|
|
||||||
|
|
||||||
|
====================== miniUPnPc Version 1.0 ======================
|
||||||
|
API version 2
|
||||||
|
|
||||||
|
|
||||||
|
struct UPNPDev {
|
||||||
|
struct UPNPDev * pNext;
|
||||||
|
char * descURL;
|
||||||
|
char * st;
|
||||||
|
char buffer[2];
|
||||||
|
};
|
||||||
|
struct UPNPDev * upnpDiscover(int delay, const char * multicastif,
|
||||||
|
const char * minissdpdsock);
|
||||||
|
|
||||||
|
|
@ -0,0 +1,164 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<ItemGroup Label="ProjectConfigurations">
|
||||||
|
<ProjectConfiguration Include="Debug|Win32">
|
||||||
|
<Configuration>Debug</Configuration>
|
||||||
|
<Platform>Win32</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
<ProjectConfiguration Include="Debug|x64">
|
||||||
|
<Configuration>Debug</Configuration>
|
||||||
|
<Platform>x64</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
<ProjectConfiguration Include="Release|Win32">
|
||||||
|
<Configuration>Release</Configuration>
|
||||||
|
<Platform>Win32</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
<ProjectConfiguration Include="Release|x64">
|
||||||
|
<Configuration>Release</Configuration>
|
||||||
|
<Platform>x64</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
</ItemGroup>
|
||||||
|
<PropertyGroup Label="Globals">
|
||||||
|
<ProjectGuid>{A680190D-0764-485B-9CF3-A82C5EDD5715}</ProjectGuid>
|
||||||
|
<RootNamespace>miniupnpc</RootNamespace>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||||
|
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||||
|
<UseDebugLibraries>true</UseDebugLibraries>
|
||||||
|
<CharacterSet>MultiByte</CharacterSet>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
||||||
|
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||||
|
<UseDebugLibraries>true</UseDebugLibraries>
|
||||||
|
<CharacterSet>MultiByte</CharacterSet>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
||||||
|
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||||
|
<UseDebugLibraries>false</UseDebugLibraries>
|
||||||
|
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||||
|
<CharacterSet>MultiByte</CharacterSet>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
||||||
|
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||||
|
<UseDebugLibraries>false</UseDebugLibraries>
|
||||||
|
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||||
|
<CharacterSet>MultiByte</CharacterSet>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||||
|
<ImportGroup Label="ExtensionSettings">
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
<Import Project="..\..\Source\VSProps\Base.props" />
|
||||||
|
<Import Project="..\..\Source\VSProps\CodeGen_Debug.props" />
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
<Import Project="..\..\Source\VSProps\Base.props" />
|
||||||
|
<Import Project="..\..\Source\VSProps\CodeGen_Debug.props" />
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
<Import Project="..\..\Source\VSProps\Base.props" />
|
||||||
|
<Import Project="..\..\Source\VSProps\CodeGen_Release.props" />
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
<Import Project="..\..\Source\VSProps\Base.props" />
|
||||||
|
<Import Project="..\..\Source\VSProps\CodeGen_Release.props" />
|
||||||
|
</ImportGroup>
|
||||||
|
<PropertyGroup Label="UserMacros" />
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||||
|
<ClCompile>
|
||||||
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
<Optimization>Disabled</Optimization>
|
||||||
|
<PreprocessorDefinitions>_WIN32_WINNT=0x0501;STATICLIB;DEBUG</PreprocessorDefinitions>
|
||||||
|
</ClCompile>
|
||||||
|
<Link>
|
||||||
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
<AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
|
</Link>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||||
|
<ClCompile>
|
||||||
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
<Optimization>Disabled</Optimization>
|
||||||
|
<PreprocessorDefinitions>_WIN32_WINNT=0x0501;STATICLIB;DEBUG</PreprocessorDefinitions>
|
||||||
|
</ClCompile>
|
||||||
|
<Link>
|
||||||
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
<AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
|
</Link>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||||
|
<ClCompile>
|
||||||
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
<Optimization>MaxSpeed</Optimization>
|
||||||
|
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||||
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||||
|
<PreprocessorDefinitions>_WIN32_WINNT=0x0501;STATICLIB</PreprocessorDefinitions>
|
||||||
|
</ClCompile>
|
||||||
|
<Link>
|
||||||
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||||
|
<OptimizeReferences>true</OptimizeReferences>
|
||||||
|
<AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
|
</Link>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||||
|
<ClCompile>
|
||||||
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
<Optimization>MaxSpeed</Optimization>
|
||||||
|
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||||
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||||
|
<PreprocessorDefinitions>_WIN32_WINNT=0x0501;STATICLIB</PreprocessorDefinitions>
|
||||||
|
</ClCompile>
|
||||||
|
<Link>
|
||||||
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||||
|
<OptimizeReferences>true</OptimizeReferences>
|
||||||
|
<AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
|
</Link>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClInclude Include="src\bsdqueue.h" />
|
||||||
|
<ClInclude Include="src\codelength.h" />
|
||||||
|
<ClInclude Include="src\connecthostport.h" />
|
||||||
|
<ClInclude Include="src\declspec.h" />
|
||||||
|
<ClInclude Include="src\igd_desc_parse.h" />
|
||||||
|
<ClInclude Include="src\minisoap.h" />
|
||||||
|
<ClInclude Include="src\minissdpc.h" />
|
||||||
|
<ClInclude Include="src\miniupnpc.h" />
|
||||||
|
<ClInclude Include="src\miniupnpcstrings.h" />
|
||||||
|
<ClInclude Include="src\miniupnpctypes.h" />
|
||||||
|
<ClInclude Include="src\miniwget.h" />
|
||||||
|
<ClInclude Include="src\minixml.h" />
|
||||||
|
<ClInclude Include="src\portlistingparse.h" />
|
||||||
|
<ClInclude Include="src\receivedata.h" />
|
||||||
|
<ClInclude Include="src\upnpcommands.h" />
|
||||||
|
<ClInclude Include="src\upnperrors.h" />
|
||||||
|
<ClInclude Include="src\upnpreplyparse.h" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClCompile Include="src\connecthostport.c" />
|
||||||
|
<ClCompile Include="src\igd_desc_parse.c" />
|
||||||
|
<ClCompile Include="src\minisoap.c" />
|
||||||
|
<ClCompile Include="src\miniupnpc.c" />
|
||||||
|
<ClCompile Include="src\miniwget.c" />
|
||||||
|
<ClCompile Include="src\minixml.c" />
|
||||||
|
<ClCompile Include="src\portlistingparse.c" />
|
||||||
|
<ClCompile Include="src\receivedata.c" />
|
||||||
|
<ClCompile Include="src\upnpc.c" />
|
||||||
|
<ClCompile Include="src\upnpcommands.c" />
|
||||||
|
<ClCompile Include="src\upnperrors.c" />
|
||||||
|
<ClCompile Include="src\upnpreplyparse.c" />
|
||||||
|
</ItemGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||||
|
<ImportGroup Label="ExtensionTargets">
|
||||||
|
</ImportGroup>
|
||||||
|
</Project>
|
||||||
|
|
@ -0,0 +1,108 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<ItemGroup>
|
||||||
|
<Filter Include="Source Files">
|
||||||
|
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
|
||||||
|
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
|
||||||
|
</Filter>
|
||||||
|
<Filter Include="Header Files">
|
||||||
|
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
|
||||||
|
<Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
|
||||||
|
</Filter>
|
||||||
|
<Filter Include="Resource Files">
|
||||||
|
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
|
||||||
|
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
|
||||||
|
</Filter>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClInclude Include="src\bsdqueue.h">
|
||||||
|
<Filter>Header Files</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="src\codelength.h">
|
||||||
|
<Filter>Header Files</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="src\connecthostport.h">
|
||||||
|
<Filter>Header Files</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="src\declspec.h">
|
||||||
|
<Filter>Header Files</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="src\igd_desc_parse.h">
|
||||||
|
<Filter>Header Files</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="src\minisoap.h">
|
||||||
|
<Filter>Header Files</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="src\minissdpc.h">
|
||||||
|
<Filter>Header Files</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="src\miniupnpc.h">
|
||||||
|
<Filter>Header Files</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="src\miniupnpcstrings.h">
|
||||||
|
<Filter>Header Files</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="src\miniupnpctypes.h">
|
||||||
|
<Filter>Header Files</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="src\miniwget.h">
|
||||||
|
<Filter>Header Files</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="src\minixml.h">
|
||||||
|
<Filter>Header Files</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="src\portlistingparse.h">
|
||||||
|
<Filter>Header Files</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="src\receivedata.h">
|
||||||
|
<Filter>Header Files</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="src\upnpcommands.h">
|
||||||
|
<Filter>Header Files</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="src\upnperrors.h">
|
||||||
|
<Filter>Header Files</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="src\upnpreplyparse.h">
|
||||||
|
<Filter>Header Files</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClCompile Include="src\igd_desc_parse.c">
|
||||||
|
<Filter>Source Files</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="src\minisoap.c">
|
||||||
|
<Filter>Source Files</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="src\miniupnpc.c">
|
||||||
|
<Filter>Source Files</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="src\miniwget.c">
|
||||||
|
<Filter>Source Files</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="src\minixml.c">
|
||||||
|
<Filter>Source Files</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="src\portlistingparse.c">
|
||||||
|
<Filter>Source Files</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="src\receivedata.c">
|
||||||
|
<Filter>Source Files</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="src\upnpc.c">
|
||||||
|
<Filter>Source Files</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="src\upnpcommands.c">
|
||||||
|
<Filter>Source Files</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="src\upnperrors.c">
|
||||||
|
<Filter>Source Files</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="src\upnpreplyparse.c">
|
||||||
|
<Filter>Source Files</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="src\connecthostport.c">
|
||||||
|
<Filter>Source Files</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
</ItemGroup>
|
||||||
|
</Project>
|
||||||
|
|
@ -0,0 +1,531 @@
|
||||||
|
/* $OpenBSD: queue.h,v 1.31 2005/11/25 08:06:25 otto Exp $ */
|
||||||
|
/* $NetBSD: queue.h,v 1.11 1996/05/16 05:17:14 mycroft Exp $ */
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Copyright (c) 1991, 1993
|
||||||
|
* The Regents of the University of California. 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. Neither the name of the University nor the names of its contributors
|
||||||
|
* may be used to endorse or promote products derived from this software
|
||||||
|
* without specific prior written permission.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 REGENTS OR CONTRIBUTORS 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.
|
||||||
|
*
|
||||||
|
* @(#)queue.h 8.5 (Berkeley) 8/20/94
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef _SYS_QUEUE_H_
|
||||||
|
#define _SYS_QUEUE_H_
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This file defines five types of data structures: singly-linked lists,
|
||||||
|
* lists, simple queues, tail queues, and circular queues.
|
||||||
|
*
|
||||||
|
*
|
||||||
|
* A singly-linked list is headed by a single forward pointer. The elements
|
||||||
|
* are singly linked for minimum space and pointer manipulation overhead at
|
||||||
|
* the expense of O(n) removal for arbitrary elements. New elements can be
|
||||||
|
* added to the list after an existing element or at the head of the list.
|
||||||
|
* Elements being removed from the head of the list should use the explicit
|
||||||
|
* macro for this purpose for optimum efficiency. A singly-linked list may
|
||||||
|
* only be traversed in the forward direction. Singly-linked lists are ideal
|
||||||
|
* for applications with large datasets and few or no removals or for
|
||||||
|
* implementing a LIFO queue.
|
||||||
|
*
|
||||||
|
* A list is headed by a single forward pointer (or an array of forward
|
||||||
|
* pointers for a hash table header). The elements are doubly linked
|
||||||
|
* so that an arbitrary element can be removed without a need to
|
||||||
|
* traverse the list. New elements can be added to the list before
|
||||||
|
* or after an existing element or at the head of the list. A list
|
||||||
|
* may only be traversed in the forward direction.
|
||||||
|
*
|
||||||
|
* A simple queue is headed by a pair of pointers, one the head of the
|
||||||
|
* list and the other to the tail of the list. The elements are singly
|
||||||
|
* linked to save space, so elements can only be removed from the
|
||||||
|
* head of the list. New elements can be added to the list before or after
|
||||||
|
* an existing element, at the head of the list, or at the end of the
|
||||||
|
* list. A simple queue may only be traversed in the forward direction.
|
||||||
|
*
|
||||||
|
* A tail queue is headed by a pair of pointers, one to the head of the
|
||||||
|
* list and the other to the tail of the list. The elements are doubly
|
||||||
|
* linked so that an arbitrary element can be removed without a need to
|
||||||
|
* traverse the list. New elements can be added to the list before or
|
||||||
|
* after an existing element, at the head of the list, or at the end of
|
||||||
|
* the list. A tail queue may be traversed in either direction.
|
||||||
|
*
|
||||||
|
* A circle queue is headed by a pair of pointers, one to the head of the
|
||||||
|
* list and the other to the tail of the list. The elements are doubly
|
||||||
|
* linked so that an arbitrary element can be removed without a need to
|
||||||
|
* traverse the list. New elements can be added to the list before or after
|
||||||
|
* an existing element, at the head of the list, or at the end of the list.
|
||||||
|
* A circle queue may be traversed in either direction, but has a more
|
||||||
|
* complex end of list detection.
|
||||||
|
*
|
||||||
|
* For details on the use of these macros, see the queue(3) manual page.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifdef QUEUE_MACRO_DEBUG
|
||||||
|
#define _Q_INVALIDATE(a) (a) = ((void *)-1)
|
||||||
|
#else
|
||||||
|
#define _Q_INVALIDATE(a)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Singly-linked List definitions.
|
||||||
|
*/
|
||||||
|
#define SLIST_HEAD(name, type) \
|
||||||
|
struct name { \
|
||||||
|
struct type *slh_first; /* first element */ \
|
||||||
|
}
|
||||||
|
|
||||||
|
#define SLIST_HEAD_INITIALIZER(head) \
|
||||||
|
{ NULL }
|
||||||
|
|
||||||
|
#ifdef SLIST_ENTRY
|
||||||
|
#undef SLIST_ENTRY
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#define SLIST_ENTRY(type) \
|
||||||
|
struct { \
|
||||||
|
struct type *sle_next; /* next element */ \
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Singly-linked List access methods.
|
||||||
|
*/
|
||||||
|
#define SLIST_FIRST(head) ((head)->slh_first)
|
||||||
|
#define SLIST_END(head) NULL
|
||||||
|
#define SLIST_EMPTY(head) (SLIST_FIRST(head) == SLIST_END(head))
|
||||||
|
#define SLIST_NEXT(elm, field) ((elm)->field.sle_next)
|
||||||
|
|
||||||
|
#define SLIST_FOREACH(var, head, field) \
|
||||||
|
for((var) = SLIST_FIRST(head); \
|
||||||
|
(var) != SLIST_END(head); \
|
||||||
|
(var) = SLIST_NEXT(var, field))
|
||||||
|
|
||||||
|
#define SLIST_FOREACH_PREVPTR(var, varp, head, field) \
|
||||||
|
for ((varp) = &SLIST_FIRST((head)); \
|
||||||
|
((var) = *(varp)) != SLIST_END(head); \
|
||||||
|
(varp) = &SLIST_NEXT((var), field))
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Singly-linked List functions.
|
||||||
|
*/
|
||||||
|
#define SLIST_INIT(head) { \
|
||||||
|
SLIST_FIRST(head) = SLIST_END(head); \
|
||||||
|
}
|
||||||
|
|
||||||
|
#define SLIST_INSERT_AFTER(slistelm, elm, field) do { \
|
||||||
|
(elm)->field.sle_next = (slistelm)->field.sle_next; \
|
||||||
|
(slistelm)->field.sle_next = (elm); \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
|
#define SLIST_INSERT_HEAD(head, elm, field) do { \
|
||||||
|
(elm)->field.sle_next = (head)->slh_first; \
|
||||||
|
(head)->slh_first = (elm); \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
|
#define SLIST_REMOVE_NEXT(head, elm, field) do { \
|
||||||
|
(elm)->field.sle_next = (elm)->field.sle_next->field.sle_next; \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
|
#define SLIST_REMOVE_HEAD(head, field) do { \
|
||||||
|
(head)->slh_first = (head)->slh_first->field.sle_next; \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
|
#define SLIST_REMOVE(head, elm, type, field) do { \
|
||||||
|
if ((head)->slh_first == (elm)) { \
|
||||||
|
SLIST_REMOVE_HEAD((head), field); \
|
||||||
|
} else { \
|
||||||
|
struct type *curelm = (head)->slh_first; \
|
||||||
|
\
|
||||||
|
while (curelm->field.sle_next != (elm)) \
|
||||||
|
curelm = curelm->field.sle_next; \
|
||||||
|
curelm->field.sle_next = \
|
||||||
|
curelm->field.sle_next->field.sle_next; \
|
||||||
|
_Q_INVALIDATE((elm)->field.sle_next); \
|
||||||
|
} \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
|
/*
|
||||||
|
* List definitions.
|
||||||
|
*/
|
||||||
|
#define LIST_HEAD(name, type) \
|
||||||
|
struct name { \
|
||||||
|
struct type *lh_first; /* first element */ \
|
||||||
|
}
|
||||||
|
|
||||||
|
#define LIST_HEAD_INITIALIZER(head) \
|
||||||
|
{ NULL }
|
||||||
|
|
||||||
|
#define LIST_ENTRY(type) \
|
||||||
|
struct { \
|
||||||
|
struct type *le_next; /* next element */ \
|
||||||
|
struct type **le_prev; /* address of previous next element */ \
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* List access methods
|
||||||
|
*/
|
||||||
|
#define LIST_FIRST(head) ((head)->lh_first)
|
||||||
|
#define LIST_END(head) NULL
|
||||||
|
#define LIST_EMPTY(head) (LIST_FIRST(head) == LIST_END(head))
|
||||||
|
#define LIST_NEXT(elm, field) ((elm)->field.le_next)
|
||||||
|
|
||||||
|
#define LIST_FOREACH(var, head, field) \
|
||||||
|
for((var) = LIST_FIRST(head); \
|
||||||
|
(var)!= LIST_END(head); \
|
||||||
|
(var) = LIST_NEXT(var, field))
|
||||||
|
|
||||||
|
/*
|
||||||
|
* List functions.
|
||||||
|
*/
|
||||||
|
#define LIST_INIT(head) do { \
|
||||||
|
LIST_FIRST(head) = LIST_END(head); \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
|
#define LIST_INSERT_AFTER(listelm, elm, field) do { \
|
||||||
|
if (((elm)->field.le_next = (listelm)->field.le_next) != NULL) \
|
||||||
|
(listelm)->field.le_next->field.le_prev = \
|
||||||
|
&(elm)->field.le_next; \
|
||||||
|
(listelm)->field.le_next = (elm); \
|
||||||
|
(elm)->field.le_prev = &(listelm)->field.le_next; \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
|
#define LIST_INSERT_BEFORE(listelm, elm, field) do { \
|
||||||
|
(elm)->field.le_prev = (listelm)->field.le_prev; \
|
||||||
|
(elm)->field.le_next = (listelm); \
|
||||||
|
*(listelm)->field.le_prev = (elm); \
|
||||||
|
(listelm)->field.le_prev = &(elm)->field.le_next; \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
|
#define LIST_INSERT_HEAD(head, elm, field) do { \
|
||||||
|
if (((elm)->field.le_next = (head)->lh_first) != NULL) \
|
||||||
|
(head)->lh_first->field.le_prev = &(elm)->field.le_next;\
|
||||||
|
(head)->lh_first = (elm); \
|
||||||
|
(elm)->field.le_prev = &(head)->lh_first; \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
|
#define LIST_REMOVE(elm, field) do { \
|
||||||
|
if ((elm)->field.le_next != NULL) \
|
||||||
|
(elm)->field.le_next->field.le_prev = \
|
||||||
|
(elm)->field.le_prev; \
|
||||||
|
*(elm)->field.le_prev = (elm)->field.le_next; \
|
||||||
|
_Q_INVALIDATE((elm)->field.le_prev); \
|
||||||
|
_Q_INVALIDATE((elm)->field.le_next); \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
|
#define LIST_REPLACE(elm, elm2, field) do { \
|
||||||
|
if (((elm2)->field.le_next = (elm)->field.le_next) != NULL) \
|
||||||
|
(elm2)->field.le_next->field.le_prev = \
|
||||||
|
&(elm2)->field.le_next; \
|
||||||
|
(elm2)->field.le_prev = (elm)->field.le_prev; \
|
||||||
|
*(elm2)->field.le_prev = (elm2); \
|
||||||
|
_Q_INVALIDATE((elm)->field.le_prev); \
|
||||||
|
_Q_INVALIDATE((elm)->field.le_next); \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Simple queue definitions.
|
||||||
|
*/
|
||||||
|
#define SIMPLEQ_HEAD(name, type) \
|
||||||
|
struct name { \
|
||||||
|
struct type *sqh_first; /* first element */ \
|
||||||
|
struct type **sqh_last; /* addr of last next element */ \
|
||||||
|
}
|
||||||
|
|
||||||
|
#define SIMPLEQ_HEAD_INITIALIZER(head) \
|
||||||
|
{ NULL, &(head).sqh_first }
|
||||||
|
|
||||||
|
#define SIMPLEQ_ENTRY(type) \
|
||||||
|
struct { \
|
||||||
|
struct type *sqe_next; /* next element */ \
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Simple queue access methods.
|
||||||
|
*/
|
||||||
|
#define SIMPLEQ_FIRST(head) ((head)->sqh_first)
|
||||||
|
#define SIMPLEQ_END(head) NULL
|
||||||
|
#define SIMPLEQ_EMPTY(head) (SIMPLEQ_FIRST(head) == SIMPLEQ_END(head))
|
||||||
|
#define SIMPLEQ_NEXT(elm, field) ((elm)->field.sqe_next)
|
||||||
|
|
||||||
|
#define SIMPLEQ_FOREACH(var, head, field) \
|
||||||
|
for((var) = SIMPLEQ_FIRST(head); \
|
||||||
|
(var) != SIMPLEQ_END(head); \
|
||||||
|
(var) = SIMPLEQ_NEXT(var, field))
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Simple queue functions.
|
||||||
|
*/
|
||||||
|
#define SIMPLEQ_INIT(head) do { \
|
||||||
|
(head)->sqh_first = NULL; \
|
||||||
|
(head)->sqh_last = &(head)->sqh_first; \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
|
#define SIMPLEQ_INSERT_HEAD(head, elm, field) do { \
|
||||||
|
if (((elm)->field.sqe_next = (head)->sqh_first) == NULL) \
|
||||||
|
(head)->sqh_last = &(elm)->field.sqe_next; \
|
||||||
|
(head)->sqh_first = (elm); \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
|
#define SIMPLEQ_INSERT_TAIL(head, elm, field) do { \
|
||||||
|
(elm)->field.sqe_next = NULL; \
|
||||||
|
*(head)->sqh_last = (elm); \
|
||||||
|
(head)->sqh_last = &(elm)->field.sqe_next; \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
|
#define SIMPLEQ_INSERT_AFTER(head, listelm, elm, field) do { \
|
||||||
|
if (((elm)->field.sqe_next = (listelm)->field.sqe_next) == NULL)\
|
||||||
|
(head)->sqh_last = &(elm)->field.sqe_next; \
|
||||||
|
(listelm)->field.sqe_next = (elm); \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
|
#define SIMPLEQ_REMOVE_HEAD(head, field) do { \
|
||||||
|
if (((head)->sqh_first = (head)->sqh_first->field.sqe_next) == NULL) \
|
||||||
|
(head)->sqh_last = &(head)->sqh_first; \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Tail queue definitions.
|
||||||
|
*/
|
||||||
|
#define TAILQ_HEAD(name, type) \
|
||||||
|
struct name { \
|
||||||
|
struct type *tqh_first; /* first element */ \
|
||||||
|
struct type **tqh_last; /* addr of last next element */ \
|
||||||
|
}
|
||||||
|
|
||||||
|
#define TAILQ_HEAD_INITIALIZER(head) \
|
||||||
|
{ NULL, &(head).tqh_first }
|
||||||
|
|
||||||
|
#define TAILQ_ENTRY(type) \
|
||||||
|
struct { \
|
||||||
|
struct type *tqe_next; /* next element */ \
|
||||||
|
struct type **tqe_prev; /* address of previous next element */ \
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* tail queue access methods
|
||||||
|
*/
|
||||||
|
#define TAILQ_FIRST(head) ((head)->tqh_first)
|
||||||
|
#define TAILQ_END(head) NULL
|
||||||
|
#define TAILQ_NEXT(elm, field) ((elm)->field.tqe_next)
|
||||||
|
#define TAILQ_LAST(head, headname) \
|
||||||
|
(*(((struct headname *)((head)->tqh_last))->tqh_last))
|
||||||
|
/* XXX */
|
||||||
|
#define TAILQ_PREV(elm, headname, field) \
|
||||||
|
(*(((struct headname *)((elm)->field.tqe_prev))->tqh_last))
|
||||||
|
#define TAILQ_EMPTY(head) \
|
||||||
|
(TAILQ_FIRST(head) == TAILQ_END(head))
|
||||||
|
|
||||||
|
#define TAILQ_FOREACH(var, head, field) \
|
||||||
|
for((var) = TAILQ_FIRST(head); \
|
||||||
|
(var) != TAILQ_END(head); \
|
||||||
|
(var) = TAILQ_NEXT(var, field))
|
||||||
|
|
||||||
|
#define TAILQ_FOREACH_REVERSE(var, head, headname, field) \
|
||||||
|
for((var) = TAILQ_LAST(head, headname); \
|
||||||
|
(var) != TAILQ_END(head); \
|
||||||
|
(var) = TAILQ_PREV(var, headname, field))
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Tail queue functions.
|
||||||
|
*/
|
||||||
|
#define TAILQ_INIT(head) do { \
|
||||||
|
(head)->tqh_first = NULL; \
|
||||||
|
(head)->tqh_last = &(head)->tqh_first; \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
|
#define TAILQ_INSERT_HEAD(head, elm, field) do { \
|
||||||
|
if (((elm)->field.tqe_next = (head)->tqh_first) != NULL) \
|
||||||
|
(head)->tqh_first->field.tqe_prev = \
|
||||||
|
&(elm)->field.tqe_next; \
|
||||||
|
else \
|
||||||
|
(head)->tqh_last = &(elm)->field.tqe_next; \
|
||||||
|
(head)->tqh_first = (elm); \
|
||||||
|
(elm)->field.tqe_prev = &(head)->tqh_first; \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
|
#define TAILQ_INSERT_TAIL(head, elm, field) do { \
|
||||||
|
(elm)->field.tqe_next = NULL; \
|
||||||
|
(elm)->field.tqe_prev = (head)->tqh_last; \
|
||||||
|
*(head)->tqh_last = (elm); \
|
||||||
|
(head)->tqh_last = &(elm)->field.tqe_next; \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
|
#define TAILQ_INSERT_AFTER(head, listelm, elm, field) do { \
|
||||||
|
if (((elm)->field.tqe_next = (listelm)->field.tqe_next) != NULL)\
|
||||||
|
(elm)->field.tqe_next->field.tqe_prev = \
|
||||||
|
&(elm)->field.tqe_next; \
|
||||||
|
else \
|
||||||
|
(head)->tqh_last = &(elm)->field.tqe_next; \
|
||||||
|
(listelm)->field.tqe_next = (elm); \
|
||||||
|
(elm)->field.tqe_prev = &(listelm)->field.tqe_next; \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
|
#define TAILQ_INSERT_BEFORE(listelm, elm, field) do { \
|
||||||
|
(elm)->field.tqe_prev = (listelm)->field.tqe_prev; \
|
||||||
|
(elm)->field.tqe_next = (listelm); \
|
||||||
|
*(listelm)->field.tqe_prev = (elm); \
|
||||||
|
(listelm)->field.tqe_prev = &(elm)->field.tqe_next; \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
|
#define TAILQ_REMOVE(head, elm, field) do { \
|
||||||
|
if (((elm)->field.tqe_next) != NULL) \
|
||||||
|
(elm)->field.tqe_next->field.tqe_prev = \
|
||||||
|
(elm)->field.tqe_prev; \
|
||||||
|
else \
|
||||||
|
(head)->tqh_last = (elm)->field.tqe_prev; \
|
||||||
|
*(elm)->field.tqe_prev = (elm)->field.tqe_next; \
|
||||||
|
_Q_INVALIDATE((elm)->field.tqe_prev); \
|
||||||
|
_Q_INVALIDATE((elm)->field.tqe_next); \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
|
#define TAILQ_REPLACE(head, elm, elm2, field) do { \
|
||||||
|
if (((elm2)->field.tqe_next = (elm)->field.tqe_next) != NULL) \
|
||||||
|
(elm2)->field.tqe_next->field.tqe_prev = \
|
||||||
|
&(elm2)->field.tqe_next; \
|
||||||
|
else \
|
||||||
|
(head)->tqh_last = &(elm2)->field.tqe_next; \
|
||||||
|
(elm2)->field.tqe_prev = (elm)->field.tqe_prev; \
|
||||||
|
*(elm2)->field.tqe_prev = (elm2); \
|
||||||
|
_Q_INVALIDATE((elm)->field.tqe_prev); \
|
||||||
|
_Q_INVALIDATE((elm)->field.tqe_next); \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Circular queue definitions.
|
||||||
|
*/
|
||||||
|
#define CIRCLEQ_HEAD(name, type) \
|
||||||
|
struct name { \
|
||||||
|
struct type *cqh_first; /* first element */ \
|
||||||
|
struct type *cqh_last; /* last element */ \
|
||||||
|
}
|
||||||
|
|
||||||
|
#define CIRCLEQ_HEAD_INITIALIZER(head) \
|
||||||
|
{ CIRCLEQ_END(&head), CIRCLEQ_END(&head) }
|
||||||
|
|
||||||
|
#define CIRCLEQ_ENTRY(type) \
|
||||||
|
struct { \
|
||||||
|
struct type *cqe_next; /* next element */ \
|
||||||
|
struct type *cqe_prev; /* previous element */ \
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Circular queue access methods
|
||||||
|
*/
|
||||||
|
#define CIRCLEQ_FIRST(head) ((head)->cqh_first)
|
||||||
|
#define CIRCLEQ_LAST(head) ((head)->cqh_last)
|
||||||
|
#define CIRCLEQ_END(head) ((void *)(head))
|
||||||
|
#define CIRCLEQ_NEXT(elm, field) ((elm)->field.cqe_next)
|
||||||
|
#define CIRCLEQ_PREV(elm, field) ((elm)->field.cqe_prev)
|
||||||
|
#define CIRCLEQ_EMPTY(head) \
|
||||||
|
(CIRCLEQ_FIRST(head) == CIRCLEQ_END(head))
|
||||||
|
|
||||||
|
#define CIRCLEQ_FOREACH(var, head, field) \
|
||||||
|
for((var) = CIRCLEQ_FIRST(head); \
|
||||||
|
(var) != CIRCLEQ_END(head); \
|
||||||
|
(var) = CIRCLEQ_NEXT(var, field))
|
||||||
|
|
||||||
|
#define CIRCLEQ_FOREACH_REVERSE(var, head, field) \
|
||||||
|
for((var) = CIRCLEQ_LAST(head); \
|
||||||
|
(var) != CIRCLEQ_END(head); \
|
||||||
|
(var) = CIRCLEQ_PREV(var, field))
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Circular queue functions.
|
||||||
|
*/
|
||||||
|
#define CIRCLEQ_INIT(head) do { \
|
||||||
|
(head)->cqh_first = CIRCLEQ_END(head); \
|
||||||
|
(head)->cqh_last = CIRCLEQ_END(head); \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
|
#define CIRCLEQ_INSERT_AFTER(head, listelm, elm, field) do { \
|
||||||
|
(elm)->field.cqe_next = (listelm)->field.cqe_next; \
|
||||||
|
(elm)->field.cqe_prev = (listelm); \
|
||||||
|
if ((listelm)->field.cqe_next == CIRCLEQ_END(head)) \
|
||||||
|
(head)->cqh_last = (elm); \
|
||||||
|
else \
|
||||||
|
(listelm)->field.cqe_next->field.cqe_prev = (elm); \
|
||||||
|
(listelm)->field.cqe_next = (elm); \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
|
#define CIRCLEQ_INSERT_BEFORE(head, listelm, elm, field) do { \
|
||||||
|
(elm)->field.cqe_next = (listelm); \
|
||||||
|
(elm)->field.cqe_prev = (listelm)->field.cqe_prev; \
|
||||||
|
if ((listelm)->field.cqe_prev == CIRCLEQ_END(head)) \
|
||||||
|
(head)->cqh_first = (elm); \
|
||||||
|
else \
|
||||||
|
(listelm)->field.cqe_prev->field.cqe_next = (elm); \
|
||||||
|
(listelm)->field.cqe_prev = (elm); \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
|
#define CIRCLEQ_INSERT_HEAD(head, elm, field) do { \
|
||||||
|
(elm)->field.cqe_next = (head)->cqh_first; \
|
||||||
|
(elm)->field.cqe_prev = CIRCLEQ_END(head); \
|
||||||
|
if ((head)->cqh_last == CIRCLEQ_END(head)) \
|
||||||
|
(head)->cqh_last = (elm); \
|
||||||
|
else \
|
||||||
|
(head)->cqh_first->field.cqe_prev = (elm); \
|
||||||
|
(head)->cqh_first = (elm); \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
|
#define CIRCLEQ_INSERT_TAIL(head, elm, field) do { \
|
||||||
|
(elm)->field.cqe_next = CIRCLEQ_END(head); \
|
||||||
|
(elm)->field.cqe_prev = (head)->cqh_last; \
|
||||||
|
if ((head)->cqh_first == CIRCLEQ_END(head)) \
|
||||||
|
(head)->cqh_first = (elm); \
|
||||||
|
else \
|
||||||
|
(head)->cqh_last->field.cqe_next = (elm); \
|
||||||
|
(head)->cqh_last = (elm); \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
|
#define CIRCLEQ_REMOVE(head, elm, field) do { \
|
||||||
|
if ((elm)->field.cqe_next == CIRCLEQ_END(head)) \
|
||||||
|
(head)->cqh_last = (elm)->field.cqe_prev; \
|
||||||
|
else \
|
||||||
|
(elm)->field.cqe_next->field.cqe_prev = \
|
||||||
|
(elm)->field.cqe_prev; \
|
||||||
|
if ((elm)->field.cqe_prev == CIRCLEQ_END(head)) \
|
||||||
|
(head)->cqh_first = (elm)->field.cqe_next; \
|
||||||
|
else \
|
||||||
|
(elm)->field.cqe_prev->field.cqe_next = \
|
||||||
|
(elm)->field.cqe_next; \
|
||||||
|
_Q_INVALIDATE((elm)->field.cqe_prev); \
|
||||||
|
_Q_INVALIDATE((elm)->field.cqe_next); \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
|
#define CIRCLEQ_REPLACE(head, elm, elm2, field) do { \
|
||||||
|
if (((elm2)->field.cqe_next = (elm)->field.cqe_next) == \
|
||||||
|
CIRCLEQ_END(head)) \
|
||||||
|
(head).cqh_last = (elm2); \
|
||||||
|
else \
|
||||||
|
(elm2)->field.cqe_next->field.cqe_prev = (elm2); \
|
||||||
|
if (((elm2)->field.cqe_prev = (elm)->field.cqe_prev) == \
|
||||||
|
CIRCLEQ_END(head)) \
|
||||||
|
(head).cqh_first = (elm2); \
|
||||||
|
else \
|
||||||
|
(elm2)->field.cqe_prev->field.cqe_next = (elm2); \
|
||||||
|
_Q_INVALIDATE((elm)->field.cqe_prev); \
|
||||||
|
_Q_INVALIDATE((elm)->field.cqe_next); \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
|
#endif /* !_SYS_QUEUE_H_ */
|
||||||
|
|
@ -0,0 +1,31 @@
|
||||||
|
/* $Id: codelength.h,v 1.4 2012/09/27 15:40:29 nanard Exp $ */
|
||||||
|
/* Project : miniupnp
|
||||||
|
* Author : Thomas BERNARD
|
||||||
|
* copyright (c) 2005-2011 Thomas Bernard
|
||||||
|
* This software is subjet to the conditions detailed in the
|
||||||
|
* provided LICENCE file. */
|
||||||
|
#ifndef CODELENGTH_H_INCLUDED
|
||||||
|
#define CODELENGTH_H_INCLUDED
|
||||||
|
|
||||||
|
/* Encode length by using 7bit per Byte :
|
||||||
|
* Most significant bit of each byte specifies that the
|
||||||
|
* following byte is part of the code */
|
||||||
|
#define DECODELENGTH(n, p) n = 0; \
|
||||||
|
do { n = (n << 7) | (*p & 0x7f); } \
|
||||||
|
while((*(p++)&0x80) && (n<(1<<25)));
|
||||||
|
|
||||||
|
#define DECODELENGTH_CHECKLIMIT(n, p, p_limit) \
|
||||||
|
n = 0; \
|
||||||
|
do { \
|
||||||
|
if((p) >= (p_limit)) break; \
|
||||||
|
n = (n << 7) | (*(p) & 0x7f); \
|
||||||
|
} while((*((p)++)&0x80) && (n<(1<<25)));
|
||||||
|
|
||||||
|
#define CODELENGTH(n, p) if(n>=268435456) *(p++) = (n >> 28) | 0x80; \
|
||||||
|
if(n>=2097152) *(p++) = (n >> 21) | 0x80; \
|
||||||
|
if(n>=16384) *(p++) = (n >> 14) | 0x80; \
|
||||||
|
if(n>=128) *(p++) = (n >> 7) | 0x80; \
|
||||||
|
*(p++) = n & 0x7f;
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
@ -0,0 +1,250 @@
|
||||||
|
/* $Id: connecthostport.c,v 1.10 2013/05/03 09:05:38 nanard Exp $ */
|
||||||
|
/* Project : miniupnp
|
||||||
|
* Author : Thomas Bernard
|
||||||
|
* Copyright (c) 2010-2012 Thomas Bernard
|
||||||
|
* This software is subject to the conditions detailed in the
|
||||||
|
* LICENCE file provided in this distribution. */
|
||||||
|
|
||||||
|
/* use getaddrinfo() or gethostbyname()
|
||||||
|
* uncomment the following line in order to use gethostbyname() */
|
||||||
|
#ifdef NO_GETADDRINFO
|
||||||
|
#define USE_GETHOSTBYNAME
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include <string.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
#ifdef _WIN32
|
||||||
|
#include <winsock2.h>
|
||||||
|
#include <ws2tcpip.h>
|
||||||
|
#include <io.h>
|
||||||
|
#define MAXHOSTNAMELEN 64
|
||||||
|
#define snprintf _snprintf
|
||||||
|
#define herror
|
||||||
|
#define socklen_t int
|
||||||
|
#else /* #ifdef _WIN32 */
|
||||||
|
#include <unistd.h>
|
||||||
|
#include <sys/param.h>
|
||||||
|
#include <sys/select.h>
|
||||||
|
#include <errno.h>
|
||||||
|
#define closesocket close
|
||||||
|
#include <netdb.h>
|
||||||
|
#include <netinet/in.h>
|
||||||
|
/* defining MINIUPNPC_IGNORE_EINTR enable the ignore of interruptions
|
||||||
|
* during the connect() call */
|
||||||
|
#define MINIUPNPC_IGNORE_EINTR
|
||||||
|
#ifndef USE_GETHOSTBYNAME
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <sys/socket.h>
|
||||||
|
#endif /* #ifndef USE_GETHOSTBYNAME */
|
||||||
|
#endif /* #else _WIN32 */
|
||||||
|
|
||||||
|
/* definition of PRINT_SOCKET_ERROR */
|
||||||
|
#ifdef _WIN32
|
||||||
|
#define PRINT_SOCKET_ERROR(x) printf("Socket error: %s, %d\n", x, WSAGetLastError());
|
||||||
|
#else
|
||||||
|
#define PRINT_SOCKET_ERROR(x) perror(x)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(__amigaos__) || defined(__amigaos4__)
|
||||||
|
#define herror(A) printf("%s\n", A)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include "connecthostport.h"
|
||||||
|
|
||||||
|
/* connecthostport()
|
||||||
|
* return a socket connected (TCP) to the host and port
|
||||||
|
* or -1 in case of error */
|
||||||
|
int connecthostport(const char * host, unsigned short port,
|
||||||
|
unsigned int scope_id)
|
||||||
|
{
|
||||||
|
int s, n;
|
||||||
|
#ifdef USE_GETHOSTBYNAME
|
||||||
|
struct sockaddr_in dest;
|
||||||
|
struct hostent *hp;
|
||||||
|
#else /* #ifdef USE_GETHOSTBYNAME */
|
||||||
|
char tmp_host[MAXHOSTNAMELEN+1];
|
||||||
|
char port_str[8];
|
||||||
|
struct addrinfo *ai, *p;
|
||||||
|
struct addrinfo hints;
|
||||||
|
#endif /* #ifdef USE_GETHOSTBYNAME */
|
||||||
|
#ifdef MINIUPNPC_SET_SOCKET_TIMEOUT
|
||||||
|
struct timeval timeout;
|
||||||
|
#endif /* #ifdef MINIUPNPC_SET_SOCKET_TIMEOUT */
|
||||||
|
|
||||||
|
#ifdef USE_GETHOSTBYNAME
|
||||||
|
hp = gethostbyname(host);
|
||||||
|
if(hp == NULL)
|
||||||
|
{
|
||||||
|
herror(host);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
memcpy(&dest.sin_addr, hp->h_addr, sizeof(dest.sin_addr));
|
||||||
|
memset(dest.sin_zero, 0, sizeof(dest.sin_zero));
|
||||||
|
s = socket(PF_INET, SOCK_STREAM, 0);
|
||||||
|
if(s < 0)
|
||||||
|
{
|
||||||
|
PRINT_SOCKET_ERROR("socket");
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
#ifdef MINIUPNPC_SET_SOCKET_TIMEOUT
|
||||||
|
/* setting a 3 seconds timeout for the connect() call */
|
||||||
|
timeout.tv_sec = 3;
|
||||||
|
timeout.tv_usec = 0;
|
||||||
|
if(setsockopt(s, SOL_SOCKET, SO_RCVTIMEO, &timeout, sizeof(struct timeval)) < 0)
|
||||||
|
{
|
||||||
|
PRINT_SOCKET_ERROR("setsockopt");
|
||||||
|
}
|
||||||
|
timeout.tv_sec = 3;
|
||||||
|
timeout.tv_usec = 0;
|
||||||
|
if(setsockopt(s, SOL_SOCKET, SO_SNDTIMEO, &timeout, sizeof(struct timeval)) < 0)
|
||||||
|
{
|
||||||
|
PRINT_SOCKET_ERROR("setsockopt");
|
||||||
|
}
|
||||||
|
#endif /* #ifdef MINIUPNPC_SET_SOCKET_TIMEOUT */
|
||||||
|
dest.sin_family = AF_INET;
|
||||||
|
dest.sin_port = htons(port);
|
||||||
|
n = connect(s, (struct sockaddr *)&dest, sizeof(struct sockaddr_in));
|
||||||
|
#ifdef MINIUPNPC_IGNORE_EINTR
|
||||||
|
while(n < 0 && errno == EINTR)
|
||||||
|
{
|
||||||
|
socklen_t len;
|
||||||
|
fd_set wset;
|
||||||
|
int err;
|
||||||
|
FD_ZERO(&wset);
|
||||||
|
FD_SET(s, &wset);
|
||||||
|
if((n = select(s + 1, NULL, &wset, NULL, NULL)) == -1 && errno == EINTR)
|
||||||
|
continue;
|
||||||
|
/*len = 0;*/
|
||||||
|
/*n = getpeername(s, NULL, &len);*/
|
||||||
|
len = sizeof(err);
|
||||||
|
if(getsockopt(s, SOL_SOCKET, SO_ERROR, &err, &len) < 0) {
|
||||||
|
PRINT_SOCKET_ERROR("getsockopt");
|
||||||
|
closesocket(s);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
if(err != 0) {
|
||||||
|
errno = err;
|
||||||
|
n = -1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif /* #ifdef MINIUPNPC_IGNORE_EINTR */
|
||||||
|
if(n<0)
|
||||||
|
{
|
||||||
|
PRINT_SOCKET_ERROR("connect");
|
||||||
|
closesocket(s);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
#else /* #ifdef USE_GETHOSTBYNAME */
|
||||||
|
/* use getaddrinfo() instead of gethostbyname() */
|
||||||
|
memset(&hints, 0, sizeof(hints));
|
||||||
|
/* hints.ai_flags = AI_ADDRCONFIG; */
|
||||||
|
#ifdef AI_NUMERICSERV
|
||||||
|
hints.ai_flags = AI_NUMERICSERV;
|
||||||
|
#endif
|
||||||
|
hints.ai_socktype = SOCK_STREAM;
|
||||||
|
hints.ai_family = AF_UNSPEC; /* AF_INET, AF_INET6 or AF_UNSPEC */
|
||||||
|
/* hints.ai_protocol = IPPROTO_TCP; */
|
||||||
|
snprintf(port_str, sizeof(port_str), "%hu", port);
|
||||||
|
if(host[0] == '[')
|
||||||
|
{
|
||||||
|
/* literal ip v6 address */
|
||||||
|
int i, j;
|
||||||
|
for(i = 0, j = 1; host[j] && (host[j] != ']') && i < MAXHOSTNAMELEN; i++, j++)
|
||||||
|
{
|
||||||
|
tmp_host[i] = host[j];
|
||||||
|
if(0 == memcmp(host+j, "%25", 3)) /* %25 is just url encoding for '%' */
|
||||||
|
j+=2; /* skip "25" */
|
||||||
|
}
|
||||||
|
tmp_host[i] = '\0';
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
strncpy(tmp_host, host, MAXHOSTNAMELEN);
|
||||||
|
}
|
||||||
|
tmp_host[MAXHOSTNAMELEN] = '\0';
|
||||||
|
n = getaddrinfo(tmp_host, port_str, &hints, &ai);
|
||||||
|
if(n != 0)
|
||||||
|
{
|
||||||
|
#ifdef _WIN32
|
||||||
|
fprintf(stderr, "getaddrinfo() error : %d\n", n);
|
||||||
|
#else
|
||||||
|
fprintf(stderr, "getaddrinfo() error : %s\n", gai_strerror(n));
|
||||||
|
#endif
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
s = -1;
|
||||||
|
for(p = ai; p; p = p->ai_next)
|
||||||
|
{
|
||||||
|
s = socket(p->ai_family, p->ai_socktype, p->ai_protocol);
|
||||||
|
if(s < 0)
|
||||||
|
continue;
|
||||||
|
if(p->ai_addr->sa_family == AF_INET6 && scope_id > 0) {
|
||||||
|
struct sockaddr_in6 * addr6 = (struct sockaddr_in6 *)p->ai_addr;
|
||||||
|
addr6->sin6_scope_id = scope_id;
|
||||||
|
}
|
||||||
|
#ifdef MINIUPNPC_SET_SOCKET_TIMEOUT
|
||||||
|
/* setting a 3 seconds timeout for the connect() call */
|
||||||
|
timeout.tv_sec = 3;
|
||||||
|
timeout.tv_usec = 0;
|
||||||
|
if(setsockopt(s, SOL_SOCKET, SO_RCVTIMEO, &timeout, sizeof(struct timeval)) < 0)
|
||||||
|
{
|
||||||
|
PRINT_SOCKET_ERROR("setsockopt");
|
||||||
|
}
|
||||||
|
timeout.tv_sec = 3;
|
||||||
|
timeout.tv_usec = 0;
|
||||||
|
if(setsockopt(s, SOL_SOCKET, SO_SNDTIMEO, &timeout, sizeof(struct timeval)) < 0)
|
||||||
|
{
|
||||||
|
PRINT_SOCKET_ERROR("setsockopt");
|
||||||
|
}
|
||||||
|
#endif /* #ifdef MINIUPNPC_SET_SOCKET_TIMEOUT */
|
||||||
|
n = connect(s, p->ai_addr, p->ai_addrlen);
|
||||||
|
#ifdef MINIUPNPC_IGNORE_EINTR
|
||||||
|
while(n < 0 && errno == EINTR)
|
||||||
|
{
|
||||||
|
socklen_t len;
|
||||||
|
fd_set wset;
|
||||||
|
int err;
|
||||||
|
FD_ZERO(&wset);
|
||||||
|
FD_SET(s, &wset);
|
||||||
|
if((n = select(s + 1, NULL, &wset, NULL, NULL)) == -1 && errno == EINTR)
|
||||||
|
continue;
|
||||||
|
/*len = 0;*/
|
||||||
|
/*n = getpeername(s, NULL, &len);*/
|
||||||
|
len = sizeof(err);
|
||||||
|
if(getsockopt(s, SOL_SOCKET, SO_ERROR, &err, &len) < 0) {
|
||||||
|
PRINT_SOCKET_ERROR("getsockopt");
|
||||||
|
closesocket(s);
|
||||||
|
freeaddrinfo(ai);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
if(err != 0) {
|
||||||
|
errno = err;
|
||||||
|
n = -1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif /* #ifdef MINIUPNPC_IGNORE_EINTR */
|
||||||
|
if(n < 0)
|
||||||
|
{
|
||||||
|
closesocket(s);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
freeaddrinfo(ai);
|
||||||
|
if(s < 0)
|
||||||
|
{
|
||||||
|
PRINT_SOCKET_ERROR("socket");
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
if(n < 0)
|
||||||
|
{
|
||||||
|
PRINT_SOCKET_ERROR("connect");
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
#endif /* #ifdef USE_GETHOSTBYNAME */
|
||||||
|
return s;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
@ -0,0 +1,18 @@
|
||||||
|
/* $Id: connecthostport.h,v 1.3 2012/09/27 15:42:10 nanard Exp $ */
|
||||||
|
/* Project: miniupnp
|
||||||
|
* http://miniupnp.free.fr/
|
||||||
|
* Author: Thomas Bernard
|
||||||
|
* Copyright (c) 2010-2012 Thomas Bernard
|
||||||
|
* This software is subjects to the conditions detailed
|
||||||
|
* in the LICENCE file provided within this distribution */
|
||||||
|
#ifndef CONNECTHOSTPORT_H_INCLUDED
|
||||||
|
#define CONNECTHOSTPORT_H_INCLUDED
|
||||||
|
|
||||||
|
/* connecthostport()
|
||||||
|
* return a socket connected (TCP) to the host and port
|
||||||
|
* or -1 in case of error */
|
||||||
|
int connecthostport(const char * host, unsigned short port,
|
||||||
|
unsigned int scope_id);
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
@ -0,0 +1,5 @@
|
||||||
|
#ifndef DECLSPEC_H_INCLUDED
|
||||||
|
#define DECLSPEC_H_INCLUDED
|
||||||
|
#define LIBSPEC
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
@ -0,0 +1,125 @@
|
||||||
|
/* $Id: igd_desc_parse.c,v 1.14 2011/04/11 09:19:24 nanard Exp $ */
|
||||||
|
/* Project : miniupnp
|
||||||
|
* http://miniupnp.free.fr/
|
||||||
|
* Author : Thomas Bernard
|
||||||
|
* Copyright (c) 2005-2010 Thomas Bernard
|
||||||
|
* This software is subject to the conditions detailed in the
|
||||||
|
* LICENCE file provided in this distribution. */
|
||||||
|
|
||||||
|
#include "igd_desc_parse.h"
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
|
/* Start element handler :
|
||||||
|
* update nesting level counter and copy element name */
|
||||||
|
void IGDstartelt(void * d, const char * name, int l)
|
||||||
|
{
|
||||||
|
struct IGDdatas * datas = (struct IGDdatas *)d;
|
||||||
|
memcpy( datas->cureltname, name, l);
|
||||||
|
datas->cureltname[l] = '\0';
|
||||||
|
datas->level++;
|
||||||
|
if( (l==7) && !memcmp(name, "service", l) ) {
|
||||||
|
datas->tmp.controlurl[0] = '\0';
|
||||||
|
datas->tmp.eventsuburl[0] = '\0';
|
||||||
|
datas->tmp.scpdurl[0] = '\0';
|
||||||
|
datas->tmp.servicetype[0] = '\0';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* End element handler :
|
||||||
|
* update nesting level counter and update parser state if
|
||||||
|
* service element is parsed */
|
||||||
|
void IGDendelt(void * d, const char * name, int l)
|
||||||
|
{
|
||||||
|
struct IGDdatas * datas = (struct IGDdatas *)d;
|
||||||
|
datas->level--;
|
||||||
|
/*printf("endelt %2d %.*s\n", datas->level, l, name);*/
|
||||||
|
if( (l==7) && !memcmp(name, "service", l) )
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
if( datas->state < 1
|
||||||
|
&& !strcmp(datas->servicetype,
|
||||||
|
// "urn:schemas-upnp-org:service:WANIPConnection:1") )
|
||||||
|
"urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1"))
|
||||||
|
datas->state ++;
|
||||||
|
*/
|
||||||
|
if(0==strcmp(datas->tmp.servicetype,
|
||||||
|
"urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1")) {
|
||||||
|
memcpy(&datas->CIF, &datas->tmp, sizeof(struct IGDdatas_service));
|
||||||
|
} else if(0==strcmp(datas->tmp.servicetype,
|
||||||
|
"urn:schemas-upnp-org:service:WANIPv6FirewallControl:1")) {
|
||||||
|
memcpy(&datas->IPv6FC, &datas->tmp, sizeof(struct IGDdatas_service));
|
||||||
|
} else if(0==strcmp(datas->tmp.servicetype,
|
||||||
|
"urn:schemas-upnp-org:service:WANIPConnection:1")
|
||||||
|
|| 0==strcmp(datas->tmp.servicetype,
|
||||||
|
"urn:schemas-upnp-org:service:WANPPPConnection:1") ) {
|
||||||
|
if(datas->first.servicetype[0] == '\0') {
|
||||||
|
memcpy(&datas->first, &datas->tmp, sizeof(struct IGDdatas_service));
|
||||||
|
} else {
|
||||||
|
memcpy(&datas->second, &datas->tmp, sizeof(struct IGDdatas_service));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Data handler :
|
||||||
|
* copy data depending on the current element name and state */
|
||||||
|
void IGDdata(void * d, const char * data, int l)
|
||||||
|
{
|
||||||
|
struct IGDdatas * datas = (struct IGDdatas *)d;
|
||||||
|
char * dstmember = 0;
|
||||||
|
/*printf("%2d %s : %.*s\n",
|
||||||
|
datas->level, datas->cureltname, l, data); */
|
||||||
|
if( !strcmp(datas->cureltname, "URLBase") )
|
||||||
|
dstmember = datas->urlbase;
|
||||||
|
else if( !strcmp(datas->cureltname, "presentationURL") )
|
||||||
|
dstmember = datas->presentationurl;
|
||||||
|
else if( !strcmp(datas->cureltname, "serviceType") )
|
||||||
|
dstmember = datas->tmp.servicetype;
|
||||||
|
else if( !strcmp(datas->cureltname, "controlURL") )
|
||||||
|
dstmember = datas->tmp.controlurl;
|
||||||
|
else if( !strcmp(datas->cureltname, "eventSubURL") )
|
||||||
|
dstmember = datas->tmp.eventsuburl;
|
||||||
|
else if( !strcmp(datas->cureltname, "SCPDURL") )
|
||||||
|
dstmember = datas->tmp.scpdurl;
|
||||||
|
/* else if( !strcmp(datas->cureltname, "deviceType") )
|
||||||
|
dstmember = datas->devicetype_tmp;*/
|
||||||
|
if(dstmember)
|
||||||
|
{
|
||||||
|
if(l>=MINIUPNPC_URL_MAXSIZE)
|
||||||
|
l = MINIUPNPC_URL_MAXSIZE-1;
|
||||||
|
memcpy(dstmember, data, l);
|
||||||
|
dstmember[l] = '\0';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void printIGD(struct IGDdatas * d)
|
||||||
|
{
|
||||||
|
printf("urlbase = '%s'\n", d->urlbase);
|
||||||
|
printf("WAN Device (Common interface config) :\n");
|
||||||
|
/*printf(" deviceType = '%s'\n", d->CIF.devicetype);*/
|
||||||
|
printf(" serviceType = '%s'\n", d->CIF.servicetype);
|
||||||
|
printf(" controlURL = '%s'\n", d->CIF.controlurl);
|
||||||
|
printf(" eventSubURL = '%s'\n", d->CIF.eventsuburl);
|
||||||
|
printf(" SCPDURL = '%s'\n", d->CIF.scpdurl);
|
||||||
|
printf("primary WAN Connection Device (IP or PPP Connection):\n");
|
||||||
|
/*printf(" deviceType = '%s'\n", d->first.devicetype);*/
|
||||||
|
printf(" servicetype = '%s'\n", d->first.servicetype);
|
||||||
|
printf(" controlURL = '%s'\n", d->first.controlurl);
|
||||||
|
printf(" eventSubURL = '%s'\n", d->first.eventsuburl);
|
||||||
|
printf(" SCPDURL = '%s'\n", d->first.scpdurl);
|
||||||
|
printf("secondary WAN Connection Device (IP or PPP Connection):\n");
|
||||||
|
/*printf(" deviceType = '%s'\n", d->second.devicetype);*/
|
||||||
|
printf(" servicetype = '%s'\n", d->second.servicetype);
|
||||||
|
printf(" controlURL = '%s'\n", d->second.controlurl);
|
||||||
|
printf(" eventSubURL = '%s'\n", d->second.eventsuburl);
|
||||||
|
printf(" SCPDURL = '%s'\n", d->second.scpdurl);
|
||||||
|
printf("WAN IPv6 Firewall Control :\n");
|
||||||
|
/*printf(" deviceType = '%s'\n", d->IPv6FC.devicetype);*/
|
||||||
|
printf(" servicetype = '%s'\n", d->IPv6FC.servicetype);
|
||||||
|
printf(" controlURL = '%s'\n", d->IPv6FC.controlurl);
|
||||||
|
printf(" eventSubURL = '%s'\n", d->IPv6FC.eventsuburl);
|
||||||
|
printf(" SCPDURL = '%s'\n", d->IPv6FC.scpdurl);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -0,0 +1,48 @@
|
||||||
|
/* $Id: igd_desc_parse.h,v 1.11 2012/10/16 16:49:02 nanard Exp $ */
|
||||||
|
/* Project : miniupnp
|
||||||
|
* http://miniupnp.free.fr/
|
||||||
|
* Author : Thomas Bernard
|
||||||
|
* Copyright (c) 2005-2010 Thomas Bernard
|
||||||
|
* This software is subject to the conditions detailed in the
|
||||||
|
* LICENCE file provided in this distribution.
|
||||||
|
* */
|
||||||
|
#ifndef IGD_DESC_PARSE_H_INCLUDED
|
||||||
|
#define IGD_DESC_PARSE_H_INCLUDED
|
||||||
|
|
||||||
|
/* Structure to store the result of the parsing of UPnP
|
||||||
|
* descriptions of Internet Gateway Devices */
|
||||||
|
#define MINIUPNPC_URL_MAXSIZE (128)
|
||||||
|
struct IGDdatas_service {
|
||||||
|
char controlurl[MINIUPNPC_URL_MAXSIZE];
|
||||||
|
char eventsuburl[MINIUPNPC_URL_MAXSIZE];
|
||||||
|
char scpdurl[MINIUPNPC_URL_MAXSIZE];
|
||||||
|
char servicetype[MINIUPNPC_URL_MAXSIZE];
|
||||||
|
/*char devicetype[MINIUPNPC_URL_MAXSIZE];*/
|
||||||
|
};
|
||||||
|
|
||||||
|
struct IGDdatas {
|
||||||
|
char cureltname[MINIUPNPC_URL_MAXSIZE];
|
||||||
|
char urlbase[MINIUPNPC_URL_MAXSIZE];
|
||||||
|
char presentationurl[MINIUPNPC_URL_MAXSIZE];
|
||||||
|
int level;
|
||||||
|
/*int state;*/
|
||||||
|
/* "urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1" */
|
||||||
|
struct IGDdatas_service CIF;
|
||||||
|
/* "urn:schemas-upnp-org:service:WANIPConnection:1"
|
||||||
|
* "urn:schemas-upnp-org:service:WANPPPConnection:1" */
|
||||||
|
struct IGDdatas_service first;
|
||||||
|
/* if both WANIPConnection and WANPPPConnection are present */
|
||||||
|
struct IGDdatas_service second;
|
||||||
|
/* "urn:schemas-upnp-org:service:WANIPv6FirewallControl:1" */
|
||||||
|
struct IGDdatas_service IPv6FC;
|
||||||
|
/* tmp */
|
||||||
|
struct IGDdatas_service tmp;
|
||||||
|
};
|
||||||
|
|
||||||
|
void IGDstartelt(void *, const char *, int);
|
||||||
|
void IGDendelt(void *, const char *, int);
|
||||||
|
void IGDdata(void *, const char *, int);
|
||||||
|
void printIGD(struct IGDdatas *);
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
@ -0,0 +1,121 @@
|
||||||
|
/* $Id: minisoap.c,v 1.22 2012/01/21 13:30:31 nanard Exp $ */
|
||||||
|
/* Project : miniupnp
|
||||||
|
* Author : Thomas Bernard
|
||||||
|
* Copyright (c) 2005-2012 Thomas Bernard
|
||||||
|
* This software is subject to the conditions detailed in the
|
||||||
|
* LICENCE file provided in this distribution.
|
||||||
|
*
|
||||||
|
* Minimal SOAP implementation for UPnP protocol.
|
||||||
|
*/
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <string.h>
|
||||||
|
#ifdef _WIN32
|
||||||
|
#include <io.h>
|
||||||
|
#include <winsock2.h>
|
||||||
|
#define snprintf _snprintf
|
||||||
|
#else
|
||||||
|
#include <unistd.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <sys/socket.h>
|
||||||
|
#endif
|
||||||
|
#include "minisoap.h"
|
||||||
|
#include "miniupnpcstrings.h"
|
||||||
|
|
||||||
|
/* only for malloc */
|
||||||
|
#include <stdlib.h>
|
||||||
|
|
||||||
|
#ifdef _WIN32
|
||||||
|
#define PRINT_SOCKET_ERROR(x) printf("Socket error: %s, %d\n", x, WSAGetLastError());
|
||||||
|
#else
|
||||||
|
#define PRINT_SOCKET_ERROR(x) perror(x)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* httpWrite sends the headers and the body to the socket
|
||||||
|
* and returns the number of bytes sent */
|
||||||
|
static int
|
||||||
|
httpWrite(int fd, const char * body, int bodysize,
|
||||||
|
const char * headers, int headerssize)
|
||||||
|
{
|
||||||
|
int n = 0;
|
||||||
|
/*n = write(fd, headers, headerssize);*/
|
||||||
|
/*if(bodysize>0)
|
||||||
|
n += write(fd, body, bodysize);*/
|
||||||
|
/* Note : my old linksys router only took into account
|
||||||
|
* soap request that are sent into only one packet */
|
||||||
|
char * p;
|
||||||
|
/* TODO: AVOID MALLOC */
|
||||||
|
p = malloc(headerssize+bodysize);
|
||||||
|
if(!p)
|
||||||
|
return 0;
|
||||||
|
memcpy(p, headers, headerssize);
|
||||||
|
memcpy(p+headerssize, body, bodysize);
|
||||||
|
/*n = write(fd, p, headerssize+bodysize);*/
|
||||||
|
n = send(fd, p, headerssize+bodysize, 0);
|
||||||
|
if(n<0) {
|
||||||
|
PRINT_SOCKET_ERROR("send");
|
||||||
|
}
|
||||||
|
/* disable send on the socket */
|
||||||
|
/* draytek routers dont seems to like that... */
|
||||||
|
#if 0
|
||||||
|
#ifdef _WIN32
|
||||||
|
if(shutdown(fd, SD_SEND)<0) {
|
||||||
|
#else
|
||||||
|
if(shutdown(fd, SHUT_WR)<0) { /*SD_SEND*/
|
||||||
|
#endif
|
||||||
|
PRINT_SOCKET_ERROR("shutdown");
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
free(p);
|
||||||
|
return n;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* self explanatory */
|
||||||
|
int soapPostSubmit(int fd,
|
||||||
|
const char * url,
|
||||||
|
const char * host,
|
||||||
|
unsigned short port,
|
||||||
|
const char * action,
|
||||||
|
const char * body,
|
||||||
|
const char * httpversion)
|
||||||
|
{
|
||||||
|
int bodysize;
|
||||||
|
char headerbuf[512];
|
||||||
|
int headerssize;
|
||||||
|
char portstr[8];
|
||||||
|
bodysize = (int)strlen(body);
|
||||||
|
/* We are not using keep-alive HTTP connections.
|
||||||
|
* HTTP/1.1 needs the header Connection: close to do that.
|
||||||
|
* This is the default with HTTP/1.0
|
||||||
|
* Using HTTP/1.1 means we need to support chunked transfer-encoding :
|
||||||
|
* When using HTTP/1.1, the router "BiPAC 7404VNOX" always use chunked
|
||||||
|
* transfer encoding. */
|
||||||
|
/* Connection: Close is normally there only in HTTP/1.1 but who knows */
|
||||||
|
portstr[0] = '\0';
|
||||||
|
if(port != 80)
|
||||||
|
snprintf(portstr, sizeof(portstr), ":%hu", port);
|
||||||
|
headerssize = snprintf(headerbuf, sizeof(headerbuf),
|
||||||
|
"POST %s HTTP/%s\r\n"
|
||||||
|
"Host: %s%s\r\n"
|
||||||
|
"User-Agent: " OS_STRING ", UPnP/1.0, MiniUPnPc/" MINIUPNPC_VERSION_STRING "\r\n"
|
||||||
|
"Content-Length: %d\r\n"
|
||||||
|
"Content-Type: text/xml\r\n"
|
||||||
|
"SOAPAction: \"%s\"\r\n"
|
||||||
|
"Connection: Close\r\n"
|
||||||
|
"Cache-Control: no-cache\r\n" /* ??? */
|
||||||
|
"Pragma: no-cache\r\n"
|
||||||
|
"\r\n",
|
||||||
|
url, httpversion, host, portstr, bodysize, action);
|
||||||
|
#ifdef DEBUG
|
||||||
|
/*printf("SOAP request : headersize=%d bodysize=%d\n",
|
||||||
|
headerssize, bodysize);
|
||||||
|
*/
|
||||||
|
printf("SOAP request : POST %s HTTP/%s - Host: %s%s\n",
|
||||||
|
url, httpversion, host, portstr);
|
||||||
|
printf("SOAPAction: \"%s\" - Content-Length: %d\n", action, bodysize);
|
||||||
|
printf("Headers :\n%s", headerbuf);
|
||||||
|
printf("Body :\n%s\n", body);
|
||||||
|
#endif
|
||||||
|
return httpWrite(fd, body, bodysize, headerbuf, headerssize);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -0,0 +1,15 @@
|
||||||
|
/* $Id: minisoap.h,v 1.5 2012/09/27 15:42:10 nanard Exp $ */
|
||||||
|
/* Project : miniupnp
|
||||||
|
* Author : Thomas Bernard
|
||||||
|
* Copyright (c) 2005 Thomas Bernard
|
||||||
|
* This software is subject to the conditions detailed in the
|
||||||
|
* LICENCE file provided in this distribution. */
|
||||||
|
#ifndef MINISOAP_H_INCLUDED
|
||||||
|
#define MINISOAP_H_INCLUDED
|
||||||
|
|
||||||
|
/*int httpWrite(int, const char *, int, const char *);*/
|
||||||
|
int soapPostSubmit(int, const char *, const char *, unsigned short,
|
||||||
|
const char *, const char *, const char *);
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
@ -0,0 +1,133 @@
|
||||||
|
/* $Id: minissdpc.c,v 1.16 2012/03/05 19:42:46 nanard Exp $ */
|
||||||
|
/* Project : miniupnp
|
||||||
|
* Web : http://miniupnp.free.fr/
|
||||||
|
* Author : Thomas BERNARD
|
||||||
|
* copyright (c) 2005-2012 Thomas Bernard
|
||||||
|
* This software is subjet to the conditions detailed in the
|
||||||
|
* provided LICENCE file. */
|
||||||
|
/*#include <syslog.h>*/
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
#if defined(_WIN32) || defined(__amigaos__) || defined(__amigaos4__)
|
||||||
|
#ifdef _WIN32
|
||||||
|
#include <winsock2.h>
|
||||||
|
#include <ws2tcpip.h>
|
||||||
|
#include <io.h>
|
||||||
|
#include <winsock.h>
|
||||||
|
#include <stdint.h>
|
||||||
|
#endif
|
||||||
|
#if defined(__amigaos__) || defined(__amigaos4__)
|
||||||
|
#include <sys/socket.h>
|
||||||
|
#endif
|
||||||
|
#if defined(__amigaos__)
|
||||||
|
#define uint16_t unsigned short
|
||||||
|
#endif
|
||||||
|
/* Hack */
|
||||||
|
#define UNIX_PATH_LEN 108
|
||||||
|
struct sockaddr_un {
|
||||||
|
uint16_t sun_family;
|
||||||
|
char sun_path[UNIX_PATH_LEN];
|
||||||
|
};
|
||||||
|
#else
|
||||||
|
#include <sys/socket.h>
|
||||||
|
#include <sys/un.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include "minissdpc.h"
|
||||||
|
#include "miniupnpc.h"
|
||||||
|
|
||||||
|
#include "codelength.h"
|
||||||
|
|
||||||
|
struct UPNPDev *
|
||||||
|
getDevicesFromMiniSSDPD(const char * devtype, const char * socketpath)
|
||||||
|
{
|
||||||
|
struct UPNPDev * tmp;
|
||||||
|
struct UPNPDev * devlist = NULL;
|
||||||
|
unsigned char buffer[2048];
|
||||||
|
ssize_t n;
|
||||||
|
unsigned char * p;
|
||||||
|
unsigned char * url;
|
||||||
|
unsigned int i;
|
||||||
|
unsigned int urlsize, stsize, usnsize, l;
|
||||||
|
int s;
|
||||||
|
struct sockaddr_un addr;
|
||||||
|
|
||||||
|
s = socket(AF_UNIX, SOCK_STREAM, 0);
|
||||||
|
if(s < 0)
|
||||||
|
{
|
||||||
|
/*syslog(LOG_ERR, "socket(unix): %m");*/
|
||||||
|
perror("socket(unix)");
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
addr.sun_family = AF_UNIX;
|
||||||
|
strncpy(addr.sun_path, socketpath, sizeof(addr.sun_path));
|
||||||
|
/* TODO : check if we need to handle the EINTR */
|
||||||
|
if(connect(s, (struct sockaddr *)&addr, sizeof(struct sockaddr_un)) < 0)
|
||||||
|
{
|
||||||
|
/*syslog(LOG_WARNING, "connect(\"%s\"): %m", socketpath);*/
|
||||||
|
close(s);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
stsize = strlen(devtype);
|
||||||
|
buffer[0] = 1; /* request type 1 : request devices/services by type */
|
||||||
|
p = buffer + 1;
|
||||||
|
l = stsize; CODELENGTH(l, p);
|
||||||
|
if(p + stsize > buffer + sizeof(buffer))
|
||||||
|
{
|
||||||
|
/* devtype is too long ! */
|
||||||
|
close(s);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
memcpy(p, devtype, stsize);
|
||||||
|
p += stsize;
|
||||||
|
if(write(s, buffer, p - buffer) < 0)
|
||||||
|
{
|
||||||
|
/*syslog(LOG_ERR, "write(): %m");*/
|
||||||
|
perror("minissdpc.c: write()");
|
||||||
|
close(s);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
n = read(s, buffer, sizeof(buffer));
|
||||||
|
if(n<=0)
|
||||||
|
{
|
||||||
|
perror("minissdpc.c: read()");
|
||||||
|
close(s);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
p = buffer + 1;
|
||||||
|
for(i = 0; i < buffer[0]; i++)
|
||||||
|
{
|
||||||
|
if(p+2>=buffer+sizeof(buffer))
|
||||||
|
break;
|
||||||
|
DECODELENGTH(urlsize, p);
|
||||||
|
if(p+urlsize+2>=buffer+sizeof(buffer))
|
||||||
|
break;
|
||||||
|
url = p;
|
||||||
|
p += urlsize;
|
||||||
|
DECODELENGTH(stsize, p);
|
||||||
|
if(p+stsize+2>=buffer+sizeof(buffer))
|
||||||
|
break;
|
||||||
|
tmp = (struct UPNPDev *)malloc(sizeof(struct UPNPDev)+urlsize+stsize);
|
||||||
|
tmp->pNext = devlist;
|
||||||
|
tmp->descURL = tmp->buffer;
|
||||||
|
tmp->st = tmp->buffer + 1 + urlsize;
|
||||||
|
memcpy(tmp->buffer, url, urlsize);
|
||||||
|
tmp->buffer[urlsize] = '\0';
|
||||||
|
memcpy(tmp->buffer + urlsize + 1, p, stsize);
|
||||||
|
p += stsize;
|
||||||
|
tmp->buffer[urlsize+1+stsize] = '\0';
|
||||||
|
devlist = tmp;
|
||||||
|
/* added for compatibility with recent versions of MiniSSDPd
|
||||||
|
* >= 2007/12/19 */
|
||||||
|
DECODELENGTH(usnsize, p);
|
||||||
|
p += usnsize;
|
||||||
|
if(p>buffer + sizeof(buffer))
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
close(s);
|
||||||
|
return devlist;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
@ -0,0 +1,15 @@
|
||||||
|
/* $Id: minissdpc.h,v 1.2 2012/09/27 15:42:10 nanard Exp $ */
|
||||||
|
/* Project: miniupnp
|
||||||
|
* http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
|
||||||
|
* Author: Thomas Bernard
|
||||||
|
* Copyright (c) 2005-2007 Thomas Bernard
|
||||||
|
* This software is subjects to the conditions detailed
|
||||||
|
* in the LICENCE file provided within this distribution */
|
||||||
|
#ifndef MINISSDPC_H_INCLUDED
|
||||||
|
#define MINISSDPC_H_INCLUDED
|
||||||
|
|
||||||
|
struct UPNPDev *
|
||||||
|
getDevicesFromMiniSSDPD(const char * devtype, const char * socketpath);
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
@ -0,0 +1,987 @@
|
||||||
|
/* $Id: miniupnpc.c,v 1.111 2012/10/09 17:53:14 nanard Exp $ */
|
||||||
|
/* Project : miniupnp
|
||||||
|
* Web : http://miniupnp.free.fr/
|
||||||
|
* Author : Thomas BERNARD
|
||||||
|
* copyright (c) 2005-2012 Thomas Bernard
|
||||||
|
* This software is subjet to the conditions detailed in the
|
||||||
|
* provided LICENSE file. */
|
||||||
|
#define __EXTENSIONS__ 1
|
||||||
|
#if !defined(MACOSX) && !defined(__sun)
|
||||||
|
#if !defined(_XOPEN_SOURCE) && !defined(__OpenBSD__) && !defined(__NetBSD__)
|
||||||
|
#ifndef __cplusplus
|
||||||
|
#define _XOPEN_SOURCE 600
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
#ifndef __BSD_VISIBLE
|
||||||
|
#define __BSD_VISIBLE 1
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if !defined(__DragonFly__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(MACOSX) && !defined(_WIN32) && !defined(__CYGWIN__) && !defined(__sun)
|
||||||
|
#define HAS_IP_MREQN
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <string.h>
|
||||||
|
#ifdef _WIN32
|
||||||
|
/* Win32 Specific includes and defines */
|
||||||
|
#include <winsock2.h>
|
||||||
|
#include <ws2tcpip.h>
|
||||||
|
#include <io.h>
|
||||||
|
#include <iphlpapi.h>
|
||||||
|
#define snprintf _snprintf
|
||||||
|
#define strdup _strdup
|
||||||
|
#ifndef strncasecmp
|
||||||
|
#if defined(_MSC_VER) && (_MSC_VER >= 1400)
|
||||||
|
#define strncasecmp _memicmp
|
||||||
|
#else /* defined(_MSC_VER) && (_MSC_VER >= 1400) */
|
||||||
|
#define strncasecmp memicmp
|
||||||
|
#endif /* defined(_MSC_VER) && (_MSC_VER >= 1400) */
|
||||||
|
#endif /* #ifndef strncasecmp */
|
||||||
|
#define MAXHOSTNAMELEN 64
|
||||||
|
#else /* #ifdef _WIN32 */
|
||||||
|
/* Standard POSIX includes */
|
||||||
|
#include <unistd.h>
|
||||||
|
#if defined(__amigaos__) && !defined(__amigaos4__)
|
||||||
|
/* Amiga OS 3 specific stuff */
|
||||||
|
#define socklen_t int
|
||||||
|
#else
|
||||||
|
#include <sys/select.h>
|
||||||
|
#endif
|
||||||
|
#include <sys/socket.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <sys/param.h>
|
||||||
|
#include <netinet/in.h>
|
||||||
|
#include <arpa/inet.h>
|
||||||
|
#include <netdb.h>
|
||||||
|
#include <net/if.h>
|
||||||
|
#if !defined(__amigaos__) && !defined(__amigaos4__)
|
||||||
|
#include <poll.h>
|
||||||
|
#endif
|
||||||
|
#include <strings.h>
|
||||||
|
#include <errno.h>
|
||||||
|
#define closesocket close
|
||||||
|
#endif /* #else _WIN32 */
|
||||||
|
#ifdef MINIUPNPC_SET_SOCKET_TIMEOUT
|
||||||
|
#include <sys/time.h>
|
||||||
|
#endif
|
||||||
|
#if defined(__amigaos__) || defined(__amigaos4__)
|
||||||
|
/* Amiga OS specific stuff */
|
||||||
|
#define TIMEVAL struct timeval
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include "miniupnpc.h"
|
||||||
|
#include "minissdpc.h"
|
||||||
|
#include "miniwget.h"
|
||||||
|
#include "minisoap.h"
|
||||||
|
#include "minixml.h"
|
||||||
|
#include "upnpcommands.h"
|
||||||
|
#include "connecthostport.h"
|
||||||
|
#include "receivedata.h"
|
||||||
|
|
||||||
|
#ifdef _WIN32
|
||||||
|
#define PRINT_SOCKET_ERROR(x) printf("Socket error: %s, %d\n", x, WSAGetLastError());
|
||||||
|
#else
|
||||||
|
#define PRINT_SOCKET_ERROR(x) perror(x)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#define SOAPPREFIX "s"
|
||||||
|
#define SERVICEPREFIX "u"
|
||||||
|
#define SERVICEPREFIX2 'u'
|
||||||
|
|
||||||
|
/* root description parsing */
|
||||||
|
LIBSPEC void parserootdesc(const char * buffer, int bufsize, struct IGDdatas * data)
|
||||||
|
{
|
||||||
|
struct xmlparser parser;
|
||||||
|
/* xmlparser object */
|
||||||
|
parser.xmlstart = buffer;
|
||||||
|
parser.xmlsize = bufsize;
|
||||||
|
parser.data = data;
|
||||||
|
parser.starteltfunc = IGDstartelt;
|
||||||
|
parser.endeltfunc = IGDendelt;
|
||||||
|
parser.datafunc = IGDdata;
|
||||||
|
parser.attfunc = 0;
|
||||||
|
parsexml(&parser);
|
||||||
|
#ifdef DEBUG
|
||||||
|
printIGD(data);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
/* simpleUPnPcommand2 :
|
||||||
|
* not so simple !
|
||||||
|
* return values :
|
||||||
|
* pointer - OK
|
||||||
|
* NULL - error */
|
||||||
|
char * simpleUPnPcommand2(int s, const char * url, const char * service,
|
||||||
|
const char * action, struct UPNParg * args,
|
||||||
|
int * bufsize, const char * httpversion)
|
||||||
|
{
|
||||||
|
char hostname[MAXHOSTNAMELEN+1];
|
||||||
|
unsigned short port = 0;
|
||||||
|
char * path;
|
||||||
|
char soapact[128];
|
||||||
|
char soapbody[2048];
|
||||||
|
char * buf;
|
||||||
|
int n;
|
||||||
|
|
||||||
|
*bufsize = 0;
|
||||||
|
snprintf(soapact, sizeof(soapact), "%s#%s", service, action);
|
||||||
|
if(args==NULL)
|
||||||
|
{
|
||||||
|
/*soapbodylen = */snprintf(soapbody, sizeof(soapbody),
|
||||||
|
"<?xml version=\"1.0\"?>\r\n"
|
||||||
|
"<" SOAPPREFIX ":Envelope "
|
||||||
|
"xmlns:" SOAPPREFIX "=\"http://schemas.xmlsoap.org/soap/envelope/\" "
|
||||||
|
SOAPPREFIX ":encodingStyle=\"http://schemas.xmlsoap.org/soap/encoding/\">"
|
||||||
|
"<" SOAPPREFIX ":Body>"
|
||||||
|
"<" SERVICEPREFIX ":%s xmlns:" SERVICEPREFIX "=\"%s\">"
|
||||||
|
"</" SERVICEPREFIX ":%s>"
|
||||||
|
"</" SOAPPREFIX ":Body></" SOAPPREFIX ":Envelope>"
|
||||||
|
"\r\n", action, service, action);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
char * p;
|
||||||
|
const char * pe, * pv;
|
||||||
|
int soapbodylen;
|
||||||
|
soapbodylen = snprintf(soapbody, sizeof(soapbody),
|
||||||
|
"<?xml version=\"1.0\"?>\r\n"
|
||||||
|
"<" SOAPPREFIX ":Envelope "
|
||||||
|
"xmlns:" SOAPPREFIX "=\"http://schemas.xmlsoap.org/soap/envelope/\" "
|
||||||
|
SOAPPREFIX ":encodingStyle=\"http://schemas.xmlsoap.org/soap/encoding/\">"
|
||||||
|
"<" SOAPPREFIX ":Body>"
|
||||||
|
"<" SERVICEPREFIX ":%s xmlns:" SERVICEPREFIX "=\"%s\">",
|
||||||
|
action, service);
|
||||||
|
p = soapbody + soapbodylen;
|
||||||
|
while(args->elt)
|
||||||
|
{
|
||||||
|
/* check that we are never overflowing the string... */
|
||||||
|
if(soapbody + sizeof(soapbody) <= p + 100)
|
||||||
|
{
|
||||||
|
/* we keep a margin of at least 100 bytes */
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
*(p++) = '<';
|
||||||
|
pe = args->elt;
|
||||||
|
while(*pe)
|
||||||
|
*(p++) = *(pe++);
|
||||||
|
*(p++) = '>';
|
||||||
|
if((pv = args->val))
|
||||||
|
{
|
||||||
|
while(*pv)
|
||||||
|
*(p++) = *(pv++);
|
||||||
|
}
|
||||||
|
*(p++) = '<';
|
||||||
|
*(p++) = '/';
|
||||||
|
pe = args->elt;
|
||||||
|
while(*pe)
|
||||||
|
*(p++) = *(pe++);
|
||||||
|
*(p++) = '>';
|
||||||
|
args++;
|
||||||
|
}
|
||||||
|
*(p++) = '<';
|
||||||
|
*(p++) = '/';
|
||||||
|
*(p++) = SERVICEPREFIX2;
|
||||||
|
*(p++) = ':';
|
||||||
|
pe = action;
|
||||||
|
while(*pe)
|
||||||
|
*(p++) = *(pe++);
|
||||||
|
strncpy(p, "></" SOAPPREFIX ":Body></" SOAPPREFIX ":Envelope>\r\n",
|
||||||
|
soapbody + sizeof(soapbody) - p);
|
||||||
|
}
|
||||||
|
if(!parseURL(url, hostname, &port, &path, NULL)) return NULL;
|
||||||
|
if(s < 0) {
|
||||||
|
s = connecthostport(hostname, port, 0);
|
||||||
|
if(s < 0) {
|
||||||
|
/* failed to connect */
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
n = soapPostSubmit(s, path, hostname, port, soapact, soapbody, httpversion);
|
||||||
|
if(n<=0) {
|
||||||
|
#ifdef DEBUG
|
||||||
|
printf("Error sending SOAP request\n");
|
||||||
|
#endif
|
||||||
|
closesocket(s);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
buf = getHTTPResponse(s, bufsize);
|
||||||
|
#ifdef DEBUG
|
||||||
|
if(*bufsize > 0 && buf)
|
||||||
|
{
|
||||||
|
printf("SOAP Response :\n%.*s\n", *bufsize, buf);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
closesocket(s);
|
||||||
|
return buf;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* simpleUPnPcommand :
|
||||||
|
* not so simple !
|
||||||
|
* return values :
|
||||||
|
* pointer - OK
|
||||||
|
* NULL - error */
|
||||||
|
char * simpleUPnPcommand(int s, const char * url, const char * service,
|
||||||
|
const char * action, struct UPNParg * args,
|
||||||
|
int * bufsize)
|
||||||
|
{
|
||||||
|
char * buf;
|
||||||
|
|
||||||
|
#if 1
|
||||||
|
buf = simpleUPnPcommand2(s, url, service, action, args, bufsize, "1.1");
|
||||||
|
#else
|
||||||
|
buf = simpleUPnPcommand2(s, url, service, action, args, bufsize, "1.0");
|
||||||
|
if (!buf || *bufsize == 0)
|
||||||
|
{
|
||||||
|
#if DEBUG
|
||||||
|
printf("Error or no result from SOAP request; retrying with HTTP/1.1\n");
|
||||||
|
#endif
|
||||||
|
buf = simpleUPnPcommand2(s, url, service, action, args, bufsize, "1.1");
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
return buf;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* parseMSEARCHReply()
|
||||||
|
* the last 4 arguments are filled during the parsing :
|
||||||
|
* - location/locationsize : "location:" field of the SSDP reply packet
|
||||||
|
* - st/stsize : "st:" field of the SSDP reply packet.
|
||||||
|
* The strings are NOT null terminated */
|
||||||
|
static void
|
||||||
|
parseMSEARCHReply(const char * reply, int size,
|
||||||
|
const char * * location, int * locationsize,
|
||||||
|
const char * * st, int * stsize)
|
||||||
|
{
|
||||||
|
int a, b, i;
|
||||||
|
i = 0;
|
||||||
|
a = i; /* start of the line */
|
||||||
|
b = 0; /* end of the "header" (position of the colon) */
|
||||||
|
while(i<size)
|
||||||
|
{
|
||||||
|
switch(reply[i])
|
||||||
|
{
|
||||||
|
case ':':
|
||||||
|
if(b==0)
|
||||||
|
{
|
||||||
|
b = i; /* end of the "header" */
|
||||||
|
/*for(j=a; j<b; j++)
|
||||||
|
{
|
||||||
|
putchar(reply[j]);
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case '\x0a':
|
||||||
|
case '\x0d':
|
||||||
|
if(b!=0)
|
||||||
|
{
|
||||||
|
/*for(j=b+1; j<i; j++)
|
||||||
|
{
|
||||||
|
putchar(reply[j]);
|
||||||
|
}
|
||||||
|
putchar('\n');*/
|
||||||
|
/* skip the colon and white spaces */
|
||||||
|
do { b++; } while(reply[b]==' ');
|
||||||
|
if(0==strncasecmp(reply+a, "location", 8))
|
||||||
|
{
|
||||||
|
*location = reply+b;
|
||||||
|
*locationsize = i-b;
|
||||||
|
}
|
||||||
|
else if(0==strncasecmp(reply+a, "st", 2))
|
||||||
|
{
|
||||||
|
*st = reply+b;
|
||||||
|
*stsize = i-b;
|
||||||
|
}
|
||||||
|
b = 0;
|
||||||
|
}
|
||||||
|
a = i+1;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
i++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* port upnp discover : SSDP protocol */
|
||||||
|
#define PORT 1900
|
||||||
|
#define XSTR(s) STR(s)
|
||||||
|
#define STR(s) #s
|
||||||
|
#define UPNP_MCAST_ADDR "239.255.255.250"
|
||||||
|
/* for IPv6 */
|
||||||
|
#define UPNP_MCAST_LL_ADDR "FF02::C" /* link-local */
|
||||||
|
#define UPNP_MCAST_SL_ADDR "FF05::C" /* site-local */
|
||||||
|
|
||||||
|
/* upnpDiscover() :
|
||||||
|
* return a chained list of all devices found or NULL if
|
||||||
|
* no devices was found.
|
||||||
|
* It is up to the caller to free the chained list
|
||||||
|
* delay is in millisecond (poll) */
|
||||||
|
LIBSPEC struct UPNPDev *
|
||||||
|
upnpDiscover(int delay, const char * multicastif,
|
||||||
|
const char * minissdpdsock, int sameport,
|
||||||
|
int ipv6,
|
||||||
|
int * error)
|
||||||
|
{
|
||||||
|
struct UPNPDev * tmp;
|
||||||
|
struct UPNPDev * devlist = 0;
|
||||||
|
unsigned int scope_id = 0;
|
||||||
|
int opt = 1;
|
||||||
|
static const char MSearchMsgFmt[] =
|
||||||
|
"M-SEARCH * HTTP/1.1\r\n"
|
||||||
|
"HOST: %s:" XSTR(PORT) "\r\n"
|
||||||
|
"ST: %s\r\n"
|
||||||
|
"MAN: \"ssdp:discover\"\r\n"
|
||||||
|
"MX: %u\r\n"
|
||||||
|
"\r\n";
|
||||||
|
static const char * const deviceList[] = {
|
||||||
|
#if 0
|
||||||
|
"urn:schemas-upnp-org:device:InternetGatewayDevice:2",
|
||||||
|
"urn:schemas-upnp-org:service:WANIPConnection:2",
|
||||||
|
#endif
|
||||||
|
"urn:schemas-upnp-org:device:InternetGatewayDevice:1",
|
||||||
|
"urn:schemas-upnp-org:service:WANIPConnection:1",
|
||||||
|
"urn:schemas-upnp-org:service:WANPPPConnection:1",
|
||||||
|
"upnp:rootdevice",
|
||||||
|
0
|
||||||
|
};
|
||||||
|
int deviceIndex = 0;
|
||||||
|
char bufr[1536]; /* reception and emission buffer */
|
||||||
|
int sudp;
|
||||||
|
int n;
|
||||||
|
struct sockaddr_storage sockudp_r;
|
||||||
|
unsigned int mx;
|
||||||
|
#ifdef NO_GETADDRINFO
|
||||||
|
struct sockaddr_storage sockudp_w;
|
||||||
|
#else
|
||||||
|
int rv;
|
||||||
|
struct addrinfo hints, *servinfo, *p;
|
||||||
|
#endif
|
||||||
|
#ifdef _WIN32
|
||||||
|
MIB_IPFORWARDROW ip_forward;
|
||||||
|
#endif
|
||||||
|
int linklocal = 1;
|
||||||
|
|
||||||
|
if(error)
|
||||||
|
*error = UPNPDISCOVER_UNKNOWN_ERROR;
|
||||||
|
/* fallback to direct discovery */
|
||||||
|
#ifdef _WIN32
|
||||||
|
sudp = socket(ipv6 ? PF_INET6 : PF_INET, SOCK_DGRAM, IPPROTO_UDP);
|
||||||
|
#else
|
||||||
|
sudp = socket(ipv6 ? PF_INET6 : PF_INET, SOCK_DGRAM, 0);
|
||||||
|
#endif
|
||||||
|
if(sudp < 0)
|
||||||
|
{
|
||||||
|
if(error)
|
||||||
|
*error = UPNPDISCOVER_SOCKET_ERROR;
|
||||||
|
PRINT_SOCKET_ERROR("socket");
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
/* reception */
|
||||||
|
memset(&sockudp_r, 0, sizeof(struct sockaddr_storage));
|
||||||
|
if(ipv6) {
|
||||||
|
struct sockaddr_in6 * p = (struct sockaddr_in6 *)&sockudp_r;
|
||||||
|
p->sin6_family = AF_INET6;
|
||||||
|
if(sameport)
|
||||||
|
p->sin6_port = htons(PORT);
|
||||||
|
p->sin6_addr = in6addr_any; /* in6addr_any is not available with MinGW32 3.4.2 */
|
||||||
|
} else {
|
||||||
|
struct sockaddr_in * p = (struct sockaddr_in *)&sockudp_r;
|
||||||
|
p->sin_family = AF_INET;
|
||||||
|
if(sameport)
|
||||||
|
p->sin_port = htons(PORT);
|
||||||
|
p->sin_addr.s_addr = INADDR_ANY;
|
||||||
|
}
|
||||||
|
#ifdef _WIN32
|
||||||
|
/* This code could help us to use the right Network interface for
|
||||||
|
* SSDP multicast traffic */
|
||||||
|
/* Get IP associated with the index given in the ip_forward struct
|
||||||
|
* in order to give this ip to setsockopt(sudp, IPPROTO_IP, IP_MULTICAST_IF) */
|
||||||
|
if(!ipv6
|
||||||
|
&& (GetBestRoute(inet_addr("223.255.255.255"), 0, &ip_forward) == NO_ERROR)) {
|
||||||
|
DWORD dwRetVal = 0;
|
||||||
|
PMIB_IPADDRTABLE pIPAddrTable;
|
||||||
|
DWORD dwSize = 0;
|
||||||
|
#ifdef DEBUG
|
||||||
|
IN_ADDR IPAddr;
|
||||||
|
#endif
|
||||||
|
int i;
|
||||||
|
#ifdef DEBUG
|
||||||
|
printf("ifIndex=%lu nextHop=%lx \n", ip_forward.dwForwardIfIndex, ip_forward.dwForwardNextHop);
|
||||||
|
#endif
|
||||||
|
pIPAddrTable = (MIB_IPADDRTABLE *) malloc(sizeof (MIB_IPADDRTABLE));
|
||||||
|
if (GetIpAddrTable(pIPAddrTable, &dwSize, 0) == ERROR_INSUFFICIENT_BUFFER) {
|
||||||
|
free(pIPAddrTable);
|
||||||
|
pIPAddrTable = (MIB_IPADDRTABLE *) malloc(dwSize);
|
||||||
|
}
|
||||||
|
if(pIPAddrTable) {
|
||||||
|
dwRetVal = GetIpAddrTable( pIPAddrTable, &dwSize, 0 );
|
||||||
|
#ifdef DEBUG
|
||||||
|
printf("\tNum Entries: %ld\n", pIPAddrTable->dwNumEntries);
|
||||||
|
#endif
|
||||||
|
for (i=0; i < (int) pIPAddrTable->dwNumEntries; i++) {
|
||||||
|
#ifdef DEBUG
|
||||||
|
printf("\n\tInterface Index[%d]:\t%ld\n", i, pIPAddrTable->table[i].dwIndex);
|
||||||
|
IPAddr.S_un.S_addr = (u_long) pIPAddrTable->table[i].dwAddr;
|
||||||
|
printf("\tIP Address[%d]: \t%s\n", i, inet_ntoa(IPAddr) );
|
||||||
|
IPAddr.S_un.S_addr = (u_long) pIPAddrTable->table[i].dwMask;
|
||||||
|
printf("\tSubnet Mask[%d]: \t%s\n", i, inet_ntoa(IPAddr) );
|
||||||
|
IPAddr.S_un.S_addr = (u_long) pIPAddrTable->table[i].dwBCastAddr;
|
||||||
|
printf("\tBroadCast[%d]: \t%s (%ld)\n", i, inet_ntoa(IPAddr), pIPAddrTable->table[i].dwBCastAddr);
|
||||||
|
printf("\tReassembly size[%d]:\t%ld\n", i, pIPAddrTable->table[i].dwReasmSize);
|
||||||
|
printf("\tType and State[%d]:", i);
|
||||||
|
printf("\n");
|
||||||
|
#endif
|
||||||
|
if (pIPAddrTable->table[i].dwIndex == ip_forward.dwForwardIfIndex) {
|
||||||
|
/* Set the address of this interface to be used */
|
||||||
|
struct in_addr mc_if;
|
||||||
|
memset(&mc_if, 0, sizeof(mc_if));
|
||||||
|
mc_if.s_addr = pIPAddrTable->table[i].dwAddr;
|
||||||
|
if(setsockopt(sudp, IPPROTO_IP, IP_MULTICAST_IF, (const char *)&mc_if, sizeof(mc_if)) < 0) {
|
||||||
|
PRINT_SOCKET_ERROR("setsockopt");
|
||||||
|
}
|
||||||
|
((struct sockaddr_in *)&sockudp_r)->sin_addr.s_addr = pIPAddrTable->table[i].dwAddr;
|
||||||
|
#ifndef DEBUG
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
}
|
||||||
|
free(pIPAddrTable);
|
||||||
|
pIPAddrTable = NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef _WIN32
|
||||||
|
if (setsockopt(sudp, SOL_SOCKET, SO_REUSEADDR, (const char *)&opt, sizeof (opt)) < 0)
|
||||||
|
#else
|
||||||
|
if (setsockopt(sudp, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof (opt)) < 0)
|
||||||
|
#endif
|
||||||
|
{
|
||||||
|
if(error)
|
||||||
|
*error = UPNPDISCOVER_SOCKET_ERROR;
|
||||||
|
PRINT_SOCKET_ERROR("setsockopt");
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(multicastif)
|
||||||
|
{
|
||||||
|
if(ipv6) {
|
||||||
|
#if !defined(_WIN32)
|
||||||
|
/* according to MSDN, if_nametoindex() is supported since
|
||||||
|
* MS Windows Vista and MS Windows Server 2008.
|
||||||
|
* http://msdn.microsoft.com/en-us/library/bb408409%28v=vs.85%29.aspx */
|
||||||
|
unsigned int ifindex = if_nametoindex(multicastif); /* eth0, etc. */
|
||||||
|
if(setsockopt(sudp, IPPROTO_IPV6, IPV6_MULTICAST_IF, &ifindex, sizeof(&ifindex)) < 0)
|
||||||
|
{
|
||||||
|
PRINT_SOCKET_ERROR("setsockopt");
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
#ifdef DEBUG
|
||||||
|
printf("Setting of multicast interface not supported in IPv6 under Windows.\n");
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
} else {
|
||||||
|
struct in_addr mc_if;
|
||||||
|
mc_if.s_addr = inet_addr(multicastif); /* ex: 192.168.x.x */
|
||||||
|
if(mc_if.s_addr != INADDR_NONE)
|
||||||
|
{
|
||||||
|
((struct sockaddr_in *)&sockudp_r)->sin_addr.s_addr = mc_if.s_addr;
|
||||||
|
if(setsockopt(sudp, IPPROTO_IP, IP_MULTICAST_IF, (const char *)&mc_if, sizeof(mc_if)) < 0)
|
||||||
|
{
|
||||||
|
PRINT_SOCKET_ERROR("setsockopt");
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
#ifdef HAS_IP_MREQN
|
||||||
|
/* was not an ip address, try with an interface name */
|
||||||
|
struct ip_mreqn reqn; /* only defined with -D_BSD_SOURCE or -D_GNU_SOURCE */
|
||||||
|
memset(&reqn, 0, sizeof(struct ip_mreqn));
|
||||||
|
reqn.imr_ifindex = if_nametoindex(multicastif);
|
||||||
|
if(setsockopt(sudp, IPPROTO_IP, IP_MULTICAST_IF, (const char *)&reqn, sizeof(reqn)) < 0)
|
||||||
|
{
|
||||||
|
PRINT_SOCKET_ERROR("setsockopt");
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
#ifdef DEBUG
|
||||||
|
printf("Setting of multicast interface not supported with interface name.\n");
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Avant d'envoyer le paquet on bind pour recevoir la reponse */
|
||||||
|
if (bind(sudp, (const struct sockaddr *)&sockudp_r,
|
||||||
|
ipv6 ? sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in)) != 0)
|
||||||
|
{
|
||||||
|
if(error)
|
||||||
|
*error = UPNPDISCOVER_SOCKET_ERROR;
|
||||||
|
PRINT_SOCKET_ERROR("bind");
|
||||||
|
closesocket(sudp);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(error)
|
||||||
|
*error = UPNPDISCOVER_SUCCESS;
|
||||||
|
/* Calculating maximum response time in seconds */
|
||||||
|
mx = ((unsigned int)delay) / 1000u;
|
||||||
|
/* receiving SSDP response packet */
|
||||||
|
for(n = 0; deviceList[deviceIndex]; deviceIndex++)
|
||||||
|
{
|
||||||
|
if(n == 0)
|
||||||
|
{
|
||||||
|
/* sending the SSDP M-SEARCH packet */
|
||||||
|
n = snprintf(bufr, sizeof(bufr),
|
||||||
|
MSearchMsgFmt,
|
||||||
|
ipv6 ?
|
||||||
|
(linklocal ? "[" UPNP_MCAST_LL_ADDR "]" : "[" UPNP_MCAST_SL_ADDR "]")
|
||||||
|
: UPNP_MCAST_ADDR,
|
||||||
|
deviceList[deviceIndex], mx);
|
||||||
|
#ifdef DEBUG
|
||||||
|
printf("Sending %s", bufr);
|
||||||
|
#endif
|
||||||
|
#ifdef NO_GETADDRINFO
|
||||||
|
/* the following code is not using getaddrinfo */
|
||||||
|
/* emission */
|
||||||
|
memset(&sockudp_w, 0, sizeof(struct sockaddr_storage));
|
||||||
|
if(ipv6) {
|
||||||
|
struct sockaddr_in6 * p = (struct sockaddr_in6 *)&sockudp_w;
|
||||||
|
p->sin6_family = AF_INET6;
|
||||||
|
p->sin6_port = htons(PORT);
|
||||||
|
inet_pton(AF_INET6,
|
||||||
|
linklocal ? UPNP_MCAST_LL_ADDR : UPNP_MCAST_SL_ADDR,
|
||||||
|
&(p->sin6_addr));
|
||||||
|
} else {
|
||||||
|
struct sockaddr_in * p = (struct sockaddr_in *)&sockudp_w;
|
||||||
|
p->sin_family = AF_INET;
|
||||||
|
p->sin_port = htons(PORT);
|
||||||
|
p->sin_addr.s_addr = inet_addr(UPNP_MCAST_ADDR);
|
||||||
|
}
|
||||||
|
n = sendto(sudp, bufr, n, 0,
|
||||||
|
&sockudp_w,
|
||||||
|
ipv6 ? sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in));
|
||||||
|
if (n < 0) {
|
||||||
|
if(error)
|
||||||
|
*error = UPNPDISCOVER_SOCKET_ERROR;
|
||||||
|
PRINT_SOCKET_ERROR("sendto");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
#else /* #ifdef NO_GETADDRINFO */
|
||||||
|
memset(&hints, 0, sizeof(hints));
|
||||||
|
hints.ai_family = AF_UNSPEC; /* AF_INET6 or AF_INET */
|
||||||
|
hints.ai_socktype = SOCK_DGRAM;
|
||||||
|
/*hints.ai_flags = */
|
||||||
|
if ((rv = getaddrinfo(ipv6
|
||||||
|
? (linklocal ? UPNP_MCAST_LL_ADDR : UPNP_MCAST_SL_ADDR)
|
||||||
|
: UPNP_MCAST_ADDR,
|
||||||
|
XSTR(PORT), &hints, &servinfo)) != 0) {
|
||||||
|
if(error)
|
||||||
|
*error = UPNPDISCOVER_SOCKET_ERROR;
|
||||||
|
#ifdef _WIN32
|
||||||
|
fprintf(stderr, "getaddrinfo() failed: %d\n", rv);
|
||||||
|
#else
|
||||||
|
fprintf(stderr, "getaddrinfo: %s\n", gai_strerror(rv));
|
||||||
|
#endif
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
for(p = servinfo; p; p = p->ai_next) {
|
||||||
|
n = sendto(sudp, bufr, n, 0, p->ai_addr, p->ai_addrlen);
|
||||||
|
if (n < 0) {
|
||||||
|
#ifdef DEBUG
|
||||||
|
char hbuf[NI_MAXHOST], sbuf[NI_MAXSERV];
|
||||||
|
if (getnameinfo(p->ai_addr, p->ai_addrlen, hbuf, sizeof(hbuf), sbuf,
|
||||||
|
sizeof(sbuf), NI_NUMERICHOST | NI_NUMERICSERV) == 0) {
|
||||||
|
fprintf(stderr, "host:%s port:%s\n", hbuf, sbuf);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
PRINT_SOCKET_ERROR("sendto");
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
freeaddrinfo(servinfo);
|
||||||
|
if(n < 0) {
|
||||||
|
if(error)
|
||||||
|
*error = UPNPDISCOVER_SOCKET_ERROR;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
#endif /* #ifdef NO_GETADDRINFO */
|
||||||
|
}
|
||||||
|
/* Waiting for SSDP REPLY packet to M-SEARCH */
|
||||||
|
n = receivedata(sudp, bufr, sizeof(bufr), delay, &scope_id);
|
||||||
|
if (n < 0) {
|
||||||
|
/* error */
|
||||||
|
if(error)
|
||||||
|
*error = UPNPDISCOVER_SOCKET_ERROR;
|
||||||
|
break;
|
||||||
|
} else if (n == 0) {
|
||||||
|
/* no data or Time Out */
|
||||||
|
if (devlist) {
|
||||||
|
/* no more device type to look for... */
|
||||||
|
if(error)
|
||||||
|
*error = UPNPDISCOVER_SUCCESS;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
if(ipv6) {
|
||||||
|
if(linklocal) {
|
||||||
|
linklocal = 0;
|
||||||
|
--deviceIndex;
|
||||||
|
} else {
|
||||||
|
linklocal = 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
const char * descURL=NULL;
|
||||||
|
int urlsize=0;
|
||||||
|
const char * st=NULL;
|
||||||
|
int stsize=0;
|
||||||
|
/*printf("%d byte(s) :\n%s\n", n, bufr);*/ /* affichage du message */
|
||||||
|
parseMSEARCHReply(bufr, n, &descURL, &urlsize, &st, &stsize);
|
||||||
|
if(st&&descURL)
|
||||||
|
{
|
||||||
|
#ifdef DEBUG
|
||||||
|
printf("M-SEARCH Reply:\nST: %.*s\nLocation: %.*s\n",
|
||||||
|
stsize, st, urlsize, descURL);
|
||||||
|
#endif
|
||||||
|
for(tmp=devlist; tmp; tmp = tmp->pNext) {
|
||||||
|
if(memcmp(tmp->descURL, descURL, urlsize) == 0 &&
|
||||||
|
tmp->descURL[urlsize] == '\0' &&
|
||||||
|
memcmp(tmp->st, st, stsize) == 0 &&
|
||||||
|
tmp->st[stsize] == '\0')
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
/* at the exit of the loop above, tmp is null if
|
||||||
|
* no duplicate device was found */
|
||||||
|
if(tmp)
|
||||||
|
continue;
|
||||||
|
tmp = (struct UPNPDev *)malloc(sizeof(struct UPNPDev)+urlsize+stsize);
|
||||||
|
if(!tmp) {
|
||||||
|
/* memory allocation error */
|
||||||
|
if(error)
|
||||||
|
*error = UPNPDISCOVER_MEMORY_ERROR;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
tmp->pNext = devlist;
|
||||||
|
tmp->descURL = tmp->buffer;
|
||||||
|
tmp->st = tmp->buffer + 1 + urlsize;
|
||||||
|
memcpy(tmp->buffer, descURL, urlsize);
|
||||||
|
tmp->buffer[urlsize] = '\0';
|
||||||
|
memcpy(tmp->buffer + urlsize + 1, st, stsize);
|
||||||
|
tmp->buffer[urlsize+1+stsize] = '\0';
|
||||||
|
tmp->scope_id = scope_id;
|
||||||
|
devlist = tmp;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
closesocket(sudp);
|
||||||
|
return devlist;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* freeUPNPDevlist() should be used to
|
||||||
|
* free the chained list returned by upnpDiscover() */
|
||||||
|
LIBSPEC void freeUPNPDevlist(struct UPNPDev * devlist)
|
||||||
|
{
|
||||||
|
struct UPNPDev * next;
|
||||||
|
while(devlist)
|
||||||
|
{
|
||||||
|
next = devlist->pNext;
|
||||||
|
free(devlist);
|
||||||
|
devlist = next;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
url_cpy_or_cat(char * dst, const char * src, int n)
|
||||||
|
{
|
||||||
|
if( (src[0] == 'h')
|
||||||
|
&&(src[1] == 't')
|
||||||
|
&&(src[2] == 't')
|
||||||
|
&&(src[3] == 'p')
|
||||||
|
&&(src[4] == ':')
|
||||||
|
&&(src[5] == '/')
|
||||||
|
&&(src[6] == '/'))
|
||||||
|
{
|
||||||
|
strncpy(dst, src, n);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
int l = strlen(dst);
|
||||||
|
if(src[0] != '/')
|
||||||
|
dst[l++] = '/';
|
||||||
|
if(l<=n)
|
||||||
|
strncpy(dst + l, src, n - l);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Prepare the Urls for usage...
|
||||||
|
*/
|
||||||
|
LIBSPEC void
|
||||||
|
GetUPNPUrls(struct UPNPUrls * urls, struct IGDdatas * data,
|
||||||
|
const char * descURL, unsigned int scope_id)
|
||||||
|
{
|
||||||
|
char * p;
|
||||||
|
int n1, n2, n3, n4;
|
||||||
|
#ifdef IF_NAMESIZE
|
||||||
|
char ifname[IF_NAMESIZE];
|
||||||
|
#else
|
||||||
|
char scope_str[8];
|
||||||
|
#endif
|
||||||
|
|
||||||
|
n1 = strlen(data->urlbase);
|
||||||
|
if(n1==0)
|
||||||
|
n1 = strlen(descURL);
|
||||||
|
if(scope_id != 0) {
|
||||||
|
#ifdef IF_NAMESIZE
|
||||||
|
if(if_indextoname(scope_id, ifname)) {
|
||||||
|
n1 += 3 + strlen(ifname); /* 3 == strlen(%25) */
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
/* under windows, scope is numerical */
|
||||||
|
snprintf(scope_str, sizeof(scope_str), "%u", scope_id);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
n1 += 2; /* 1 byte more for Null terminator, 1 byte for '/' if needed */
|
||||||
|
n2 = n1; n3 = n1; n4 = n1;
|
||||||
|
n1 += strlen(data->first.scpdurl);
|
||||||
|
n2 += strlen(data->first.controlurl);
|
||||||
|
n3 += strlen(data->CIF.controlurl);
|
||||||
|
n4 += strlen(data->IPv6FC.controlurl);
|
||||||
|
|
||||||
|
/* allocate memory to store URLs */
|
||||||
|
urls->ipcondescURL = (char *)malloc(n1);
|
||||||
|
urls->controlURL = (char *)malloc(n2);
|
||||||
|
urls->controlURL_CIF = (char *)malloc(n3);
|
||||||
|
urls->controlURL_6FC = (char *)malloc(n4);
|
||||||
|
|
||||||
|
/* strdup descURL */
|
||||||
|
urls->rootdescURL = strdup(descURL);
|
||||||
|
|
||||||
|
/* get description of WANIPConnection */
|
||||||
|
if(data->urlbase[0] != '\0')
|
||||||
|
strncpy(urls->ipcondescURL, data->urlbase, n1);
|
||||||
|
else
|
||||||
|
strncpy(urls->ipcondescURL, descURL, n1);
|
||||||
|
p = strchr(urls->ipcondescURL+7, '/');
|
||||||
|
if(p) p[0] = '\0';
|
||||||
|
if(scope_id != 0) {
|
||||||
|
if(0 == memcmp(urls->ipcondescURL, "http://[fe80:", 13)) {
|
||||||
|
/* this is a linklocal IPv6 address */
|
||||||
|
p = strchr(urls->ipcondescURL, ']');
|
||||||
|
if(p) {
|
||||||
|
/* insert %25<scope> into URL */
|
||||||
|
#ifdef IF_NAMESIZE
|
||||||
|
memmove(p + 3 + strlen(ifname), p, strlen(p) + 1);
|
||||||
|
memcpy(p, "%25", 3);
|
||||||
|
memcpy(p + 3, ifname, strlen(ifname));
|
||||||
|
#else
|
||||||
|
memmove(p + 3 + strlen(scope_str), p, strlen(p) + 1);
|
||||||
|
memcpy(p, "%25", 3);
|
||||||
|
memcpy(p + 3, scope_str, strlen(scope_str));
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
strncpy(urls->controlURL, urls->ipcondescURL, n2);
|
||||||
|
strncpy(urls->controlURL_CIF, urls->ipcondescURL, n3);
|
||||||
|
strncpy(urls->controlURL_6FC, urls->ipcondescURL, n4);
|
||||||
|
|
||||||
|
url_cpy_or_cat(urls->ipcondescURL, data->first.scpdurl, n1);
|
||||||
|
|
||||||
|
url_cpy_or_cat(urls->controlURL, data->first.controlurl, n2);
|
||||||
|
|
||||||
|
url_cpy_or_cat(urls->controlURL_CIF, data->CIF.controlurl, n3);
|
||||||
|
|
||||||
|
url_cpy_or_cat(urls->controlURL_6FC, data->IPv6FC.controlurl, n4);
|
||||||
|
|
||||||
|
#ifdef DEBUG
|
||||||
|
printf("urls->ipcondescURL='%s' %u n1=%d\n", urls->ipcondescURL,
|
||||||
|
(unsigned)strlen(urls->ipcondescURL), n1);
|
||||||
|
printf("urls->controlURL='%s' %u n2=%d\n", urls->controlURL,
|
||||||
|
(unsigned)strlen(urls->controlURL), n2);
|
||||||
|
printf("urls->controlURL_CIF='%s' %u n3=%d\n", urls->controlURL_CIF,
|
||||||
|
(unsigned)strlen(urls->controlURL_CIF), n3);
|
||||||
|
printf("urls->controlURL_6FC='%s' %u n4=%d\n", urls->controlURL_6FC,
|
||||||
|
(unsigned)strlen(urls->controlURL_6FC), n4);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
LIBSPEC void
|
||||||
|
FreeUPNPUrls(struct UPNPUrls * urls)
|
||||||
|
{
|
||||||
|
if(!urls)
|
||||||
|
return;
|
||||||
|
free(urls->controlURL);
|
||||||
|
urls->controlURL = 0;
|
||||||
|
free(urls->ipcondescURL);
|
||||||
|
urls->ipcondescURL = 0;
|
||||||
|
free(urls->controlURL_CIF);
|
||||||
|
urls->controlURL_CIF = 0;
|
||||||
|
free(urls->controlURL_6FC);
|
||||||
|
urls->controlURL_6FC = 0;
|
||||||
|
free(urls->rootdescURL);
|
||||||
|
urls->rootdescURL = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
int
|
||||||
|
UPNPIGD_IsConnected(struct UPNPUrls * urls, struct IGDdatas * data)
|
||||||
|
{
|
||||||
|
char status[64];
|
||||||
|
unsigned int uptime;
|
||||||
|
status[0] = '\0';
|
||||||
|
UPNP_GetStatusInfo(urls->controlURL, data->first.servicetype,
|
||||||
|
status, &uptime, NULL);
|
||||||
|
if(0 == strcmp("Connected", status))
|
||||||
|
{
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/* UPNP_GetValidIGD() :
|
||||||
|
* return values :
|
||||||
|
* -1 = Internal error
|
||||||
|
* 0 = NO IGD found
|
||||||
|
* 1 = A valid connected IGD has been found
|
||||||
|
* 2 = A valid IGD has been found but it reported as
|
||||||
|
* not connected
|
||||||
|
* 3 = an UPnP device has been found but was not recognized as an IGD
|
||||||
|
*
|
||||||
|
* In any non zero return case, the urls and data structures
|
||||||
|
* passed as parameters are set. Donc forget to call FreeUPNPUrls(urls) to
|
||||||
|
* free allocated memory.
|
||||||
|
*/
|
||||||
|
LIBSPEC int
|
||||||
|
UPNP_GetValidIGD(struct UPNPDev * devlist,
|
||||||
|
struct UPNPUrls * urls,
|
||||||
|
struct IGDdatas * data,
|
||||||
|
char * lanaddr, int lanaddrlen)
|
||||||
|
{
|
||||||
|
struct xml_desc {
|
||||||
|
char * xml;
|
||||||
|
int size;
|
||||||
|
} * desc = NULL;
|
||||||
|
struct UPNPDev * dev;
|
||||||
|
int ndev = 0;
|
||||||
|
int i;
|
||||||
|
int state = -1; /* state 1 : IGD connected. State 2 : IGD. State 3 : anything */
|
||||||
|
if(!devlist)
|
||||||
|
{
|
||||||
|
#ifdef DEBUG
|
||||||
|
printf("Empty devlist\n");
|
||||||
|
#endif
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
for(dev = devlist; dev; dev = dev->pNext)
|
||||||
|
ndev++;
|
||||||
|
if(ndev > 0)
|
||||||
|
{
|
||||||
|
desc = calloc(ndev, sizeof(struct xml_desc));
|
||||||
|
if(!desc)
|
||||||
|
return -1; /* memory allocation error */
|
||||||
|
}
|
||||||
|
for(state = 1; state <= 3; state++)
|
||||||
|
{
|
||||||
|
for(dev = devlist, i = 0; dev; dev = dev->pNext, i++)
|
||||||
|
{
|
||||||
|
/* we should choose an internet gateway device.
|
||||||
|
* with st == urn:schemas-upnp-org:device:InternetGatewayDevice:1 */
|
||||||
|
if(state == 1)
|
||||||
|
{
|
||||||
|
desc[i].xml = miniwget_getaddr(dev->descURL, &(desc[i].size),
|
||||||
|
lanaddr, lanaddrlen,
|
||||||
|
dev->scope_id);
|
||||||
|
#ifdef DEBUG
|
||||||
|
if(!desc[i].xml)
|
||||||
|
{
|
||||||
|
printf("error getting XML description %s\n", dev->descURL);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
if(desc[i].xml)
|
||||||
|
{
|
||||||
|
memset(data, 0, sizeof(struct IGDdatas));
|
||||||
|
memset(urls, 0, sizeof(struct UPNPUrls));
|
||||||
|
parserootdesc(desc[i].xml, desc[i].size, data);
|
||||||
|
if(0==strcmp(data->CIF.servicetype,
|
||||||
|
"urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1")
|
||||||
|
|| state >= 3 )
|
||||||
|
{
|
||||||
|
GetUPNPUrls(urls, data, dev->descURL, dev->scope_id);
|
||||||
|
|
||||||
|
#ifdef DEBUG
|
||||||
|
printf("UPNPIGD_IsConnected(%s) = %d\n",
|
||||||
|
urls->controlURL,
|
||||||
|
UPNPIGD_IsConnected(urls, data));
|
||||||
|
#endif
|
||||||
|
if((state >= 2) || UPNPIGD_IsConnected(urls, data))
|
||||||
|
goto free_and_return;
|
||||||
|
FreeUPNPUrls(urls);
|
||||||
|
if(data->second.servicetype[0] != '\0') {
|
||||||
|
#ifdef DEBUG
|
||||||
|
printf("We tried %s, now we try %s !\n",
|
||||||
|
data->first.servicetype, data->second.servicetype);
|
||||||
|
#endif
|
||||||
|
/* swaping WANPPPConnection and WANIPConnection ! */
|
||||||
|
memcpy(&data->tmp, &data->first, sizeof(struct IGDdatas_service));
|
||||||
|
memcpy(&data->first, &data->second, sizeof(struct IGDdatas_service));
|
||||||
|
memcpy(&data->second, &data->tmp, sizeof(struct IGDdatas_service));
|
||||||
|
GetUPNPUrls(urls, data, dev->descURL, dev->scope_id);
|
||||||
|
#ifdef DEBUG
|
||||||
|
printf("UPNPIGD_IsConnected(%s) = %d\n",
|
||||||
|
urls->controlURL,
|
||||||
|
UPNPIGD_IsConnected(urls, data));
|
||||||
|
#endif
|
||||||
|
if((state >= 2) || UPNPIGD_IsConnected(urls, data))
|
||||||
|
goto free_and_return;
|
||||||
|
FreeUPNPUrls(urls);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
memset(data, 0, sizeof(struct IGDdatas));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
state = 0;
|
||||||
|
free_and_return:
|
||||||
|
if(desc) {
|
||||||
|
for(i = 0; i < ndev; i++) {
|
||||||
|
if(desc[i].xml) {
|
||||||
|
free(desc[i].xml);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
free(desc);
|
||||||
|
}
|
||||||
|
return state;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* UPNP_GetIGDFromUrl()
|
||||||
|
* Used when skipping the discovery process.
|
||||||
|
* return value :
|
||||||
|
* 0 - Not ok
|
||||||
|
* 1 - OK */
|
||||||
|
int
|
||||||
|
UPNP_GetIGDFromUrl(const char * rootdescurl,
|
||||||
|
struct UPNPUrls * urls,
|
||||||
|
struct IGDdatas * data,
|
||||||
|
char * lanaddr, int lanaddrlen)
|
||||||
|
{
|
||||||
|
char * descXML;
|
||||||
|
int descXMLsize = 0;
|
||||||
|
descXML = miniwget_getaddr(rootdescurl, &descXMLsize,
|
||||||
|
lanaddr, lanaddrlen, 0);
|
||||||
|
if(descXML) {
|
||||||
|
memset(data, 0, sizeof(struct IGDdatas));
|
||||||
|
memset(urls, 0, sizeof(struct UPNPUrls));
|
||||||
|
parserootdesc(descXML, descXMLsize, data);
|
||||||
|
free(descXML);
|
||||||
|
descXML = NULL;
|
||||||
|
GetUPNPUrls(urls, data, rootdescurl, 0);
|
||||||
|
return 1;
|
||||||
|
} else {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
@ -0,0 +1,42 @@
|
||||||
|
LIBRARY
|
||||||
|
; miniupnpc library
|
||||||
|
|
||||||
|
EXPORTS
|
||||||
|
; miniupnpc
|
||||||
|
upnpDiscover
|
||||||
|
freeUPNPDevlist
|
||||||
|
parserootdesc
|
||||||
|
UPNP_GetValidIGD
|
||||||
|
UPNP_GetIGDFromUrl
|
||||||
|
GetUPNPUrls
|
||||||
|
FreeUPNPUrls
|
||||||
|
; miniwget
|
||||||
|
miniwget
|
||||||
|
miniwget_getaddr
|
||||||
|
; upnpcommands
|
||||||
|
UPNP_GetTotalBytesSent
|
||||||
|
UPNP_GetTotalBytesReceived
|
||||||
|
UPNP_GetTotalPacketsSent
|
||||||
|
UPNP_GetTotalPacketsReceived
|
||||||
|
UPNP_GetStatusInfo
|
||||||
|
UPNP_GetConnectionTypeInfo
|
||||||
|
UPNP_GetExternalIPAddress
|
||||||
|
UPNP_GetLinkLayerMaxBitRates
|
||||||
|
UPNP_AddPortMapping
|
||||||
|
UPNP_DeletePortMapping
|
||||||
|
UPNP_GetPortMappingNumberOfEntries
|
||||||
|
UPNP_GetSpecificPortMappingEntry
|
||||||
|
UPNP_GetGenericPortMappingEntry
|
||||||
|
UPNP_GetListOfPortMappings
|
||||||
|
UPNP_AddPinhole
|
||||||
|
UPNP_CheckPinholeWorking
|
||||||
|
UPNP_UpdatePinhole
|
||||||
|
UPNP_GetPinholePackets
|
||||||
|
UPNP_DeletePinhole
|
||||||
|
UPNP_GetFirewallStatus
|
||||||
|
UPNP_GetOutboundPinholeTimeout
|
||||||
|
; upnperrors
|
||||||
|
strupnperror
|
||||||
|
; portlistingparse
|
||||||
|
ParsePortListing
|
||||||
|
FreePortListing
|
||||||
|
|
@ -0,0 +1,130 @@
|
||||||
|
/* $Id: miniupnpc.h,v 1.32 2013/02/06 14:44:42 nanard Exp $ */
|
||||||
|
/* Project: miniupnp
|
||||||
|
* http://miniupnp.free.fr/
|
||||||
|
* Author: Thomas Bernard
|
||||||
|
* Copyright (c) 2005-2012 Thomas Bernard
|
||||||
|
* This software is subjects to the conditions detailed
|
||||||
|
* in the LICENCE file provided within this distribution */
|
||||||
|
#ifndef MINIUPNPC_H_INCLUDED
|
||||||
|
#define MINIUPNPC_H_INCLUDED
|
||||||
|
|
||||||
|
#include "declspec.h"
|
||||||
|
#include "igd_desc_parse.h"
|
||||||
|
|
||||||
|
/* error codes : */
|
||||||
|
#define UPNPDISCOVER_SUCCESS (0)
|
||||||
|
#define UPNPDISCOVER_UNKNOWN_ERROR (-1)
|
||||||
|
#define UPNPDISCOVER_SOCKET_ERROR (-101)
|
||||||
|
#define UPNPDISCOVER_MEMORY_ERROR (-102)
|
||||||
|
|
||||||
|
/* versions : */
|
||||||
|
#define MINIUPNPC_VERSION "1.8.20130503"
|
||||||
|
#define MINIUPNPC_API_VERSION 9
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* Structures definitions : */
|
||||||
|
struct UPNParg { const char * elt; const char * val; };
|
||||||
|
|
||||||
|
char *
|
||||||
|
simpleUPnPcommand(int, const char *, const char *,
|
||||||
|
const char *, struct UPNParg *,
|
||||||
|
int *);
|
||||||
|
|
||||||
|
struct UPNPDev {
|
||||||
|
struct UPNPDev * pNext;
|
||||||
|
char * descURL;
|
||||||
|
char * st;
|
||||||
|
unsigned int scope_id;
|
||||||
|
char buffer[2];
|
||||||
|
};
|
||||||
|
|
||||||
|
/* upnpDiscover()
|
||||||
|
* discover UPnP devices on the network.
|
||||||
|
* The discovered devices are returned as a chained list.
|
||||||
|
* It is up to the caller to free the list with freeUPNPDevlist().
|
||||||
|
* delay (in millisecond) is the maximum time for waiting any device
|
||||||
|
* response.
|
||||||
|
* If available, device list will be obtained from MiniSSDPd.
|
||||||
|
* Default path for minissdpd socket will be used if minissdpdsock argument
|
||||||
|
* is NULL.
|
||||||
|
* If multicastif is not NULL, it will be used instead of the default
|
||||||
|
* multicast interface for sending SSDP discover packets.
|
||||||
|
* If sameport is not null, SSDP packets will be sent from the source port
|
||||||
|
* 1900 (same as destination port) otherwise system assign a source port. */
|
||||||
|
LIBSPEC struct UPNPDev *
|
||||||
|
upnpDiscover(int delay, const char * multicastif,
|
||||||
|
const char * minissdpdsock, int sameport,
|
||||||
|
int ipv6,
|
||||||
|
int * error);
|
||||||
|
/* freeUPNPDevlist()
|
||||||
|
* free list returned by upnpDiscover() */
|
||||||
|
LIBSPEC void freeUPNPDevlist(struct UPNPDev * devlist);
|
||||||
|
|
||||||
|
/* parserootdesc() :
|
||||||
|
* parse root XML description of a UPnP device and fill the IGDdatas
|
||||||
|
* structure. */
|
||||||
|
LIBSPEC void parserootdesc(const char *, int, struct IGDdatas *);
|
||||||
|
|
||||||
|
/* structure used to get fast access to urls
|
||||||
|
* controlURL: controlURL of the WANIPConnection
|
||||||
|
* ipcondescURL: url of the description of the WANIPConnection
|
||||||
|
* controlURL_CIF: controlURL of the WANCommonInterfaceConfig
|
||||||
|
* controlURL_6FC: controlURL of the WANIPv6FirewallControl
|
||||||
|
*/
|
||||||
|
struct UPNPUrls {
|
||||||
|
char * controlURL;
|
||||||
|
char * ipcondescURL;
|
||||||
|
char * controlURL_CIF;
|
||||||
|
char * controlURL_6FC;
|
||||||
|
char * rootdescURL;
|
||||||
|
};
|
||||||
|
|
||||||
|
/* UPNP_GetValidIGD() :
|
||||||
|
* return values :
|
||||||
|
* 0 = NO IGD found
|
||||||
|
* 1 = A valid connected IGD has been found
|
||||||
|
* 2 = A valid IGD has been found but it reported as
|
||||||
|
* not connected
|
||||||
|
* 3 = an UPnP device has been found but was not recognized as an IGD
|
||||||
|
*
|
||||||
|
* In any non zero return case, the urls and data structures
|
||||||
|
* passed as parameters are set. Donc forget to call FreeUPNPUrls(urls) to
|
||||||
|
* free allocated memory.
|
||||||
|
*/
|
||||||
|
LIBSPEC int
|
||||||
|
UPNP_GetValidIGD(struct UPNPDev * devlist,
|
||||||
|
struct UPNPUrls * urls,
|
||||||
|
struct IGDdatas * data,
|
||||||
|
char * lanaddr, int lanaddrlen);
|
||||||
|
|
||||||
|
/* UPNP_GetIGDFromUrl()
|
||||||
|
* Used when skipping the discovery process.
|
||||||
|
* return value :
|
||||||
|
* 0 - Not ok
|
||||||
|
* 1 - OK */
|
||||||
|
LIBSPEC int
|
||||||
|
UPNP_GetIGDFromUrl(const char * rootdescurl,
|
||||||
|
struct UPNPUrls * urls,
|
||||||
|
struct IGDdatas * data,
|
||||||
|
char * lanaddr, int lanaddrlen);
|
||||||
|
|
||||||
|
LIBSPEC void
|
||||||
|
GetUPNPUrls(struct UPNPUrls *, struct IGDdatas *,
|
||||||
|
const char *, unsigned int);
|
||||||
|
|
||||||
|
LIBSPEC void
|
||||||
|
FreeUPNPUrls(struct UPNPUrls *);
|
||||||
|
|
||||||
|
/* return 0 or 1 */
|
||||||
|
LIBSPEC int UPNPIGD_IsConnected(struct UPNPUrls *, struct IGDdatas *);
|
||||||
|
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
@ -0,0 +1,544 @@
|
||||||
|
/* $Id: miniupnpcmodule.c,v 1.21 2012/08/29 07:51:30 nanard Exp $*/
|
||||||
|
/* Project : miniupnp
|
||||||
|
* Author : Thomas BERNARD
|
||||||
|
* website : http://miniupnp.tuxfamily.org/
|
||||||
|
* copyright (c) 2007-2012 Thomas Bernard
|
||||||
|
* This software is subjet to the conditions detailed in the
|
||||||
|
* provided LICENCE file. */
|
||||||
|
#include <Python.h>
|
||||||
|
#define STATICLIB
|
||||||
|
#include "structmember.h"
|
||||||
|
#include "miniupnpc.h"
|
||||||
|
#include "upnpcommands.h"
|
||||||
|
#include "upnperrors.h"
|
||||||
|
|
||||||
|
/* for compatibility with Python < 2.4 */
|
||||||
|
#ifndef Py_RETURN_NONE
|
||||||
|
#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef Py_RETURN_TRUE
|
||||||
|
#define Py_RETURN_TRUE return Py_INCREF(Py_True), Py_True
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef Py_RETURN_FALSE
|
||||||
|
#define Py_RETURN_FALSE return Py_INCREF(Py_False), Py_False
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* for compatibility with Python < 3.0 */
|
||||||
|
#ifndef PyVarObject_HEAD_INIT
|
||||||
|
#define PyVarObject_HEAD_INIT(type, size) \
|
||||||
|
PyObject_HEAD_INIT(type) size,
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef Py_TYPE
|
||||||
|
#define Py_TYPE(ob) (((PyObject*)(ob))->ob_type)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
PyObject_HEAD
|
||||||
|
/* Type-specific fields go here. */
|
||||||
|
struct UPNPDev * devlist;
|
||||||
|
struct UPNPUrls urls;
|
||||||
|
struct IGDdatas data;
|
||||||
|
unsigned int discoverdelay; /* value passed to upnpDiscover() */
|
||||||
|
char lanaddr[40]; /* our ip address on the LAN */
|
||||||
|
char * multicastif;
|
||||||
|
char * minissdpdsocket;
|
||||||
|
} UPnPObject;
|
||||||
|
|
||||||
|
static PyMemberDef UPnP_members[] = {
|
||||||
|
{"lanaddr", T_STRING_INPLACE, offsetof(UPnPObject, lanaddr),
|
||||||
|
READONLY, "ip address on the LAN"
|
||||||
|
},
|
||||||
|
{"discoverdelay", T_UINT, offsetof(UPnPObject, discoverdelay),
|
||||||
|
0/*READWRITE*/, "value in ms used to wait for SSDP responses"
|
||||||
|
},
|
||||||
|
/* T_STRING is allways readonly :( */
|
||||||
|
{"multicastif", T_STRING, offsetof(UPnPObject, multicastif),
|
||||||
|
0, "IP of the network interface to be used for multicast operations"
|
||||||
|
},
|
||||||
|
{"minissdpdsocket", T_STRING, offsetof(UPnPObject, multicastif),
|
||||||
|
0, "path of the MiniSSDPd unix socket"
|
||||||
|
},
|
||||||
|
{NULL}
|
||||||
|
};
|
||||||
|
|
||||||
|
static void
|
||||||
|
UPnPObject_dealloc(UPnPObject *self)
|
||||||
|
{
|
||||||
|
freeUPNPDevlist(self->devlist);
|
||||||
|
FreeUPNPUrls(&self->urls);
|
||||||
|
Py_TYPE(self)->tp_free((PyObject*)self);
|
||||||
|
}
|
||||||
|
|
||||||
|
static PyObject *
|
||||||
|
UPnP_discover(UPnPObject *self)
|
||||||
|
{
|
||||||
|
struct UPNPDev * dev;
|
||||||
|
int i;
|
||||||
|
PyObject *res = NULL;
|
||||||
|
if(self->devlist)
|
||||||
|
{
|
||||||
|
freeUPNPDevlist(self->devlist);
|
||||||
|
self->devlist = 0;
|
||||||
|
}
|
||||||
|
Py_BEGIN_ALLOW_THREADS
|
||||||
|
self->devlist = upnpDiscover((int)self->discoverdelay/*timeout in ms*/,
|
||||||
|
0/* multicast if*/,
|
||||||
|
0/*minissdpd socket*/,
|
||||||
|
0/*sameport flag*/,
|
||||||
|
0/*ip v6*/,
|
||||||
|
0/*error */);
|
||||||
|
Py_END_ALLOW_THREADS
|
||||||
|
/* Py_RETURN_NONE ??? */
|
||||||
|
for(dev = self->devlist, i = 0; dev; dev = dev->pNext)
|
||||||
|
i++;
|
||||||
|
res = Py_BuildValue("i", i);
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
|
||||||
|
static PyObject *
|
||||||
|
UPnP_selectigd(UPnPObject *self)
|
||||||
|
{
|
||||||
|
int r;
|
||||||
|
Py_BEGIN_ALLOW_THREADS
|
||||||
|
r = UPNP_GetValidIGD(self->devlist, &self->urls, &self->data,
|
||||||
|
self->lanaddr, sizeof(self->lanaddr));
|
||||||
|
Py_END_ALLOW_THREADS
|
||||||
|
if(r)
|
||||||
|
{
|
||||||
|
return Py_BuildValue("s", self->urls.controlURL);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
/* TODO: have our own exception type ! */
|
||||||
|
PyErr_SetString(PyExc_Exception, "No UPnP device discovered");
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static PyObject *
|
||||||
|
UPnP_totalbytesent(UPnPObject *self)
|
||||||
|
{
|
||||||
|
UNSIGNED_INTEGER i;
|
||||||
|
Py_BEGIN_ALLOW_THREADS
|
||||||
|
i = UPNP_GetTotalBytesSent(self->urls.controlURL_CIF,
|
||||||
|
self->data.CIF.servicetype);
|
||||||
|
Py_END_ALLOW_THREADS
|
||||||
|
return Py_BuildValue("I", i);
|
||||||
|
}
|
||||||
|
|
||||||
|
static PyObject *
|
||||||
|
UPnP_totalbytereceived(UPnPObject *self)
|
||||||
|
{
|
||||||
|
UNSIGNED_INTEGER i;
|
||||||
|
Py_BEGIN_ALLOW_THREADS
|
||||||
|
i = UPNP_GetTotalBytesReceived(self->urls.controlURL_CIF,
|
||||||
|
self->data.CIF.servicetype);
|
||||||
|
Py_END_ALLOW_THREADS
|
||||||
|
return Py_BuildValue("I", i);
|
||||||
|
}
|
||||||
|
|
||||||
|
static PyObject *
|
||||||
|
UPnP_totalpacketsent(UPnPObject *self)
|
||||||
|
{
|
||||||
|
UNSIGNED_INTEGER i;
|
||||||
|
Py_BEGIN_ALLOW_THREADS
|
||||||
|
i = UPNP_GetTotalPacketsSent(self->urls.controlURL_CIF,
|
||||||
|
self->data.CIF.servicetype);
|
||||||
|
Py_END_ALLOW_THREADS
|
||||||
|
return Py_BuildValue("I", i);
|
||||||
|
}
|
||||||
|
|
||||||
|
static PyObject *
|
||||||
|
UPnP_totalpacketreceived(UPnPObject *self)
|
||||||
|
{
|
||||||
|
UNSIGNED_INTEGER i;
|
||||||
|
Py_BEGIN_ALLOW_THREADS
|
||||||
|
i = UPNP_GetTotalPacketsReceived(self->urls.controlURL_CIF,
|
||||||
|
self->data.CIF.servicetype);
|
||||||
|
Py_END_ALLOW_THREADS
|
||||||
|
return Py_BuildValue("I", i);
|
||||||
|
}
|
||||||
|
|
||||||
|
static PyObject *
|
||||||
|
UPnP_statusinfo(UPnPObject *self)
|
||||||
|
{
|
||||||
|
char status[64];
|
||||||
|
char lastconnerror[64];
|
||||||
|
unsigned int uptime = 0;
|
||||||
|
int r;
|
||||||
|
status[0] = '\0';
|
||||||
|
lastconnerror[0] = '\0';
|
||||||
|
Py_BEGIN_ALLOW_THREADS
|
||||||
|
r = UPNP_GetStatusInfo(self->urls.controlURL, self->data.first.servicetype,
|
||||||
|
status, &uptime, lastconnerror);
|
||||||
|
Py_END_ALLOW_THREADS
|
||||||
|
if(r==UPNPCOMMAND_SUCCESS) {
|
||||||
|
return Py_BuildValue("(s,I,s)", status, uptime, lastconnerror);
|
||||||
|
} else {
|
||||||
|
/* TODO: have our own exception type ! */
|
||||||
|
PyErr_SetString(PyExc_Exception, strupnperror(r));
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static PyObject *
|
||||||
|
UPnP_connectiontype(UPnPObject *self)
|
||||||
|
{
|
||||||
|
char connectionType[64];
|
||||||
|
int r;
|
||||||
|
connectionType[0] = '\0';
|
||||||
|
Py_BEGIN_ALLOW_THREADS
|
||||||
|
r = UPNP_GetConnectionTypeInfo(self->urls.controlURL,
|
||||||
|
self->data.first.servicetype,
|
||||||
|
connectionType);
|
||||||
|
Py_END_ALLOW_THREADS
|
||||||
|
if(r==UPNPCOMMAND_SUCCESS) {
|
||||||
|
return Py_BuildValue("s", connectionType);
|
||||||
|
} else {
|
||||||
|
/* TODO: have our own exception type ! */
|
||||||
|
PyErr_SetString(PyExc_Exception, strupnperror(r));
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static PyObject *
|
||||||
|
UPnP_externalipaddress(UPnPObject *self)
|
||||||
|
{
|
||||||
|
char externalIPAddress[40];
|
||||||
|
int r;
|
||||||
|
externalIPAddress[0] = '\0';
|
||||||
|
Py_BEGIN_ALLOW_THREADS
|
||||||
|
r = UPNP_GetExternalIPAddress(self->urls.controlURL,
|
||||||
|
self->data.first.servicetype,
|
||||||
|
externalIPAddress);
|
||||||
|
Py_END_ALLOW_THREADS
|
||||||
|
if(r==UPNPCOMMAND_SUCCESS) {
|
||||||
|
return Py_BuildValue("s", externalIPAddress);
|
||||||
|
} else {
|
||||||
|
/* TODO: have our own exception type ! */
|
||||||
|
PyErr_SetString(PyExc_Exception, strupnperror(r));
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* AddPortMapping(externalPort, protocol, internalHost, internalPort, desc,
|
||||||
|
* remoteHost)
|
||||||
|
* protocol is 'UDP' or 'TCP' */
|
||||||
|
static PyObject *
|
||||||
|
UPnP_addportmapping(UPnPObject *self, PyObject *args)
|
||||||
|
{
|
||||||
|
char extPort[6];
|
||||||
|
unsigned short ePort;
|
||||||
|
char inPort[6];
|
||||||
|
unsigned short iPort;
|
||||||
|
const char * proto;
|
||||||
|
const char * host;
|
||||||
|
const char * desc;
|
||||||
|
const char * remoteHost;
|
||||||
|
const char * leaseDuration = "0";
|
||||||
|
int r;
|
||||||
|
if (!PyArg_ParseTuple(args, "HssHss", &ePort, &proto,
|
||||||
|
&host, &iPort, &desc, &remoteHost))
|
||||||
|
return NULL;
|
||||||
|
Py_BEGIN_ALLOW_THREADS
|
||||||
|
sprintf(extPort, "%hu", ePort);
|
||||||
|
sprintf(inPort, "%hu", iPort);
|
||||||
|
r = UPNP_AddPortMapping(self->urls.controlURL, self->data.first.servicetype,
|
||||||
|
extPort, inPort, host, desc, proto,
|
||||||
|
remoteHost, leaseDuration);
|
||||||
|
Py_END_ALLOW_THREADS
|
||||||
|
if(r==UPNPCOMMAND_SUCCESS)
|
||||||
|
{
|
||||||
|
Py_RETURN_TRUE;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// TODO: RAISE an Exception. See upnpcommands.h for errors codes.
|
||||||
|
// upnperrors.c
|
||||||
|
//Py_RETURN_FALSE;
|
||||||
|
/* TODO: have our own exception type ! */
|
||||||
|
PyErr_SetString(PyExc_Exception, strupnperror(r));
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* DeletePortMapping(extPort, proto, removeHost='')
|
||||||
|
* proto = 'UDP', 'TCP' */
|
||||||
|
static PyObject *
|
||||||
|
UPnP_deleteportmapping(UPnPObject *self, PyObject *args)
|
||||||
|
{
|
||||||
|
char extPort[6];
|
||||||
|
unsigned short ePort;
|
||||||
|
const char * proto;
|
||||||
|
const char * remoteHost = "";
|
||||||
|
int r;
|
||||||
|
if(!PyArg_ParseTuple(args, "Hs|z", &ePort, &proto, &remoteHost))
|
||||||
|
return NULL;
|
||||||
|
Py_BEGIN_ALLOW_THREADS
|
||||||
|
sprintf(extPort, "%hu", ePort);
|
||||||
|
r = UPNP_DeletePortMapping(self->urls.controlURL, self->data.first.servicetype,
|
||||||
|
extPort, proto, remoteHost);
|
||||||
|
Py_END_ALLOW_THREADS
|
||||||
|
if(r==UPNPCOMMAND_SUCCESS) {
|
||||||
|
Py_RETURN_TRUE;
|
||||||
|
} else {
|
||||||
|
/* TODO: have our own exception type ! */
|
||||||
|
PyErr_SetString(PyExc_Exception, strupnperror(r));
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static PyObject *
|
||||||
|
UPnP_getportmappingnumberofentries(UPnPObject *self)
|
||||||
|
{
|
||||||
|
unsigned int n = 0;
|
||||||
|
int r;
|
||||||
|
Py_BEGIN_ALLOW_THREADS
|
||||||
|
r = UPNP_GetPortMappingNumberOfEntries(self->urls.controlURL,
|
||||||
|
self->data.first.servicetype,
|
||||||
|
&n);
|
||||||
|
Py_END_ALLOW_THREADS
|
||||||
|
if(r==UPNPCOMMAND_SUCCESS) {
|
||||||
|
return Py_BuildValue("I", n);
|
||||||
|
} else {
|
||||||
|
/* TODO: have our own exception type ! */
|
||||||
|
PyErr_SetString(PyExc_Exception, strupnperror(r));
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* GetSpecificPortMapping(ePort, proto)
|
||||||
|
* proto = 'UDP' or 'TCP' */
|
||||||
|
static PyObject *
|
||||||
|
UPnP_getspecificportmapping(UPnPObject *self, PyObject *args)
|
||||||
|
{
|
||||||
|
char extPort[6];
|
||||||
|
unsigned short ePort;
|
||||||
|
const char * proto;
|
||||||
|
char intClient[40];
|
||||||
|
char intPort[6];
|
||||||
|
unsigned short iPort;
|
||||||
|
char desc[80];
|
||||||
|
char enabled[4];
|
||||||
|
char leaseDuration[16];
|
||||||
|
if(!PyArg_ParseTuple(args, "Hs", &ePort, &proto))
|
||||||
|
return NULL;
|
||||||
|
extPort[0] = '\0'; intClient[0] = '\0'; intPort[0] = '\0';
|
||||||
|
desc[0] = '\0'; enabled[0] = '\0'; leaseDuration[0] = '\0';
|
||||||
|
Py_BEGIN_ALLOW_THREADS
|
||||||
|
sprintf(extPort, "%hu", ePort);
|
||||||
|
UPNP_GetSpecificPortMappingEntry(self->urls.controlURL,
|
||||||
|
self->data.first.servicetype,
|
||||||
|
extPort, proto,
|
||||||
|
intClient, intPort,
|
||||||
|
desc, enabled, leaseDuration);
|
||||||
|
Py_END_ALLOW_THREADS
|
||||||
|
if(intClient[0])
|
||||||
|
{
|
||||||
|
iPort = (unsigned short)atoi(intPort);
|
||||||
|
return Py_BuildValue("(s,H,s,O,i)",
|
||||||
|
intClient, iPort, desc,
|
||||||
|
PyBool_FromLong(atoi(enabled)),
|
||||||
|
atoi(leaseDuration));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Py_RETURN_NONE;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* GetGenericPortMapping(index) */
|
||||||
|
static PyObject *
|
||||||
|
UPnP_getgenericportmapping(UPnPObject *self, PyObject *args)
|
||||||
|
{
|
||||||
|
int i, r;
|
||||||
|
char index[8];
|
||||||
|
char intClient[40];
|
||||||
|
char intPort[6];
|
||||||
|
unsigned short iPort;
|
||||||
|
char extPort[6];
|
||||||
|
unsigned short ePort;
|
||||||
|
char protocol[4];
|
||||||
|
char desc[80];
|
||||||
|
char enabled[6];
|
||||||
|
char rHost[64];
|
||||||
|
char duration[16]; /* lease duration */
|
||||||
|
unsigned int dur;
|
||||||
|
if(!PyArg_ParseTuple(args, "i", &i))
|
||||||
|
return NULL;
|
||||||
|
Py_BEGIN_ALLOW_THREADS
|
||||||
|
snprintf(index, sizeof(index), "%d", i);
|
||||||
|
rHost[0] = '\0'; enabled[0] = '\0';
|
||||||
|
duration[0] = '\0'; desc[0] = '\0';
|
||||||
|
extPort[0] = '\0'; intPort[0] = '\0'; intClient[0] = '\0';
|
||||||
|
r = UPNP_GetGenericPortMappingEntry(self->urls.controlURL,
|
||||||
|
self->data.first.servicetype,
|
||||||
|
index,
|
||||||
|
extPort, intClient, intPort,
|
||||||
|
protocol, desc, enabled, rHost,
|
||||||
|
duration);
|
||||||
|
Py_END_ALLOW_THREADS
|
||||||
|
if(r==UPNPCOMMAND_SUCCESS)
|
||||||
|
{
|
||||||
|
ePort = (unsigned short)atoi(extPort);
|
||||||
|
iPort = (unsigned short)atoi(intPort);
|
||||||
|
dur = (unsigned int)strtoul(duration, 0, 0);
|
||||||
|
return Py_BuildValue("(H,s,(s,H),s,s,s,I)",
|
||||||
|
ePort, protocol, intClient, iPort,
|
||||||
|
desc, enabled, rHost, dur);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Py_RETURN_NONE;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* miniupnpc.UPnP object Method Table */
|
||||||
|
static PyMethodDef UPnP_methods[] = {
|
||||||
|
{"discover", (PyCFunction)UPnP_discover, METH_NOARGS,
|
||||||
|
"discover UPnP IGD devices on the network"
|
||||||
|
},
|
||||||
|
{"selectigd", (PyCFunction)UPnP_selectigd, METH_NOARGS,
|
||||||
|
"select a valid UPnP IGD among discovered devices"
|
||||||
|
},
|
||||||
|
{"totalbytesent", (PyCFunction)UPnP_totalbytesent, METH_NOARGS,
|
||||||
|
"return the total number of bytes sent by UPnP IGD"
|
||||||
|
},
|
||||||
|
{"totalbytereceived", (PyCFunction)UPnP_totalbytereceived, METH_NOARGS,
|
||||||
|
"return the total number of bytes received by UPnP IGD"
|
||||||
|
},
|
||||||
|
{"totalpacketsent", (PyCFunction)UPnP_totalpacketsent, METH_NOARGS,
|
||||||
|
"return the total number of packets sent by UPnP IGD"
|
||||||
|
},
|
||||||
|
{"totalpacketreceived", (PyCFunction)UPnP_totalpacketreceived, METH_NOARGS,
|
||||||
|
"return the total number of packets received by UPnP IGD"
|
||||||
|
},
|
||||||
|
{"statusinfo", (PyCFunction)UPnP_statusinfo, METH_NOARGS,
|
||||||
|
"return status and uptime"
|
||||||
|
},
|
||||||
|
{"connectiontype", (PyCFunction)UPnP_connectiontype, METH_NOARGS,
|
||||||
|
"return IGD WAN connection type"
|
||||||
|
},
|
||||||
|
{"externalipaddress", (PyCFunction)UPnP_externalipaddress, METH_NOARGS,
|
||||||
|
"return external IP address"
|
||||||
|
},
|
||||||
|
{"addportmapping", (PyCFunction)UPnP_addportmapping, METH_VARARGS,
|
||||||
|
"add a port mapping"
|
||||||
|
},
|
||||||
|
{"deleteportmapping", (PyCFunction)UPnP_deleteportmapping, METH_VARARGS,
|
||||||
|
"delete a port mapping"
|
||||||
|
},
|
||||||
|
{"getportmappingnumberofentries", (PyCFunction)UPnP_getportmappingnumberofentries, METH_NOARGS,
|
||||||
|
"-- non standard --"
|
||||||
|
},
|
||||||
|
{"getspecificportmapping", (PyCFunction)UPnP_getspecificportmapping, METH_VARARGS,
|
||||||
|
"get details about a specific port mapping entry"
|
||||||
|
},
|
||||||
|
{"getgenericportmapping", (PyCFunction)UPnP_getgenericportmapping, METH_VARARGS,
|
||||||
|
"get all details about the port mapping at index"
|
||||||
|
},
|
||||||
|
{NULL} /* Sentinel */
|
||||||
|
};
|
||||||
|
|
||||||
|
static PyTypeObject UPnPType = {
|
||||||
|
PyVarObject_HEAD_INIT(NULL,
|
||||||
|
0) /*ob_size*/
|
||||||
|
"miniupnpc.UPnP", /*tp_name*/
|
||||||
|
sizeof(UPnPObject), /*tp_basicsize*/
|
||||||
|
0, /*tp_itemsize*/
|
||||||
|
(destructor)UPnPObject_dealloc,/*tp_dealloc*/
|
||||||
|
0, /*tp_print*/
|
||||||
|
0, /*tp_getattr*/
|
||||||
|
0, /*tp_setattr*/
|
||||||
|
0, /*tp_compare*/
|
||||||
|
0, /*tp_repr*/
|
||||||
|
0, /*tp_as_number*/
|
||||||
|
0, /*tp_as_sequence*/
|
||||||
|
0, /*tp_as_mapping*/
|
||||||
|
0, /*tp_hash */
|
||||||
|
0, /*tp_call*/
|
||||||
|
0, /*tp_str*/
|
||||||
|
0, /*tp_getattro*/
|
||||||
|
0, /*tp_setattro*/
|
||||||
|
0, /*tp_as_buffer*/
|
||||||
|
Py_TPFLAGS_DEFAULT, /*tp_flags*/
|
||||||
|
"UPnP objects", /* tp_doc */
|
||||||
|
0, /* tp_traverse */
|
||||||
|
0, /* tp_clear */
|
||||||
|
0, /* tp_richcompare */
|
||||||
|
0, /* tp_weaklistoffset */
|
||||||
|
0, /* tp_iter */
|
||||||
|
0, /* tp_iternext */
|
||||||
|
UPnP_methods, /* tp_methods */
|
||||||
|
UPnP_members, /* tp_members */
|
||||||
|
0, /* tp_getset */
|
||||||
|
0, /* tp_base */
|
||||||
|
0, /* tp_dict */
|
||||||
|
0, /* tp_descr_get */
|
||||||
|
0, /* tp_descr_set */
|
||||||
|
0, /* tp_dictoffset */
|
||||||
|
0,/*(initproc)UPnP_init,*/ /* tp_init */
|
||||||
|
0, /* tp_alloc */
|
||||||
|
#ifndef _WIN32
|
||||||
|
PyType_GenericNew,/*UPnP_new,*/ /* tp_new */
|
||||||
|
#else
|
||||||
|
0,
|
||||||
|
#endif
|
||||||
|
};
|
||||||
|
|
||||||
|
/* module methods */
|
||||||
|
static PyMethodDef miniupnpc_methods[] = {
|
||||||
|
{NULL} /* Sentinel */
|
||||||
|
};
|
||||||
|
|
||||||
|
#if PY_MAJOR_VERSION >= 3
|
||||||
|
static struct PyModuleDef moduledef = {
|
||||||
|
PyModuleDef_HEAD_INIT,
|
||||||
|
"miniupnpc", /* m_name */
|
||||||
|
"miniupnpc module.", /* m_doc */
|
||||||
|
-1, /* m_size */
|
||||||
|
miniupnpc_methods, /* m_methods */
|
||||||
|
NULL, /* m_reload */
|
||||||
|
NULL, /* m_traverse */
|
||||||
|
NULL, /* m_clear */
|
||||||
|
NULL, /* m_free */
|
||||||
|
};
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef PyMODINIT_FUNC /* declarations for DLL import/export */
|
||||||
|
#define PyMODINIT_FUNC void
|
||||||
|
#endif
|
||||||
|
|
||||||
|
PyMODINIT_FUNC
|
||||||
|
#if PY_MAJOR_VERSION >= 3
|
||||||
|
PyInit_miniupnpc(void)
|
||||||
|
#else
|
||||||
|
initminiupnpc(void)
|
||||||
|
#endif
|
||||||
|
{
|
||||||
|
PyObject* m;
|
||||||
|
|
||||||
|
#ifdef _WIN32
|
||||||
|
UPnPType.tp_new = PyType_GenericNew;
|
||||||
|
#endif
|
||||||
|
if (PyType_Ready(&UPnPType) < 0)
|
||||||
|
return;
|
||||||
|
|
||||||
|
#if PY_MAJOR_VERSION >= 3
|
||||||
|
m = PyModule_Create(&moduledef);
|
||||||
|
#else
|
||||||
|
m = Py_InitModule3("miniupnpc", miniupnpc_methods,
|
||||||
|
"miniupnpc module.");
|
||||||
|
#endif
|
||||||
|
|
||||||
|
Py_INCREF(&UPnPType);
|
||||||
|
PyModule_AddObject(m, "UPnP", (PyObject *)&UPnPType);
|
||||||
|
|
||||||
|
#if PY_MAJOR_VERSION >= 3
|
||||||
|
return m;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
|
@ -0,0 +1,27 @@
|
||||||
|
/* $Id: miniupnpcstrings.h.in,v 1.5 2012/10/16 16:48:26 nanard Exp $ */
|
||||||
|
/* Project: miniupnp
|
||||||
|
* http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
|
||||||
|
* Author: Thomas Bernard
|
||||||
|
* Copyright (c) 2005-2011 Thomas Bernard
|
||||||
|
* This software is subjects to the conditions detailed
|
||||||
|
* in the LICENCE file provided within this distribution */
|
||||||
|
#ifndef MINIUPNPCSTRINGS_H_INCLUDED
|
||||||
|
#define MINIUPNPCSTRINGS_H_INCLUDED
|
||||||
|
|
||||||
|
#if defined(_WIN32)
|
||||||
|
#define OS_STRING "Windows"
|
||||||
|
#elif defined(__linux__)
|
||||||
|
#define OS_STRING "Linux"
|
||||||
|
#elif defined(__OSX__)
|
||||||
|
#define OS_STRING "Mac OS X"
|
||||||
|
#elif defined(__APPLE__)
|
||||||
|
#define OS_STRING "Mac OS X"
|
||||||
|
#elif defined(__DARWIN__)
|
||||||
|
#define OS_STRING "Darwin"
|
||||||
|
#else
|
||||||
|
#define OS_STRING "Generic"
|
||||||
|
#endif
|
||||||
|
#define MINIUPNPC_VERSION_STRING "1.7"
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
@ -0,0 +1,19 @@
|
||||||
|
/* $Id: miniupnpctypes.h,v 1.2 2012/09/27 15:42:10 nanard Exp $ */
|
||||||
|
/* Miniupnp project : http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org
|
||||||
|
* Author : Thomas Bernard
|
||||||
|
* Copyright (c) 2011 Thomas Bernard
|
||||||
|
* This software is subject to the conditions detailed in the
|
||||||
|
* LICENCE file provided within this distribution */
|
||||||
|
#ifndef MINIUPNPCTYPES_H_INCLUDED
|
||||||
|
#define MINIUPNPCTYPES_H_INCLUDED
|
||||||
|
|
||||||
|
#if (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L)
|
||||||
|
#define UNSIGNED_INTEGER unsigned long long
|
||||||
|
#define STRTOUI strtoull
|
||||||
|
#else
|
||||||
|
#define UNSIGNED_INTEGER unsigned int
|
||||||
|
#define STRTOUI strtoul
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
@ -0,0 +1,574 @@
|
||||||
|
/* $Id: miniwget.c,v 1.58 2012/08/11 05:52:49 nanard Exp $ */
|
||||||
|
/* Project : miniupnp
|
||||||
|
* Website : http://miniupnp.free.fr/
|
||||||
|
* Author : Thomas Bernard
|
||||||
|
* Copyright (c) 2005-2012 Thomas Bernard
|
||||||
|
* This software is subject to the conditions detailed in the
|
||||||
|
* LICENCE file provided in this distribution. */
|
||||||
|
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <ctype.h>
|
||||||
|
#ifdef _WIN32
|
||||||
|
#include <winsock2.h>
|
||||||
|
#include <ws2tcpip.h>
|
||||||
|
#include <io.h>
|
||||||
|
#define MAXHOSTNAMELEN 64
|
||||||
|
#define MIN(x,y) (((x)<(y))?(x):(y))
|
||||||
|
#define snprintf _snprintf
|
||||||
|
#define socklen_t int
|
||||||
|
#ifndef strncasecmp
|
||||||
|
#if defined(_MSC_VER) && (_MSC_VER >= 1400)
|
||||||
|
#define strncasecmp _memicmp
|
||||||
|
#else /* defined(_MSC_VER) && (_MSC_VER >= 1400) */
|
||||||
|
#define strncasecmp memicmp
|
||||||
|
#endif /* defined(_MSC_VER) && (_MSC_VER >= 1400) */
|
||||||
|
#endif /* #ifndef strncasecmp */
|
||||||
|
#else /* #ifdef _WIN32 */
|
||||||
|
#include <unistd.h>
|
||||||
|
#include <sys/param.h>
|
||||||
|
#if defined(__amigaos__) && !defined(__amigaos4__)
|
||||||
|
#define socklen_t int
|
||||||
|
#else /* #if defined(__amigaos__) && !defined(__amigaos4__) */
|
||||||
|
#include <sys/select.h>
|
||||||
|
#endif /* #else defined(__amigaos__) && !defined(__amigaos4__) */
|
||||||
|
#include <sys/socket.h>
|
||||||
|
#include <netinet/in.h>
|
||||||
|
#include <arpa/inet.h>
|
||||||
|
#include <net/if.h>
|
||||||
|
#include <netdb.h>
|
||||||
|
#define closesocket close
|
||||||
|
/* defining MINIUPNPC_IGNORE_EINTR enable the ignore of interruptions
|
||||||
|
* during the connect() call */
|
||||||
|
#define MINIUPNPC_IGNORE_EINTR
|
||||||
|
#endif /* #else _WIN32 */
|
||||||
|
#if defined(__sun) || defined(sun)
|
||||||
|
#define MIN(x,y) (((x)<(y))?(x):(y))
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include "miniupnpcstrings.h"
|
||||||
|
#include "miniwget.h"
|
||||||
|
#include "connecthostport.h"
|
||||||
|
#include "receivedata.h"
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Read a HTTP response from a socket.
|
||||||
|
* Process Content-Length and Transfer-encoding headers.
|
||||||
|
* return a pointer to the content buffer, which length is saved
|
||||||
|
* to the length parameter.
|
||||||
|
*/
|
||||||
|
void *
|
||||||
|
getHTTPResponse(int s, int * size)
|
||||||
|
{
|
||||||
|
char buf[2048];
|
||||||
|
int n;
|
||||||
|
int endofheaders = 0;
|
||||||
|
int chunked = 0;
|
||||||
|
int content_length = -1;
|
||||||
|
unsigned int chunksize = 0;
|
||||||
|
unsigned int bytestocopy = 0;
|
||||||
|
/* buffers : */
|
||||||
|
char * header_buf;
|
||||||
|
unsigned int header_buf_len = 2048;
|
||||||
|
unsigned int header_buf_used = 0;
|
||||||
|
char * content_buf;
|
||||||
|
unsigned int content_buf_len = 2048;
|
||||||
|
unsigned int content_buf_used = 0;
|
||||||
|
char chunksize_buf[32];
|
||||||
|
unsigned int chunksize_buf_index;
|
||||||
|
|
||||||
|
header_buf = malloc(header_buf_len);
|
||||||
|
content_buf = malloc(content_buf_len);
|
||||||
|
chunksize_buf[0] = '\0';
|
||||||
|
chunksize_buf_index = 0;
|
||||||
|
|
||||||
|
while((n = receivedata(s, buf, 2048, 5000, NULL)) > 0)
|
||||||
|
{
|
||||||
|
if(endofheaders == 0)
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
int linestart=0;
|
||||||
|
int colon=0;
|
||||||
|
int valuestart=0;
|
||||||
|
if(header_buf_used + n > header_buf_len) {
|
||||||
|
header_buf = realloc(header_buf, header_buf_used + n);
|
||||||
|
header_buf_len = header_buf_used + n;
|
||||||
|
}
|
||||||
|
memcpy(header_buf + header_buf_used, buf, n);
|
||||||
|
header_buf_used += n;
|
||||||
|
/* search for CR LF CR LF (end of headers)
|
||||||
|
* recognize also LF LF */
|
||||||
|
i = 0;
|
||||||
|
while(i < ((int)header_buf_used-1) && (endofheaders == 0)) {
|
||||||
|
if(header_buf[i] == '\r') {
|
||||||
|
i++;
|
||||||
|
if(header_buf[i] == '\n') {
|
||||||
|
i++;
|
||||||
|
if(i < (int)header_buf_used && header_buf[i] == '\r') {
|
||||||
|
i++;
|
||||||
|
if(i < (int)header_buf_used && header_buf[i] == '\n') {
|
||||||
|
endofheaders = i+1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else if(header_buf[i] == '\n') {
|
||||||
|
i++;
|
||||||
|
if(header_buf[i] == '\n') {
|
||||||
|
endofheaders = i+1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
i++;
|
||||||
|
}
|
||||||
|
if(endofheaders == 0)
|
||||||
|
continue;
|
||||||
|
/* parse header lines */
|
||||||
|
for(i = 0; i < endofheaders - 1; i++) {
|
||||||
|
if(colon <= linestart && header_buf[i]==':')
|
||||||
|
{
|
||||||
|
colon = i;
|
||||||
|
while(i < (endofheaders-1)
|
||||||
|
&& (header_buf[i+1] == ' ' || header_buf[i+1] == '\t'))
|
||||||
|
i++;
|
||||||
|
valuestart = i + 1;
|
||||||
|
}
|
||||||
|
/* detecting end of line */
|
||||||
|
else if(header_buf[i]=='\r' || header_buf[i]=='\n')
|
||||||
|
{
|
||||||
|
if(colon > linestart && valuestart > colon)
|
||||||
|
{
|
||||||
|
#ifdef DEBUG
|
||||||
|
printf("header='%.*s', value='%.*s'\n",
|
||||||
|
colon-linestart, header_buf+linestart,
|
||||||
|
i-valuestart, header_buf+valuestart);
|
||||||
|
#endif
|
||||||
|
if(0==strncasecmp(header_buf+linestart, "content-length", colon-linestart))
|
||||||
|
{
|
||||||
|
content_length = atoi(header_buf+valuestart);
|
||||||
|
#ifdef DEBUG
|
||||||
|
printf("Content-Length: %d\n", content_length);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
else if(0==strncasecmp(header_buf+linestart, "transfer-encoding", colon-linestart)
|
||||||
|
&& 0==strncasecmp(header_buf+valuestart, "chunked", 7))
|
||||||
|
{
|
||||||
|
#ifdef DEBUG
|
||||||
|
printf("chunked transfer-encoding!\n");
|
||||||
|
#endif
|
||||||
|
chunked = 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
while(header_buf[i]=='\r' || header_buf[i] == '\n')
|
||||||
|
i++;
|
||||||
|
linestart = i;
|
||||||
|
colon = linestart;
|
||||||
|
valuestart = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/* copy the remaining of the received data back to buf */
|
||||||
|
n = header_buf_used - endofheaders;
|
||||||
|
memcpy(buf, header_buf + endofheaders, n);
|
||||||
|
/* if(headers) */
|
||||||
|
}
|
||||||
|
if(endofheaders)
|
||||||
|
{
|
||||||
|
/* content */
|
||||||
|
if(chunked)
|
||||||
|
{
|
||||||
|
int i = 0;
|
||||||
|
while(i < n)
|
||||||
|
{
|
||||||
|
if(chunksize == 0)
|
||||||
|
{
|
||||||
|
/* reading chunk size */
|
||||||
|
if(chunksize_buf_index == 0) {
|
||||||
|
/* skipping any leading CR LF */
|
||||||
|
if(i<n && buf[i] == '\r') i++;
|
||||||
|
if(i<n && buf[i] == '\n') i++;
|
||||||
|
}
|
||||||
|
while(i<n && isxdigit(buf[i])
|
||||||
|
&& chunksize_buf_index < (sizeof(chunksize_buf)-1))
|
||||||
|
{
|
||||||
|
chunksize_buf[chunksize_buf_index++] = buf[i];
|
||||||
|
chunksize_buf[chunksize_buf_index] = '\0';
|
||||||
|
i++;
|
||||||
|
}
|
||||||
|
while(i<n && buf[i] != '\r' && buf[i] != '\n')
|
||||||
|
i++; /* discarding chunk-extension */
|
||||||
|
if(i<n && buf[i] == '\r') i++;
|
||||||
|
if(i<n && buf[i] == '\n') {
|
||||||
|
unsigned int j;
|
||||||
|
for(j = 0; j < chunksize_buf_index; j++) {
|
||||||
|
if(chunksize_buf[j] >= '0'
|
||||||
|
&& chunksize_buf[j] <= '9')
|
||||||
|
chunksize = (chunksize << 4) + (chunksize_buf[j] - '0');
|
||||||
|
else
|
||||||
|
chunksize = (chunksize << 4) + ((chunksize_buf[j] | 32) - 'a' + 10);
|
||||||
|
}
|
||||||
|
chunksize_buf[0] = '\0';
|
||||||
|
chunksize_buf_index = 0;
|
||||||
|
i++;
|
||||||
|
} else {
|
||||||
|
/* not finished to get chunksize */
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
#ifdef DEBUG
|
||||||
|
printf("chunksize = %u (%x)\n", chunksize, chunksize);
|
||||||
|
#endif
|
||||||
|
if(chunksize == 0)
|
||||||
|
{
|
||||||
|
#ifdef DEBUG
|
||||||
|
printf("end of HTTP content - %d %d\n", i, n);
|
||||||
|
/*printf("'%.*s'\n", n-i, buf+i);*/
|
||||||
|
#endif
|
||||||
|
goto end_of_stream;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
bytestocopy = ((int)chunksize < (n - i))?chunksize:(unsigned int)(n - i);
|
||||||
|
if((content_buf_used + bytestocopy) > content_buf_len)
|
||||||
|
{
|
||||||
|
if(content_length >= (int)(content_buf_used + bytestocopy)) {
|
||||||
|
content_buf_len = content_length;
|
||||||
|
} else {
|
||||||
|
content_buf_len = content_buf_used + bytestocopy;
|
||||||
|
}
|
||||||
|
content_buf = (char *)realloc((void *)content_buf,
|
||||||
|
content_buf_len);
|
||||||
|
}
|
||||||
|
memcpy(content_buf + content_buf_used, buf + i, bytestocopy);
|
||||||
|
content_buf_used += bytestocopy;
|
||||||
|
i += bytestocopy;
|
||||||
|
chunksize -= bytestocopy;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
/* not chunked */
|
||||||
|
if(content_length > 0
|
||||||
|
&& (int)(content_buf_used + n) > content_length) {
|
||||||
|
/* skipping additional bytes */
|
||||||
|
n = content_length - content_buf_used;
|
||||||
|
}
|
||||||
|
if(content_buf_used + n > content_buf_len)
|
||||||
|
{
|
||||||
|
if(content_length >= (int)(content_buf_used + n)) {
|
||||||
|
content_buf_len = content_length;
|
||||||
|
} else {
|
||||||
|
content_buf_len = content_buf_used + n;
|
||||||
|
}
|
||||||
|
content_buf = (char *)realloc((void *)content_buf,
|
||||||
|
content_buf_len);
|
||||||
|
}
|
||||||
|
memcpy(content_buf + content_buf_used, buf, n);
|
||||||
|
content_buf_used += n;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/* use the Content-Length header value if available */
|
||||||
|
if(content_length > 0 && (int)content_buf_used >= content_length)
|
||||||
|
{
|
||||||
|
#ifdef DEBUG
|
||||||
|
printf("End of HTTP content\n");
|
||||||
|
#endif
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
end_of_stream:
|
||||||
|
free(header_buf); header_buf = NULL;
|
||||||
|
*size = content_buf_used;
|
||||||
|
if(content_buf_used == 0)
|
||||||
|
{
|
||||||
|
free(content_buf);
|
||||||
|
content_buf = NULL;
|
||||||
|
}
|
||||||
|
return content_buf;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* miniwget3() :
|
||||||
|
* do all the work.
|
||||||
|
* Return NULL if something failed. */
|
||||||
|
static void *
|
||||||
|
miniwget3(const char * host,
|
||||||
|
unsigned short port, const char * path,
|
||||||
|
int * size, char * addr_str, int addr_str_len,
|
||||||
|
const char * httpversion, unsigned int scope_id)
|
||||||
|
{
|
||||||
|
char buf[2048];
|
||||||
|
int s;
|
||||||
|
int n;
|
||||||
|
int len;
|
||||||
|
int sent;
|
||||||
|
void * content;
|
||||||
|
|
||||||
|
*size = 0;
|
||||||
|
s = connecthostport(host, port, scope_id);
|
||||||
|
if(s < 0)
|
||||||
|
return NULL;
|
||||||
|
|
||||||
|
/* get address for caller ! */
|
||||||
|
if(addr_str)
|
||||||
|
{
|
||||||
|
struct sockaddr_storage saddr;
|
||||||
|
socklen_t saddrlen;
|
||||||
|
|
||||||
|
saddrlen = sizeof(saddr);
|
||||||
|
if(getsockname(s, (struct sockaddr *)&saddr, &saddrlen) < 0)
|
||||||
|
{
|
||||||
|
perror("getsockname");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
#if defined(__amigaos__) && !defined(__amigaos4__)
|
||||||
|
/* using INT WINAPI WSAAddressToStringA(LPSOCKADDR, DWORD, LPWSAPROTOCOL_INFOA, LPSTR, LPDWORD);
|
||||||
|
* But his function make a string with the port : nn.nn.nn.nn:port */
|
||||||
|
/* if(WSAAddressToStringA((SOCKADDR *)&saddr, sizeof(saddr),
|
||||||
|
NULL, addr_str, (DWORD *)&addr_str_len))
|
||||||
|
{
|
||||||
|
printf("WSAAddressToStringA() failed : %d\n", WSAGetLastError());
|
||||||
|
}*/
|
||||||
|
/* the following code is only compatible with ip v4 addresses */
|
||||||
|
strncpy(addr_str, inet_ntoa(((struct sockaddr_in *)&saddr)->sin_addr), addr_str_len);
|
||||||
|
#else
|
||||||
|
#if 0
|
||||||
|
if(saddr.sa_family == AF_INET6) {
|
||||||
|
inet_ntop(AF_INET6,
|
||||||
|
&(((struct sockaddr_in6 *)&saddr)->sin6_addr),
|
||||||
|
addr_str, addr_str_len);
|
||||||
|
} else {
|
||||||
|
inet_ntop(AF_INET,
|
||||||
|
&(((struct sockaddr_in *)&saddr)->sin_addr),
|
||||||
|
addr_str, addr_str_len);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
/* getnameinfo return ip v6 address with the scope identifier
|
||||||
|
* such as : 2a01:e35:8b2b:7330::%4281128194 */
|
||||||
|
n = getnameinfo((const struct sockaddr *)&saddr, saddrlen,
|
||||||
|
addr_str, addr_str_len,
|
||||||
|
NULL, 0,
|
||||||
|
NI_NUMERICHOST | NI_NUMERICSERV);
|
||||||
|
if(n != 0) {
|
||||||
|
#ifdef _WIN32
|
||||||
|
fprintf(stderr, "getnameinfo() failed : %d\n", n);
|
||||||
|
#else
|
||||||
|
fprintf(stderr, "getnameinfo() failed : %s\n", gai_strerror(n));
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
#ifdef DEBUG
|
||||||
|
printf("address miniwget : %s\n", addr_str);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
len = snprintf(buf, sizeof(buf),
|
||||||
|
"GET %s HTTP/%s\r\n"
|
||||||
|
"Host: %s:%d\r\n"
|
||||||
|
"Connection: Close\r\n"
|
||||||
|
"User-Agent: " OS_STRING ", UPnP/1.0, MiniUPnPc/" MINIUPNPC_VERSION_STRING "\r\n"
|
||||||
|
|
||||||
|
"\r\n",
|
||||||
|
path, httpversion, host, port);
|
||||||
|
sent = 0;
|
||||||
|
/* sending the HTTP request */
|
||||||
|
while(sent < len)
|
||||||
|
{
|
||||||
|
n = send(s, buf+sent, len-sent, 0);
|
||||||
|
if(n < 0)
|
||||||
|
{
|
||||||
|
perror("send");
|
||||||
|
closesocket(s);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
sent += n;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
content = getHTTPResponse(s, size);
|
||||||
|
closesocket(s);
|
||||||
|
return content;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* miniwget2() :
|
||||||
|
* Call miniwget3(); retry with HTTP/1.1 if 1.0 fails. */
|
||||||
|
static void *
|
||||||
|
miniwget2(const char * host,
|
||||||
|
unsigned short port, const char * path,
|
||||||
|
int * size, char * addr_str, int addr_str_len,
|
||||||
|
unsigned int scope_id)
|
||||||
|
{
|
||||||
|
char * respbuffer;
|
||||||
|
|
||||||
|
#if 1
|
||||||
|
respbuffer = miniwget3(host, port, path, size,
|
||||||
|
addr_str, addr_str_len, "1.1", scope_id);
|
||||||
|
#else
|
||||||
|
respbuffer = miniwget3(host, port, path, size,
|
||||||
|
addr_str, addr_str_len, "1.0", scope_id);
|
||||||
|
if (*size == 0)
|
||||||
|
{
|
||||||
|
#ifdef DEBUG
|
||||||
|
printf("Retrying with HTTP/1.1\n");
|
||||||
|
#endif
|
||||||
|
free(respbuffer);
|
||||||
|
respbuffer = miniwget3(host, port, path, size,
|
||||||
|
addr_str, addr_str_len, "1.1", scope_id);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
return respbuffer;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/* parseURL()
|
||||||
|
* arguments :
|
||||||
|
* url : source string not modified
|
||||||
|
* hostname : hostname destination string (size of MAXHOSTNAMELEN+1)
|
||||||
|
* port : port (destination)
|
||||||
|
* path : pointer to the path part of the URL
|
||||||
|
*
|
||||||
|
* Return values :
|
||||||
|
* 0 - Failure
|
||||||
|
* 1 - Success */
|
||||||
|
int
|
||||||
|
parseURL(const char * url,
|
||||||
|
char * hostname, unsigned short * port,
|
||||||
|
char * * path, unsigned int * scope_id)
|
||||||
|
{
|
||||||
|
char * p1, *p2, *p3;
|
||||||
|
if(!url)
|
||||||
|
return 0;
|
||||||
|
p1 = strstr(url, "://");
|
||||||
|
if(!p1)
|
||||||
|
return 0;
|
||||||
|
p1 += 3;
|
||||||
|
if( (url[0]!='h') || (url[1]!='t')
|
||||||
|
||(url[2]!='t') || (url[3]!='p'))
|
||||||
|
return 0;
|
||||||
|
memset(hostname, 0, MAXHOSTNAMELEN + 1);
|
||||||
|
if(*p1 == '[')
|
||||||
|
{
|
||||||
|
/* IP v6 : http://[2a00:1450:8002::6a]/path/abc */
|
||||||
|
char * scope;
|
||||||
|
scope = strchr(p1, '%');
|
||||||
|
p2 = strchr(p1, ']');
|
||||||
|
if(p2 && scope && scope < p2 && scope_id) {
|
||||||
|
/* parse scope */
|
||||||
|
#ifdef IF_NAMESIZE
|
||||||
|
char tmp[IF_NAMESIZE];
|
||||||
|
int l;
|
||||||
|
scope++;
|
||||||
|
/* "%25" is just '%' in URL encoding */
|
||||||
|
if(scope[0] == '2' && scope[1] == '5')
|
||||||
|
scope += 2; /* skip "25" */
|
||||||
|
l = p2 - scope;
|
||||||
|
if(l >= IF_NAMESIZE)
|
||||||
|
l = IF_NAMESIZE - 1;
|
||||||
|
memcpy(tmp, scope, l);
|
||||||
|
tmp[l] = '\0';
|
||||||
|
*scope_id = if_nametoindex(tmp);
|
||||||
|
if(*scope_id == 0) {
|
||||||
|
*scope_id = (unsigned int)strtoul(tmp, NULL, 10);
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
/* under windows, scope is numerical */
|
||||||
|
char tmp[8];
|
||||||
|
int l;
|
||||||
|
scope++;
|
||||||
|
/* "%25" is just '%' in URL encoding */
|
||||||
|
if(scope[0] == '2' && scope[1] == '5')
|
||||||
|
scope += 2; /* skip "25" */
|
||||||
|
l = p2 - scope;
|
||||||
|
if(l >= sizeof(tmp))
|
||||||
|
l = sizeof(tmp) - 1;
|
||||||
|
memcpy(tmp, scope, l);
|
||||||
|
tmp[l] = '\0';
|
||||||
|
*scope_id = (unsigned int)strtoul(tmp, NULL, 10);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
p3 = strchr(p1, '/');
|
||||||
|
if(p2 && p3)
|
||||||
|
{
|
||||||
|
p2++;
|
||||||
|
strncpy(hostname, p1, MIN(MAXHOSTNAMELEN, (int)(p2-p1)));
|
||||||
|
if(*p2 == ':')
|
||||||
|
{
|
||||||
|
*port = 0;
|
||||||
|
p2++;
|
||||||
|
while( (*p2 >= '0') && (*p2 <= '9'))
|
||||||
|
{
|
||||||
|
*port *= 10;
|
||||||
|
*port += (unsigned short)(*p2 - '0');
|
||||||
|
p2++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
*port = 80;
|
||||||
|
}
|
||||||
|
*path = p3;
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
p2 = strchr(p1, ':');
|
||||||
|
p3 = strchr(p1, '/');
|
||||||
|
if(!p3)
|
||||||
|
return 0;
|
||||||
|
if(!p2 || (p2>p3))
|
||||||
|
{
|
||||||
|
strncpy(hostname, p1, MIN(MAXHOSTNAMELEN, (int)(p3-p1)));
|
||||||
|
*port = 80;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
strncpy(hostname, p1, MIN(MAXHOSTNAMELEN, (int)(p2-p1)));
|
||||||
|
*port = 0;
|
||||||
|
p2++;
|
||||||
|
while( (*p2 >= '0') && (*p2 <= '9'))
|
||||||
|
{
|
||||||
|
*port *= 10;
|
||||||
|
*port += (unsigned short)(*p2 - '0');
|
||||||
|
p2++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
*path = p3;
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
void *
|
||||||
|
miniwget(const char * url, int * size, unsigned int scope_id)
|
||||||
|
{
|
||||||
|
unsigned short port;
|
||||||
|
char * path;
|
||||||
|
/* protocol://host:port/chemin */
|
||||||
|
char hostname[MAXHOSTNAMELEN+1];
|
||||||
|
*size = 0;
|
||||||
|
if(!parseURL(url, hostname, &port, &path, &scope_id))
|
||||||
|
return NULL;
|
||||||
|
#ifdef DEBUG
|
||||||
|
printf("parsed url : hostname='%s' port=%hu path='%s' scope_id=%u\n",
|
||||||
|
hostname, port, path, scope_id);
|
||||||
|
#endif
|
||||||
|
return miniwget2(hostname, port, path, size, 0, 0, scope_id);
|
||||||
|
}
|
||||||
|
|
||||||
|
void *
|
||||||
|
miniwget_getaddr(const char * url, int * size,
|
||||||
|
char * addr, int addrlen, unsigned int scope_id)
|
||||||
|
{
|
||||||
|
unsigned short port;
|
||||||
|
char * path;
|
||||||
|
/* protocol://host:port/path */
|
||||||
|
char hostname[MAXHOSTNAMELEN+1];
|
||||||
|
*size = 0;
|
||||||
|
if(addr)
|
||||||
|
addr[0] = '\0';
|
||||||
|
if(!parseURL(url, hostname, &port, &path, &scope_id))
|
||||||
|
return NULL;
|
||||||
|
#ifdef DEBUG
|
||||||
|
printf("parsed url : hostname='%s' port=%hu path='%s' scope_id=%u\n",
|
||||||
|
hostname, port, path, scope_id);
|
||||||
|
#endif
|
||||||
|
return miniwget2(hostname, port, path, size, addr, addrlen, scope_id);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
@ -0,0 +1,30 @@
|
||||||
|
/* $Id: miniwget.h,v 1.8 2012/09/27 15:42:10 nanard Exp $ */
|
||||||
|
/* Project : miniupnp
|
||||||
|
* Author : Thomas Bernard
|
||||||
|
* Copyright (c) 2005-2012 Thomas Bernard
|
||||||
|
* This software is subject to the conditions detailed in the
|
||||||
|
* LICENCE file provided in this distribution.
|
||||||
|
* */
|
||||||
|
#ifndef MINIWGET_H_INCLUDED
|
||||||
|
#define MINIWGET_H_INCLUDED
|
||||||
|
|
||||||
|
#include "declspec.h"
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
LIBSPEC void * getHTTPResponse(int s, int * size);
|
||||||
|
|
||||||
|
LIBSPEC void * miniwget(const char *, int *, unsigned int);
|
||||||
|
|
||||||
|
LIBSPEC void * miniwget_getaddr(const char *, int *, char *, int, unsigned int);
|
||||||
|
|
||||||
|
int parseURL(const char *, char *, unsigned short *, char * *, unsigned int *);
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
@ -0,0 +1,216 @@
|
||||||
|
/* $Id: minixml.c,v 1.10 2012/03/05 19:42:47 nanard Exp $ */
|
||||||
|
/* minixml.c : the minimum size a xml parser can be ! */
|
||||||
|
/* Project : miniupnp
|
||||||
|
* webpage: http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
|
||||||
|
* Author : Thomas Bernard
|
||||||
|
|
||||||
|
Copyright (c) 2005-2011, Thomas BERNARD
|
||||||
|
All rights reserved.
|
||||||
|
|
||||||
|
Redistribution and use in source and binary forms, with or without
|
||||||
|
modification, are permitted provided that the following conditions are met:
|
||||||
|
|
||||||
|
* Redistributions of source code must retain the above copyright notice,
|
||||||
|
this list of conditions and the following disclaimer.
|
||||||
|
* 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.
|
||||||
|
* 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 COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
|
||||||
|
*/
|
||||||
|
#include <string.h>
|
||||||
|
#include "minixml.h"
|
||||||
|
|
||||||
|
/* parseatt : used to parse the argument list
|
||||||
|
* return 0 (false) in case of success and -1 (true) if the end
|
||||||
|
* of the xmlbuffer is reached. */
|
||||||
|
static int parseatt(struct xmlparser * p)
|
||||||
|
{
|
||||||
|
const char * attname;
|
||||||
|
int attnamelen;
|
||||||
|
const char * attvalue;
|
||||||
|
int attvaluelen;
|
||||||
|
while(p->xml < p->xmlend)
|
||||||
|
{
|
||||||
|
if(*p->xml=='/' || *p->xml=='>')
|
||||||
|
return 0;
|
||||||
|
if( !IS_WHITE_SPACE(*p->xml) )
|
||||||
|
{
|
||||||
|
char sep;
|
||||||
|
attname = p->xml;
|
||||||
|
attnamelen = 0;
|
||||||
|
while(*p->xml!='=' && !IS_WHITE_SPACE(*p->xml) )
|
||||||
|
{
|
||||||
|
attnamelen++; p->xml++;
|
||||||
|
if(p->xml >= p->xmlend)
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
while(*(p->xml++) != '=')
|
||||||
|
{
|
||||||
|
if(p->xml >= p->xmlend)
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
while(IS_WHITE_SPACE(*p->xml))
|
||||||
|
{
|
||||||
|
p->xml++;
|
||||||
|
if(p->xml >= p->xmlend)
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
sep = *p->xml;
|
||||||
|
if(sep=='\'' || sep=='\"')
|
||||||
|
{
|
||||||
|
p->xml++;
|
||||||
|
if(p->xml >= p->xmlend)
|
||||||
|
return -1;
|
||||||
|
attvalue = p->xml;
|
||||||
|
attvaluelen = 0;
|
||||||
|
while(*p->xml != sep)
|
||||||
|
{
|
||||||
|
attvaluelen++; p->xml++;
|
||||||
|
if(p->xml >= p->xmlend)
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
attvalue = p->xml;
|
||||||
|
attvaluelen = 0;
|
||||||
|
while( !IS_WHITE_SPACE(*p->xml)
|
||||||
|
&& *p->xml != '>' && *p->xml != '/')
|
||||||
|
{
|
||||||
|
attvaluelen++; p->xml++;
|
||||||
|
if(p->xml >= p->xmlend)
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/*printf("%.*s='%.*s'\n",
|
||||||
|
attnamelen, attname, attvaluelen, attvalue);*/
|
||||||
|
if(p->attfunc)
|
||||||
|
p->attfunc(p->data, attname, attnamelen, attvalue, attvaluelen);
|
||||||
|
}
|
||||||
|
p->xml++;
|
||||||
|
}
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* parseelt parse the xml stream and
|
||||||
|
* call the callback functions when needed... */
|
||||||
|
static void parseelt(struct xmlparser * p)
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
const char * elementname;
|
||||||
|
while(p->xml < (p->xmlend - 1))
|
||||||
|
{
|
||||||
|
if((p->xml)[0]=='<' && (p->xml)[1]!='?')
|
||||||
|
{
|
||||||
|
i = 0; elementname = ++p->xml;
|
||||||
|
while( !IS_WHITE_SPACE(*p->xml)
|
||||||
|
&& (*p->xml!='>') && (*p->xml!='/')
|
||||||
|
)
|
||||||
|
{
|
||||||
|
i++; p->xml++;
|
||||||
|
if (p->xml >= p->xmlend)
|
||||||
|
return;
|
||||||
|
/* to ignore namespace : */
|
||||||
|
if(*p->xml==':')
|
||||||
|
{
|
||||||
|
i = 0;
|
||||||
|
elementname = ++p->xml;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(i>0)
|
||||||
|
{
|
||||||
|
if(p->starteltfunc)
|
||||||
|
p->starteltfunc(p->data, elementname, i);
|
||||||
|
if(parseatt(p))
|
||||||
|
return;
|
||||||
|
if(*p->xml!='/')
|
||||||
|
{
|
||||||
|
const char * data;
|
||||||
|
i = 0; data = ++p->xml;
|
||||||
|
if (p->xml >= p->xmlend)
|
||||||
|
return;
|
||||||
|
while( IS_WHITE_SPACE(*p->xml) )
|
||||||
|
{
|
||||||
|
i++; p->xml++;
|
||||||
|
if (p->xml >= p->xmlend)
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if(memcmp(p->xml, "<![CDATA[", 9) == 0)
|
||||||
|
{
|
||||||
|
/* CDATA handling */
|
||||||
|
p->xml += 9;
|
||||||
|
data = p->xml;
|
||||||
|
i = 0;
|
||||||
|
while(memcmp(p->xml, "]]>", 3) != 0)
|
||||||
|
{
|
||||||
|
i++; p->xml++;
|
||||||
|
if ((p->xml + 3) >= p->xmlend)
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if(i>0 && p->datafunc)
|
||||||
|
p->datafunc(p->data, data, i);
|
||||||
|
while(*p->xml!='<')
|
||||||
|
{
|
||||||
|
p->xml++;
|
||||||
|
if (p->xml >= p->xmlend)
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
while(*p->xml!='<')
|
||||||
|
{
|
||||||
|
i++; p->xml++;
|
||||||
|
if ((p->xml + 1) >= p->xmlend)
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if(i>0 && p->datafunc && *(p->xml + 1) == '/')
|
||||||
|
p->datafunc(p->data, data, i);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if(*p->xml == '/')
|
||||||
|
{
|
||||||
|
i = 0; elementname = ++p->xml;
|
||||||
|
if (p->xml >= p->xmlend)
|
||||||
|
return;
|
||||||
|
while((*p->xml != '>'))
|
||||||
|
{
|
||||||
|
i++; p->xml++;
|
||||||
|
if (p->xml >= p->xmlend)
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if(p->endeltfunc)
|
||||||
|
p->endeltfunc(p->data, elementname, i);
|
||||||
|
p->xml++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
p->xml++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* the parser must be initialized before calling this function */
|
||||||
|
void parsexml(struct xmlparser * parser)
|
||||||
|
{
|
||||||
|
parser->xml = parser->xmlstart;
|
||||||
|
parser->xmlend = parser->xmlstart + parser->xmlsize;
|
||||||
|
parseelt(parser);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -0,0 +1,37 @@
|
||||||
|
/* $Id: minixml.h,v 1.7 2012/09/27 15:42:10 nanard Exp $ */
|
||||||
|
/* minimal xml parser
|
||||||
|
*
|
||||||
|
* Project : miniupnp
|
||||||
|
* Website : http://miniupnp.free.fr/
|
||||||
|
* Author : Thomas Bernard
|
||||||
|
* Copyright (c) 2005 Thomas Bernard
|
||||||
|
* This software is subject to the conditions detailed in the
|
||||||
|
* LICENCE file provided in this distribution.
|
||||||
|
* */
|
||||||
|
#ifndef MINIXML_H_INCLUDED
|
||||||
|
#define MINIXML_H_INCLUDED
|
||||||
|
#define IS_WHITE_SPACE(c) ((c==' ') || (c=='\t') || (c=='\r') || (c=='\n'))
|
||||||
|
|
||||||
|
/* if a callback function pointer is set to NULL,
|
||||||
|
* the function is not called */
|
||||||
|
struct xmlparser {
|
||||||
|
const char *xmlstart;
|
||||||
|
const char *xmlend;
|
||||||
|
const char *xml; /* pointer to current character */
|
||||||
|
int xmlsize;
|
||||||
|
void * data;
|
||||||
|
void (*starteltfunc) (void *, const char *, int);
|
||||||
|
void (*endeltfunc) (void *, const char *, int);
|
||||||
|
void (*datafunc) (void *, const char *, int);
|
||||||
|
void (*attfunc) (void *, const char *, int, const char *, int);
|
||||||
|
};
|
||||||
|
|
||||||
|
/* parsexml()
|
||||||
|
* the xmlparser structure must be initialized before the call
|
||||||
|
* the following structure members have to be initialized :
|
||||||
|
* xmlstart, xmlsize, data, *func
|
||||||
|
* xml is for internal usage, xmlend is computed automatically */
|
||||||
|
void parsexml(struct xmlparser *);
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
@ -0,0 +1,159 @@
|
||||||
|
/* $Id: portlistingparse.c,v 1.6 2012/05/29 10:26:51 nanard Exp $ */
|
||||||
|
/* MiniUPnP project
|
||||||
|
* http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
|
||||||
|
* (c) 2011 Thomas Bernard
|
||||||
|
* This software is subject to the conditions detailed
|
||||||
|
* in the LICENCE file provided within the distribution */
|
||||||
|
#include <string.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include "portlistingparse.h"
|
||||||
|
#include "minixml.h"
|
||||||
|
|
||||||
|
/* list of the elements */
|
||||||
|
static const struct {
|
||||||
|
const portMappingElt code;
|
||||||
|
const char * const str;
|
||||||
|
} elements[] = {
|
||||||
|
{ PortMappingEntry, "PortMappingEntry"},
|
||||||
|
{ NewRemoteHost, "NewRemoteHost"},
|
||||||
|
{ NewExternalPort, "NewExternalPort"},
|
||||||
|
{ NewProtocol, "NewProtocol"},
|
||||||
|
{ NewInternalPort, "NewInternalPort"},
|
||||||
|
{ NewInternalClient, "NewInternalClient"},
|
||||||
|
{ NewEnabled, "NewEnabled"},
|
||||||
|
{ NewDescription, "NewDescription"},
|
||||||
|
{ NewLeaseTime, "NewLeaseTime"},
|
||||||
|
{ PortMappingEltNone, NULL}
|
||||||
|
};
|
||||||
|
|
||||||
|
/* Helper function */
|
||||||
|
static UNSIGNED_INTEGER
|
||||||
|
atoui(const char * p, int l)
|
||||||
|
{
|
||||||
|
UNSIGNED_INTEGER r = 0;
|
||||||
|
while(l > 0 && *p)
|
||||||
|
{
|
||||||
|
if(*p >= '0' && *p <= '9')
|
||||||
|
r = r*10 + (*p - '0');
|
||||||
|
else
|
||||||
|
break;
|
||||||
|
p++;
|
||||||
|
l--;
|
||||||
|
}
|
||||||
|
return r;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Start element handler */
|
||||||
|
static void
|
||||||
|
startelt(void * d, const char * name, int l)
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
struct PortMappingParserData * pdata = (struct PortMappingParserData *)d;
|
||||||
|
pdata->curelt = PortMappingEltNone;
|
||||||
|
for(i = 0; elements[i].str; i++)
|
||||||
|
{
|
||||||
|
if(memcmp(name, elements[i].str, l) == 0)
|
||||||
|
{
|
||||||
|
pdata->curelt = elements[i].code;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(pdata->curelt == PortMappingEntry)
|
||||||
|
{
|
||||||
|
struct PortMapping * pm;
|
||||||
|
pm = calloc(1, sizeof(struct PortMapping));
|
||||||
|
LIST_INSERT_HEAD( &(pdata->head), pm, entries);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* End element handler */
|
||||||
|
static void
|
||||||
|
endelt(void * d, const char * name, int l)
|
||||||
|
{
|
||||||
|
struct PortMappingParserData * pdata = (struct PortMappingParserData *)d;
|
||||||
|
(void)name;
|
||||||
|
(void)l;
|
||||||
|
pdata->curelt = PortMappingEltNone;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Data handler */
|
||||||
|
static void
|
||||||
|
data(void * d, const char * data, int l)
|
||||||
|
{
|
||||||
|
struct PortMapping * pm;
|
||||||
|
struct PortMappingParserData * pdata = (struct PortMappingParserData *)d;
|
||||||
|
pm = pdata->head.lh_first;
|
||||||
|
if(!pm)
|
||||||
|
return;
|
||||||
|
if(l > 63)
|
||||||
|
l = 63;
|
||||||
|
switch(pdata->curelt)
|
||||||
|
{
|
||||||
|
case NewRemoteHost:
|
||||||
|
memcpy(pm->remoteHost, data, l);
|
||||||
|
pm->remoteHost[l] = '\0';
|
||||||
|
break;
|
||||||
|
case NewExternalPort:
|
||||||
|
pm->externalPort = (unsigned short)atoui(data, l);
|
||||||
|
break;
|
||||||
|
case NewProtocol:
|
||||||
|
if(l > 3)
|
||||||
|
l = 3;
|
||||||
|
memcpy(pm->protocol, data, l);
|
||||||
|
pm->protocol[l] = '\0';
|
||||||
|
break;
|
||||||
|
case NewInternalPort:
|
||||||
|
pm->internalPort = (unsigned short)atoui(data, l);
|
||||||
|
break;
|
||||||
|
case NewInternalClient:
|
||||||
|
memcpy(pm->internalClient, data, l);
|
||||||
|
pm->internalClient[l] = '\0';
|
||||||
|
break;
|
||||||
|
case NewEnabled:
|
||||||
|
pm->enabled = (unsigned char)atoui(data, l);
|
||||||
|
break;
|
||||||
|
case NewDescription:
|
||||||
|
memcpy(pm->description, data, l);
|
||||||
|
pm->description[l] = '\0';
|
||||||
|
break;
|
||||||
|
case NewLeaseTime:
|
||||||
|
pm->leaseTime = atoui(data, l);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/* Parse the PortMappingList XML document for IGD version 2
|
||||||
|
*/
|
||||||
|
void
|
||||||
|
ParsePortListing(const char * buffer, int bufsize,
|
||||||
|
struct PortMappingParserData * pdata)
|
||||||
|
{
|
||||||
|
struct xmlparser parser;
|
||||||
|
|
||||||
|
memset(pdata, 0, sizeof(struct PortMappingParserData));
|
||||||
|
LIST_INIT(&(pdata->head));
|
||||||
|
/* init xmlparser */
|
||||||
|
parser.xmlstart = buffer;
|
||||||
|
parser.xmlsize = bufsize;
|
||||||
|
parser.data = pdata;
|
||||||
|
parser.starteltfunc = startelt;
|
||||||
|
parser.endeltfunc = endelt;
|
||||||
|
parser.datafunc = data;
|
||||||
|
parser.attfunc = 0;
|
||||||
|
parsexml(&parser);
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
FreePortListing(struct PortMappingParserData * pdata)
|
||||||
|
{
|
||||||
|
struct PortMapping * pm;
|
||||||
|
while((pm = pdata->head.lh_first) != NULL)
|
||||||
|
{
|
||||||
|
LIST_REMOVE(pm, entries);
|
||||||
|
free(pm);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
@ -0,0 +1,71 @@
|
||||||
|
/* $Id: portlistingparse.h,v 1.7 2012/09/27 15:42:10 nanard Exp $ */
|
||||||
|
/* MiniUPnP project
|
||||||
|
* http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
|
||||||
|
* (c) 2011-2012 Thomas Bernard
|
||||||
|
* This software is subject to the conditions detailed
|
||||||
|
* in the LICENCE file provided within the distribution */
|
||||||
|
#ifndef PORTLISTINGPARSE_H_INCLUDED
|
||||||
|
#define PORTLISTINGPARSE_H_INCLUDED
|
||||||
|
|
||||||
|
#include "declspec.h"
|
||||||
|
/* for the definition of UNSIGNED_INTEGER */
|
||||||
|
#include "miniupnpctypes.h"
|
||||||
|
|
||||||
|
#if defined(NO_SYS_QUEUE_H) || defined(_WIN32) || defined(__HAIKU__)
|
||||||
|
#include "bsdqueue.h"
|
||||||
|
#else
|
||||||
|
#include <sys/queue.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* sample of PortMappingEntry :
|
||||||
|
<p:PortMappingEntry>
|
||||||
|
<p:NewRemoteHost>202.233.2.1</p:NewRemoteHost>
|
||||||
|
<p:NewExternalPort>2345</p:NewExternalPort>
|
||||||
|
<p:NewProtocol>TCP</p:NewProtocol>
|
||||||
|
<p:NewInternalPort>2345</p:NewInternalPort>
|
||||||
|
<p:NewInternalClient>192.168.1.137</p:NewInternalClient>
|
||||||
|
<p:NewEnabled>1</p:NewEnabled>
|
||||||
|
<p:NewDescription>dooom</p:NewDescription>
|
||||||
|
<p:NewLeaseTime>345</p:NewLeaseTime>
|
||||||
|
</p:PortMappingEntry>
|
||||||
|
*/
|
||||||
|
typedef enum { PortMappingEltNone,
|
||||||
|
PortMappingEntry, NewRemoteHost,
|
||||||
|
NewExternalPort, NewProtocol,
|
||||||
|
NewInternalPort, NewInternalClient,
|
||||||
|
NewEnabled, NewDescription,
|
||||||
|
NewLeaseTime } portMappingElt;
|
||||||
|
|
||||||
|
struct PortMapping {
|
||||||
|
LIST_ENTRY(PortMapping) entries;
|
||||||
|
UNSIGNED_INTEGER leaseTime;
|
||||||
|
unsigned short externalPort;
|
||||||
|
unsigned short internalPort;
|
||||||
|
char remoteHost[64];
|
||||||
|
char internalClient[64];
|
||||||
|
char description[64];
|
||||||
|
char protocol[4];
|
||||||
|
unsigned char enabled;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct PortMappingParserData {
|
||||||
|
LIST_HEAD(portmappinglisthead, PortMapping) head;
|
||||||
|
portMappingElt curelt;
|
||||||
|
};
|
||||||
|
|
||||||
|
LIBSPEC void
|
||||||
|
ParsePortListing(const char * buffer, int bufsize,
|
||||||
|
struct PortMappingParserData * pdata);
|
||||||
|
|
||||||
|
LIBSPEC void
|
||||||
|
FreePortListing(struct PortMappingParserData * pdata);
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
@ -0,0 +1,104 @@
|
||||||
|
/* $Id: receivedata.c,v 1.4 2012/06/23 22:34:47 nanard Exp $ */
|
||||||
|
/* Project : miniupnp
|
||||||
|
* Website : http://miniupnp.free.fr/
|
||||||
|
* Author : Thomas Bernard
|
||||||
|
* Copyright (c) 2011-2012 Thomas Bernard
|
||||||
|
* This software is subject to the conditions detailed in the
|
||||||
|
* LICENCE file provided in this distribution. */
|
||||||
|
|
||||||
|
#include <stdio.h>
|
||||||
|
#ifdef _WIN32
|
||||||
|
#include <winsock2.h>
|
||||||
|
#include <ws2tcpip.h>
|
||||||
|
#else
|
||||||
|
#include <unistd.h>
|
||||||
|
#if defined(__amigaos__) && !defined(__amigaos4__)
|
||||||
|
#define socklen_t int
|
||||||
|
#else /* #if defined(__amigaos__) && !defined(__amigaos4__) */
|
||||||
|
#include <sys/select.h>
|
||||||
|
#endif /* #else defined(__amigaos__) && !defined(__amigaos4__) */
|
||||||
|
#include <sys/socket.h>
|
||||||
|
#include <netinet/in.h>
|
||||||
|
#if !defined(__amigaos__) && !defined(__amigaos4__)
|
||||||
|
#include <poll.h>
|
||||||
|
#endif
|
||||||
|
#include <errno.h>
|
||||||
|
#define MINIUPNPC_IGNORE_EINTR
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef _WIN32
|
||||||
|
#define PRINT_SOCKET_ERROR(x) printf("Socket error: %s, %d\n", x, WSAGetLastError());
|
||||||
|
#else
|
||||||
|
#define PRINT_SOCKET_ERROR(x) perror(x)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include "receivedata.h"
|
||||||
|
|
||||||
|
int
|
||||||
|
receivedata(int socket,
|
||||||
|
char * data, int length,
|
||||||
|
int timeout, unsigned int * scope_id)
|
||||||
|
{
|
||||||
|
#if MINIUPNPC_GET_SRC_ADDR
|
||||||
|
struct sockaddr_storage src_addr;
|
||||||
|
socklen_t src_addr_len = sizeof(src_addr);
|
||||||
|
#endif
|
||||||
|
int n;
|
||||||
|
#if !defined(_WIN32) && !defined(__amigaos__) && !defined(__amigaos4__)
|
||||||
|
/* using poll */
|
||||||
|
struct pollfd fds[1]; /* for the poll */
|
||||||
|
#ifdef MINIUPNPC_IGNORE_EINTR
|
||||||
|
do {
|
||||||
|
#endif
|
||||||
|
fds[0].fd = socket;
|
||||||
|
fds[0].events = POLLIN;
|
||||||
|
n = poll(fds, 1, timeout);
|
||||||
|
#ifdef MINIUPNPC_IGNORE_EINTR
|
||||||
|
} while(n < 0 && errno == EINTR);
|
||||||
|
#endif
|
||||||
|
if(n < 0) {
|
||||||
|
PRINT_SOCKET_ERROR("poll");
|
||||||
|
return -1;
|
||||||
|
} else if(n == 0) {
|
||||||
|
/* timeout */
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
#else /* !defined(_WIN32) && !defined(__amigaos__) && !defined(__amigaos4__) */
|
||||||
|
/* using select under _WIN32 and amigaos */
|
||||||
|
fd_set socketSet;
|
||||||
|
TIMEVAL timeval;
|
||||||
|
FD_ZERO(&socketSet);
|
||||||
|
FD_SET(socket, &socketSet);
|
||||||
|
timeval.tv_sec = timeout / 1000;
|
||||||
|
timeval.tv_usec = (timeout % 1000) * 1000;
|
||||||
|
n = select(FD_SETSIZE, &socketSet, NULL, NULL, &timeval);
|
||||||
|
if(n < 0) {
|
||||||
|
PRINT_SOCKET_ERROR("select");
|
||||||
|
return -1;
|
||||||
|
} else if(n == 0) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
#if MINIUPNPC_GET_SRC_ADDR
|
||||||
|
n = recvfrom(socket, data, length, 0,
|
||||||
|
(struct sockaddr *)&src_addr, &src_addr_len);
|
||||||
|
#else
|
||||||
|
n = recv(socket, data, length, 0);
|
||||||
|
#endif
|
||||||
|
if(n<0) {
|
||||||
|
PRINT_SOCKET_ERROR("recv");
|
||||||
|
}
|
||||||
|
#if MINIUPNPC_GET_SRC_ADDR
|
||||||
|
if (src_addr.ss_family == AF_INET6) {
|
||||||
|
const struct sockaddr_in6 * src_addr6 = (struct sockaddr_in6 *)&src_addr;
|
||||||
|
#ifdef DEBUG
|
||||||
|
printf("scope_id=%u\n", src_addr6->sin6_scope_id);
|
||||||
|
#endif
|
||||||
|
if(scope_id)
|
||||||
|
*scope_id = src_addr6->sin6_scope_id;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
return n;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -0,0 +1,19 @@
|
||||||
|
/* $Id: receivedata.h,v 1.4 2012/09/27 15:42:10 nanard Exp $ */
|
||||||
|
/* Project: miniupnp
|
||||||
|
* http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
|
||||||
|
* Author: Thomas Bernard
|
||||||
|
* Copyright (c) 2011-2012 Thomas Bernard
|
||||||
|
* This software is subjects to the conditions detailed
|
||||||
|
* in the LICENCE file provided within this distribution */
|
||||||
|
#ifndef RECEIVEDATA_H_INCLUDED
|
||||||
|
#define RECEIVEDATA_H_INCLUDED
|
||||||
|
|
||||||
|
/* Reads data from the specified socket.
|
||||||
|
* Returns the number of bytes read if successful, zero if no bytes were
|
||||||
|
* read or if we timed out. Returns negative if there was an error. */
|
||||||
|
int receivedata(int socket,
|
||||||
|
char * data, int length,
|
||||||
|
int timeout, unsigned int * scope_id);
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
@ -0,0 +1,715 @@
|
||||||
|
/* $Id: upnpc.c,v 1.99 2013/02/06 12:56:41 nanard Exp $ */
|
||||||
|
/* Project : miniupnp
|
||||||
|
* Author : Thomas Bernard
|
||||||
|
* Copyright (c) 2005-2013 Thomas Bernard
|
||||||
|
* This software is subject to the conditions detailed in the
|
||||||
|
* LICENCE file provided in this distribution. */
|
||||||
|
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <time.h>
|
||||||
|
#ifdef _WIN32
|
||||||
|
#include <winsock2.h>
|
||||||
|
#define snprintf _snprintf
|
||||||
|
#else
|
||||||
|
/* for IPPROTO_TCP / IPPROTO_UDP */
|
||||||
|
#include <netinet/in.h>
|
||||||
|
#endif
|
||||||
|
#include "miniwget.h"
|
||||||
|
#include "miniupnpc.h"
|
||||||
|
#include "upnpcommands.h"
|
||||||
|
#include "upnperrors.h"
|
||||||
|
|
||||||
|
/* protofix() checks if protocol is "UDP" or "TCP"
|
||||||
|
* returns NULL if not */
|
||||||
|
const char * protofix(const char * proto)
|
||||||
|
{
|
||||||
|
static const char proto_tcp[4] = { 'T', 'C', 'P', 0};
|
||||||
|
static const char proto_udp[4] = { 'U', 'D', 'P', 0};
|
||||||
|
int i, b;
|
||||||
|
for(i=0, b=1; i<4; i++)
|
||||||
|
b = b && ( (proto[i] == proto_tcp[i])
|
||||||
|
|| (proto[i] == (proto_tcp[i] | 32)) );
|
||||||
|
if(b)
|
||||||
|
return proto_tcp;
|
||||||
|
for(i=0, b=1; i<4; i++)
|
||||||
|
b = b && ( (proto[i] == proto_udp[i])
|
||||||
|
|| (proto[i] == (proto_udp[i] | 32)) );
|
||||||
|
if(b)
|
||||||
|
return proto_udp;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void DisplayInfos(struct UPNPUrls * urls,
|
||||||
|
struct IGDdatas * data)
|
||||||
|
{
|
||||||
|
char externalIPAddress[40];
|
||||||
|
char connectionType[64];
|
||||||
|
char status[64];
|
||||||
|
char lastconnerr[64];
|
||||||
|
unsigned int uptime;
|
||||||
|
unsigned int brUp, brDown;
|
||||||
|
time_t timenow, timestarted;
|
||||||
|
int r;
|
||||||
|
if(UPNP_GetConnectionTypeInfo(urls->controlURL,
|
||||||
|
data->first.servicetype,
|
||||||
|
connectionType) != UPNPCOMMAND_SUCCESS)
|
||||||
|
printf("GetConnectionTypeInfo failed.\n");
|
||||||
|
else
|
||||||
|
printf("Connection Type : %s\n", connectionType);
|
||||||
|
if(UPNP_GetStatusInfo(urls->controlURL, data->first.servicetype,
|
||||||
|
status, &uptime, lastconnerr) != UPNPCOMMAND_SUCCESS)
|
||||||
|
printf("GetStatusInfo failed.\n");
|
||||||
|
else
|
||||||
|
printf("Status : %s, uptime=%us, LastConnectionError : %s\n",
|
||||||
|
status, uptime, lastconnerr);
|
||||||
|
timenow = time(NULL);
|
||||||
|
timestarted = timenow - uptime;
|
||||||
|
printf(" Time started : %s", ctime(×tarted));
|
||||||
|
if(UPNP_GetLinkLayerMaxBitRates(urls->controlURL_CIF, data->CIF.servicetype,
|
||||||
|
&brDown, &brUp) != UPNPCOMMAND_SUCCESS) {
|
||||||
|
printf("GetLinkLayerMaxBitRates failed.\n");
|
||||||
|
} else {
|
||||||
|
printf("MaxBitRateDown : %u bps", brDown);
|
||||||
|
if(brDown >= 1000000) {
|
||||||
|
printf(" (%u.%u Mbps)", brDown / 1000000, (brDown / 100000) % 10);
|
||||||
|
} else if(brDown >= 1000) {
|
||||||
|
printf(" (%u Kbps)", brDown / 1000);
|
||||||
|
}
|
||||||
|
printf(" MaxBitRateUp %u bps", brUp);
|
||||||
|
if(brUp >= 1000000) {
|
||||||
|
printf(" (%u.%u Mbps)", brUp / 1000000, (brUp / 100000) % 10);
|
||||||
|
} else if(brUp >= 1000) {
|
||||||
|
printf(" (%u Kbps)", brUp / 1000);
|
||||||
|
}
|
||||||
|
printf("\n");
|
||||||
|
}
|
||||||
|
r = UPNP_GetExternalIPAddress(urls->controlURL,
|
||||||
|
data->first.servicetype,
|
||||||
|
externalIPAddress);
|
||||||
|
if(r != UPNPCOMMAND_SUCCESS) {
|
||||||
|
printf("GetExternalIPAddress failed. (errorcode=%d)\n", r);
|
||||||
|
} else {
|
||||||
|
printf("ExternalIPAddress = %s\n", externalIPAddress);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void GetConnectionStatus(struct UPNPUrls * urls,
|
||||||
|
struct IGDdatas * data)
|
||||||
|
{
|
||||||
|
unsigned int bytessent, bytesreceived, packetsreceived, packetssent;
|
||||||
|
DisplayInfos(urls, data);
|
||||||
|
bytessent = UPNP_GetTotalBytesSent(urls->controlURL_CIF, data->CIF.servicetype);
|
||||||
|
bytesreceived = UPNP_GetTotalBytesReceived(urls->controlURL_CIF, data->CIF.servicetype);
|
||||||
|
packetssent = UPNP_GetTotalPacketsSent(urls->controlURL_CIF, data->CIF.servicetype);
|
||||||
|
packetsreceived = UPNP_GetTotalPacketsReceived(urls->controlURL_CIF, data->CIF.servicetype);
|
||||||
|
printf("Bytes: Sent: %8u\tRecv: %8u\n", bytessent, bytesreceived);
|
||||||
|
printf("Packets: Sent: %8u\tRecv: %8u\n", packetssent, packetsreceived);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void ListRedirections(struct UPNPUrls * urls,
|
||||||
|
struct IGDdatas * data)
|
||||||
|
{
|
||||||
|
int r;
|
||||||
|
int i = 0;
|
||||||
|
char index[6];
|
||||||
|
char intClient[40];
|
||||||
|
char intPort[6];
|
||||||
|
char extPort[6];
|
||||||
|
char protocol[4];
|
||||||
|
char desc[80];
|
||||||
|
char enabled[6];
|
||||||
|
char rHost[64];
|
||||||
|
char duration[16];
|
||||||
|
/*unsigned int num=0;
|
||||||
|
UPNP_GetPortMappingNumberOfEntries(urls->controlURL, data->servicetype, &num);
|
||||||
|
printf("PortMappingNumberOfEntries : %u\n", num);*/
|
||||||
|
printf(" i protocol exPort->inAddr:inPort description remoteHost leaseTime\n");
|
||||||
|
do {
|
||||||
|
snprintf(index, 6, "%d", i);
|
||||||
|
rHost[0] = '\0'; enabled[0] = '\0';
|
||||||
|
duration[0] = '\0'; desc[0] = '\0';
|
||||||
|
extPort[0] = '\0'; intPort[0] = '\0'; intClient[0] = '\0';
|
||||||
|
r = UPNP_GetGenericPortMappingEntry(urls->controlURL,
|
||||||
|
data->first.servicetype,
|
||||||
|
index,
|
||||||
|
extPort, intClient, intPort,
|
||||||
|
protocol, desc, enabled,
|
||||||
|
rHost, duration);
|
||||||
|
if(r==0)
|
||||||
|
/*
|
||||||
|
printf("%02d - %s %s->%s:%s\tenabled=%s leaseDuration=%s\n"
|
||||||
|
" desc='%s' rHost='%s'\n",
|
||||||
|
i, protocol, extPort, intClient, intPort,
|
||||||
|
enabled, duration,
|
||||||
|
desc, rHost);
|
||||||
|
*/
|
||||||
|
printf("%2d %s %5s->%s:%-5s '%s' '%s' %s\n",
|
||||||
|
i, protocol, extPort, intClient, intPort,
|
||||||
|
desc, rHost, duration);
|
||||||
|
else
|
||||||
|
printf("GetGenericPortMappingEntry() returned %d (%s)\n",
|
||||||
|
r, strupnperror(r));
|
||||||
|
i++;
|
||||||
|
} while(r==0);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void NewListRedirections(struct UPNPUrls * urls,
|
||||||
|
struct IGDdatas * data)
|
||||||
|
{
|
||||||
|
int r;
|
||||||
|
int i = 0;
|
||||||
|
struct PortMappingParserData pdata;
|
||||||
|
struct PortMapping * pm;
|
||||||
|
|
||||||
|
memset(&pdata, 0, sizeof(struct PortMappingParserData));
|
||||||
|
r = UPNP_GetListOfPortMappings(urls->controlURL,
|
||||||
|
data->first.servicetype,
|
||||||
|
"0",
|
||||||
|
"65535",
|
||||||
|
"TCP",
|
||||||
|
"1000",
|
||||||
|
&pdata);
|
||||||
|
if(r == UPNPCOMMAND_SUCCESS)
|
||||||
|
{
|
||||||
|
printf(" i protocol exPort->inAddr:inPort description remoteHost leaseTime\n");
|
||||||
|
for(pm = pdata.head.lh_first; pm != NULL; pm = pm->entries.le_next)
|
||||||
|
{
|
||||||
|
printf("%2d %s %5hu->%s:%-5hu '%s' '%s' %u\n",
|
||||||
|
i, pm->protocol, pm->externalPort, pm->internalClient,
|
||||||
|
pm->internalPort,
|
||||||
|
pm->description, pm->remoteHost,
|
||||||
|
(unsigned)pm->leaseTime);
|
||||||
|
i++;
|
||||||
|
}
|
||||||
|
FreePortListing(&pdata);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
printf("GetListOfPortMappings() returned %d (%s)\n",
|
||||||
|
r, strupnperror(r));
|
||||||
|
}
|
||||||
|
r = UPNP_GetListOfPortMappings(urls->controlURL,
|
||||||
|
data->first.servicetype,
|
||||||
|
"0",
|
||||||
|
"65535",
|
||||||
|
"UDP",
|
||||||
|
"1000",
|
||||||
|
&pdata);
|
||||||
|
if(r == UPNPCOMMAND_SUCCESS)
|
||||||
|
{
|
||||||
|
for(pm = pdata.head.lh_first; pm != NULL; pm = pm->entries.le_next)
|
||||||
|
{
|
||||||
|
printf("%2d %s %5hu->%s:%-5hu '%s' '%s' %u\n",
|
||||||
|
i, pm->protocol, pm->externalPort, pm->internalClient,
|
||||||
|
pm->internalPort,
|
||||||
|
pm->description, pm->remoteHost,
|
||||||
|
(unsigned)pm->leaseTime);
|
||||||
|
i++;
|
||||||
|
}
|
||||||
|
FreePortListing(&pdata);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
printf("GetListOfPortMappings() returned %d (%s)\n",
|
||||||
|
r, strupnperror(r));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Test function
|
||||||
|
* 1 - get connection type
|
||||||
|
* 2 - get extenal ip address
|
||||||
|
* 3 - Add port mapping
|
||||||
|
* 4 - get this port mapping from the IGD */
|
||||||
|
static void SetRedirectAndTest(struct UPNPUrls * urls,
|
||||||
|
struct IGDdatas * data,
|
||||||
|
const char * iaddr,
|
||||||
|
const char * iport,
|
||||||
|
const char * eport,
|
||||||
|
const char * proto,
|
||||||
|
const char * leaseDuration,
|
||||||
|
const char * description)
|
||||||
|
{
|
||||||
|
char externalIPAddress[40];
|
||||||
|
char intClient[40];
|
||||||
|
char intPort[6];
|
||||||
|
char duration[16];
|
||||||
|
int r;
|
||||||
|
|
||||||
|
if(!iaddr || !iport || !eport || !proto)
|
||||||
|
{
|
||||||
|
fprintf(stderr, "Wrong arguments\n");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
proto = protofix(proto);
|
||||||
|
if(!proto)
|
||||||
|
{
|
||||||
|
fprintf(stderr, "invalid protocol\n");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
UPNP_GetExternalIPAddress(urls->controlURL,
|
||||||
|
data->first.servicetype,
|
||||||
|
externalIPAddress);
|
||||||
|
if(externalIPAddress[0])
|
||||||
|
printf("ExternalIPAddress = %s\n", externalIPAddress);
|
||||||
|
else
|
||||||
|
printf("GetExternalIPAddress failed.\n");
|
||||||
|
|
||||||
|
r = UPNP_AddPortMapping(urls->controlURL, data->first.servicetype,
|
||||||
|
eport, iport, iaddr, description,
|
||||||
|
proto, 0, leaseDuration);
|
||||||
|
if(r!=UPNPCOMMAND_SUCCESS)
|
||||||
|
printf("AddPortMapping(%s, %s, %s) failed with code %d (%s)\n",
|
||||||
|
eport, iport, iaddr, r, strupnperror(r));
|
||||||
|
|
||||||
|
r = UPNP_GetSpecificPortMappingEntry(urls->controlURL,
|
||||||
|
data->first.servicetype,
|
||||||
|
eport, proto,
|
||||||
|
intClient, intPort, NULL/*desc*/,
|
||||||
|
NULL/*enabled*/, duration);
|
||||||
|
if(r!=UPNPCOMMAND_SUCCESS)
|
||||||
|
printf("GetSpecificPortMappingEntry() failed with code %d (%s)\n",
|
||||||
|
r, strupnperror(r));
|
||||||
|
|
||||||
|
if(intClient[0]) {
|
||||||
|
printf("InternalIP:Port = %s:%s\n", intClient, intPort);
|
||||||
|
printf("external %s:%s %s is redirected to internal %s:%s (duration=%s)\n",
|
||||||
|
externalIPAddress, eport, proto, intClient, intPort, duration);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
RemoveRedirect(struct UPNPUrls * urls,
|
||||||
|
struct IGDdatas * data,
|
||||||
|
const char * eport,
|
||||||
|
const char * proto)
|
||||||
|
{
|
||||||
|
int r;
|
||||||
|
if(!proto || !eport)
|
||||||
|
{
|
||||||
|
fprintf(stderr, "invalid arguments\n");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
proto = protofix(proto);
|
||||||
|
if(!proto)
|
||||||
|
{
|
||||||
|
fprintf(stderr, "protocol invalid\n");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
r = UPNP_DeletePortMapping(urls->controlURL, data->first.servicetype, eport, proto, 0);
|
||||||
|
printf("UPNP_DeletePortMapping() returned : %d\n", r);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* IGD:2, functions for service WANIPv6FirewallControl:1 */
|
||||||
|
static void GetFirewallStatus(struct UPNPUrls * urls, struct IGDdatas * data)
|
||||||
|
{
|
||||||
|
unsigned int bytessent, bytesreceived, packetsreceived, packetssent;
|
||||||
|
int firewallEnabled = 0, inboundPinholeAllowed = 0;
|
||||||
|
|
||||||
|
UPNP_GetFirewallStatus(urls->controlURL_6FC, data->IPv6FC.servicetype, &firewallEnabled, &inboundPinholeAllowed);
|
||||||
|
printf("FirewallEnabled: %d & Inbound Pinhole Allowed: %d\n", firewallEnabled, inboundPinholeAllowed);
|
||||||
|
printf("GetFirewallStatus:\n Firewall Enabled: %s\n Inbound Pinhole Allowed: %s\n", (firewallEnabled)? "Yes":"No", (inboundPinholeAllowed)? "Yes":"No");
|
||||||
|
|
||||||
|
bytessent = UPNP_GetTotalBytesSent(urls->controlURL_CIF, data->CIF.servicetype);
|
||||||
|
bytesreceived = UPNP_GetTotalBytesReceived(urls->controlURL_CIF, data->CIF.servicetype);
|
||||||
|
packetssent = UPNP_GetTotalPacketsSent(urls->controlURL_CIF, data->CIF.servicetype);
|
||||||
|
packetsreceived = UPNP_GetTotalPacketsReceived(urls->controlURL_CIF, data->CIF.servicetype);
|
||||||
|
printf("Bytes: Sent: %8u\tRecv: %8u\n", bytessent, bytesreceived);
|
||||||
|
printf("Packets: Sent: %8u\tRecv: %8u\n", packetssent, packetsreceived);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Test function
|
||||||
|
* 1 - Add pinhole
|
||||||
|
* 2 - Check if pinhole is working from the IGD side */
|
||||||
|
static void SetPinholeAndTest(struct UPNPUrls * urls, struct IGDdatas * data,
|
||||||
|
const char * remoteaddr, const char * eport,
|
||||||
|
const char * intaddr, const char * iport,
|
||||||
|
const char * proto, const char * lease_time)
|
||||||
|
{
|
||||||
|
char uniqueID[8];
|
||||||
|
/*int isWorking = 0;*/
|
||||||
|
int r;
|
||||||
|
char proto_tmp[8];
|
||||||
|
|
||||||
|
if(!intaddr || !remoteaddr || !iport || !eport || !proto || !lease_time)
|
||||||
|
{
|
||||||
|
fprintf(stderr, "Wrong arguments\n");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if(atoi(proto) == 0)
|
||||||
|
{
|
||||||
|
const char * protocol;
|
||||||
|
protocol = protofix(proto);
|
||||||
|
if(protocol && (strcmp("TCP", protocol) == 0))
|
||||||
|
{
|
||||||
|
snprintf(proto_tmp, sizeof(proto_tmp), "%d", IPPROTO_TCP);
|
||||||
|
proto = proto_tmp;
|
||||||
|
}
|
||||||
|
else if(protocol && (strcmp("UDP", protocol) == 0))
|
||||||
|
{
|
||||||
|
snprintf(proto_tmp, sizeof(proto_tmp), "%d", IPPROTO_UDP);
|
||||||
|
proto = proto_tmp;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
fprintf(stderr, "invalid protocol\n");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
r = UPNP_AddPinhole(urls->controlURL_6FC, data->IPv6FC.servicetype, remoteaddr, eport, intaddr, iport, proto, lease_time, uniqueID);
|
||||||
|
if(r!=UPNPCOMMAND_SUCCESS)
|
||||||
|
printf("AddPinhole([%s]:%s -> [%s]:%s) failed with code %d (%s)\n",
|
||||||
|
remoteaddr, eport, intaddr, iport, r, strupnperror(r));
|
||||||
|
else
|
||||||
|
{
|
||||||
|
printf("AddPinhole: ([%s]:%s -> [%s]:%s) / Pinhole ID = %s\n",
|
||||||
|
remoteaddr, eport, intaddr, iport, uniqueID);
|
||||||
|
/*r = UPNP_CheckPinholeWorking(urls->controlURL_6FC, data->servicetype_6FC, uniqueID, &isWorking);
|
||||||
|
if(r!=UPNPCOMMAND_SUCCESS)
|
||||||
|
printf("CheckPinholeWorking() failed with code %d (%s)\n", r, strupnperror(r));
|
||||||
|
printf("CheckPinholeWorking: Pinhole ID = %s / IsWorking = %s\n", uniqueID, (isWorking)? "Yes":"No");*/
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Test function
|
||||||
|
* 1 - Check if pinhole is working from the IGD side
|
||||||
|
* 2 - Update pinhole */
|
||||||
|
static void GetPinholeAndUpdate(struct UPNPUrls * urls, struct IGDdatas * data,
|
||||||
|
const char * uniqueID, const char * lease_time)
|
||||||
|
{
|
||||||
|
int isWorking = 0;
|
||||||
|
int r;
|
||||||
|
|
||||||
|
if(!uniqueID || !lease_time)
|
||||||
|
{
|
||||||
|
fprintf(stderr, "Wrong arguments\n");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
r = UPNP_CheckPinholeWorking(urls->controlURL_6FC, data->IPv6FC.servicetype, uniqueID, &isWorking);
|
||||||
|
printf("CheckPinholeWorking: Pinhole ID = %s / IsWorking = %s\n", uniqueID, (isWorking)? "Yes":"No");
|
||||||
|
if(r!=UPNPCOMMAND_SUCCESS)
|
||||||
|
printf("CheckPinholeWorking() failed with code %d (%s)\n", r, strupnperror(r));
|
||||||
|
if(isWorking || r==709)
|
||||||
|
{
|
||||||
|
r = UPNP_UpdatePinhole(urls->controlURL_6FC, data->IPv6FC.servicetype, uniqueID, lease_time);
|
||||||
|
printf("UpdatePinhole: Pinhole ID = %s with Lease Time: %s\n", uniqueID, lease_time);
|
||||||
|
if(r!=UPNPCOMMAND_SUCCESS)
|
||||||
|
printf("UpdatePinhole: ID (%s) failed with code %d (%s)\n", uniqueID, r, strupnperror(r));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Test function
|
||||||
|
* Get pinhole timeout
|
||||||
|
*/
|
||||||
|
static void GetPinholeOutboundTimeout(struct UPNPUrls * urls, struct IGDdatas * data,
|
||||||
|
const char * remoteaddr, const char * eport,
|
||||||
|
const char * intaddr, const char * iport,
|
||||||
|
const char * proto)
|
||||||
|
{
|
||||||
|
int timeout = 0;
|
||||||
|
int r;
|
||||||
|
|
||||||
|
if(!intaddr || !remoteaddr || !iport || !eport || !proto)
|
||||||
|
{
|
||||||
|
fprintf(stderr, "Wrong arguments\n");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
r = UPNP_GetOutboundPinholeTimeout(urls->controlURL_6FC, data->IPv6FC.servicetype, remoteaddr, eport, intaddr, iport, proto, &timeout);
|
||||||
|
if(r!=UPNPCOMMAND_SUCCESS)
|
||||||
|
printf("GetOutboundPinholeTimeout([%s]:%s -> [%s]:%s) failed with code %d (%s)\n",
|
||||||
|
intaddr, iport, remoteaddr, eport, r, strupnperror(r));
|
||||||
|
else
|
||||||
|
printf("GetOutboundPinholeTimeout: ([%s]:%s -> [%s]:%s) / Timeout = %d\n", intaddr, iport, remoteaddr, eport, timeout);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
GetPinholePackets(struct UPNPUrls * urls,
|
||||||
|
struct IGDdatas * data, const char * uniqueID)
|
||||||
|
{
|
||||||
|
int r, pinholePackets = 0;
|
||||||
|
if(!uniqueID)
|
||||||
|
{
|
||||||
|
fprintf(stderr, "invalid arguments\n");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
r = UPNP_GetPinholePackets(urls->controlURL_6FC, data->IPv6FC.servicetype, uniqueID, &pinholePackets);
|
||||||
|
if(r!=UPNPCOMMAND_SUCCESS)
|
||||||
|
printf("GetPinholePackets() failed with code %d (%s)\n", r, strupnperror(r));
|
||||||
|
else
|
||||||
|
printf("GetPinholePackets: Pinhole ID = %s / PinholePackets = %d\n", uniqueID, pinholePackets);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
CheckPinhole(struct UPNPUrls * urls,
|
||||||
|
struct IGDdatas * data, const char * uniqueID)
|
||||||
|
{
|
||||||
|
int r, isWorking = 0;
|
||||||
|
if(!uniqueID)
|
||||||
|
{
|
||||||
|
fprintf(stderr, "invalid arguments\n");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
r = UPNP_CheckPinholeWorking(urls->controlURL_6FC, data->IPv6FC.servicetype, uniqueID, &isWorking);
|
||||||
|
if(r!=UPNPCOMMAND_SUCCESS)
|
||||||
|
printf("CheckPinholeWorking() failed with code %d (%s)\n", r, strupnperror(r));
|
||||||
|
else
|
||||||
|
printf("CheckPinholeWorking: Pinhole ID = %s / IsWorking = %s\n", uniqueID, (isWorking)? "Yes":"No");
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
RemovePinhole(struct UPNPUrls * urls,
|
||||||
|
struct IGDdatas * data, const char * uniqueID)
|
||||||
|
{
|
||||||
|
int r;
|
||||||
|
if(!uniqueID)
|
||||||
|
{
|
||||||
|
fprintf(stderr, "invalid arguments\n");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
r = UPNP_DeletePinhole(urls->controlURL_6FC, data->IPv6FC.servicetype, uniqueID);
|
||||||
|
printf("UPNP_DeletePinhole() returned : %d\n", r);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/* sample upnp client program */
|
||||||
|
int main(int argc, char ** argv)
|
||||||
|
{
|
||||||
|
char command = 0;
|
||||||
|
char ** commandargv = 0;
|
||||||
|
int commandargc = 0;
|
||||||
|
struct UPNPDev * devlist = 0;
|
||||||
|
char lanaddr[64]; /* my ip address on the LAN */
|
||||||
|
int i;
|
||||||
|
const char * rootdescurl = 0;
|
||||||
|
const char * multicastif = 0;
|
||||||
|
const char * minissdpdpath = 0;
|
||||||
|
int retcode = 0;
|
||||||
|
int error = 0;
|
||||||
|
int ipv6 = 0;
|
||||||
|
const char * description = 0;
|
||||||
|
|
||||||
|
#ifdef _WIN32
|
||||||
|
WSADATA wsaData;
|
||||||
|
int nResult = WSAStartup(MAKEWORD(2,2), &wsaData);
|
||||||
|
if(nResult != NO_ERROR)
|
||||||
|
{
|
||||||
|
fprintf(stderr, "WSAStartup() failed.\n");
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
printf("upnpc : miniupnpc library test client. (c) 2005-2013 Thomas Bernard\n");
|
||||||
|
printf("Go to http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/\n"
|
||||||
|
"for more information.\n");
|
||||||
|
/* command line processing */
|
||||||
|
for(i=1; i<argc; i++)
|
||||||
|
{
|
||||||
|
if(argv[i][0] == '-')
|
||||||
|
{
|
||||||
|
if(argv[i][1] == 'u')
|
||||||
|
rootdescurl = argv[++i];
|
||||||
|
else if(argv[i][1] == 'm')
|
||||||
|
multicastif = argv[++i];
|
||||||
|
else if(argv[i][1] == 'p')
|
||||||
|
minissdpdpath = argv[++i];
|
||||||
|
else if(argv[i][1] == '6')
|
||||||
|
ipv6 = 1;
|
||||||
|
else if(argv[i][1] == 'e')
|
||||||
|
description = argv[++i];
|
||||||
|
else
|
||||||
|
{
|
||||||
|
command = argv[i][1];
|
||||||
|
i++;
|
||||||
|
commandargv = argv + i;
|
||||||
|
commandargc = argc - i;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
fprintf(stderr, "option '%s' invalid\n", argv[i]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if(!command || (command == 'a' && commandargc<4)
|
||||||
|
|| (command == 'd' && argc<2)
|
||||||
|
|| (command == 'r' && argc<2)
|
||||||
|
|| (command == 'A' && commandargc<6)
|
||||||
|
|| (command == 'U' && commandargc<2)
|
||||||
|
|| (command == 'D' && commandargc<1))
|
||||||
|
{
|
||||||
|
fprintf(stderr, "Usage :\t%s [options] -a ip port external_port protocol [duration]\n\t\tAdd port redirection\n", argv[0]);
|
||||||
|
fprintf(stderr, " \t%s [options] -d external_port protocol [port2 protocol2] [...]\n\t\tDelete port redirection\n", argv[0]);
|
||||||
|
fprintf(stderr, " \t%s [options] -s\n\t\tGet Connection status\n", argv[0]);
|
||||||
|
fprintf(stderr, " \t%s [options] -l\n\t\tList redirections\n", argv[0]);
|
||||||
|
fprintf(stderr, " \t%s [options] -L\n\t\tList redirections (using GetListOfPortMappings, IGD v2)\n", argv[0]);
|
||||||
|
fprintf(stderr, " \t%s [options] -r port1 protocol1 [port2 protocol2] [...]\n\t\tAdd all redirections to the current host\n", argv[0]);
|
||||||
|
fprintf(stderr, " \t%s [options] -A remote_ip remote_port internal_ip internal_port protocol lease_time\n\t\tAdd Pinhole (for IGD:2 only)\n", argv[0]);
|
||||||
|
fprintf(stderr, " \t%s [options] -U uniqueID new_lease_time\n\t\tUpdate Pinhole (for IGD:2 only)\n", argv[0]);
|
||||||
|
fprintf(stderr, " \t%s [options] -C uniqueID\n\t\tCheck if Pinhole is Working (for IGD:2 only)\n", argv[0]);
|
||||||
|
fprintf(stderr, " \t%s [options] -K uniqueID\n\t\tGet Number of packets going through the rule (for IGD:2 only)\n", argv[0]);
|
||||||
|
fprintf(stderr, " \t%s [options] -D uniqueID\n\t\tDelete Pinhole (for IGD:2 only)\n", argv[0]);
|
||||||
|
fprintf(stderr, " \t%s [options] -S\n\t\tGet Firewall status (for IGD:2 only)\n", argv[0]);
|
||||||
|
fprintf(stderr, " \t%s [options] -G remote_ip remote_port internal_ip internal_port protocol\n\t\tGet Outbound Pinhole Timeout (for IGD:2 only)\n", argv[0]);
|
||||||
|
fprintf(stderr, " \t%s [options] -P\n\t\tGet Presentation url\n", argv[0]);
|
||||||
|
fprintf(stderr, "\nprotocol is UDP or TCP\n");
|
||||||
|
fprintf(stderr, "Options:\n");
|
||||||
|
fprintf(stderr, " -e description : set description for port mapping.\n");
|
||||||
|
fprintf(stderr, " -6 : use ip v6 instead of ip v4.\n");
|
||||||
|
fprintf(stderr, " -u url : bypass discovery process by providing the XML root description url.\n");
|
||||||
|
fprintf(stderr, " -m address/interface : provide ip address (ip v4) or interface name (ip v4 or v6) to use for sending SSDP multicast packets.\n");
|
||||||
|
fprintf(stderr, " -p path : use this path for MiniSSDPd socket.\n");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if( rootdescurl
|
||||||
|
|| (devlist = upnpDiscover(2000, multicastif, minissdpdpath,
|
||||||
|
0/*sameport*/, ipv6, &error)))
|
||||||
|
{
|
||||||
|
struct UPNPDev * device;
|
||||||
|
struct UPNPUrls urls;
|
||||||
|
struct IGDdatas data;
|
||||||
|
if(devlist)
|
||||||
|
{
|
||||||
|
printf("List of UPNP devices found on the network :\n");
|
||||||
|
for(device = devlist; device; device = device->pNext)
|
||||||
|
{
|
||||||
|
printf(" desc: %s\n st: %s\n\n",
|
||||||
|
device->descURL, device->st);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
printf("upnpDiscover() error code=%d\n", error);
|
||||||
|
}
|
||||||
|
i = 1;
|
||||||
|
if( (rootdescurl && UPNP_GetIGDFromUrl(rootdescurl, &urls, &data, lanaddr, sizeof(lanaddr)))
|
||||||
|
|| (i = UPNP_GetValidIGD(devlist, &urls, &data, lanaddr, sizeof(lanaddr))))
|
||||||
|
{
|
||||||
|
switch(i) {
|
||||||
|
case 1:
|
||||||
|
printf("Found valid IGD : %s\n", urls.controlURL);
|
||||||
|
break;
|
||||||
|
case 2:
|
||||||
|
printf("Found a (not connected?) IGD : %s\n", urls.controlURL);
|
||||||
|
printf("Trying to continue anyway\n");
|
||||||
|
break;
|
||||||
|
case 3:
|
||||||
|
printf("UPnP device found. Is it an IGD ? : %s\n", urls.controlURL);
|
||||||
|
printf("Trying to continue anyway\n");
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
printf("Found device (igd ?) : %s\n", urls.controlURL);
|
||||||
|
printf("Trying to continue anyway\n");
|
||||||
|
}
|
||||||
|
printf("Local LAN ip address : %s\n", lanaddr);
|
||||||
|
#if 0
|
||||||
|
printf("getting \"%s\"\n", urls.ipcondescURL);
|
||||||
|
descXML = miniwget(urls.ipcondescURL, &descXMLsize);
|
||||||
|
if(descXML)
|
||||||
|
{
|
||||||
|
/*fwrite(descXML, 1, descXMLsize, stdout);*/
|
||||||
|
free(descXML); descXML = NULL;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
switch(command)
|
||||||
|
{
|
||||||
|
case 'l':
|
||||||
|
DisplayInfos(&urls, &data);
|
||||||
|
ListRedirections(&urls, &data);
|
||||||
|
break;
|
||||||
|
case 'L':
|
||||||
|
NewListRedirections(&urls, &data);
|
||||||
|
break;
|
||||||
|
case 'a':
|
||||||
|
SetRedirectAndTest(&urls, &data,
|
||||||
|
commandargv[0], commandargv[1],
|
||||||
|
commandargv[2], commandargv[3],
|
||||||
|
(commandargc > 4)?commandargv[4]:"0",
|
||||||
|
description);
|
||||||
|
break;
|
||||||
|
case 'd':
|
||||||
|
for(i=0; i<commandargc; i+=2)
|
||||||
|
{
|
||||||
|
RemoveRedirect(&urls, &data, commandargv[i], commandargv[i+1]);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case 's':
|
||||||
|
GetConnectionStatus(&urls, &data);
|
||||||
|
break;
|
||||||
|
case 'r':
|
||||||
|
for(i=0; i<commandargc; i+=2)
|
||||||
|
{
|
||||||
|
/*printf("port %s protocol %s\n", argv[i], argv[i+1]);*/
|
||||||
|
SetRedirectAndTest(&urls, &data,
|
||||||
|
lanaddr, commandargv[i],
|
||||||
|
commandargv[i], commandargv[i+1], "0",
|
||||||
|
description);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case 'A':
|
||||||
|
SetPinholeAndTest(&urls, &data,
|
||||||
|
commandargv[0], commandargv[1],
|
||||||
|
commandargv[2], commandargv[3],
|
||||||
|
commandargv[4], commandargv[5]);
|
||||||
|
break;
|
||||||
|
case 'U':
|
||||||
|
GetPinholeAndUpdate(&urls, &data,
|
||||||
|
commandargv[0], commandargv[1]);
|
||||||
|
break;
|
||||||
|
case 'C':
|
||||||
|
for(i=0; i<commandargc; i++)
|
||||||
|
{
|
||||||
|
CheckPinhole(&urls, &data, commandargv[i]);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case 'K':
|
||||||
|
for(i=0; i<commandargc; i++)
|
||||||
|
{
|
||||||
|
GetPinholePackets(&urls, &data, commandargv[i]);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case 'D':
|
||||||
|
for(i=0; i<commandargc; i++)
|
||||||
|
{
|
||||||
|
RemovePinhole(&urls, &data, commandargv[i]);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case 'S':
|
||||||
|
GetFirewallStatus(&urls, &data);
|
||||||
|
break;
|
||||||
|
case 'G':
|
||||||
|
GetPinholeOutboundTimeout(&urls, &data,
|
||||||
|
commandargv[0], commandargv[1],
|
||||||
|
commandargv[2], commandargv[3],
|
||||||
|
commandargv[4]);
|
||||||
|
break;
|
||||||
|
case 'P':
|
||||||
|
printf("Presentation URL found:\n");
|
||||||
|
printf(" %s\n", data.presentationurl);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
fprintf(stderr, "Unknown switch -%c\n", command);
|
||||||
|
retcode = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
FreeUPNPUrls(&urls);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
fprintf(stderr, "No valid UPNP Internet Gateway Device found.\n");
|
||||||
|
retcode = 1;
|
||||||
|
}
|
||||||
|
freeUPNPDevlist(devlist); devlist = 0;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
fprintf(stderr, "No IGD UPnP Device found on the network !\n");
|
||||||
|
retcode = 1;
|
||||||
|
}
|
||||||
|
return retcode;
|
||||||
|
}
|
||||||
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,271 @@
|
||||||
|
/* $Id: upnpcommands.h,v 1.25 2012/09/27 15:42:10 nanard Exp $ */
|
||||||
|
/* Miniupnp project : http://miniupnp.free.fr/
|
||||||
|
* Author : Thomas Bernard
|
||||||
|
* Copyright (c) 2005-2011 Thomas Bernard
|
||||||
|
* This software is subject to the conditions detailed in the
|
||||||
|
* LICENCE file provided within this distribution */
|
||||||
|
#ifndef UPNPCOMMANDS_H_INCLUDED
|
||||||
|
#define UPNPCOMMANDS_H_INCLUDED
|
||||||
|
|
||||||
|
#include "upnpreplyparse.h"
|
||||||
|
#include "portlistingparse.h"
|
||||||
|
#include "declspec.h"
|
||||||
|
#include "miniupnpctypes.h"
|
||||||
|
|
||||||
|
/* MiniUPnPc return codes : */
|
||||||
|
#define UPNPCOMMAND_SUCCESS (0)
|
||||||
|
#define UPNPCOMMAND_UNKNOWN_ERROR (-1)
|
||||||
|
#define UPNPCOMMAND_INVALID_ARGS (-2)
|
||||||
|
#define UPNPCOMMAND_HTTP_ERROR (-3)
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
LIBSPEC UNSIGNED_INTEGER
|
||||||
|
UPNP_GetTotalBytesSent(const char * controlURL,
|
||||||
|
const char * servicetype);
|
||||||
|
|
||||||
|
LIBSPEC UNSIGNED_INTEGER
|
||||||
|
UPNP_GetTotalBytesReceived(const char * controlURL,
|
||||||
|
const char * servicetype);
|
||||||
|
|
||||||
|
LIBSPEC UNSIGNED_INTEGER
|
||||||
|
UPNP_GetTotalPacketsSent(const char * controlURL,
|
||||||
|
const char * servicetype);
|
||||||
|
|
||||||
|
LIBSPEC UNSIGNED_INTEGER
|
||||||
|
UPNP_GetTotalPacketsReceived(const char * controlURL,
|
||||||
|
const char * servicetype);
|
||||||
|
|
||||||
|
/* UPNP_GetStatusInfo()
|
||||||
|
* status and lastconnerror are 64 byte buffers
|
||||||
|
* Return values :
|
||||||
|
* UPNPCOMMAND_SUCCESS, UPNPCOMMAND_INVALID_ARGS, UPNPCOMMAND_UNKNOWN_ERROR
|
||||||
|
* or a UPnP Error code */
|
||||||
|
LIBSPEC int
|
||||||
|
UPNP_GetStatusInfo(const char * controlURL,
|
||||||
|
const char * servicetype,
|
||||||
|
char * status,
|
||||||
|
unsigned int * uptime,
|
||||||
|
char * lastconnerror);
|
||||||
|
|
||||||
|
/* UPNP_GetConnectionTypeInfo()
|
||||||
|
* argument connectionType is a 64 character buffer
|
||||||
|
* Return Values :
|
||||||
|
* UPNPCOMMAND_SUCCESS, UPNPCOMMAND_INVALID_ARGS, UPNPCOMMAND_UNKNOWN_ERROR
|
||||||
|
* or a UPnP Error code */
|
||||||
|
LIBSPEC int
|
||||||
|
UPNP_GetConnectionTypeInfo(const char * controlURL,
|
||||||
|
const char * servicetype,
|
||||||
|
char * connectionType);
|
||||||
|
|
||||||
|
/* UPNP_GetExternalIPAddress() call the corresponding UPNP method.
|
||||||
|
* if the third arg is not null the value is copied to it.
|
||||||
|
* at least 16 bytes must be available
|
||||||
|
*
|
||||||
|
* Return values :
|
||||||
|
* 0 : SUCCESS
|
||||||
|
* NON ZERO : ERROR Either an UPnP error code or an unknown error.
|
||||||
|
*
|
||||||
|
* possible UPnP Errors :
|
||||||
|
* 402 Invalid Args - See UPnP Device Architecture section on Control.
|
||||||
|
* 501 Action Failed - See UPnP Device Architecture section on Control. */
|
||||||
|
LIBSPEC int
|
||||||
|
UPNP_GetExternalIPAddress(const char * controlURL,
|
||||||
|
const char * servicetype,
|
||||||
|
char * extIpAdd);
|
||||||
|
|
||||||
|
/* UPNP_GetLinkLayerMaxBitRates()
|
||||||
|
* call WANCommonInterfaceConfig:1#GetCommonLinkProperties
|
||||||
|
*
|
||||||
|
* return values :
|
||||||
|
* UPNPCOMMAND_SUCCESS, UPNPCOMMAND_INVALID_ARGS, UPNPCOMMAND_UNKNOWN_ERROR
|
||||||
|
* or a UPnP Error Code. */
|
||||||
|
LIBSPEC int
|
||||||
|
UPNP_GetLinkLayerMaxBitRates(const char* controlURL,
|
||||||
|
const char* servicetype,
|
||||||
|
unsigned int * bitrateDown,
|
||||||
|
unsigned int * bitrateUp);
|
||||||
|
|
||||||
|
/* UPNP_AddPortMapping()
|
||||||
|
* if desc is NULL, it will be defaulted to "libminiupnpc"
|
||||||
|
* remoteHost is usually NULL because IGD don't support it.
|
||||||
|
*
|
||||||
|
* Return values :
|
||||||
|
* 0 : SUCCESS
|
||||||
|
* NON ZERO : ERROR. Either an UPnP error code or an unknown error.
|
||||||
|
*
|
||||||
|
* List of possible UPnP errors for AddPortMapping :
|
||||||
|
* errorCode errorDescription (short) - Description (long)
|
||||||
|
* 402 Invalid Args - See UPnP Device Architecture section on Control.
|
||||||
|
* 501 Action Failed - See UPnP Device Architecture section on Control.
|
||||||
|
* 715 WildCardNotPermittedInSrcIP - The source IP address cannot be
|
||||||
|
* wild-carded
|
||||||
|
* 716 WildCardNotPermittedInExtPort - The external port cannot be wild-carded
|
||||||
|
* 718 ConflictInMappingEntry - The port mapping entry specified conflicts
|
||||||
|
* with a mapping assigned previously to another client
|
||||||
|
* 724 SamePortValuesRequired - Internal and External port values
|
||||||
|
* must be the same
|
||||||
|
* 725 OnlyPermanentLeasesSupported - The NAT implementation only supports
|
||||||
|
* permanent lease times on port mappings
|
||||||
|
* 726 RemoteHostOnlySupportsWildcard - RemoteHost must be a wildcard
|
||||||
|
* and cannot be a specific IP address or DNS name
|
||||||
|
* 727 ExternalPortOnlySupportsWildcard - ExternalPort must be a wildcard and
|
||||||
|
* cannot be a specific port value */
|
||||||
|
LIBSPEC int
|
||||||
|
UPNP_AddPortMapping(const char * controlURL, const char * servicetype,
|
||||||
|
const char * extPort,
|
||||||
|
const char * inPort,
|
||||||
|
const char * inClient,
|
||||||
|
const char * desc,
|
||||||
|
const char * proto,
|
||||||
|
const char * remoteHost,
|
||||||
|
const char * leaseDuration);
|
||||||
|
|
||||||
|
/* UPNP_DeletePortMapping()
|
||||||
|
* Use same argument values as what was used for AddPortMapping().
|
||||||
|
* remoteHost is usually NULL because IGD don't support it.
|
||||||
|
* Return Values :
|
||||||
|
* 0 : SUCCESS
|
||||||
|
* NON ZERO : error. Either an UPnP error code or an undefined error.
|
||||||
|
*
|
||||||
|
* List of possible UPnP errors for DeletePortMapping :
|
||||||
|
* 402 Invalid Args - See UPnP Device Architecture section on Control.
|
||||||
|
* 714 NoSuchEntryInArray - The specified value does not exist in the array */
|
||||||
|
LIBSPEC int
|
||||||
|
UPNP_DeletePortMapping(const char * controlURL, const char * servicetype,
|
||||||
|
const char * extPort, const char * proto,
|
||||||
|
const char * remoteHost);
|
||||||
|
|
||||||
|
/* UPNP_GetPortMappingNumberOfEntries()
|
||||||
|
* not supported by all routers */
|
||||||
|
LIBSPEC int
|
||||||
|
UPNP_GetPortMappingNumberOfEntries(const char* controlURL,
|
||||||
|
const char* servicetype,
|
||||||
|
unsigned int * num);
|
||||||
|
|
||||||
|
/* UPNP_GetSpecificPortMappingEntry()
|
||||||
|
* retrieves an existing port mapping
|
||||||
|
* params :
|
||||||
|
* in extPort
|
||||||
|
* in proto
|
||||||
|
* out intClient (16 bytes)
|
||||||
|
* out intPort (6 bytes)
|
||||||
|
* out desc (80 bytes)
|
||||||
|
* out enabled (4 bytes)
|
||||||
|
* out leaseDuration (16 bytes)
|
||||||
|
*
|
||||||
|
* return value :
|
||||||
|
* UPNPCOMMAND_SUCCESS, UPNPCOMMAND_INVALID_ARGS, UPNPCOMMAND_UNKNOWN_ERROR
|
||||||
|
* or a UPnP Error Code. */
|
||||||
|
LIBSPEC int
|
||||||
|
UPNP_GetSpecificPortMappingEntry(const char * controlURL,
|
||||||
|
const char * servicetype,
|
||||||
|
const char * extPort,
|
||||||
|
const char * proto,
|
||||||
|
char * intClient,
|
||||||
|
char * intPort,
|
||||||
|
char * desc,
|
||||||
|
char * enabled,
|
||||||
|
char * leaseDuration);
|
||||||
|
|
||||||
|
/* UPNP_GetGenericPortMappingEntry()
|
||||||
|
* params :
|
||||||
|
* in index
|
||||||
|
* out extPort (6 bytes)
|
||||||
|
* out intClient (16 bytes)
|
||||||
|
* out intPort (6 bytes)
|
||||||
|
* out protocol (4 bytes)
|
||||||
|
* out desc (80 bytes)
|
||||||
|
* out enabled (4 bytes)
|
||||||
|
* out rHost (64 bytes)
|
||||||
|
* out duration (16 bytes)
|
||||||
|
*
|
||||||
|
* return value :
|
||||||
|
* UPNPCOMMAND_SUCCESS, UPNPCOMMAND_INVALID_ARGS, UPNPCOMMAND_UNKNOWN_ERROR
|
||||||
|
* or a UPnP Error Code.
|
||||||
|
*
|
||||||
|
* Possible UPNP Error codes :
|
||||||
|
* 402 Invalid Args - See UPnP Device Architecture section on Control.
|
||||||
|
* 713 SpecifiedArrayIndexInvalid - The specified array index is out of bounds
|
||||||
|
*/
|
||||||
|
LIBSPEC int
|
||||||
|
UPNP_GetGenericPortMappingEntry(const char * controlURL,
|
||||||
|
const char * servicetype,
|
||||||
|
const char * index,
|
||||||
|
char * extPort,
|
||||||
|
char * intClient,
|
||||||
|
char * intPort,
|
||||||
|
char * protocol,
|
||||||
|
char * desc,
|
||||||
|
char * enabled,
|
||||||
|
char * rHost,
|
||||||
|
char * duration);
|
||||||
|
|
||||||
|
/* UPNP_GetListOfPortMappings() Available in IGD v2
|
||||||
|
*
|
||||||
|
*
|
||||||
|
* Possible UPNP Error codes :
|
||||||
|
* 606 Action not Authorized
|
||||||
|
* 730 PortMappingNotFound - no port mapping is found in the specified range.
|
||||||
|
* 733 InconsistantParameters - NewStartPort and NewEndPort values are not
|
||||||
|
* consistent.
|
||||||
|
*/
|
||||||
|
LIBSPEC int
|
||||||
|
UPNP_GetListOfPortMappings(const char * controlURL,
|
||||||
|
const char * servicetype,
|
||||||
|
const char * startPort,
|
||||||
|
const char * endPort,
|
||||||
|
const char * protocol,
|
||||||
|
const char * numberOfPorts,
|
||||||
|
struct PortMappingParserData * data);
|
||||||
|
|
||||||
|
/* IGD:2, functions for service WANIPv6FirewallControl:1 */
|
||||||
|
LIBSPEC int
|
||||||
|
UPNP_GetFirewallStatus(const char * controlURL,
|
||||||
|
const char * servicetype,
|
||||||
|
int * firewallEnabled,
|
||||||
|
int * inboundPinholeAllowed);
|
||||||
|
|
||||||
|
LIBSPEC int
|
||||||
|
UPNP_GetOutboundPinholeTimeout(const char * controlURL, const char * servicetype,
|
||||||
|
const char * remoteHost,
|
||||||
|
const char * remotePort,
|
||||||
|
const char * intClient,
|
||||||
|
const char * intPort,
|
||||||
|
const char * proto,
|
||||||
|
int * opTimeout);
|
||||||
|
|
||||||
|
LIBSPEC int
|
||||||
|
UPNP_AddPinhole(const char * controlURL, const char * servicetype,
|
||||||
|
const char * remoteHost,
|
||||||
|
const char * remotePort,
|
||||||
|
const char * intClient,
|
||||||
|
const char * intPort,
|
||||||
|
const char * proto,
|
||||||
|
const char * leaseTime,
|
||||||
|
char * uniqueID);
|
||||||
|
|
||||||
|
LIBSPEC int
|
||||||
|
UPNP_UpdatePinhole(const char * controlURL, const char * servicetype,
|
||||||
|
const char * uniqueID,
|
||||||
|
const char * leaseTime);
|
||||||
|
|
||||||
|
LIBSPEC int
|
||||||
|
UPNP_DeletePinhole(const char * controlURL, const char * servicetype, const char * uniqueID);
|
||||||
|
|
||||||
|
LIBSPEC int
|
||||||
|
UPNP_CheckPinholeWorking(const char * controlURL, const char * servicetype,
|
||||||
|
const char * uniqueID, int * isWorking);
|
||||||
|
|
||||||
|
LIBSPEC int
|
||||||
|
UPNP_GetPinholePackets(const char * controlURL, const char * servicetype,
|
||||||
|
const char * uniqueID, int * packets);
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
@ -0,0 +1,104 @@
|
||||||
|
/* $Id: upnperrors.c,v 1.6 2012/03/15 01:02:03 nanard Exp $ */
|
||||||
|
/* Project : miniupnp
|
||||||
|
* Author : Thomas BERNARD
|
||||||
|
* copyright (c) 2007 Thomas Bernard
|
||||||
|
* All Right reserved.
|
||||||
|
* http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
|
||||||
|
* This software is subjet to the conditions detailed in the
|
||||||
|
* provided LICENCE file. */
|
||||||
|
#include <string.h>
|
||||||
|
#include "upnperrors.h"
|
||||||
|
#include "upnpcommands.h"
|
||||||
|
#include "miniupnpc.h"
|
||||||
|
|
||||||
|
const char * strupnperror(int err)
|
||||||
|
{
|
||||||
|
const char * s = NULL;
|
||||||
|
switch(err) {
|
||||||
|
case UPNPCOMMAND_SUCCESS:
|
||||||
|
s = "Success";
|
||||||
|
break;
|
||||||
|
case UPNPCOMMAND_UNKNOWN_ERROR:
|
||||||
|
s = "Miniupnpc Unknown Error";
|
||||||
|
break;
|
||||||
|
case UPNPCOMMAND_INVALID_ARGS:
|
||||||
|
s = "Miniupnpc Invalid Arguments";
|
||||||
|
break;
|
||||||
|
case UPNPDISCOVER_SOCKET_ERROR:
|
||||||
|
s = "Miniupnpc Socket error";
|
||||||
|
break;
|
||||||
|
case UPNPDISCOVER_MEMORY_ERROR:
|
||||||
|
s = "Miniupnpc Memory allocation error";
|
||||||
|
break;
|
||||||
|
case 401:
|
||||||
|
s = "Invalid Action";
|
||||||
|
break;
|
||||||
|
case 402:
|
||||||
|
s = "Invalid Args";
|
||||||
|
break;
|
||||||
|
case 501:
|
||||||
|
s = "Action Failed";
|
||||||
|
break;
|
||||||
|
case 606:
|
||||||
|
s = "Action not authorized";
|
||||||
|
break;
|
||||||
|
case 701:
|
||||||
|
s = "PinholeSpaceExhausted";
|
||||||
|
break;
|
||||||
|
case 702:
|
||||||
|
s = "FirewallDisabled";
|
||||||
|
break;
|
||||||
|
case 703:
|
||||||
|
s = "InboundPinholeNotAllowed";
|
||||||
|
break;
|
||||||
|
case 704:
|
||||||
|
s = "NoSuchEntry";
|
||||||
|
break;
|
||||||
|
case 705:
|
||||||
|
s = "ProtocolNotSupported";
|
||||||
|
break;
|
||||||
|
case 706:
|
||||||
|
s = "InternalPortWildcardingNotAllowed";
|
||||||
|
break;
|
||||||
|
case 707:
|
||||||
|
s = "ProtocolWildcardingNotAllowed";
|
||||||
|
break;
|
||||||
|
case 708:
|
||||||
|
s = "WildcardNotPermittedInSrcIP";
|
||||||
|
break;
|
||||||
|
case 709:
|
||||||
|
s = "NoPacketSent";
|
||||||
|
break;
|
||||||
|
case 713:
|
||||||
|
s = "SpecifiedArrayIndexInvalid";
|
||||||
|
break;
|
||||||
|
case 714:
|
||||||
|
s = "NoSuchEntryInArray";
|
||||||
|
break;
|
||||||
|
case 715:
|
||||||
|
s = "WildCardNotPermittedInSrcIP";
|
||||||
|
break;
|
||||||
|
case 716:
|
||||||
|
s = "WildCardNotPermittedInExtPort";
|
||||||
|
break;
|
||||||
|
case 718:
|
||||||
|
s = "ConflictInMappingEntry";
|
||||||
|
break;
|
||||||
|
case 724:
|
||||||
|
s = "SamePortValuesRequired";
|
||||||
|
break;
|
||||||
|
case 725:
|
||||||
|
s = "OnlyPermanentLeasesSupported";
|
||||||
|
break;
|
||||||
|
case 726:
|
||||||
|
s = "RemoteHostOnlySupportsWildcard";
|
||||||
|
break;
|
||||||
|
case 727:
|
||||||
|
s = "ExternalPortOnlySupportsWildcard";
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
s = "UnknownError";
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
return s;
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,26 @@
|
||||||
|
/* $Id: upnperrors.h,v 1.4 2012/09/27 15:42:11 nanard Exp $ */
|
||||||
|
/* (c) 2007 Thomas Bernard
|
||||||
|
* All rights reserved.
|
||||||
|
* MiniUPnP Project.
|
||||||
|
* http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
|
||||||
|
* This software is subjet to the conditions detailed in the
|
||||||
|
* provided LICENCE file. */
|
||||||
|
#ifndef UPNPERRORS_H_INCLUDED
|
||||||
|
#define UPNPERRORS_H_INCLUDED
|
||||||
|
|
||||||
|
#include "declspec.h"
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* strupnperror()
|
||||||
|
* Return a string description of the UPnP error code
|
||||||
|
* or NULL for undefinded errors */
|
||||||
|
LIBSPEC const char * strupnperror(int err);
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
@ -0,0 +1,152 @@
|
||||||
|
/* $Id: upnpreplyparse.c,v 1.12 2012/03/05 19:42:48 nanard Exp $ */
|
||||||
|
/* MiniUPnP project
|
||||||
|
* http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
|
||||||
|
* (c) 2006-2011 Thomas Bernard
|
||||||
|
* This software is subject to the conditions detailed
|
||||||
|
* in the LICENCE file provided within the distribution */
|
||||||
|
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
|
||||||
|
#include "upnpreplyparse.h"
|
||||||
|
#include "minixml.h"
|
||||||
|
|
||||||
|
static void
|
||||||
|
NameValueParserStartElt(void * d, const char * name, int l)
|
||||||
|
{
|
||||||
|
struct NameValueParserData * data = (struct NameValueParserData *)d;
|
||||||
|
if(l>63)
|
||||||
|
l = 63;
|
||||||
|
memcpy(data->curelt, name, l);
|
||||||
|
data->curelt[l] = '\0';
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
NameValueParserGetData(void * d, const char * datas, int l)
|
||||||
|
{
|
||||||
|
struct NameValueParserData * data = (struct NameValueParserData *)d;
|
||||||
|
struct NameValue * nv;
|
||||||
|
if(strcmp(data->curelt, "NewPortListing") == 0)
|
||||||
|
{
|
||||||
|
/* specific case for NewPortListing which is a XML Document */
|
||||||
|
data->portListing = malloc(l + 1);
|
||||||
|
if(!data->portListing)
|
||||||
|
{
|
||||||
|
/* malloc error */
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
memcpy(data->portListing, datas, l);
|
||||||
|
data->portListing[l] = '\0';
|
||||||
|
data->portListingLength = l;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
/* standard case. Limited to 63 chars strings */
|
||||||
|
nv = malloc(sizeof(struct NameValue));
|
||||||
|
if(l>63)
|
||||||
|
l = 63;
|
||||||
|
strncpy(nv->name, data->curelt, 64);
|
||||||
|
nv->name[63] = '\0';
|
||||||
|
memcpy(nv->value, datas, l);
|
||||||
|
nv->value[l] = '\0';
|
||||||
|
LIST_INSERT_HEAD( &(data->head), nv, entries);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
ParseNameValue(const char * buffer, int bufsize,
|
||||||
|
struct NameValueParserData * data)
|
||||||
|
{
|
||||||
|
struct xmlparser parser;
|
||||||
|
LIST_INIT(&(data->head));
|
||||||
|
data->portListing = NULL;
|
||||||
|
data->portListingLength = 0;
|
||||||
|
/* init xmlparser object */
|
||||||
|
parser.xmlstart = buffer;
|
||||||
|
parser.xmlsize = bufsize;
|
||||||
|
parser.data = data;
|
||||||
|
parser.starteltfunc = NameValueParserStartElt;
|
||||||
|
parser.endeltfunc = 0;
|
||||||
|
parser.datafunc = NameValueParserGetData;
|
||||||
|
parser.attfunc = 0;
|
||||||
|
parsexml(&parser);
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
ClearNameValueList(struct NameValueParserData * pdata)
|
||||||
|
{
|
||||||
|
struct NameValue * nv;
|
||||||
|
if(pdata->portListing)
|
||||||
|
{
|
||||||
|
free(pdata->portListing);
|
||||||
|
pdata->portListing = NULL;
|
||||||
|
pdata->portListingLength = 0;
|
||||||
|
}
|
||||||
|
while((nv = pdata->head.lh_first) != NULL)
|
||||||
|
{
|
||||||
|
LIST_REMOVE(nv, entries);
|
||||||
|
free(nv);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
char *
|
||||||
|
GetValueFromNameValueList(struct NameValueParserData * pdata,
|
||||||
|
const char * Name)
|
||||||
|
{
|
||||||
|
struct NameValue * nv;
|
||||||
|
char * p = NULL;
|
||||||
|
for(nv = pdata->head.lh_first;
|
||||||
|
(nv != NULL) && (p == NULL);
|
||||||
|
nv = nv->entries.le_next)
|
||||||
|
{
|
||||||
|
if(strcmp(nv->name, Name) == 0)
|
||||||
|
p = nv->value;
|
||||||
|
}
|
||||||
|
return p;
|
||||||
|
}
|
||||||
|
|
||||||
|
#if 0
|
||||||
|
/* useless now that minixml ignores namespaces by itself */
|
||||||
|
char *
|
||||||
|
GetValueFromNameValueListIgnoreNS(struct NameValueParserData * pdata,
|
||||||
|
const char * Name)
|
||||||
|
{
|
||||||
|
struct NameValue * nv;
|
||||||
|
char * p = NULL;
|
||||||
|
char * pname;
|
||||||
|
for(nv = pdata->head.lh_first;
|
||||||
|
(nv != NULL) && (p == NULL);
|
||||||
|
nv = nv->entries.le_next)
|
||||||
|
{
|
||||||
|
pname = strrchr(nv->name, ':');
|
||||||
|
if(pname)
|
||||||
|
pname++;
|
||||||
|
else
|
||||||
|
pname = nv->name;
|
||||||
|
if(strcmp(pname, Name)==0)
|
||||||
|
p = nv->value;
|
||||||
|
}
|
||||||
|
return p;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* debug all-in-one function
|
||||||
|
* do parsing then display to stdout */
|
||||||
|
#ifdef DEBUG
|
||||||
|
void
|
||||||
|
DisplayNameValueList(char * buffer, int bufsize)
|
||||||
|
{
|
||||||
|
struct NameValueParserData pdata;
|
||||||
|
struct NameValue * nv;
|
||||||
|
ParseNameValue(buffer, bufsize, &pdata);
|
||||||
|
for(nv = pdata.head.lh_first;
|
||||||
|
nv != NULL;
|
||||||
|
nv = nv->entries.le_next)
|
||||||
|
{
|
||||||
|
printf("%s = %s\n", nv->name, nv->value);
|
||||||
|
}
|
||||||
|
ClearNameValueList(&pdata);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
@ -0,0 +1,64 @@
|
||||||
|
/* $Id: upnpreplyparse.h,v 1.14 2012/09/27 15:42:11 nanard Exp $ */
|
||||||
|
/* MiniUPnP project
|
||||||
|
* http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
|
||||||
|
* (c) 2006-2012 Thomas Bernard
|
||||||
|
* This software is subject to the conditions detailed
|
||||||
|
* in the LICENCE file provided within the distribution */
|
||||||
|
|
||||||
|
#ifndef UPNPREPLYPARSE_H_INCLUDED
|
||||||
|
#define UPNPREPLYPARSE_H_INCLUDED
|
||||||
|
|
||||||
|
#if defined(NO_SYS_QUEUE_H) || defined(_WIN32) || defined(__HAIKU__)
|
||||||
|
#include "bsdqueue.h"
|
||||||
|
#else
|
||||||
|
#include <sys/queue.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
struct NameValue {
|
||||||
|
LIST_ENTRY(NameValue) entries;
|
||||||
|
char name[64];
|
||||||
|
char value[64];
|
||||||
|
};
|
||||||
|
|
||||||
|
struct NameValueParserData {
|
||||||
|
LIST_HEAD(listhead, NameValue) head;
|
||||||
|
char curelt[64];
|
||||||
|
char * portListing;
|
||||||
|
int portListingLength;
|
||||||
|
};
|
||||||
|
|
||||||
|
/* ParseNameValue() */
|
||||||
|
void
|
||||||
|
ParseNameValue(const char * buffer, int bufsize,
|
||||||
|
struct NameValueParserData * data);
|
||||||
|
|
||||||
|
/* ClearNameValueList() */
|
||||||
|
void
|
||||||
|
ClearNameValueList(struct NameValueParserData * pdata);
|
||||||
|
|
||||||
|
/* GetValueFromNameValueList() */
|
||||||
|
char *
|
||||||
|
GetValueFromNameValueList(struct NameValueParserData * pdata,
|
||||||
|
const char * Name);
|
||||||
|
|
||||||
|
/* GetValueFromNameValueListIgnoreNS() */
|
||||||
|
char *
|
||||||
|
GetValueFromNameValueListIgnoreNS(struct NameValueParserData * pdata,
|
||||||
|
const char * Name);
|
||||||
|
|
||||||
|
/* DisplayNameValueList() */
|
||||||
|
#ifdef DEBUG
|
||||||
|
void
|
||||||
|
DisplayNameValueList(char * buffer, int bufsize);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
@ -115,7 +115,7 @@
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" />
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" />
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<AdditionalIncludeDirectories>.\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\portaudio\include;..\..\..\Externals\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>.\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\portaudio\include;..\..\..\Externals\zlib;..\..\..\Externals\miniupnpc\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link>
|
<Link>
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
|
@ -127,7 +127,7 @@
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<AdditionalIncludeDirectories>.\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\portaudio\include;..\..\..\Externals\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>.\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\portaudio\include;..\..\..\Externals\zlib;..\..\..\Externals\miniupnpc\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link>
|
<Link>
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
|
@ -139,7 +139,7 @@
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<AdditionalIncludeDirectories>.\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\portaudio\include;..\..\..\Externals\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>.\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\portaudio\include;..\..\..\Externals\zlib;..\..\..\Externals\miniupnpc\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link>
|
<Link>
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
|
@ -153,7 +153,7 @@
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<AdditionalIncludeDirectories>.\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\portaudio\include;..\..\..\Externals\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>.\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\portaudio\include;..\..\..\Externals\zlib;..\..\..\Externals\miniupnpc\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link>
|
<Link>
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
|
@ -167,7 +167,7 @@
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<AdditionalIncludeDirectories>.\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\portaudio\include;..\..\..\Externals\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>.\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\portaudio\include;..\..\..\Externals\zlib;..\..\..\Externals\miniupnpc\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link>
|
<Link>
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
|
@ -181,7 +181,7 @@
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<AdditionalIncludeDirectories>.\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\portaudio\include;..\..\..\Externals\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>.\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\portaudio\include;..\..\..\Externals\zlib;..\..\..\Externals\miniupnpc\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link>
|
<Link>
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
|
|
||||||
|
|
@ -192,6 +192,10 @@ public:
|
||||||
u64 CalculateMinimumBufferTime();
|
u64 CalculateMinimumBufferTime();
|
||||||
void AdjustPadBufferSize(unsigned int size);
|
void AdjustPadBufferSize(unsigned int size);
|
||||||
|
|
||||||
|
#ifdef USE_UPNP
|
||||||
|
void TryPortmapping(u16 port);
|
||||||
|
#endif
|
||||||
|
|
||||||
private:
|
private:
|
||||||
class Client : public Player
|
class Client : public Player
|
||||||
{
|
{
|
||||||
|
|
@ -215,6 +219,22 @@ private:
|
||||||
Common::Timer m_ping_timer;
|
Common::Timer m_ping_timer;
|
||||||
u32 m_ping_key;
|
u32 m_ping_key;
|
||||||
bool m_update_pings;
|
bool m_update_pings;
|
||||||
|
|
||||||
|
#ifdef USE_UPNP
|
||||||
|
static void mapPortThread(const u16 port);
|
||||||
|
static void unmapPortThread();
|
||||||
|
|
||||||
|
static bool initUPnP();
|
||||||
|
static bool UPnPMapPort(const std::string& addr, const u16 port);
|
||||||
|
static bool UPnPUnmapPort(const u16 port);
|
||||||
|
|
||||||
|
static struct UPNPUrls m_upnp_urls;
|
||||||
|
static struct IGDdatas m_upnp_data;
|
||||||
|
static u16 m_upnp_mapped;
|
||||||
|
static bool m_upnp_inited;
|
||||||
|
static bool m_upnp_error;
|
||||||
|
static std::thread m_upnp_thread;
|
||||||
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
class NetPlayClient : public NetPlay
|
class NetPlayClient : public NetPlay
|
||||||
|
|
|
||||||
|
|
@ -12,6 +12,13 @@ NetPlayServer::~NetPlayServer()
|
||||||
m_do_loop = false;
|
m_do_loop = false;
|
||||||
m_thread.join();
|
m_thread.join();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef USE_UPNP
|
||||||
|
if (m_upnp_thread.joinable())
|
||||||
|
m_upnp_thread.join();
|
||||||
|
m_upnp_thread = std::thread(&NetPlayServer::unmapPortThread);
|
||||||
|
m_upnp_thread.join();
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
// called from ---GUI--- thread
|
// called from ---GUI--- thread
|
||||||
|
|
@ -632,3 +639,161 @@ void NetPlayServer::SendToClients(sf::Packet& packet, const PlayerId skip_pid)
|
||||||
if (i->second.pid && (i->second.pid != skip_pid))
|
if (i->second.pid && (i->second.pid != skip_pid))
|
||||||
i->second.socket.Send(packet);
|
i->second.socket.Send(packet);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef USE_UPNP
|
||||||
|
#include <miniwget.h>
|
||||||
|
#include <miniupnpc.h>
|
||||||
|
#include <upnpcommands.h>
|
||||||
|
|
||||||
|
struct UPNPUrls NetPlayServer::m_upnp_urls;
|
||||||
|
struct IGDdatas NetPlayServer::m_upnp_data;
|
||||||
|
u16 NetPlayServer::m_upnp_mapped = 0;
|
||||||
|
bool NetPlayServer::m_upnp_inited = false;
|
||||||
|
bool NetPlayServer::m_upnp_error = false;
|
||||||
|
std::thread NetPlayServer::m_upnp_thread;
|
||||||
|
|
||||||
|
// called from ---GUI--- thread
|
||||||
|
void NetPlayServer::TryPortmapping(u16 port)
|
||||||
|
{
|
||||||
|
if (m_upnp_thread.joinable())
|
||||||
|
m_upnp_thread.join();
|
||||||
|
m_upnp_thread = std::thread(&NetPlayServer::mapPortThread, port);
|
||||||
|
}
|
||||||
|
|
||||||
|
// UPnP thread: try to map a port
|
||||||
|
void NetPlayServer::mapPortThread(const u16 port)
|
||||||
|
{
|
||||||
|
std::string ourIP = sf::IPAddress::GetLocalAddress().ToString();
|
||||||
|
|
||||||
|
if (!m_upnp_inited)
|
||||||
|
if (!initUPnP())
|
||||||
|
goto fail;
|
||||||
|
|
||||||
|
if (!UPnPMapPort(ourIP, port))
|
||||||
|
goto fail;
|
||||||
|
|
||||||
|
NOTICE_LOG(NETPLAY, "Successfully mapped port %d to %s.", port, ourIP.c_str());
|
||||||
|
return;
|
||||||
|
fail:
|
||||||
|
WARN_LOG(NETPLAY, "Failed to map port %d to %s.", port, ourIP.c_str());
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// UPnP thread: try to unmap a port
|
||||||
|
void NetPlayServer::unmapPortThread()
|
||||||
|
{
|
||||||
|
if (m_upnp_mapped > 0)
|
||||||
|
UPnPUnmapPort(m_upnp_mapped);
|
||||||
|
}
|
||||||
|
|
||||||
|
// called from ---UPnP--- thread
|
||||||
|
// discovers the IGD
|
||||||
|
bool NetPlayServer::initUPnP()
|
||||||
|
{
|
||||||
|
UPNPDev *devlist, *dev;
|
||||||
|
std::vector<UPNPDev *> igds;
|
||||||
|
int descXMLsize = 0, upnperror = 0;
|
||||||
|
char *descXML;
|
||||||
|
|
||||||
|
// Don't init if already inited
|
||||||
|
if (m_upnp_inited)
|
||||||
|
return true;
|
||||||
|
|
||||||
|
// Don't init if it failed before
|
||||||
|
if (m_upnp_error)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
memset(&m_upnp_urls, 0, sizeof(UPNPUrls));
|
||||||
|
memset(&m_upnp_data, 0, sizeof(IGDdatas));
|
||||||
|
|
||||||
|
// Find all UPnP devices
|
||||||
|
devlist = upnpDiscover(2000, NULL, NULL, 0, 0, &upnperror);
|
||||||
|
if (!devlist)
|
||||||
|
{
|
||||||
|
WARN_LOG(NETPLAY, "An error occured trying to discover UPnP devices.");
|
||||||
|
|
||||||
|
m_upnp_error = true;
|
||||||
|
m_upnp_inited = false;
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Look for the IGD
|
||||||
|
dev = devlist;
|
||||||
|
while (dev)
|
||||||
|
{
|
||||||
|
if (strstr(dev->st, "InternetGatewayDevice"))
|
||||||
|
igds.push_back(dev);
|
||||||
|
dev = dev->pNext;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::vector<UPNPDev *>::iterator i;
|
||||||
|
for (i = igds.begin(); i != igds.end(); i++)
|
||||||
|
{
|
||||||
|
dev = *i;
|
||||||
|
descXML = (char *) miniwget(dev->descURL, &descXMLsize, 0);
|
||||||
|
if (descXML)
|
||||||
|
{
|
||||||
|
parserootdesc(descXML, descXMLsize, &m_upnp_data);
|
||||||
|
free(descXML);
|
||||||
|
descXML = 0;
|
||||||
|
GetUPNPUrls(&m_upnp_urls, &m_upnp_data, dev->descURL, 0);
|
||||||
|
|
||||||
|
NOTICE_LOG(NETPLAY, "Got info from IGD at %s.", dev->descURL);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
WARN_LOG(NETPLAY, "Error getting info from IGD at %s.", dev->descURL);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
freeUPNPDevlist(devlist);
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// called from ---UPnP--- thread
|
||||||
|
// Attempt to portforward!
|
||||||
|
bool NetPlayServer::UPnPMapPort(const std::string& addr, const u16 port)
|
||||||
|
{
|
||||||
|
char port_str[6] = { 0 };
|
||||||
|
int result;
|
||||||
|
|
||||||
|
if (m_upnp_mapped > 0)
|
||||||
|
UPnPUnmapPort(m_upnp_mapped);
|
||||||
|
|
||||||
|
sprintf(port_str, "%d", port);
|
||||||
|
result = UPNP_AddPortMapping(m_upnp_urls.controlURL, m_upnp_data.first.servicetype,
|
||||||
|
port_str, port_str, addr.c_str(),
|
||||||
|
(std::string("dolphin-emu TCP on ") + addr).c_str(),
|
||||||
|
"TCP", NULL, NULL);
|
||||||
|
|
||||||
|
if(result != 0)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
m_upnp_mapped = port;
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// called from ---UPnP--- thread
|
||||||
|
// Attempt to stop portforwarding.
|
||||||
|
// --
|
||||||
|
// NOTE: It is important that this happens! A few very crappy routers
|
||||||
|
// apparently do not delete UPnP mappings on their own, so if you leave them
|
||||||
|
// hanging, the NVRAM will fill with portmappings, and eventually all UPnP
|
||||||
|
// requests will fail silently, with the only recourse being a factory reset.
|
||||||
|
// --
|
||||||
|
bool NetPlayServer::UPnPUnmapPort(const u16 port)
|
||||||
|
{
|
||||||
|
char port_str[6] = { 0 };
|
||||||
|
|
||||||
|
sprintf(port_str, "%d", port);
|
||||||
|
UPNP_DeletePortMapping(m_upnp_urls.controlURL, m_upnp_data.first.servicetype,
|
||||||
|
port_str, "TCP", NULL);
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -164,6 +164,10 @@ else()
|
||||||
set(DOLPHIN_EXE ${DOLPHIN_EXE_BASE}-nogui)
|
set(DOLPHIN_EXE ${DOLPHIN_EXE_BASE}-nogui)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if(USE_UPNP)
|
||||||
|
set(LIBS ${LIBS} miniupnpc)
|
||||||
|
endif()
|
||||||
|
|
||||||
if(ANDROID)
|
if(ANDROID)
|
||||||
add_library(${DOLPHIN_EXE} SHARED ${SRCS})
|
add_library(${DOLPHIN_EXE} SHARED ${SRCS})
|
||||||
target_link_libraries(${DOLPHIN_EXE}
|
target_link_libraries(${DOLPHIN_EXE}
|
||||||
|
|
|
||||||
|
|
@ -130,7 +130,7 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<AdditionalIncludeDirectories>..\..\..\Externals\GLew\include;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>..\..\..\Externals\GLew\include;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;..\..\..\Externals\miniupnpc\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link />
|
<Link />
|
||||||
<PostBuildEvent>
|
<PostBuildEvent>
|
||||||
|
|
@ -144,7 +144,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<AdditionalIncludeDirectories>..\..\..\Externals\GLew\include;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>..\..\..\Externals\GLew\include;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;..\..\..\Externals\miniupnpc\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link />
|
<Link />
|
||||||
<PostBuildEvent>
|
<PostBuildEvent>
|
||||||
|
|
@ -158,7 +158,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<AdditionalIncludeDirectories>..\..\..\Externals\GLew\include;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>..\..\..\Externals\GLew\include;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;..\..\..\Externals\miniupnpc\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<OpenMPSupport>
|
<OpenMPSupport>
|
||||||
</OpenMPSupport>
|
</OpenMPSupport>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
|
|
@ -174,7 +174,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<AdditionalIncludeDirectories>..\..\..\Externals\GLew\include;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\InputUICommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>..\..\..\Externals\GLew\include;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;..\..\..\Externals\miniupnpc\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link />
|
<Link />
|
||||||
<PostBuildEvent>
|
<PostBuildEvent>
|
||||||
|
|
@ -188,7 +188,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<AdditionalIncludeDirectories>..\..\..\Externals\GLew\include;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>..\..\..\Externals\GLew\include;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;..\..\..\Externals\miniupnpc\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<OpenMPSupport>
|
<OpenMPSupport>
|
||||||
</OpenMPSupport>
|
</OpenMPSupport>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
|
|
@ -206,7 +206,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<AdditionalIncludeDirectories>..\..\..\Externals\GLew\include;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\InputUICommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>..\..\..\Externals\GLew\include;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;..\..\..\Externals\miniupnpc\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link />
|
<Link />
|
||||||
<PostBuildEvent>
|
<PostBuildEvent>
|
||||||
|
|
@ -347,6 +347,9 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /
|
||||||
<ProjectReference Include="..\..\..\Externals\LZO\LZO.vcxproj">
|
<ProjectReference Include="..\..\..\Externals\LZO\LZO.vcxproj">
|
||||||
<Project>{d8890b98-26f7-4cff-bbfb-b95f371b5f20}</Project>
|
<Project>{d8890b98-26f7-4cff-bbfb-b95f371b5f20}</Project>
|
||||||
</ProjectReference>
|
</ProjectReference>
|
||||||
|
<ProjectReference Include="..\..\..\Externals\miniupnpc\miniupnpc.vcxproj">
|
||||||
|
<Project>{a680190d-0764-485b-9cf3-a82c5edd5715}</Project>
|
||||||
|
</ProjectReference>
|
||||||
<ProjectReference Include="..\..\..\Externals\SFML\build\vc2010\SFML_Network.vcxproj">
|
<ProjectReference Include="..\..\..\Externals\SFML\build\vc2010\SFML_Network.vcxproj">
|
||||||
<Project>{93d73454-2512-424e-9cda-4bb357fe13dd}</Project>
|
<Project>{93d73454-2512-424e-9cda-4bb357fe13dd}</Project>
|
||||||
</ProjectReference>
|
</ProjectReference>
|
||||||
|
|
|
||||||
|
|
@ -135,6 +135,7 @@
|
||||||
<ClCompile Include="Src\GCMicDlg.cpp">
|
<ClCompile Include="Src\GCMicDlg.cpp">
|
||||||
<Filter>GUI</Filter>
|
<Filter>GUI</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
|
<ClCompile Include="Src\GLInterface\WGL.cpp" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClInclude Include="Src\Main.h" />
|
<ClInclude Include="Src\Main.h" />
|
||||||
|
|
@ -264,6 +265,9 @@
|
||||||
<ClInclude Include="Src\GCMicDlg.h">
|
<ClInclude Include="Src\GCMicDlg.h">
|
||||||
<Filter>GUI</Filter>
|
<Filter>GUI</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
|
<ClInclude Include="Src\GLInterface.h" />
|
||||||
|
<ClInclude Include="Src\GLInterface\InterfaceBase.h" />
|
||||||
|
<ClInclude Include="Src\GLInterface\WGL.h" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Include="CMakeLists.txt" />
|
<None Include="CMakeLists.txt" />
|
||||||
|
|
|
||||||
|
|
@ -149,6 +149,10 @@ NetPlaySetupDiag::NetPlaySetupDiag(wxWindow* const parent, const CGameListCtrl*
|
||||||
wxBoxSizer* const top_szr = new wxBoxSizer(wxHORIZONTAL);
|
wxBoxSizer* const top_szr = new wxBoxSizer(wxHORIZONTAL);
|
||||||
top_szr->Add(port_lbl, 0, wxCENTER | wxRIGHT, 5);
|
top_szr->Add(port_lbl, 0, wxCENTER | wxRIGHT, 5);
|
||||||
top_szr->Add(m_host_port_text, 0);
|
top_szr->Add(m_host_port_text, 0);
|
||||||
|
#ifdef USE_UPNP
|
||||||
|
m_upnp_chk = new wxCheckBox(host_tab, wxID_ANY, _("Forward port (UPnP)"));
|
||||||
|
top_szr->Add(m_upnp_chk, 0, wxALL | wxALIGN_RIGHT, 5);
|
||||||
|
#endif
|
||||||
|
|
||||||
wxBoxSizer* const host_szr = new wxBoxSizer(wxVERTICAL);
|
wxBoxSizer* const host_szr = new wxBoxSizer(wxVERTICAL);
|
||||||
host_szr->Add(top_szr, 0, wxALL | wxEXPAND, 5);
|
host_szr->Add(top_szr, 0, wxALL | wxEXPAND, 5);
|
||||||
|
|
@ -220,6 +224,10 @@ void NetPlaySetupDiag::OnHost(wxCommandEvent&)
|
||||||
, WxStrToStr(m_nickname_text->GetValue()), npd, game);
|
, WxStrToStr(m_nickname_text->GetValue()), npd, game);
|
||||||
if (netplay_ptr->is_connected)
|
if (netplay_ptr->is_connected)
|
||||||
{
|
{
|
||||||
|
#ifdef USE_UPNP
|
||||||
|
if(m_upnp_chk->GetValue())
|
||||||
|
((NetPlayServer*)netplay_ptr)->TryPortmapping(port);
|
||||||
|
#endif
|
||||||
npd->Show();
|
npd->Show();
|
||||||
Destroy();
|
Destroy();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -48,6 +48,9 @@ private:
|
||||||
*m_connect_ip_text;
|
*m_connect_ip_text;
|
||||||
|
|
||||||
wxListBox* m_game_lbox;
|
wxListBox* m_game_lbox;
|
||||||
|
#ifdef USE_UPNP
|
||||||
|
wxCheckBox* m_upnp_chk;
|
||||||
|
#endif
|
||||||
|
|
||||||
const CGameListCtrl* const m_game_list;
|
const CGameListCtrl* const m_game_list;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -112,6 +112,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SoundTouch", "..\Externals\
|
||||||
EndProject
|
EndProject
|
||||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTests", "UnitTests\UnitTests.vcxproj", "{40C636FA-B5BF-4D67-ABC8-376B524A7551}"
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTests", "UnitTests\UnitTests.vcxproj", "{40C636FA-B5BF-4D67-ABC8-376B524A7551}"
|
||||||
EndProject
|
EndProject
|
||||||
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniupnpc", "..\Externals\miniupnpc\miniupnpc.vcxproj", "{A680190D-0764-485B-9CF3-A82C5EDD5715}"
|
||||||
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Debug|Win32 = Debug|Win32
|
Debug|Win32 = Debug|Win32
|
||||||
|
|
@ -409,6 +411,18 @@ Global
|
||||||
{40C636FA-B5BF-4D67-ABC8-376B524A7551}.Release|Win32.Build.0 = Release|Win32
|
{40C636FA-B5BF-4D67-ABC8-376B524A7551}.Release|Win32.Build.0 = Release|Win32
|
||||||
{40C636FA-B5BF-4D67-ABC8-376B524A7551}.Release|x64.ActiveCfg = Release|x64
|
{40C636FA-B5BF-4D67-ABC8-376B524A7551}.Release|x64.ActiveCfg = Release|x64
|
||||||
{40C636FA-B5BF-4D67-ABC8-376B524A7551}.Release|x64.Build.0 = Release|x64
|
{40C636FA-B5BF-4D67-ABC8-376B524A7551}.Release|x64.Build.0 = Release|x64
|
||||||
|
{A680190D-0764-485B-9CF3-A82C5EDD5715}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||||
|
{A680190D-0764-485B-9CF3-A82C5EDD5715}.Debug|Win32.Build.0 = Debug|Win32
|
||||||
|
{A680190D-0764-485B-9CF3-A82C5EDD5715}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
|
{A680190D-0764-485B-9CF3-A82C5EDD5715}.Debug|x64.Build.0 = Debug|x64
|
||||||
|
{A680190D-0764-485B-9CF3-A82C5EDD5715}.DebugFast|Win32.ActiveCfg = Debug|Win32
|
||||||
|
{A680190D-0764-485B-9CF3-A82C5EDD5715}.DebugFast|Win32.Build.0 = Debug|Win32
|
||||||
|
{A680190D-0764-485B-9CF3-A82C5EDD5715}.DebugFast|x64.ActiveCfg = Debug|x64
|
||||||
|
{A680190D-0764-485B-9CF3-A82C5EDD5715}.DebugFast|x64.Build.0 = Debug|x64
|
||||||
|
{A680190D-0764-485B-9CF3-A82C5EDD5715}.Release|Win32.ActiveCfg = Release|Win32
|
||||||
|
{A680190D-0764-485B-9CF3-A82C5EDD5715}.Release|Win32.Build.0 = Release|Win32
|
||||||
|
{A680190D-0764-485B-9CF3-A82C5EDD5715}.Release|x64.ActiveCfg = Release|x64
|
||||||
|
{A680190D-0764-485B-9CF3-A82C5EDD5715}.Release|x64.Build.0 = Release|x64
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemDefinitionGroup>
|
<ItemDefinitionGroup>
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;USE_UPNP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<WarningLevel>Level3</WarningLevel>
|
<WarningLevel>Level3</WarningLevel>
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||||
<StructMemberAlignment>16Bytes</StructMemberAlignment>
|
<StructMemberAlignment>16Bytes</StructMemberAlignment>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue