Commit Graph

368 Commits

Author SHA1 Message Date
Mr. Snow f3fb046e45 Repair python3 build under Homebrew Python 3.4 with OSX 10.9. 2014-09-06 09:58:31 +02:00
Thomas Bernard 626cd2cd6c miniupnpc/miniwget.c: define MIN only when not defined by system headers 2014-08-26 20:48:34 +02:00
Jason Huntley 000f9be7fd Dynamic build fails
Dynamic build fails as a result of undefined reference for UPNP_AddAnyPortMapping and UPNP_DeletePortMappingRange
2014-07-29 11:07:43 -04:00
Thomas Bernard f8cb84e393 miniupnpc/igd_desc_parse.c: Fix parsing of IGD:2 root descriptions
fixes #083
2014-07-01 15:03:34 +02:00
Thomas Bernard bd4de468ad update Changelog.txt 2014-07-01 15:03:08 +02:00
Thomas Bernard 78d32ba012 Merge remote branch 'mikedld/remove-macosx-macro' 2014-06-16 10:54:03 +02:00
Mike Gelfand c08833f9e8 Use _WIN32 instead of WIN32 to check for Windows
MinGW defines both _WIN32 and WIN32 (and may even be the only compiler
doing so). Microsoft and Intel compilers only define _WIN32. Use the
common one to eliminate the need in defining WIN32 explicitly.
2014-06-15 09:37:13 +03:00
Mike Gelfand 920845b107 Use built-in __APPLE__ macro instead of MACOSX
GCC and Clang on Mac OS have a built-in __APPLE__ macro. Use it instead of
manually-defined MACOSX.
2014-06-15 04:14:43 +03:00
Thomas Bernard ebd7138cc0 miniupnpc/Makefile: Add test executables to clean target 2014-06-10 11:55:03 +02:00
Thomas BERNARD 011e7e7acd Merge pull request #77 from mikedld/miniupnp-staticlib
Rename STATICLIB macro to resolve natpmp/miniupnp conflict
2014-06-02 18:54:33 +02:00
Thomas Bernard e222e50b24 miniupnpc: Compile with GNU/Hurd and GNU/kFreeBSD 2014-06-02 17:13:52 +02:00
Mike Gelfand 2e4011ce33 Rename LIBSPEC macro to resolve natpmp/miniupnp conflict
Same macro name is used in both natpmp and miniupnp libraries so it's
impossble to link one statically and another dynamically. This patch
renames the macro to have library-specific name.
2014-06-01 13:35:13 +03:00
Mike Gelfand f6774e3316 Rename STATICLIB macro to resolve natpmp/miniupnp conflict
Same macro name is used in both natpmp and miniupnp libraries so it's
impossble to link one statically and another dynamically. This patch
renames the macro to have library-specific name.
2014-06-01 13:22:35 +03:00
Thomas Bernard 1213033912 => 2014 2014-05-20 00:25:35 +02:00
Thomas Bernard 126bf58d23 miniupnpc: add more info to python packages 2014-05-20 00:24:59 +02:00
Thomas Bernard de96dd47d5 update Changelog.txt files 2014-05-15 10:42:08 +02:00
Arran Cudbard-Bell 0490d16221 Don't print garbage values on failure 2014-05-13 21:50:16 +01:00
Arran Cudbard-Bell b9362f32a7 Add support for IGD2 AddAnyPortMapping and DeletePortMappingRange
Added python bindings for both AddAnyPortMapping and DeletePortMappingRange
2014-05-13 21:50:07 +01:00
Arran Cudbard-Bell be9584d156 Fix formatting in areas the next commit will touch 2014-05-13 21:49:51 +01:00
Thomas Bernard 242aceceb4 miniupnpc/CMakeLists.txt: install portlistingparse.h upnpreplyparse.h
Was in Makefile, but forgotten in CMakeLists.txt
Fixes #68
2014-04-17 12:53:11 +02:00
Thomas Bernard c2b3c70f3d miniupnpc/listdevices.c: improve output 2014-04-14 18:11:01 +02:00
Thomas Bernard c2273b584e miniupnpc: API_VERSION incremented to 11 2014-04-14 17:48:50 +02:00
Thomas Bernard 4e44ef642a Merge branch 'master' into search_all
Conflicts:
	miniupnpc/miniupnpc.c
