Commit Graph

494 Commits

Author SHA1 Message Date
Ștefan Talpalaru c8566d6ebd
strupnperror(): add 2 more error codes 2019-05-03 14:37:02 +02:00
Nathan Richard 8aec04e234 Add wheels as a distribution alternative for Windows builds. 2019-04-25 18:17:27 +02:00
Nathan Richard b11f642b81 Creation a build matrix to support various python versions. 2019-04-25 17:28:49 +02:00
Nathan Richard 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
Thomas Bernard f3a567cedf
best way to test for integer in [16;31] 2019-04-23 14:19:31 +02:00
Thomas Bernard 60ed85fe70
upnpcommands.c: restrict scope of variable p
see #362
2019-04-23 14:18:23 +02:00
Thomas Bernard 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
Thomas Bernard c1cbcd971b remove space at end of line... 2019-04-23 12:56:28 +02:00
Rosen Penev 82b117ee7f
CMake: Add listdevices
Matches the Makefile
2019-04-23 12:56:15 +02:00
past-due aea0a6093d
[CMake] Add UPNPC_NO_INSTALL option 2019-04-17 10:27:29 -04:00
Thomas Bernard 5ae326a95e
minissdpc.c: fix variable redeclaration of p 2019-04-10 14:15:33 +02:00
Thomas Bernard 922372bff3 2019 2019-04-08 14:46:11 +02:00
Thomas Bernard 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
Thomas Bernard a9a764cea9 update Changlogs. 2019-04-03 17:38:33 +02:00
Thomas Bernard b725f5114f
connecthostport.c: code simplification 2019-03-10 19:23:58 +01:00
Cameron Gutman 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
Thomas Bernard 61a18d6b02 getnameinfo() 2nd arg is socklen_t
fixes #350

