Commit Graph

1595 Commits

Author SHA1 Message Date
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 db4463e694 disable building of linux_nft
not available yet with travis-ci
2018-07-15 15:57:31 +02:00
Thomas Bernard cd94372942
gitlab-ci: add net-tools pkg for ifconfig command 2018-07-15 15:39:34 +02:00
Thomas Bernard 7806a58e78
add gitlab/framagit.org URL 2018-07-15 15:33:54 +02:00
Thomas Bernard f676144be7
gitlab-ci: also build miniupnpd for libnft
https://netfilter.org/projects/libnftnl/index.html
2018-07-15 14:30:18 +02:00
Thomas Bernard bdf8f50754 mingw32-gcc is i686-w64-mingw32-gcc 2018-07-15 14:22:19 +02:00
Thomas Bernard 7ae64999a8 gitlab-ci: make clean before cross building for windows 2018-07-15 14:17:09 +02:00
Thomas Bernard dc11f02d37
gitlab-ci: cross-compile miniupnpc for Win32 2018-07-15 14:11:31 +02:00
Thomas Bernard 8a2af6e9e6 gitlab-ci: add make and gcc packages
Signed-off-by: Thomas Bernard <miniupnp@free.fr>
2018-07-15 14:06:43 +02:00
Thomas Bernard 075064806b add a simple .gitlab-ci.yml file
see https://framagit.org/miniupnp/miniupnp
2018-07-15 13:58:47 +02:00
Thomas Bernard 9b23bdf6de Merge branch 'master' into travis-ci-nftables 2018-07-15 13:06:51 +02:00
Thomas Bernard 11785205f1 Merge remote-tracking branch 'Lochnair/fix_nftables' into travis-ci-nftables 2018-07-15 12:59:25 +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
Nils Andreas Svee 181428e843 miniupnpd: add update_portmappings functions for nft 2018-07-14 19:59:26 +02:00
Thomas Bernard e92d54acdf travis-ci: build linux nft version of miniupnpd 2018-07-14 14:29:27 +02:00
Thomas Bernard ac796a4077 linux: add -lrt when building for glibc < 2.17 2018-07-14 14:23:13 +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
Thomas Bernard d27a3152bd fix generate_transaction_id() 2018-07-06 15:29:15 +02:00
Thomas Bernard efe5d87103 LOG_WARNING if behind restrictive NAT 2018-07-06 14:41:04 +02:00
Pali Rohár e6011dc534 miniupnpd: Allow to specify also port number in -o STUN: option
Also update help for -o STUN: option, it can take stun hostname too.
2018-07-06 14:38:37 +02:00
Thomas Bernard 6e5a88098d fix file headers (=>2018)
Signed-off-by: Thomas Bernard <miniupnp@free.fr>
2018-07-06 14:16:49 +02:00
Thomas Bernard d84e004849 Fix upnpstun.o dependencies 2018-07-06 14:16:07 +02:00
Thomas Bernard 810cb665c2 Merge branch 'pr_307'
see #307
2018-07-06 13:40:18 +02:00
Thomas Bernard 012cad4111 Makefile.linux: fix depends 2018-07-06 13:36:23 +02:00
Thomas Bernard b2343c87a7 Add STUN support
see #307
2018-07-06 13:33:33 +02:00
Thomas Bernard 18ec4e88e7 asyncsendto.c: 2018 2018-07-06 13:31:44 +02:00
Thomas Bernard 1da39554c7 fixes in upnpstun.c
Signed-off-by: Thomas Bernard <miniupnp@free.fr>
2018-07-06 13:31:26 +02:00
Thomas Bernard 15b6f3e9c2 fixes in update_ext_ip_addr_from_stun()
Signed-off-by: Thomas Bernard <miniupnp@free.fr>
2018-07-06 13:29:33 +02:00
Thomas Bernard 8bc6d6f556 PERFORMSTUN => PERFORMSTUNMASK. allow to specify stun using -o option 2018-07-06 13:23:22 +02:00
Thomas Bernard 8c91ff515e reserved[] is const 2018-07-06 13:20:30 +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
Nils Andreas Svee 5262990d8e miniupnpd: support newer libnftnl versions 2018-07-01 23:50:12 +02:00
Thomas Bernard ef179a45e3 do not check empty string with strlen(s) == 0
see #292
2018-06-01 10:55:45 +02:00
Thomas Bernard 72005ce86a add -w option to iptables.
see https://miniupnp.tuxfamily.org/forum/viewtopic.php?p=5113

Signed-off-by: Thomas Bernard <miniupnp@free.fr>
2018-05-29 12:26:33 +02:00
Pali Rohár c1472ffe4e miniupnpd: GetExternalIPAddress(): Instead of invalid IP address 0.0.0.0 returns error 501
IP address 0.0.0.0 is filled when it is not possible to retrieve IP address. According to specification, GetExternalIPAddress() can return error 501 when action failed.
2018-05-19 17:28:43 +02:00
Pali Rohár 8c97654d70 miniupnpd: When enabled perform STUN to learn external IP address and NAT type
Also enable port forwarding when direct (non-NAT) connection or unrestricted NAT 1:1 (without any filtering) is detected.
2018-05-19 13:32:42 +02:00
Pali Rohár 8e10a1aeab miniupnpd: Disable port forwarding when we are behind restrictive nat with reserved / private IP address
In this case port forwarding is impossible, so rather return error code to the client instead of silently trying to do something and informing clients that port forwarding is enabled.
2018-05-19 13:32:04 +02:00
Pali Rohár cce19781e6 miniupnpd: Add validation that public ip address is not reserved and is really public
This ensures that all requests for getting public IP address (either via UPnP IGD or PCP/PMP) would contain correct public IP address or an error (instead of some invalid private/reserved IP address).
2018-05-19 13:31:26 +02:00
Pali Rohár c35935c61d miniupnpd: Add function addr_is_reserved() to check if address is private/reserved and therefore not for public port forwarding 2018-05-19 13:31:14 +02:00
Pali Rohár 4f53b322fd miniupnpd: Add function perform_stun() for detecting external IP address and restrictive NAT via STUN protocol
It automatically unblock selected UDP ports for incoming responses and after finishing ports unblock is removed.
2018-05-19 13:31:08 +02:00
Pali Rohár cd7284785b miniupnpd: Add function delete_filter_rule() also for PF and Linux Netfilter
It is needed for STUN implementation.
2018-05-19 13:31:02 +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