2014-04-14 17:32:27 +02:00
Thomas BERNARD 1576c07058 use bigger buffers for minissdpd responses 2014-04-12 10:06:53 +02:00
Thomas Bernard 0a46cb1616 miniupnpc/minihttptestserver.c: small improvements 2014-04-01 17:24:19 +02:00
Thomas Bernard 1c451f31bc miniupnpc/minihttptestserver.c: Have fun with favicon ;) 2014-04-01 16:47:57 +02:00
Thomas Bernard a4b29d2c3c miniupnpc/minihttptestserver.c: use sigaction() instead of signal()
now accept() is interrupted by signals
2014-04-01 16:47:00 +02:00
Thomas Bernard acbe15c5ea miniupnpc: fix exported symbols in OS X dynlibs
fixes #63
2014-03-14 09:21:11 +01:00
Thomas Bernard 7fb5fe5dcb miniupnpc/upnpcommands.h: explain UPNP error codes 2014-02-17 16:52:53 +01:00
Thomas Bernard 8ffaa91b2d upnpc.c: 2013 -> 2014 2014-02-05 18:32:47 +01:00
Thomas Bernard cd5cb6e48e removed unused stuff 2014-02-05 18:32:29 +01:00
Thomas Bernard f354f73238 miniupnpc/connecthostport.c: handle EINPROGRESS after connect() 2014-02-05 18:31:28 +01:00
Thomas Bernard 4d62c19c29 send ssdp:all requests to MiniSSDPD correctly 2014-02-03 16:40:42 +01:00
Thomas Bernard b7a4f8d696 minixml.c: now handle XML comments 2014-02-03 11:28:31 +01:00
Thomas Bernard ab7865ae99 miniupnpc.c: translate comment from French to English :) 2014-01-31 15:20:15 +01:00
Thomas Bernard b36900b3e9 miniupnpc/Makefile: fix clean target 2014-01-31 15:19:38 +01:00
Thomas Bernard 02f137700f APIVERSION = 10 2014-01-31 15:00:09 +01:00
Thomas Bernard bf3a91ba83 miniupnpc.c: added upnpDiscoverDevice() 2014-01-31 14:59:21 +01:00
Thomas Bernard 66bd0cce2d APIVERSION = 10 2014-01-31 14:58:40 +01:00
Thomas Bernard 7ef1687d72 Merge branch 'master' into search_all 2014-01-31 14:40:22 +01:00
Thomas Bernard b72a782ab0 VERSION 1.9 2014-01-31 14:32:26 +01:00
Thomas Bernard 28cab3e219 miniupnpc: added argument remoteHost to UPNP_GetSpecificPortMappingEntry()
increment API_VERSION to 10
2014-01-31 14:32:00 +01:00
Thomas Bernard 223398ee0e fix miniupnpc/testupnpreplyparse.c 2014-01-27 16:29:35 +01:00
Thomas Bernard a79cd61fc8 fix miniupnpc.def 2014-01-27 16:29:13 +01:00
Thomas Bernard fd065f7c75 Makefile.mingw: removed -enable-stdcall-fixup 2014-01-27 16:28:50 +01:00
Thomas Bernard af085e8276 miniupnpc: added test cases for XML parsing 2014-01-27 16:27:51 +01:00
Thomas Bernard 18d54e2ae0 miniupnpc.c: MX cannot be 0 2013-12-13 12:50:25 +01:00
Thomas Bernard 370d568715 Merge branch 'master' into search_all 2013-12-13 12:46:09 +01:00
Thomas Bernard b6ecae893c upnpc.c: --help and -h arguments
fixes #037
2013-12-09 10:25:27 +01:00
Thomas Bernard 81f57226eb upnpcommands.c: fixes potential null dereference. Fix #046 2013-12-09 09:31:05 +01:00
Thomas Bernard 3ae6b969a3 testminiwget.sh: fix comment (it now works with dash) 2013-12-09 09:31:04 +01:00
Thomas Bernard 6e20b2af61 miniupnpc.c: UPNP_GetValidIGD() now checks for ExternalIpAddress 2013-12-09 09:31:04 +01:00
Thomas Bernard 3a87aa2f10 miniwget.c: fixed potential buffer overrun 2013-12-09 09:31:04 +01:00
Thomas Bernard b0c66c01e2 miniupnpc: define MAXHOSTNAMELEN if not already done 2013-12-09 09:31:04 +01:00
Karl Hiramoto 2ae481b969 some libc implementations don't define struct ip_mreqn
define it here if CFLAG passed with -DNEED_STRUCT_IP_MREQN