also fix ressource leak
2019-02-12 14:26:01 +01:00
Thomas Bernard 3e32ea04c8 fix ssdpDiscoverDevices() when building for DEBUG under WIN32 2019-02-11 16:08:55 +01:00
Thomas Bernard 08e955de40 Update Changelogs + 2019 2019-02-10 16:11:16 +01:00
Thomas Bernard 2656f41c7a
miniupnpc: set timeout for select() in connecthostport() 2019-01-23 09:44:21 +01:00
Thomas Bernard e7d99e6b65
fix comment about parseMSEARCHReply() 2019-01-07 09:35:21 +01:00
Cameron Gutman aaa0ed8c86 ensure SSDP reply headers are not partial matches 2019-01-05 12:24:46 -08:00
Thomas Bernard 6ae3445c2e
miniupnpcmodule.c: check return of WSAStartup() 2018-10-31 16:34:00 +01:00
Thomas Bernard 33de3996d7 Merge branch 'uwp_upnpc' 2018-10-31 16:30:56 +01:00
Thomas Bernard 4b87224e6f fix WIN32 warnings introduced in a31c86b8db 2018-10-31 16:26:01 +01:00
Brett 9638371244 Update renamed file in MSVC Project (#331) 2018-10-20 08:56:12 +02:00
Fabio Alessandrelli 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
Thomas Bernard ab4559a432
Make testigddescparse work under Win32
fixes #325
Line endings are CRLF
2018-09-02 18:50:58 +02:00
irwir a7626af053 Fix conditions for Windows versions below Vista 2018-08-05 15:20:44 +03:00
Thomas Bernard 5ddf1e7edb
update miniupnpc README about MINIUPNP_STATICLIB 2018-08-03 02:52:10 +02:00
Thomas Bernard c55d27f46e InetPton() is not available with Win XP so use inet_addr()
see 8babc5d013

Signed-off-by: Thomas Bernard <miniupnp@free.fr>
2018-07-15 12:52:19 +02:00
Pali Rohár a2cec1d868 miniupnp: Add information about iptables settings into README 2018-07-14 13:45:09 +02:00
irwir d8c6433c2e Move common definition to miniupnpc_socketdef.h 2018-07-14 13:39:01 +02:00
Thomas Bernard c70a646a73 add genminiupnpcstrings.vbs to MSVC 2015 project 2018-07-14 13:34:44 +02:00
Thomas Bernard 6f99427d69 improve genminiupnpcstrings.vbs to generate file only if changed 2018-07-14 13:29:37 +02:00
Thomas Bernard 8babc5d013 Win32 : use InetPton() etc. to silence MSVC warnings 2018-07-14 12:53:42 +02:00
Thomas Bernard 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
Thomas Bernard 032ecf654a Add Debug Dll / Release Dll configurations for MSVC 2010 2018-07-14 11:51:48 +02:00
Thomas Bernard 13a9c24d7f declspec.h had been renamed miniupnpc_declspec.h 2018-07-14 11:29:07 +02:00
irwir 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
Tengiz Sharafiev d3a7441aeb
Fix colliding of miniupnpc.lib files
Fix miniupnp/miniupnp#270

Both libminiupnpc-static and libminiupnpc-shared targets
were generated miniupnpc.lib files.
Now libminiupnpc-static generates libminiupnpc.lib whereas
libminiupnpc-shared generates miniupnpc.lib and miniupnpc.dll
2018-05-09 13:52:41 +03:00
Tengiz Sharafiev 891b15b789
Fix copy-paste typo 2018-05-09 13:51:30 +03:00
Thomas Bernard bd836936f7 miniupnpc: VERSION 2.1 2018-05-07 13:12:58 +02:00
Thomas Bernard 4a9c12ca20 VBscript to generate miniupnpcstrings.h
fixes #297
2018-05-07 12:51:59 +02:00
Thomas BERNARD 943e28bdaa
Merge pull request #296 from btolfa/miniupnpc-modern-cmake
Modernize and cleanup CMakeLists.txt
2018-05-07 11:24:22 +02:00
Thomas Bernard 61703ad8b1 miniupnpc/lisdevices.c: remove warnings. fix leak 2018-04-30 16:44:15 +02:00
Thomas Bernard f65d34433f miniupnpc/listdevices: remove duplicates 2018-04-30 16:26:29 +02:00
Thomas BERNARD bdfd7bb562 miniupnpc/listdevices: show devices sorted by XML desc URL 2018-04-30 01:59:38 +02:00
Tengiz Sharafiev 530b272350
Modernize and cleanup CMakeLists.txt
[Effective Modern CMake](https://gist.github.com/mbinna/c61dbb39bca0e4fb7d1f73b0d66a4fd1)

- Set the minimum required version for CMake to 3.5
- Added `UPNPC_BUILD_SAMPLE` option for building sample client application (upnpc.c)
- Added interface target library `miniupnpc-private` for common settings like compile
  definitions, flags and include directories. It helps to keep global scope clean.
  https://cmake.org/cmake/help/v3.11/manual/cmake-buildsystem.7.html#interface-libraries
- Replaced `-fPIC` compile option with `POSITION_INDEPENDENT_CODE` target property
  https://cmake.org/cmake/help/v3.11/prop_tgt/POSITION_INDEPENDENT_CODE.html#prop_tgt:POSITION_INDEPENDENT_CODE
- Set usage requirements for `libminiupnpc-*` targets for more convenient
  usage through `add_subdirectory()` (as cmake subproject)
  https://cmake.org/cmake/help/v3.11/manual/cmake-buildsystem.7.html#build-specification-and-usage-requirements
- Removed old and outdated code from CMakeLists.txt
2018-04-27 21:38:25 +07:00
Thomas Bernard b7e1b2ef09 miniupnpc/miniupnpcmodule.c: small fix 2018-04-26 22:27:05 +02:00
Thomas Bernard 9663c55c61 miniupnpc/Makefile.mingw: Support cross compiling for Ming32
fixes #293
2018-04-26 22:13:06 +02:00
Thomas Bernard 9d569438d3 update MS VS 2010 project files 2018-04-20 16:34:44 +02:00
Thomas Bernard 154d27c773 miniupnpc/upnpc.c: 2017=>2018 2018-04-20 16:34:42 +02:00
Thomas Bernard 0d0b4d2372 .gitignore: add miniupnpc.pc 2018-04-10 09:47:18 +02:00
Thomas Bernard f8acab6d38 miniupnpc: increments API_VERSION to 17 2018-04-06 12:48:24 +02:00
Thomas Bernard 284db0bb49 miniupnpc: use SOCKET type instead of int for copilation under Win64
see #289
2018-04-06 12:21:36 +02:00
Thomas Bernard a4af4a66b2 miniupnpc: cleanup includes in upnpcommands.h
see #289
2018-03-14 00:36:12 +01:00
Thomas Bernard 8945a6ee15 miniupnpc/miniwget.c: remove useless test
see #289
2018-03-14 00:23:10 +01:00
Thomas Bernard ce2673118d miniupnpc: disable call to MiniSSDPd when -m option is used
fixes #269
2018-02-22 15:58:25 +01:00
Thomas Bernard 90b8f3711c miniupnpc: add miniupnpc.pc for pkg-config
fixes #281
2018-02-22 15:31:34 +01:00
Thomas Bernard a752cf30b5 Add project files for MS Visual Studio 2010 2018-02-17 18:06:57 +01:00
Thomas BERNARD 348e5c405a Fix Makefile for GNU make 3.80
"else ifeq" on the same line is not compatible with GNU Make 3.80
2018-02-03 18:29:35 +01:00
yangfl 2b0a6dd163 Makefile: Use crosscompile target as OS 2018-02-03 11:29:58 +08:00
yangfl b40e6e4eb6 miniupnpc: fix typo 2018-02-03 01:12:45 +08:00
Thomas Bernard 718deea11e Update file headers. 2017 => 2018 etc. 2018-01-16 02:06:46 +01:00
Thomas Bernard 34ac268fc2 minihttptestserver: int => size_t when possible 2018-01-15 17:39:08 +01:00
yangfl d492fa39ef fix typo 2018-01-09 09:33:31 +08:00
Thomas Bernard 37d54ed207 miniupnpc: update Changelog.txt 2017-12-12 12:27:05 +01:00
Thomas Bernard 377cef2dc8 upnpreplyparse.c: NameValueParserEndElt() rename arg to avoid confusion 2017-12-12 12:21:38 +01:00
Thomas Bernard 1f5ca16931 miniupnpc: improve testupnpreplyparse 2017-12-12 11:07:09 +01:00
Thomas Bernard a0573e2518 minixml.c: fix heap buffer overflow
should fix #268
2017-12-11 14:59:29 +01:00
Thomas Bernard 7aeb624b44 properly initialize data structure for SOAP parsing in ParseNameValue()
topelt field was not properly initialized.

should fix #268
2017-12-11 14:27:27 +01:00
Thomas Bernard b4bbee1df9 testminiwget.sh: test IPV6 availability 2017-11-02 18:24:08 +01:00
Thomas Bernard 6600c52b67 testminiwget.sh: display network confing in case of error 2017-11-02 18:11:29 +01:00
Thomas Bernard dfb3115bc3 minihttptestserver.c: fix minor warning in build_favicon_content() 2017-11-02 18:01:57 +01:00
Thomas Bernard 38a20e4849 testminiwget.sh: don't get stuck if the http test server does not starts 2017-11-02 17:53:33 +01:00
Thomas Bernard 7848d799a4 Merge remote-tracking branch 'raspopov/patch-2' 2017-09-29 11:16:20 +02:00
DQ 4afc0edbe3 Update external-ip.sh, only output on success
change sed pattern to only match when GetExternalIPAaddress succeeds and output nothing if it fails

$ upnpc -s | grep ExternalIPAddress | sed 's/[^0-9\.]//g'
.3
$ upnpc -s | grep ExternalIPAddress 
GetExternalIPAddress failed. (errorcode=-3)
$ upnpc -s | sed -n -e 's/^ExternalIPAddress = \([0-9.]*\)$/\1/p'
$
2017-09-28 15:14:22 -07:00
Nikolay Raspopov 1ffb2ea580 Fixed incompatible types (from 'int *' to 'const char *') warning #2
https://msdn.microsoft.com/en-us/library/windows/desktop/ms738574(v=vs.85).aspx
2017-09-18 20:27:10 +03:00
Dmytro Milinevskyy 74c6ab5a46 cli:py: do not ship binaries in sdist
#252
2017-08-25 16:06:26 +02:00
Dmytro Milinevskyy 587f33c3c9 py: include version file in the package file 2017-08-08 19:55:24 +02:00
Thomas Bernard a5f3436cfd Merge remote-tracking branch 'niamster/master' 2017-07-19 20:07:02 +02:00
Thomas Bernard d40e9a9f52 allow setup.py to call another make executable that 'make'
closes #246
2017-07-19 19:44:30 +02:00
Dmytro Milinevskyy a677dccc4d miniupnpc:py: allow desc and remote to be None for addportmapping and addanyportmapping 2017-07-19 13:44:26 +02:00
Dmytro Milinevskyy ae0c3489bf miniupnpc:py: build libminiupnpc.a 2017-07-18 13:00:28 +02:00
Thomas Bernard d13f840a4a =>2017. http => https 2017-07-06 00:03:12 +02:00
Thomas Bernard 04d1e4e3f5 miniupnpc: Add MS VS 2015 solution/project files 2017-06-20 11:45:27 +02:00
Sean Li 1988b54fec Fix issue in CMakeLists.txt.
CMAKE_COMPILER_IS_GNUC should be CMAKE_COMPILER_IS_GNUCC.
2017-06-12 19:13:18 +08:00
Thomas Bernard 15cd905f6f => 2017
also http://miniupnp.tuxfamily.org => HTTPS
2017-05-26 17:27:20 +02:00
Thomas Bernard f0f1f4b22d miniupnpc: Fix CVE-2017-8798
Thanks to tin/Team OSTStrom
2017-05-09 12:00:47 +02:00
Thomas Bernard 086c387924 miniwget.c: use sizeof(buf) 2017-05-05 12:46:09 +02:00
Matthieu Nottale af5c091002 Send error logs to stderr. 2017-04-21 11:25:49 +02:00
Thomas Bernard e6ed3c5b8a do not stop discovery on sendto() failure 2017-03-13 15:33:38 +01:00
Thomas Bernard d36853118e connecthostport.c: fix compilation with -DNO_GETADDRINFO 2017-03-13 14:34:16 +01:00
Darexon 2c262a8793 AddPortMapping() now returns an error code 2017-02-15 00:01:41 -06:00
Thomas Bernard 8c9ce4dbb4 make sure no unitialized memory is accessed in the sockaddr_un structure 2017-01-09 10:18:16 +01:00
Thomas Bernard c8b42602a2 fix potential mem leaks in upnpcommands.c
fixes #225
2017-01-09 10:18:16 +01:00
Thomas Bernard e7068a7d34 LDLIBS, not LDFLAGS :) 2016-12-30 20:07:59 +01:00
Thomas Bernard b433902c02 update .gitignore for win32 files 2016-12-30 16:42:33 +01:00
Thomas Bernard 9e73075752 initialize Winsock in python module
fixes #221
2016-12-28 10:16:47 +01:00