6600cdf792
miniupnpc: fix Makefile.mingw
2021-08-22 23:26:09 +02:00
eba48d0f4e
update VC++ projects
2021-08-22 23:26:09 +02:00
177cac1368
updateminiupnpcstrings.sh: mktemp
2021-08-22 23:26:09 +02:00
f1f3b6a5fc
fix build of miniupnpcstrings.h
2021-08-22 23:26:09 +02:00
4975eeabe2
update CMakeLists.txt
...
CMakeLists.txt: always includes minissdpc.c
2021-08-22 23:26:09 +02:00
92b1c8198d
WIP. Reorganize src build directories
2021-08-22 23:26:04 +02:00
874a3aba9e
miniupnpc: move public .h files to include/ subdir
...
fixes #540
2021-08-22 23:21:54 +02:00
384268ac46
LICENSE / README : 2021
2021-08-22 23:15:53 +02:00
2066ccbbdb
Makefile: flags for ASAN
2021-08-21 12:57:13 +02:00
2c4acd0d50
Makefile: use CPPFLAGS instead of CFLAGS for -D
2021-08-21 12:40:11 +02:00
2cc539ae27
upnpdev.h: 2021
2021-08-21 11:46:50 +02:00
d04473c67f
miniupnpc: don't assume '.' is in the Windows PATH
2021-08-17 02:48:36 +02:00
da771539c1
fix cross-build to iOS/tvOS/watchOS
2021-07-19 22:35:31 +02:00
97b7ec1ad2
normalize use of __STDC_VERSION__
2021-06-17 09:25:26 +02:00
8f9ce751ba
Fix __STDC_VERSION__ check in upnpdev.h
2021-06-17 14:48:34 +08:00
479f6ed616
miniupnpc/CMakeLists.txt: TAB => SPACES
2021-05-22 00:09:09 +02:00
2c564135e1
[CMake] Build listdevices.c as part of the listdevices executable
...
Do not include it in MINIUPNPC_SOURCES
2021-05-21 17:06:33 -04:00
f3c0d52ca4
wingenminiupnpcstrings.c: fix -Wsign-compare warning
2021-05-19 10:33:33 +02:00
69acdf3356
ssdpDiscoverDevices() ignore empty string multicastif
...
fixes #544
2021-05-13 13:01:38 +02:00
f13a79fabc
Merge branch 'apple_clock_gettime_fallback_1'
...
see #516
2021-05-12 00:09:48 +02:00
56aa707a75
use C style comments
2021-05-12 00:09:28 +02:00
0c7579c9aa
2020 => 2021
2021-05-12 00:00:06 +02:00
20ee72f9c8
miniupnpc: Show error message when GetExternalIPAddress returns empty string
...
According to IGD v2.0 specification GetExternalIPAddress can return also
empty string in case of error.
2021-03-28 17:33:15 +02:00
3a08dd4b89
Use GetBestInterfaceEx when available.
...
Since GetBestInterface is not available in UWP apps.
GetBestInterface:
https://docs.microsoft.com/en-us/windows/win32/api/iphlpapi/nf-iphlpapi-getbestinterface#requirements
GetBestInterfaceEx:
https://docs.microsoft.com/en-us/windows/win32/api/iphlpapi/nf-iphlpapi-getbestinterfaceex#requirements
2021-03-18 17:30:46 +01:00
c1b64740fb
Use WINVER values instead of _WIN32_WINNT_[NAME].
...
WINVER values are well defined, see:
https://docs.microsoft.com/en-us/cpp/porting/modifying-winver-and-win32-winnt?view=msvc-160
2021-03-18 17:11:48 +01:00
81029a860b
miniupnpc: version 2.2.2
2021-03-03 00:50:51 +01:00
200cf4cd75
miniupnpc: update Changelog.txt + 2021
2021-03-03 00:41:49 +01:00
94f72a63b5
Merge pull request #486 from hrydgard/fix-uwp-build
...
Fix Windows UWP build.
2021-02-26 15:41:11 +01:00
bfc5eab6be
fix #522 for MS VS 2010 too
2021-02-05 20:37:15 +01:00
b6d8a4545b
miniupnpc: Enable -W -Wstrict-prototypes compile flags also for MinGW builds
2021-01-27 13:14:33 +01:00
c8883e8491
miniupnpc: Fix compile warning: comparison between signed and unsigned
...
receivedata.c: In function ‘receivedata’:
receivedata.c:66: warning: comparison between signed and unsigned
Macro ISINVALID needs to be defined via INVALID_SOCKET on all WIN32 targets, not only for MSVC.
2021-01-27 13:12:24 +01:00
d693584fdb
miniupnpc: Fix compile warning: unused parameter
...
receivedata.c: In function ‘receivedata’:
receivedata.c:35:41: warning: unused parameter ‘scope_id’ [-Wunused-parameter]
int timeout, unsigned int * scope_id)
~~~~~~~~~~~~~~~^~~~~~~~
2021-01-27 13:10:49 +01:00
e768e1555e
miniupnpc: Fix compile warning: unused parameter
...
miniupnpc.c: In function ‘upnpDiscoverDevices’:
miniupnpc.c:270:34: warning: unused parameter ‘minissdpdsock’ [-Wunused-parameter]
const char * minissdpdsock, int localport,
~~~~~~~~~~~~~^~~~~~~~~~~~~
2021-01-27 13:10:03 +01:00
36cc66edda
Visual Studio : define INTERNAL_NAME
...
fixes #522
2021-01-23 00:05:38 +01:00
1d38b37732
Fallback for earlier Apple platforms that lack clock_gettime
2021-01-15 17:15:54 -05:00
2adcf3f432
miniupnpcmodule.c: throw an exception in UPnP_discover()
...
fixes #521
2021-01-15 20:21:02 +01:00
474658716f
miniupnpc: update Changelog.txt
...
regarding bfbe42d392
2021-01-04 01:17:50 +01:00
184ed52069
upnpc.c: fix SetRedirectAndTest() args.
2021-01-04 01:16:02 +01:00
bfbe42d392
miniupnpc: Fix usage of IP_MULTICAST_IF with struct ip_mreqn
...
When struct ip_mreqn is passed to IP_MULTICAST_IF setsockopt option it is
always required to set also ipv4 source address. Otherwise Linux kernel
will choose default system multicast ipv4 address which does not have to
belong to chosen interface specified in struct ip_mreqn.
Therefore on system with more multicast interfaces and more ipv4 addresses,
it may happen that interface chosen by upnpc -m option would use ipv4
address which does not belong to this interface.
This change is fixing above issue and ensure that if interface is chosen by
upnpc -m option then source address which belongs to this interface would
be used.
Without this change upnpc -m eth1 can send multicast traffic over interface
eth1 but with source ipv4 address of interface eth0, which obviously would
be rejected by upnp gateway.
2021-01-04 00:29:58 +01:00
36a6913970
miniupnpc: Add missing checks for if_nametoindex() return value
...
if_nametoindex() returns zero value on failure. Add missing error handling.
2020-12-30 13:41:20 +01:00
0d5b416e05
miniupnpc: Fix checking for inet_pton() errors
...
inet_pton() indicates error by zero or negative return value.
2020-12-30 13:39:36 +01:00
544e6fcc73
miniupnpc: version 2.2.1
2020-12-20 19:11:18 +01:00
ba130320f4
.gitignore: wingenminiupnpcstrings
2020-11-30 01:59:15 +01:00
ca4e0342bf
genminiupnpcstrings.vbs: generates rc_version.h as well
...
see #512
2020-11-30 01:55:06 +01:00
b28462b62a
wingenminiupnpcstrings also generates rc_version.h
2020-11-30 01:48:15 +01:00
f04dbafe09
mingw32: build resources for .dll
2020-11-30 01:21:26 +01:00
44dd54051c
Add RC file
2020-11-28 11:49:59 +01:00
677e0db636
Install cmake config file
...
miniupnpc::miniupnpc becomes an ALIAS for the shared library, if
available, and the static library otherwise.
Users of the installed library can use MINIUPNPC_USE_STATIC_LIBS to
force the use of the static library.
2020-11-27 18:49:51 +00:00
5b5ce9e49e
Merge remote-tracking branch 'RedDwarf69/stuff' into master
2020-11-27 19:08:35 +01:00
f1f8ae3659
cmake: use GNUInstallDirs
2020-11-25 11:09:21 +00:00
efcc616110
cmake: remove wrong target_include_directories()
2020-11-24 16:37:35 +00:00
ae5e8fa9af
Merge remote-tracking branch 'RedDwarf69/pkgconfig' into master
2020-11-23 18:30:18 +01:00
ed989c3fa2
miniupnpc.pc: remove "miniupnpc" from includedir
2020-11-22 19:51:57 +00:00
876109c890
cmake: update version
2020-11-22 19:31:42 +00:00
9793607a76
miniupnpc version 2.2.0
2020-11-09 20:52:52 +01:00
82e874ada9
remove build warning.
...
PortMappingNumberOfEntries is supposed to be limited to 65536
should fix #501
2020-11-09 20:38:45 +01:00
1756c9259a
github workflows: try to upload win32 binaries
2020-11-05 13:24:59 +01:00
26e8f7831a
Use GetBestInterface() instead of GetBestInterfaceEx()
...
GetBestInterfaceEx() is not supported by older i586-mingw32msvc-gcc
compiler. GetBestInterface() works only with IPv4 addresses but in this
case it is enough as it is needed only for IP address 223.255.255.255.
2020-11-04 23:59:03 +01:00
23f492fd1b
Fix compilation when _WIN32_WINNT_VISTA macro is not defined
...
Older version of i586-mingw32msvc-gcc compiler does not define
_WIN32_WINNT_VISTA macro. Therefore preprocessor #if condition is
incorrectly evaluated.
2020-11-04 23:57:43 +01:00
8b44224b91
2020
2020-11-04 23:42:37 +01:00
0a9750602d
Merge branch 'win32_snprintf'
2020-11-04 23:40:37 +01:00
25a78aa385
add win32_snprintf.h
2020-11-04 23:37:07 +01:00
29797cf607
2019 => 2020
2020-10-31 11:36:06 +01:00
8cd542a809
Fix snprintf emulation for Windows
...
* Move it into separate win32_snprintf.h file to de-duplicate its
implementation from all miniupnp source files.
* Do not use this emulation with mingw32 SDK when __NO_ISOCEXT is not
defined as in this case mingw32 provides working snprintf function.
* Fix detection for mingw-w64 variants, when __NO_ISOCEXT is defined or
when older version without UCRT is used.
* Add check if _scprintf function is available. In case it is not available
just returns length of filled buffer to prevent buffer overflow.
2020-10-18 20:29:53 +02:00
bd71e2e279
miniupnpc/addr_is_reserved.c: include sys/types.h
2020-10-17 22:13:32 +02:00
138b4ff3aa
Fix for compiling with old windows SDK
2020-10-17 22:03:22 +02:00
7a66f373fc
inet_pton() instead of inet_addr()
2020-10-17 15:19:58 +02:00
69fc376929
add addr_is_reserved.c/.h to MSVC project files
...
fixes #489
2020-10-17 15:15:59 +02:00
63bf239a3e
remove unused definitions
...
see #489
2020-10-17 14:56:58 +02:00
062b562c37
ignore *.opendb
2020-10-17 14:49:43 +02:00
9ec4351829
Fix solaris build
...
fixes #490
2020-10-07 00:17:16 +02:00
f5f693876d
miniupnpc: By default skip invalid, disconnected and non-IGD devices
...
Allow to use such IGD devices by new -i option.
2020-10-05 22:30:30 +02:00
11c479fb2a
Merge remote-tracking branch 'pali/master'
2020-10-05 22:02:29 +02:00
c7cfe2c51a
fix compilation warning (WIN32)
2020-10-05 21:56:32 +02:00
fc74c42864
miniupnpc: Fix name of miniupnpc import library in setupmingw32.py
2020-10-02 22:52:26 +02:00
7d5fdf0743
miniupnpc: Fix usage of Windows _snprintf() function
...
_snprintf() differs from snprintf() in:
* on overflow it returns -1 instead of required buffer size
* on overflow it does not fill nul byte
* does not accept NULL/0 as a buffer
Microsoft implemented snprintf() in Visual Studio 2015 as part of UCRT.
Mingw32 contains snprintf() implementation only when __USE_MINGW_ANSI_STDIO
is defined.
Mingw-w64 versions prior to 8.0.0. contain snprintf() implementation when
__USE_MINGW_ANSI_STDIO or _UCRT is defined. Since version 8.0.0 it is
always supported.
Mingw-w64 defines both __MINGW32__ and __MINGW64_VERSION_MAJOR macros.
Mingw32 defines only __MINGW32__.
_scprintf() just count number of bytes needed for formatting string, so it
is basically return value of snprintf().
This change updates miniupnpc code to use snprintf() when is provided by
compiler/runtime to avoid usage _snprintf().
And also this changes updates miniupnpc emulation of snprintf() by
_snprintf() and _scprintf() functions to avoid buffer overflows.
For inspiration full emulation of snprintf() by _snprintf() is available in
mingw-w64 stdio library:
https://sourceforge.net/p/mingw-w64/mingw-w64/ci/master/tree/mingw-w64-crt/stdio/snprintf.c
2020-10-02 22:32:36 +02:00
c1eb7c0069
update Changelog
2020-09-28 23:25:23 +02:00
6358882f19
check string passed to atoi()
2020-09-28 23:24:54 +02:00
cce4407d9d
check for malformed HTTP response
2020-09-28 23:23:17 +02:00
426f9a1835
fix warning
2020-09-24 10:38:05 +02:00
2db013d891
use GetTickCount()/GetTickCount64() under windows
...
GetTickCount() when GetTickCount64() is not available
2020-09-24 10:19:09 +02:00
af1ea9f60b
miniupnpc: use clock_gettime() instead of gettimeofday() if possible
2020-09-24 10:19:08 +02:00
aa490867b3
prevent infinite loop in upnpDiscover()
...
fixes #488
2020-09-24 10:19:08 +02:00
0c556655ea
Move addr_is_reserved() to a specific source file and test it
2020-09-24 09:57:25 +02:00
96aa863c78
Fix check for reserved IP addresses in miniupnpc
...
Check for 0.0.0.0, 192.168., 10. and 172. is not enough. Nowadays routers
behind NAT are getting IP address from shared CG-NAT space 100.64.0.0/10.
This patch adjust miniupnpc to check for all reserved IPv4 addresses.
2020-08-05 16:26:26 +02:00
7e229ddd63
Fix Windows UWP build.
2020-07-21 23:42:42 +02:00
029383e5f4
initialize tp_free
2020-06-05 21:13:19 +02:00
47a55b27c7
miniupnpc: use C99 flexible array member for struct UPNPDev
...
see #462
2020-05-29 17:59:38 +02:00
f34241339e
miniupnpc: update *.py files headers
2020-04-06 12:25:34 +02:00
c5e8694746
Merge pull request #434 from pali/master
...
Fix and simplify Makefile.mingw for miniupnpc
2020-04-06 12:05:56 +02:00
8fc9a6d8ad
Compile static mingw executables with -static argument
2020-04-06 00:09:52 +02:00
2e3e6990db
Fix and simplify Makefile.mingw for miniupnpc
...
* Ensure that all executables would have .exe Windows extension
* Do not use dll subdirectory, so makefile would be slash agnostic
* Define common targets to simplify makefile
* Export required functions for listdevices executable
2020-04-02 18:45:46 +02:00
ad7c1db49a
fix: TypeError: a bytes-like object is required, not 'str'
2020-03-22 03:31:34 +09:00
4436632866
2019=>2020
2020-02-20 09:04:23 +01:00
443cb78e83
Haiku support
2020-02-20 09:03:53 +01:00
bffb6a828f
Add Haiku Support
2020-02-19 16:07:56 -06:00
f8a39b7fd5
miniupnpc/Changelog.txt: update
2019-12-24 00:36:49 +01:00
0ab1d6725b
Merge branch 'issue396'
2019-11-01 00:04:23 +01:00
efb6ec1b2f
testminiwget.sh: use either "ip addr" or "ifconfig -a"
2019-10-22 14:35:15 +02:00
c2818392e1
fix UPNP_GetValidIGD()
...
lanaddr was the one used to connect to the last device.
fixes #396
2019-10-13 19:58:52 +02:00
5f85321084
connecthostport.c: output to help debug
...
see #396
2019-10-13 19:22:59 +02:00
7c35c5269c
update miniupnpc/Changelog.txt
2019-08-24 10:51:36 +02:00
191b8bc106
upnperrors.c: update url and add vim modeline
2019-08-24 10:51:27 +02:00
564464efdb
Merge remote-tracking branch 'jleyec/master'
2019-07-30 00:17:09 +02:00
ea69474873
Fix error code for 708
...
According to the specification
http://upnp.org/specs/gw/UPnP-gw-WANIPConnection-v2-Service.pdf , the
708 error code corresponds to InvalidLayer2Address. Also
WildcardNotPermittedInSrcIP is for 715 which is already properly mapped.
2019-07-29 22:49:07 +05:30
e1ff22b20d
manage [remote host]
2019-07-13 12:39:33 +02:00
1d6b9ae38d
upnperrors.c: 2019 !
2019-06-25 23:21:26 +02:00
14f6ed5111
python module: UPnP_addportmapping() lease duration is unsigned int
...
Also, this is the server that will check for the maximum value (604800 seconds)
2019-05-20 21:07:53 +02:00
d457eacec6
Added the leaseDuration parameter to the addportmapping python binding.
...
This parameter was already present in the C API but not exposed to the
python module.
For backward compatibility, leaseDuration was made optional with a
default value of 0 (unlimited duration).
2019-05-17 15:45:21 +02:00
9132003aa0
simplify Win32 loop
...
thanks to irwir !
see https://github.com/miniupnp/miniupnp/pull/362
2019-05-08 15:46:52 +02:00
c8566d6ebd
strupnperror(): add 2 more error codes
2019-05-03 14:37:02 +02:00
8aec04e234
Add wheels as a distribution alternative for Windows builds.
2019-04-25 18:17:27 +02:00
b11f642b81
Creation a build matrix to support various python versions.
2019-04-25 17:28:49 +02:00
e1779d3518
Attempt to have a working build for Python 3.7 under windows with appveyor.
...
- Python 3.7 is built using Visual Studio 2017 so we use the corresponding image.
- Python 3.7 replaces Python 2.7 when building the module.
- Adding the library legacy_stdio_definitions to the linker input as starting with VS 2015 some symbols have been inlined but may be expected by older binaries. This compatibility library exposes these symbols so they can be dynamically linked when required (Cf. https://stackoverflow.com/a/32418900 ).
2019-04-25 17:07:26 +02:00
f3a567cedf
best way to test for integer in [16;31]
2019-04-23 14:19:31 +02:00
60ed85fe70
upnpcommands.c: restrict scope of variable p
...
see #362
2019-04-23 14:18:23 +02:00
422d42357e
use strncmp() instead of memcmp() when needed
...
memcmp(s1, s2, l) is valid when both s1 and s2
have at least l bytes acccessible. So
memcmp("a", "abcdefgh", 8)
is not valid
see #362
2019-04-23 14:16:25 +02:00
c1cbcd971b
remove space at end of line...
2019-04-23 12:56:28 +02:00
82b117ee7f
CMake: Add listdevices
...
Matches the Makefile
2019-04-23 12:56:15 +02:00
aea0a6093d
[CMake] Add UPNPC_NO_INSTALL option
2019-04-17 10:27:29 -04:00
5ae326a95e
minissdpc.c: fix variable redeclaration of p
2019-04-10 14:15:33 +02:00
922372bff3
2019
2019-04-08 14:46:11 +02:00
e1b4f25bba
upnpreplyparse.c: Fix memory leak
...
If there are multiple NewPortListing tags,
there is a malloc() for each one.
fixes #357
2019-04-05 10:30:10 +02:00
a9a764cea9
update Changlogs.
2019-04-03 17:38:33 +02:00
b725f5114f
connecthostport.c: code simplification
2019-03-10 19:23:58 +01:00
3d4661635e
Fix connect() socket error trace on Windows
...
closesocket() clobbers the Winsock last error value, so we must only call it after tracing.
2019-03-05 23:30:24 -08:00
61a18d6b02
getnameinfo() 2nd arg is socklen_t
...
fixes #350
also fix ressource leak
2019-02-12 14:26:01 +01:00
3e32ea04c8
fix ssdpDiscoverDevices() when building for DEBUG under WIN32
2019-02-11 16:08:55 +01:00
08e955de40
Update Changelogs + 2019
2019-02-10 16:11:16 +01:00
2656f41c7a
miniupnpc: set timeout for select() in connecthostport()
2019-01-23 09:44:21 +01:00
e7d99e6b65
fix comment about parseMSEARCHReply()
2019-01-07 09:35:21 +01:00
aaa0ed8c86
ensure SSDP reply headers are not partial matches
2019-01-05 12:24:46 -08:00
6ae3445c2e
miniupnpcmodule.c: check return of WSAStartup()
2018-10-31 16:34:00 +01:00
33de3996d7
Merge branch 'uwp_upnpc'
2018-10-31 16:30:56 +01:00
4b87224e6f
fix WIN32 warnings introduced in a31c86b8db
2018-10-31 16:26:01 +01:00
9638371244
Update renamed file in MSVC Project ( #331 )
2018-10-20 08:56:12 +02:00
a31c86b8db
Replace GetBestRoute with UWP-compatible API
...
Everything should still work with Windows XP as minimum version.
Those API are, according to Microsoft docs, compatible with XP.
2018-09-21 14:56:59 +02:00
ab4559a432
Make testigddescparse work under Win32
...
fixes #325
Line endings are CRLF
2018-09-02 18:50:58 +02:00
a7626af053
Fix conditions for Windows versions below Vista
2018-08-05 15:20:44 +03:00
5ddf1e7edb
update miniupnpc README about MINIUPNP_STATICLIB
2018-08-03 02:52:10 +02:00
c55d27f46e
InetPton() is not available with Win XP so use inet_addr()
...
see 8babc5d013
2018-07-15 12:52:19 +02:00
a2cec1d868
miniupnp: Add information about iptables settings into README
2018-07-14 13:45:09 +02:00
d8c6433c2e
Move common definition to miniupnpc_socketdef.h
2018-07-14 13:39:01 +02:00
c70a646a73
add genminiupnpcstrings.vbs to MSVC 2015 project
2018-07-14 13:34:44 +02:00
6f99427d69
improve genminiupnpcstrings.vbs to generate file only if changed
2018-07-14 13:29:37 +02:00
8babc5d013
Win32 : use InetPton() etc. to silence MSVC warnings
2018-07-14 12:53:42 +02:00
fe73488e88
Add Debug Dll/Release Dll configurations to MSVC 2015 projects
...
also fix the link with miniupnpc.lib in MSVC 2010
2018-07-14 12:41:52 +02:00
032ecf654a
Add Debug Dll / Release Dll configurations for MSVC 2010
2018-07-14 11:51:48 +02:00
13a9c24d7f
declspec.h had been renamed miniupnpc_declspec.h
2018-07-14 11:29:07 +02:00
bded13f390
When code was updated for 64-bit Windows configurations, some changes were not applied.
...
Details :
cast for connect() sendto() arguments
remove unecessary p = NULL;
remove unecessary code
printf format fixes in ssdpDiscoverDevices()
fixes #311
Signed-off-by: Thomas Bernard <miniupnp@free.fr>
2018-07-06 11:35:12 +02:00
Thomas Bernard
Ștefan Talpalaru
SpaceIm
fanquake
past-due
Pali Rohár
Fabio Alessandrelli
Stanislas Dolcini
Cristian Morales Vega
Cristian Morales Vega
Henrik Rydgård
jaehong park
CodeforEvolution
Sibi Prabakaran
jlayec
Nathan Richard
Nathan Richard
Rosen Penev
Cameron Gutman
Brett
irwir