I found this issue cross compiling for ARM using eclibc in the
https://www.yoctoproject.org/  build system.
2013-11-15 10:42:27 +01:00
rofl0r aaf8b028a2 upnpreplyparse.h: always use internal bsdqueue.h 2013-07-05 12:00:04 +02:00
rofl0r e86867da8b postlistingparse.h: always use included bsdqueue.h 2013-07-05 11:55:23 +02:00
rofl0r e901773530 install bsdqueue.h, so an installed version of upnpreplyparse.h can find it 2013-07-05 11:54:20 +02:00
Thomas Bernard 63ece30b87 update upnpreplyparse to allow larger values (128 chars instead of 64)
also add testcase
2013-06-06 23:41:23 +02:00
Thomas Bernard 9b193b0546 comment unused function... 2013-05-14 23:11:43 +02:00
Thomas Bernard a8b1851522 testminixml.c: remove warnings 2013-05-14 23:10:06 +02:00
Thomas Bernard 59d98199c5 miniupnpc: validate upnpreplyparse.c code with "make check" 2013-05-14 23:09:42 +02:00
Thomas Bernard 0f401fe2d5 Update upnpreplyparse.c to take into account "empty" elements 2013-05-14 23:05:08 +02:00
Thomas Bernard 4cd6295119 Changelog for cc165a7aa3 2013-05-14 23:02:47 +02:00
Maciej Małecki cc165a7aa3 Fix Solaris (SmartOS) build
* On Solaris `fd_set` is defined in `sys/select.h`.
  * `libsocket`, `libnsl` and `libresolv` are required.

