146164a5ca
Merge remote-tracking branch 'rat4/patch'
2015-09-20 17:32:04 +02:00
7a99b7c1d1
miniupnpc/CMakeLists.txt: add new source files
2015-09-19 02:15:31 +03:00
d8dc8ff95b
miniupnpc: update MSVC project file
2015-09-18 18:12:19 +02:00
6092fdb4f8
miniupnpc: fix Win32 build, both MinGW and MSVC
2015-09-18 18:11:56 +02:00
1315c47353
install upnpdev.h
...
It's required by miniupnpc.h
2015-09-18 04:43:30 +03:00
3a6e41f516
miniupnpc/CMakeLists.txt: fix missed renaming of declspec.h
2015-09-16 18:59:12 +03:00
d2d913e304
minissdpc.c: remove "comparaison btw signed and unsigned" Warnings
2015-09-16 14:55:42 +02:00
f6d84e6705
fix a few warnings (WIN32)
2015-09-16 00:31:34 +02:00
b7b8711dd2
iphlpapi.h is needed for Win32
2015-09-16 00:19:43 +02:00
c4df1c9e83
try to fix win32/MinGW link
2015-09-16 00:12:43 +02:00
e1344f74aa
removed unused variable under win32
2015-09-16 00:12:35 +02:00
92294994a1
Makefile.mingw: add upnpdev.c / minissdpc.c
2015-09-16 00:08:52 +02:00
c9af50b644
Makefile.mingw: fix dependencies
2015-09-16 00:01:54 +02:00
79cca974a4
igd_desc_parse.c: fix buffer overflow
2015-09-15 15:32:33 +02:00
e5ed3a7019
miniupnpc/Makefile: improve readability
2015-09-04 18:15:15 +02:00
3b417915cb
miniupnpc: jnaerator-0.11 => jnaerator-0.12
2015-09-04 18:15:07 +02:00
b6668e628d
changes java sample according to change of upnpDiscover()
...
should have been included in 1da63faa4f
2015-09-04 18:15:07 +02:00
26960a8a25
miniupnpc/testminiwget.sh: fix for OS X mktemp
2015-09-04 17:47:11 +02:00
46f4679508
miniupnpc.c: clean #define's
2015-09-04 17:37:11 +02:00
6728b12965
dont define _XOPEN_SOURCE with FreeBSD
2015-09-04 12:16:16 +02:00
2889f0a6ca
miniupnpc: don't compile with -ansi
2015-09-04 10:22:34 +02:00
d6700c5d1f
_XOPEN_SOURCE=600 instead of _POSIX_C_SOURCE=200112L
2015-08-31 00:10:33 +02:00
f68edea0fa
miniupnpc/minissdpc.c: tries to fix compilation issue with FreeBSD 10.2
...
see #151
2015-08-29 11:05:32 +02:00
b7654b557f
comments / param.h
2015-08-28 14:32:14 +02:00
e5eabdb3d7
strncasecmp for WIN32
2015-08-28 14:29:20 +02:00
ead5afaaeb
miniupnpc: update Changelog / dependencies / comments
2015-08-28 14:23:38 +02:00
2400d2f8d2
Merge branch 'refact_ssdpc'
...
Conflicts:
miniupnpc/miniupnpc.c
was because of aba8c3f3d7
2015-08-27 22:29:53 +02:00
d0c8154d74
miniupnpc.c: add minissdpd and discovered devices list
2015-08-27 22:22:35 +02:00
cdccc0290d
minissdpc.c: avoid unix socket leak in getDevicesFromMiniSSDPD()
2015-08-27 10:03:22 +02:00
aba8c3f3d7
miniupnpc.c: use unsigned long for IP_MULTICAST_TTL with win32
...
fixes 1da63faa4f
2015-08-26 18:47:27 +02:00
cdb23ff377
python module: change UPnP_discover() invocation
...
fixes #148
2015-08-17 16:22:03 +02:00
fd8e8e7593
miniupnpc: Also accept "Up" as ConnectionStatus value
2015-08-16 22:10:48 +02:00
a95c501959
Use MINISSDPC_* error codes instead of UPNPDISCOVER_*.
2015-08-04 14:15:56 +03:00
353f101655
Moved SSDP discovery code into minissdpc.c
2015-08-03 20:09:26 +03:00
fd65c0a9df
Moved UPNPDev definition to separate header.
2015-08-03 20:09:26 +03:00
b55ecd70ef
miniupnpc: mem leaks fixes.
2015-07-30 01:10:03 +02:00
d9b25c25c0
miniupnpc: declspec.h => miniupnpc_declspec.h
2015-07-30 00:03:58 +02:00
1da63faa4f
miniupnpc: add ttl argument to upnpDiscover() functions
...
increments API_VERSION to 14
2015-07-23 22:44:37 +02:00
20efc8f03e
2015
2015-07-23 22:44:03 +02:00
507c664706
miniupnpc/Changelog.txt: update
2015-07-23 19:16:20 +02:00
7ccbdb6511
Report more error kinds from minissdpc functions.
2015-07-23 16:23:39 +03:00
f29b026f38
Use /var/run/minissdpd.sock as default socketpath in connectToMiniSSDPD().
2015-07-23 16:22:54 +03:00
cffba15387
Split getDevicesFromMiniSSDPD into 4 steps to allow reuse of local socket.
...
It allows allows client application to use event loop instead of blocking
in read() while waiting for server reply.
2015-07-23 16:22:23 +03:00
2c56ffceeb
Fixed typo in setsockopt invocation which sets TTL.
2015-07-23 12:40:42 +03:00
af2ec81f14
Merge branch 'read_usn'
2015-07-22 23:50:44 +02:00
963eefcae5
miniupnpc.c: dont break if USN is not set
...
USN is mandatory, but don't break if the packet don't follow the standard and misses USN: header
2015-07-22 23:46:44 +02:00
bfc7c4f042
listdevices.c: print both ST: and USN:
2015-07-22 23:37:40 +02:00
151b16a1ed
miniupnpc.c: set multicast TTL to 2 by default
2015-07-22 15:00:01 +02:00
eb74f5c886
Read USN from SSDP messages.
2015-07-22 12:08:52 +03:00
d456889b52
miniupnpc: renamed declspec.h in order to avoid conflicts
2015-07-21 12:39:40 +02:00
5aa2181336
testigddescparse.c: check fread() return value
2015-07-21 12:02:10 +02:00
6db99a1a40
use mktemp properly ?
...
-t option to put in /tmp dir
2015-07-16 17:16:52 +02:00
904399cd62
=> (c) 2015
2015-07-16 17:16:09 +02:00
a3179fb284
Check malloc/calloc return values
2015-07-15 18:10:10 +02:00
e516851a40
miniupnpc/listdevices.c: call WSAStartup()
...
fixes #135
2015-07-15 14:52:10 +02:00
e0999ace78
miniupnpc: Check malloc/calloc return values
...
fixes #136
2015-07-15 14:48:57 +02:00
ce56baf81e
Moving to setuptools to enable wheel
2015-07-08 09:21:35 -04:00
27e2aa3841
miniupnpc: update getDevicesFromMiniSSDPD() to process longer minissdpd responses
2015-06-16 17:33:59 +02:00
eec3f12012
miniupnpc: minor code/comments modifications
2015-06-11 14:28:35 +02:00
76f52c81de
fixes 5c6a140098
2015-06-09 17:20:30 +02:00
a2adfcd05d
miniupnpc/miniupnpc.c: don't wait several times for the timeout in upnpDiscoverDevices()
2015-05-22 12:44:38 +02:00
0bf168d306
miniupnpc.c: minor comment reformatting
2015-05-22 12:27:38 +02:00
fce3099080
miniupnpc/listdevices.c: add -l option to search for several dev types
2015-05-22 12:26:54 +02:00
5c6a140098
miniupnpc: add searchalltypes param to upnpDiscoverDevices()
...
increase API_VERSION to 13
2015-05-22 12:25:51 +02:00
94a5af0c15
Allow user to explicitly specify local (source) port
...
See https://github.com/miniupnp/miniupnp/issues/119
- Replace the sameport parameter to the upnpDiscover* functions
- Added constants UPNP_LOCAL_PORT_ANY(0) & UPNP_LOCAL_PORT_SAME(1). The
value "1" was chosen for presumed backwards compatability with the
previous "sameport" parameter (assuming usesr would have set to 1 if
they wanted same port)
- Can be specified with "-z" to the test programs "upnpc" & "pymoduletest.py"
2015-05-12 19:05:48 -04:00
f11b8b2a0d
Init accepts multicastif, minissdpdsocket, discoverdelay
...
+ Created initialize for the UPnP class. Initializer accepts named
arguments to override defaults.
+ multicastif & minissdpdsocket ars strduped and thus freed in the dealloc
(tho could/should they be native py objects instead?)
+ The pymoduletest.py test has been modified to support these but I only
tested multicastif & discoverdelay.
2015-05-06 13:12:43 -04:00
82969aec1d
Wrong field mapped for minissdpdsocket
2015-05-05 13:16:10 -04:00
9b9c7dfe1d
upnpc: output version on the terminal
2015-04-30 10:34:22 +02:00
c7943b6db3
upnpc.c: output Version on the terminal
...
fixes #115
2015-04-30 10:31:53 +02:00
1df576c72e
miniupnpc: update Changelog.txt
2015-04-27 18:02:41 +02:00
e501f5625d
minissdpc.c: Fix uninitialized dev->scope_id
2015-04-24 22:58:46 +02:00
1e7d13f34f
improve -r command
...
fixes #104
2015-04-24 22:55:37 +02:00
a0614ecfb3
add optional parameter <external_port> to option -r
2015-04-24 19:24:20 +02:00
d00db100c1
_BSD_SOURCE => _DEFAULT_SOURCE
...
with glibc 2.20+ _BSD_SOURCE is deprecated in favor of _DEFAULT_SOURCE
use both to please everyone
fixes #107
2015-04-23 12:40:54 +02:00
5de2bcb561
Fix MINIUPNP_STATICLIB being lost in CMake configuration
2015-04-21 14:28:23 +03:00
46533e6f6c
pymoduletest3.py: python3 version of the test program
2015-02-16 22:59:13 +01:00
c7d7efd230
fix realloc failure issues detected thanks to cppcheck
2015-02-08 10:23:22 +01:00
e280c3dd3a
miniupnpc/upnpcommands.c: minor fix to UPNP_GetStatusInfo()
...
*uptime = 0; instead of the useless uptime = 0;
2015-02-06 11:39:39 +01:00
557fd71fb1
miniupnpc: check realloc() return
2015-02-06 11:39:16 +01:00
81dc08d290
Fix setsockopt() for IPV6_MULTICAST_IF
...
32bit: sizeof(&ifindex) == sizeof(void *) == 4
64bit: sizeof(&ifindex) == sizeof(void *) == 8
As a result, it is "ifindex" oob acces on 64bit platforms.
2015-01-21 16:44:36 +01:00
f795af5f54
2014 => 2015
2015-01-20 14:12:10 +01:00
a30bdc5e71
miniupnpc/Makefile: install-static target
2015-01-07 10:23:59 +01:00
3875d61c9e
miniupnpc/upnpc.c: avoid printing imaginary error when using -u
2015-01-01 19:40:44 +01:00
6eef80dab0
miniupnpc.h: UPNP_GetIGDFromUrl() doc
2015-01-01 19:39:47 +01:00
3a3072ee8c
miniupnpc/upnpc.c: call WSACleanup()
2014-12-01 10:33:00 +01:00
c72591e72e
miniupnpc/miniupnpc.c: fix compilation under WIN32
2014-12-01 10:31:50 +01:00
4cae31c948
miniupnpc.c: dont use if_indextoname() under MS Windows
...
fixes #85
2014-11-27 12:59:12 +01:00
725632f27d
miniupnpc: Add linksys_WAG200G_desc.xml to test
2014-11-26 12:39:43 +01:00
c490b42547
Fix _POSIX_C_SOURCE definition
...
Current code makes use of `snprintf` function defined in C99 standard
but _POSIX_C_SOURCE is set to "1" which is not correct. To access C99
definitions, this macro should be set to at least "200112L".
Also, `strncasecmp` function is being used but corresponding <strings.h>
header is not being included in miniwget.c.
Changes have been tested on FreeBSD 10.1 amd64 with default compiler
(Clang).
2014-11-19 17:06:14 +03:00
3690785a79
miniupnpc/miniupnpc.c: accept all versions of urn:schemas-upnp-org:service:WANCommonInterfaceConfig: service
2014-11-18 00:01:48 +01:00
d44d16a688
igd_desc_parse.c: define printIGD() only in DEBUG
2014-11-17 20:32:41 +01:00
6e8106688c
miniupnpc: validate igd_desc_parse
2014-11-17 20:31:11 +01:00
eefb134e09
miniupnpc/listdevices.c: add -m option
2014-11-17 10:54:09 +01:00
e60c3a8ce5
Merge branch 'master' into search_all
...
Conflicts:
miniupnpc/apiversions.txt
2014-11-17 10:29:29 +01:00
8d5a9d72da
miniupnpc/receivedata.c: zero src_addr to silence valgrind
2014-11-13 14:53:50 +01:00
8b22c4d7f4
miniupnpc/receivedata.c: clean up comments
2014-11-13 14:52:58 +01:00
b6438f2f72
miniupnpc: API_VERSION 11
2014-11-13 11:28:20 +01:00
04b7126079
miniupnpc: fix LIBSPEC => MINIUPNP_LIBSPEC
2014-11-13 11:05:09 +01:00
9325bacbfc
Merge branch 'master' into search_all
...
Conflicts:
miniupnpc/.gitignore
miniupnpc/Makefile
miniupnpc/miniupnpc.c
2014-11-13 11:02:28 +01:00
edfd211276
miniupnpc/miniupnpc.c: simplified function GetUPNPUrls()
2014-11-05 07:09:42 +01:00
55fc3e4c3c
miniupnpc: use #define UPNP_VERSION_STRING "UPnP/1.1"
2014-11-05 06:34:51 +01:00
80268b203c
miniupnpc/upnpreplyparse.c: Fix compiling with DEBUG
...
DEBUG only enabled code was forgotten in commit a80c87fb8d
2014-11-05 06:32:43 +01:00
c333c3218d
miniupnpc/msvc/miniupnpc.vcproj: remove bsdqueue.h
2014-11-01 22:10:55 +01:00
06bf746cc2
miniupnpc: remove bsdqueue.h
2014-11-01 11:41:31 +01:00
00fd13abe5
miniupnpc/Makefile: fix dependencies
2014-11-01 11:40:15 +01:00
63964448b6
miniupnpc: add testportlistringparse
2014-11-01 11:18:26 +01:00
a80c87fb8d
remove need of sys/queue.h or bsdqueue.h in upnpreplyparse.c/.h
2014-10-27 17:38:26 +01:00
5973d53736
miniupnpc/Makefile: fix installation of man page
2014-10-25 22:04:10 +02:00
c68c435827
Merge pull request #39 from rofl0r/master
...
get rid of bsd sys/queue.h dependency
2014-10-25 21:56:33 +02:00
28e3bda6dd
miniupnpc/connecthostport.c: fix for compilation with SunOS
2014-10-06 14:42:28 +02:00
0436d03757
miniupnpc/upnpc.c: use remoteHost arg of DeletePortMapping
2014-09-11 16:31:36 +02:00
05cc5daf14
update Changelog.txt files
2014-09-06 10:37:08 +02:00
658c5bd0dc
miniupnpc/Makefile: clean minihttptestserver
2014-09-06 10:36:58 +02:00
c7b0c20502
miniupnpc/miniupnpcmidule.c: fix for both python2 and python3
2014-09-06 10:01:15 +02:00
f3fb046e45
Repair python3 build under Homebrew Python 3.4 with OSX 10.9.
2014-09-06 09:58:31 +02:00
626cd2cd6c
miniupnpc/miniwget.c: define MIN only when not defined by system headers
2014-08-26 20:48:34 +02:00
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
f8cb84e393
miniupnpc/igd_desc_parse.c: Fix parsing of IGD:2 root descriptions
...
fixes #083
2014-07-01 15:03:34 +02:00
bd4de468ad
update Changelog.txt
2014-07-01 15:03:08 +02:00
78d32ba012
Merge remote branch 'mikedld/remove-macosx-macro'
2014-06-16 10:54:03 +02:00
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
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
ebd7138cc0
miniupnpc/Makefile: Add test executables to clean target
2014-06-10 11:55:03 +02:00
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
e222e50b24
miniupnpc: Compile with GNU/Hurd and GNU/kFreeBSD
2014-06-02 17:13:52 +02:00
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
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
1213033912
=> 2014
2014-05-20 00:25:35 +02:00
126bf58d23
miniupnpc: add more info to python packages
2014-05-20 00:24:59 +02:00
de96dd47d5
update Changelog.txt files
2014-05-15 10:42:08 +02:00
0490d16221
Don't print garbage values on failure
2014-05-13 21:50:16 +01:00
b9362f32a7
Add support for IGD2 AddAnyPortMapping and DeletePortMappingRange
...
Added python bindings for both AddAnyPortMapping and DeletePortMappingRange
2014-05-13 21:50:07 +01:00
be9584d156
Fix formatting in areas the next commit will touch
2014-05-13 21:49:51 +01:00
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
c2b3c70f3d
miniupnpc/listdevices.c: improve output
2014-04-14 18:11:01 +02:00
c2273b584e
miniupnpc: API_VERSION incremented to 11
2014-04-14 17:48:50 +02:00
4e44ef642a
Merge branch 'master' into search_all
...
Conflicts:
miniupnpc/miniupnpc.c
2014-04-14 17:32:27 +02:00
1576c07058
use bigger buffers for minissdpd responses
2014-04-12 10:06:53 +02:00
0a46cb1616
miniupnpc/minihttptestserver.c: small improvements
2014-04-01 17:24:19 +02:00
1c451f31bc
miniupnpc/minihttptestserver.c: Have fun with favicon ;)
2014-04-01 16:47:57 +02:00
a4b29d2c3c
miniupnpc/minihttptestserver.c: use sigaction() instead of signal()
...
now accept() is interrupted by signals
2014-04-01 16:47:00 +02:00
acbe15c5ea
miniupnpc: fix exported symbols in OS X dynlibs
...
fixes #63
2014-03-14 09:21:11 +01:00
7fb5fe5dcb
miniupnpc/upnpcommands.h: explain UPNP error codes
2014-02-17 16:52:53 +01:00
8ffaa91b2d
upnpc.c: 2013 -> 2014
2014-02-05 18:32:47 +01:00
cd5cb6e48e
removed unused stuff
2014-02-05 18:32:29 +01:00
f354f73238
miniupnpc/connecthostport.c: handle EINPROGRESS after connect()
2014-02-05 18:31:28 +01:00
4d62c19c29
send ssdp:all requests to MiniSSDPD correctly
2014-02-03 16:40:42 +01:00
b7a4f8d696
minixml.c: now handle XML comments
2014-02-03 11:28:31 +01:00
ab7865ae99
miniupnpc.c: translate comment from French to English :)
2014-01-31 15:20:15 +01:00
b36900b3e9
miniupnpc/Makefile: fix clean target
2014-01-31 15:19:38 +01:00
Thomas Bernard
Pavel Vasin
Konstantin Tokarev
Vladimir Sapronov
Nevo Hed
sanderjo
Mike Gelfand
Maks Naumov
Mr. Snow
Jason Huntley
Mike Gelfand
Arran Cudbard-Bell