This makes it build cleanly if `MINIUPNPC_SET_SOCKET_TIMEOUT` is forced
to `false` (as tested on Joyent's SmartOS).
2013-05-03 07:40:26 +02:00
Thomas Bernard 1a2984c1d8 miniupnpc: Fix testminiwget.sh for BSD
Fixes #33
2013-04-27 17:50:02 +02:00
Thomas Bernard e371359050 added miniupnpc/apiversions.txt 2013-03-29 15:46:25 +01:00
Thomas Bernard 2b2efd4459 miniupnpc: Fixed Makefile for *BSD 2013-03-23 10:08:43 +01:00
Thomas Bernard 3f1aaef49a miniupnpc: Update Makefile to use JNAerator version 0.11
fix #29
2013-03-11 11:23:08 +01:00
Thomas Bernard 3e885191c0 miniupnpc.c: MX cannot be 0 2013-02-20 17:08:07 +01:00
Thomas Bernard 91602e129d miniupnpc.c: change upnpDiscoverDevice() to stop when devices are 2013-02-20 17:07:18 +01:00
Thomas Bernard cb054ef580 miniupnpc.c: add upnpDiscoverAll() function 2013-02-20 17:04:53 +01:00
Thomas Bernard 09d5473c54 miniupnpc.c: reindent upnpDiscover() 2013-02-20 16:29:28 +01:00
Thomas Bernard 2b9c014394 miniupnpc.c: improve debug output in upnpDiscoverDevices() 2013-02-20 16:12:35 +01:00
Thomas Bernard f9ea7ad372 upnpDiscover() => upnpDiscoverDevices() 2013-02-18 00:46:09 +01:00
Thomas Bernard 9f1a9a91e6 test: patch upnpDiscover() in order to allow to detect all UPnP devices on the network 2013-02-16 10:48:56 +01:00
Thomas Bernard d06140277b Adding listdevice program 2013-02-16 10:25:10 +01:00
Thomas Bernard 01ec54aec3 Update Changelog.txt files 2013-02-11 11:40:01 +01:00
Michał Górny a3e8540cd0 Fix killing the test server.
The '%1' argument seems to be non-POSIX and does not work well with
dash. Store the forked PID instead, and use it directly to kill the
server.
2013-02-11 10:59:36 +01:00
Thomas Bernard d50eaf3c52 to upper case 2013-02-09 16:32:57 +01:00
Thomas Bernard 44bff51403 miniupnpc/.gitignore: add miniupnpc.h.bak 2013-02-09 16:32:32 +01:00
Thomas Bernard 803899514e use DESTDIR for install targets
fix #026
thanks to rofl0r
2013-02-09 16:17:23 +01:00
Thomas Bernard 370bf72e72 miniupnpc.h changed version to 1.8 2013-02-06 15:50:37 +01:00
Thomas Bernard 49f38310fa miniupnpc: prepare version 1.8 ! 2013-02-06 14:57:49 +01:00
Leah X Schmidt 5e5847facc distclean target 2013-01-27 22:42:52 +01:00
Leah X Schmidt 89755b36aa fix gitignore 2013-01-27 22:42:30 +01:00
Leah X Schmidt 184d79bf59 fix typo in makefile 2013-01-27 22:42:14 +01:00
Leah X Schmidt b74bb40780 Make miniupnpc jar file build on win32 2013-01-27 22:41:33 +01:00
Thomas Bernard 3e5aedae7f miniupnpc/miniupnpc.c: #define strdup to please MSVC 2012-10-16 18:53:28 +02:00
Thomas Bernard d6c4e55e68 miniupnpc/Changelog.txt: update 2012-10-16 18:51:58 +02:00
Nikolay Orlyuk ea7b76b46c miniupnpc: added HAVE_IPV6 and LIBDIR 2012-10-16 08:04:05 +03:00
Jardel Weyrich a8b4fa53ba Fix include guards that were missed in 95d5c0bf39. 2012-10-09 19:00:31 -03:00
Jardel Weyrich 95d5c0bf39 Rename all include guards to not clash with C99 (7.1.3 Reserved identifiers). 2012-09-20 17:52:51 -03:00
Thomas Bernard 18ea17b95e Add -e option to upnpc program (set description for port mappings) 2012-08-30 12:38:27 +02:00
Thomas Bernard d148904d2b update/fix changelogs 2012-08-29 09:59:06 +02:00
Thomas Bernard 0aea9dc0fb Try to handle scope id in link local IPv6 URL under MS Windows 2012-08-29 09:58:39 +02:00
Thomas Bernard f9c6d4709e Fix a memory link in UPNP_GetValidIGD() 2012-08-29 09:57:38 +02:00
Christopher Foo 0c652db9dd miniupnpc: Supports Python 3 2012-08-28 21:25:00 -04:00
Thomas Bernard ad744bd6a5 miniupnpc: Disable HAS_IP_MREQN on DragonFly BSD 2012-07-20 10:09:40 +02:00
Thomas Bernard 06484ed6d7 miniupnpc: GetUPNPUrls() now inserts scope into link-local IPv6 addresses 2012-06-28 21:05:50 +02:00
Thomas Bernard b8953b8414 miniupnpc/connecthostport.c: include netinet/in.h 2012-06-28 21:03:10 +02:00
Thomas Bernard 18c973d9fc upnpc: yead 2012 in (c) :) 2012-06-28 21:02:37 +02:00
Thomas Bernard 19adf87029 minor things 2012-06-24 00:56:24 +02:00
Thomas Bernard c585986d2f miniupnpc: parseURL()/miniwget() : IPv6 addresses scope 2012-06-24 00:55:31 +02:00
Thomas Bernard 0e85a91784 #define MINIUPNPC_GET_SRC_ADDR enables receivedata() to get scope_id 2012-06-24 00:52:51 +02:00
Thomas Bernard 9c884d3848 miniupnpc: increment API_VERSION to 9 2012-06-24 00:49:09 +02:00
Thomas Bernard 40c0c8d356 miniupnpc/Makefile: add validateminiwget to clean; and minor things 2012-06-24 00:47:50 +02:00
Thomas Bernard 8c22bf187d miniupnpc: More error return checks in upnpc.c 2012-06-24 00:44:22 +02:00
Thomas Bernard 5e05f913e6 fixed miniupnpc/CMakeLists.txt 2012-06-20 23:13:03 +02:00
Thomas Bernard 5d3dc1a290 miniupnpc/portlistingparse.c: removed a unused argument warning 2012-06-20 23:11:59 +02:00
Thomas Bernard f63cbf0935 miniupnpc: Improvements in testminiwget.sh 2012-06-20 23:11:36 +02:00
Thomas Bernard aefb519168 disable HAS_IP_MREQN for Solaris (__sun) 2012-06-11 22:06:22 +02:00
Thomas Bernard 91319b1f7b miniupnpc VERSION 1.7 2012-05-25 00:34:33 +02:00
Thomas Bernard ef49e90d28 Prepare release of version 1.7 of both miniupnpc and miniupnpd 2012-05-24 18:26:39 +02:00
Thomas Bernard fe37de7e2c Clean signal handling 2012-05-24 18:17:31 +02:00
Thomas Bernard 901a6a998b update version 2012-05-09 23:31:37 +02:00
Thomas Bernard cd87891cd7 Try to update README and INSTALL files 2012-05-09 23:25:43 +02:00
Thomas Bernard 83032a62ca Fix crash if -A protocol argument is neither numeric, neither TCP or UDP 2012-05-08 23:05:21 +02:00
Thomas Bernard 439047cbc4 Remove warning about unused argument 2012-05-01 20:55:13 +02:00
Thomas Bernard d8c652a883 Turn C++ comment to C 2012-05-01 20:54:52 +02:00
Thomas Bernard 24e6129c29 removed unused argument url in minwget2() miniwget3() 2012-05-01 20:54:11 +02:00
Thomas Bernard 9fc7b7058a Fix signed/unsigned integer comparaisons 2012-05-01 20:53:19 +02:00
Thomas Bernard 2c2596c72a Cleanup settings of CFLAGS in Makefile 2012-05-01 20:49:43 +02:00
Thomas Bernard 825d3bd89f Allow to specify protocol with TCP or UDP for -A option 2012-04-20 16:44:03 +02:00
Thomas Bernard 691c9d9947 miniupnpc: disable HAS_IP_MREQN for Cygwin 2012-04-11 07:51:53 +02:00
Thomas Bernard 0695b341a6 Add a debug message 2012-04-10 00:11:28 +02:00
Thomas Bernard f42e4060cb Only try to fetch XML description once in UPNP_GetValidIGD() 2012-04-10 00:10:52 +02:00
Thomas Bernard 175bd2894f Added -ansi flag to compilation, and fixed C++ comments to ANSI C comments 2012-04-10 00:08:53 +02:00
Thomas Bernard 7474d22cf9 added a test target to Makefile 2012-04-06 16:08:43 +02:00
Thomas Bernard e73e9c5b42 minor improvements to minihttptestserver.c
Also update Changelog.txt
2012-04-06 16:07:53 +02:00
Thomas Bernard ed859b7c57 remove trailing whitespaces 2012-04-06 16:06:30 +02:00
Tom Stokes 7b1696aff3 upnperrors.c returns valid error string for unrecognized error codes 2012-03-12 16:50:27 -07:00
Thomas Bernard 45b845009f make minihttptestserver listen on loopback interface instead of 0.0.0.0 2012-03-08 11:05:43 +01:00
Thomas Bernard 2665ed123b Merge branch 'master' of https://github.com/shawnl/miniupnp
Conflicts:
	miniupnpd/upnpredirect.c
2012-03-05 05:59:52 +01:00
Thomas Bernard 080bcf1783 Fixes setup.py to use the defined CFLAGS
Python bindings will be re-build with its distutils script to get private
module built against all supported python versions. Let's fix setup.py
to use the defined CFLAGS.
2012-03-05 05:56:02 +01:00
Shawn Landen 6e14420ab1 remove trailing whitespace from miniupnpc 2012-02-29 17:51:24 -08:00
Thomas Bernard 9fb0a2ae2d update version in miniupnpc/setup*.py 2012-02-13 22:00:11 +01:00
Thomas Bernard 01ca32afa0 Makefile: Improve Jnaerator targets
Fetch with either wget or curl
2012-02-12 14:22:32 +01:00
Thomas Bernard 7e1d782b07 use absolute path for linking with OS X .dylib 2012-02-12 14:21:56 +01:00
Thomas Bernard 2542deb718 keep Changelog.txt files up to date. 2012-01-25 22:40:32 +01:00
Thomas Bernard 1f6ec953a1 disable HAS_IP_MREQN for Windows (_WIN32) 2012-01-25 22:35:16 +01:00
Alexey Kuznetsov 3e9a5d8ce6 add linux prefix 2012-01-25 14:07:02 +04:00
Alexey Kuznetsov cb29843506 drop snapshot prefix 2012-01-25 14:05:01 +04:00
Alexey Kuznetsov ee9a7072bd read version from file 2012-01-25 13:57:46 +04:00
Alexey Kuznetsov d63a51b9a9 Merge remote-tracking branch 'miniupnp/master' 2012-01-24 09:52:45 +04:00
Alexey Kuznetsov 40e53a9a10 update ignore 2012-01-24 03:28:59 +04:00
Alexey Kuznetsov db7a700a4a add mvn_install command 2012-01-24 03:14:43 +04:00
Thomas Bernard 35e25ab375 Replaced WIN32 macro by _WIN32 2012-01-21 14:38:38 +01:00
Thomas Bernard 86c20047ee updated Changelog.txt following merge of Alexey Kuznetsov branches 2012-01-21 14:37:07 +01:00
Thomas Bernard 04d13c7152 always #include <netinet/in.h> before <arpa/inet.h> 2012-01-20 23:09:40 +01:00
Thomas Bernard d24eaf9158 Merge branch 'feature-debbuild' of https://github.com/axet/miniupnp 2012-01-19 12:45:06 +01:00
Thomas Bernard e824f0ccad Merge branch 'fix-javatest' of https://github.com/axet/miniupnp 2012-01-19 12:33:50 +01:00
Thomas Bernard 7dee9f77e6 disable HAS_IP_MREQN under Mac OS X and NetBSD. 2012-01-19 12:32:25 +01:00
Thomas Bernard 1cdee24b01 make miniupnpcstrings.h depend on VERSION 2012-01-19 12:31:42 +01:00
Alexey Kuznetsov 61ffe81818 install helpers 2012-01-18 21:37:00 +04:00
Alexey Kuznetsov 44f65308f3 add deb build make targets 2012-01-18 21:32:28 +04:00
Alexey Kuznetsov 5928430789 add new interface imports 2012-01-18 21:04:27 +04:00
Alexey Kuznetsov 3b39594518 fix CP on test script 2012-01-18 21:04:17 +04:00
Alexey Kuznetsov a11b75fcdf switch to jnaerator-0.9.7.jar 2012-01-18 21:03:52 +04:00
Alexey Kuznetsov 60c30eef22 add jnaerator auto download 2012-01-18 20:51:22 +04:00
Alexey Kuznetsov 2f974e7e6e fix discover method 2012-01-18 20:47:15 +04:00
Thomas Bernard 3917487cb4 The multicast interface can now be specified by name with IPv4 2012-01-07 11:40:50 +01:00
Thomas Bernard e6a2c788f4 added header to Port Mappings list in upnpc.c 2012-01-07 11:37:16 +01:00
Thomas Bernard 368e232179 MINIUPNPC_VERSION in miniupnpc.h (updated by make) 2012-01-07 11:35:45 +01:00
Thomas Bernard f567e229d8 Makefile : make clean now removes jnaerator generated files 2012-01-07 11:33:21 +01:00
Ville Kallioniemi f9549e86b1 Man page and mac installation fixes.
* fix minissdpd man page not getting installed
* fix miniupnpc man page wasn't installed
* fix minissdpd attempted to install init.d
  file on mac
2011-12-31 12:06:17 -07:00
Thomas Bernard e667e962ac Added relevant .gitignore files 2011-09-30 09:59:34 +02:00
Thomas Bernard c183a72c46 Added miniupnpc 2011-09-27 22:25:35 +02:00