a4e12c01c4
miniupnpd: move READNU32/WRITENU32/etc. to rw_unaligned.h
2022-10-16 07:54:38 +02:00
c13a4b15f1
upnpdescgen.c: include macros.h for UNUSED
...
fixes 3a2b15af4c
2022-10-16 07:43:42 +02:00
3f6350da6a
Merge pull request #630 from miniupnp/issue-628
...
fixes Issue 628 - bug on big endian
2022-10-16 07:33:19 +02:00
3a2b15af4c
miniupnpd: fix warnings when compiling with IGD_V2 disabled
...
fixes #617
./upnpdescgen.c:946:1: warning: unused label 'unstack' [-Wunused-label]
unstack:
^~~~~~~~
./upnpdescgen.c:891:12: warning: unused parameter 'force_igd1' [-Wunused-parameter]
int force_igd1)
^
./upnpdescgen.c:1035:61: warning: unused parameter 'force_igd1' [-Wunused-parameter]
genServiceDesc(int * len, const struct serviceDesc * s, int force_igd1)
^
3 warnings generated.
2022-10-15 13:09:36 +02:00
61127ca0be
nftnlrdr_misc.c: expr_set_reg_val_u16() has uint16_t arg
2022-10-10 02:33:04 +02:00
890e4ec218
nftnlrdr_misc.c: fix parse_rule_immediate()
...
so it works correctly on both little endian and big endian CPUs
should fix #628
2022-10-10 02:32:58 +02:00
8bbe1c1339
remove useless UNUSED()
2022-10-10 01:23:26 +02:00
fa190f294a
pcpserver.c: fix type LOG_WARN => LOG_WARNING
...
fixes #620
2022-08-25 23:52:23 +02:00
7b45ec940a
update changelog.
...
fixes #611
2022-08-06 11:27:35 +02:00
b8d66c5f7c
pcpserver.c: rewrite DeletePCPMap() to work with netfilter_nft
...
try to fix #611
2022-07-01 07:15:36 +02:00
16366f5db4
add debug logs in DeletePCPMap
2022-06-19 19:41:32 +02:00
0cc037f8b0
update miniupnpd/Changelog.txt
2022-06-02 01:26:37 +02:00
1cdf9ba744
Merge branch '529-port-triggering-openbsd'
...
fixes #529
2022-06-02 01:19:53 +02:00
b734f94bdf
pcpserver.c: improve DeletePCPMap() error message
2022-05-18 11:25:32 +02:00
047fe367dd
miniupnpd: improve configure script for cross builds
2022-05-18 09:55:52 +02:00
2ede47be46
pf/obsdrdr.c: better document PFRULE_INOUT_COUNTS and PF_NEWSTYLE
2022-05-18 08:34:16 +02:00
a255df2488
Dont create nat rule for Port Triggering, but a pass rule
...
should fix #529
2022-05-18 08:32:42 +02:00
a6ca2b14c5
miniupnpd/nftnldr.c: init local var in update_portmapping()
...
see https://github.com/miniupnp/miniupnp/pull/607
rhost is not currently in use, but it might be some day.
2022-04-21 00:19:45 +02:00
fda61180e0
iptpinhole.c: check inet_pton() return values
2022-03-19 18:50:58 +01:00
c8476e6f16
miniupnpd.init.d.script: support nftables
...
fixes #594
2022-02-19 23:49:18 +01:00
89c6556338
miniupnpd/ipfw: make it clear it is not working under FreeBSD
2022-02-19 22:49:14 +01:00
c0d3a17650
pf: Use private WAN IP for NAT in double NAT setups
...
fixes #598
2022-02-19 20:19:34 +01:00
5231397bd6
update Changelog and comments about commit 9500253
2022-02-19 20:03:30 +01:00
9e042264fa
Merge pull request #599 from jow-/master
...
Expose `USE_GETIFADDRS` and tweak `getifaddr()` behaviour
2022-02-19 18:50:39 +01:00
af812c8775
Refine LICENSE so github can understand it ;)
...
see #592
also replace project specific files to symbolic link
2022-02-19 18:38:48 +01:00
95002535b3
getifaddr.c: prefer non-reserved over reserved addresses in `getifaddr()`
...
When iterating interface addresses obtained via `getifaddrs()`, don't
stop at the first found IPv4 address but continue checking all IPv4
addresses and prefer to use a non-reserved one in case an interface
has both reserved (private) and non-reserved (public) addresses
assigned.
After this fix, miniupnpd on OpenWrt is able to properly detect the
external IP address of an external interface with both a private
RFC1918 and a public IP assigned regardless of whether `getifaddrs()`
happens to return the private or the public IPv4 address first.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2022-02-16 17:58:42 +01:00
a28dec3c2d
configure: expose USE_GETIFADDRS configuration
...
The miniupnpd sources contain a working getifaddrs() based implementation
to fetch the IP address of an interface but that implementation is guarded
by a USE_GETIFADDRS define which can only be passed manually via CFLAGS.
Introduce a new `--getifaddrs` option to the configure script which can be
used to explicitly enable `getifaddrs()` usage.
Also extend the OpenWrt configuration case to enable `getifaddrs()` since
OpenWrt ships with a working implementation of it since several years
already.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2022-02-16 17:54:01 +01:00
1479881003
minixml.c sync sources
...
In the commit a0573e2518
2022-01-27 11:29:16 +02:00
9df2f43e08
miniupnpd: VERSION 2.3.0
2022-01-23 01:25:49 +01:00
6576eb611b
version 2.3.0
2022-01-23 01:19:01 +01:00
545d2b421c
2022
2022-01-23 01:18:49 +01:00
87776e8345
Split "NAT" and "TABLE" for consistency
2022-01-01 16:58:55 -06:00
8d061ecf65
Fix typo: should check for `$NAT_TABLE`
2022-01-01 16:17:31 -06:00
69f01ffcc8
Spelling fix: routeing --> routing
2022-01-01 16:15:54 -06:00
78823d762e
README.md: updated. fix titles
2021-12-16 00:29:39 +01:00
2bfed34e8c
README.md: reformat chain/tables setup
...
fix 3129683cb3
2021-12-16 00:27:57 +01:00
1a5cdc0a13
remove space before eol
2021-12-02 00:35:51 +01:00
af0ee582d9
commonrdr.h: 2021
2021-12-02 00:06:24 +01:00
97aa00f076
miniupnpd/Changelog.txt: update regarding #584 / 3129683c
2021-12-02 00:06:24 +01:00
46ecef1365
miniupnpd.conf: default table name changed with #584 / 3129683c
2021-12-02 00:06:23 +01:00
3129683cb3
NFTables use scripts to create tables and chains
...
To hardcode table and chain creation and deletion makes it impossible
for existing firewall infrastructures to integrate miniupnpd.
NFTables will either reevaluate packets through miniupnpd or
it will delete existing tables when there are already custom chains in it.
Signed-off-by: Sven Auhagen <sven.auhagen@voleatech.de>
2021-11-28 08:08:37 +01:00
d4849fa08e
miniupnpd.conf: comments about netfilter table/chain names
2021-11-27 21:49:25 +01:00
0b3f3e4029
NFTables make tables name configurable
...
Right now the table names are hardcoded and do not integrate with an overall
firewall strategy.
NFTables has restrictions on how packets are evaluated against chains.
For example if multiple forward chains are evaluated with different prioity,
all packets that pass the first one will be reevaluated again in the second chain.
To have an overall firewall concept with miniupnpd it is necessary to use existing
tables and hence to configure them in miniupnpd.
Signed-off-by: Sven Auhagen <sven.auhagen@voleatech.de>
2021-11-27 21:49:21 +01:00
9eb826a7eb
miniupnpd/Changelog.txt: update regarding merge of #562
...
see https://github.com/miniupnp/miniupnp/pull/562
2021-11-17 12:37:02 +01:00
9a5215c54a
Merge pull request #562 from svenauhagen/feature/nftablesnat
...
NFTables use nat chain for inet (instead of specific IPv4 chain)
2021-11-17 12:36:19 +01:00
51a422407b
miniupnpd/configure: don't hardcode iptables
...
The OpenWrt Makefile that builds miniupnpd passes the firewall argument
to the configure script, so this is not needed and it is blocking us
from using nftables instead, which will be the default backend for
firewall4 to be used in the next OpenWrt stable release.
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
2021-11-07 20:24:29 +02:00
2b00c461fb
treewide: s/OpenWRT/OpenWrt/
...
The correct spelling is OpenWrt.
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
2021-11-07 20:21:25 +02:00
7634920f3c
Makefile.linux_nft: fix DEPFLAGS and make install
2021-09-30 23:20:52 +02:00
a933c76be4
Makefile.linux: fix install dependencies
2021-09-30 23:20:25 +02:00
881ba06bc1
configure: warning when no libiptc pkg-config found
2021-09-30 01:49:30 +02:00
d2f558f659
configure: use 'command -v' instead of 'which'
2021-09-30 01:49:30 +02:00
6e16650bc2
miniupnpd/configure: fix comparaison
...
[ "$IPTABLES_143" -eq 1 ]
doesn't work if $ITABLES_143 is empty
using instead :
[ "$IPTABLES_143" = "1" ]
2021-09-30 01:49:30 +02:00
c88178650e
replace 'which' with 'command -v'
2021-09-30 01:49:30 +02:00
5d315359aa
gitrev.mk: use gitlab-ci predefined variables
2021-09-30 01:49:29 +02:00
50950a3520
iptcrdr.c: fix a potential double iptc_free(h)
...
closes #566
2021-09-28 22:47:05 +02:00
200d6c2509
miniupnpd: Add some missing checks when update_ext_ip_addr_from_stun() or getifaddr() fails
...
There is missing corner case check when these functions return failure.
Network in this case does not work, so disable port forwarding to prevent
returning incorrect response about port forwarding state.
Also explicitly set disable_port_forwarding to 0 on success to make code
more readable.
2021-08-31 21:34:27 +02:00
2087e14b8e
testgetifaddr.sh: Always use the first IP addr from 'ip -4 addr'
...
Terminate the awk after getting the first interface name and IP address
from 'ip -4 addr' output. Otherwise, the test fails if the interface
in question has multiple IP addresses, as the test program returns
the first address, while awk prints all.
2021-08-22 09:53:31 +02:00
8c1e5f9500
testgetifaddr.sh: Implement EXTIF fallback to 'ip -4 addr'
...
Fall back to getting the interface name from 'ip -4 addr' when there
is no default route. In this case, the test simply uses the interface
providing the IP address for 'ip -4 addr' (since the command is
implicitly called with no interface argument).
2021-08-22 09:50:25 +02:00
df0fbf08b8
miniupnpd version 2.2.3
2021-08-21 11:17:30 +02:00
92cf5c2f95
nftnlrdr_misc.c: 2021
2021-08-21 10:26:31 +02:00
23edb7e5eb
options.c: 2021
2021-08-21 10:24:22 +02:00
fec7d87f00
pcplearndscp.h: "new" website
2021-08-21 10:22:26 +02:00
9dbee950ad
upnppinhole.c/.h: 2021
2021-08-21 10:14:28 +02:00
2115b8f8f0
Merge pull request #553 from ncopa/musl-libc-fix
...
miniupnpd: don't check for glibc version with musl
2021-08-21 09:52:06 +02:00
acc3bcb0a3
NFTables use inet nat chain
...
NFTables supports inet in the nat chain as well.
Use it instead of IPv4 chain so it is consistent with the filter chain.
Signed-off-by: Sven Auhagen <sven.auhagen@voleatech.de>
2021-08-18 16:58:50 +01:00
5d5a06c206
Changelog.txt: lease file for IPv6 pinholes
...
closes #18
2021-08-18 12:38:04 +02:00
74dbad5ab0
IPv6 pinholes lease file
...
This patch adds a lease file for IPv6 pinholes.
The leases are maintained and readded when miniupnpd restarts.
Currently all IPv6 leases are lost on restart.
Signed-off-by: Sven Auhagen <sven.auhagen@voleatech.de>
2021-08-18 11:06:12 +01:00
46fedcbc32
update Changelog.txt
...
see #539
2021-08-12 23:19:14 +02:00
32f1d4cd1a
upnpdescgen.c: rootDesc.xml skip DeviceProtection and WANIPv6FirewallControl when force_igd1
...
see #539
2021-08-12 23:19:14 +02:00
4d4121bf40
upnpdescgen.c: move a variable declaration
2021-08-12 23:19:14 +02:00
2f2685af97
upnphttp.c: detecting MS client and forcing IGD v1
...
should fix #539
2021-08-12 23:19:14 +02:00
d8e5659c7b
upnpdescgen.c: add force_igd1 param to XML description generation functions
2021-08-12 23:19:13 +02:00
7c112e2b39
Merge commit '7ee554d31b47a7227ab85aa919792597ce78c81e'
2021-08-11 14:49:06 +02:00
f1388717af
miniupnpd.c: fix 1aa46b5a2c
2021-08-11 12:19:30 +02:00
7ee554d31b
miniupnpd: Disable port forwarding when upstream interface is down
...
Obviously port forwarding cannot work when upstream interface is down. So
correctly report status code for port forwarding requests to clients in
this case.
2021-08-06 16:13:25 +02:00
ebaa69b313
miniupnpd: don't check for glibc version with musl
...
Test that ldd is from GLIBC before exctracting the GLIBC_VERSION. This
is not needed with musl libc.
2021-07-21 10:38:35 +02:00
1aa46b5a2c
miniupnpd: improve error message for bad config
...
Improve error message so users don't need read the source to figure out
why miniupnpd refuses to start even if the usage is correct.
2021-07-15 12:23:26 +02:00
6f848ae082
2021
2021-06-18 00:37:27 +02:00
7fcbcd35b9
fix commit 5567e7c7e0
2021-06-18 00:31:27 +02:00
5567e7c7e0
miniupnpd: improves error handling during init.
...
- Fails on config parsing and init errors.
- print errors during init to both syslog and stderr.
fixes #551
2021-06-18 00:21:16 +02:00
97b7ec1ad2
normalize use of __STDC_VERSION__
2021-06-17 09:25:26 +02:00
7783ac1545
upnphttp.c: Code factorization : use SendResp_upnphttp() in SendRespAndClose_upnphttp()
2021-05-22 23:54:32 +02:00
acca60a365
miniupnpd: Better comment snprintf() used to build HTTP headers
2021-05-22 23:30:05 +02:00
08ae9e9e71
miniupnpd: dynamically retrieve `uname -r`
...
fixes #547
2021-05-22 00:16:40 +02:00
982f47a8b6
miniupnpd: version 2.2.2
2021-05-13 13:33:02 +02:00
1713f4b9b4
Add SO_REUSEPORT option for SSDP
...
fixes #541
2021-05-12 00:15:02 +02:00
57e9a52b95
miniupnpd/Changelog.txt: update
2021-05-11 23:58:35 +02:00
3a87be33e7
upnpsoap.c: comment and improve GetExternalIPAddress()
...
GetExternalIPAddress returns empty string when the External IP address can
not be retrieved.
2021-03-31 09:43:28 +02:00
79ca440f73
miniupnpd: When ExternalIPAddress is unknown returns empty string in GetExternalIPAddress
...
IGD v2.0 specification for WANIPConnection:2 says:
When the external IP address could not be retrieved by the gateway (for
example, because the interface is down or because there was a failure in
the last connection setup attempt), then the ExternalIPAddress MUST be
equal to the empty string.
So instead of Error 501 "Action Failed" returns empty string to be
compliant with IGD v2.0 specification.
2021-03-28 17:20:34 +02:00
9239cf28c1
Fix the cleanup of PREROUTING mangle chain
...
it was changed iby mistake to FORWARD by 82ec7bc3df#530
2021-02-26 15:15:09 +01:00
3b6b0ba1e3
INSTALL: update
2021-02-26 15:14:03 +01:00
207d1849e4
miniupnpd.c: typo and ip -> IP
2021-01-15 19:33:29 +01:00
e6bf74a691
Add check that miniupnpd is not going to listen on WAN interface with public IP address
...
Option listen= is used for LAN interface/address and option ext_addr= is
used for public IP address. If users by mistake swap WAN and LAN interface
or public and private IP addresses then miniupnpd obviously would not work
and instead of hacking miniupnpd code users should rather check their
miniupnpd configuration or local firewall settings.
So add checks and hints which prevents security issues like swapping LAN
and WAN interfaces/addresses and therefore prevent exposing port forwarding
and firewall configuration on public Internet.
2020-12-30 11:23:29 +01:00
304ff79dc5
Update and extend description from STUN output
...
People sometimes do not understand where is the problem, so include also
hints what they needs to check, change and re-configure.
2020-12-30 11:22:12 +01:00
9ef311d235
miniupnpd: version 2.2.1
2020-12-20 19:12:47 +01:00
341d0f51a2
docs: fix simple typo, decription -> description
...
There is a small typo in miniupnpd/commonrdr.h, miniupnpd/ipf/ipfrdr.c, miniupnpd/pf/obsdrdr.c.
Should read `description` rather than `decription`.
2020-12-10 05:26:04 +11:00
22c1386351
protocol[] can be "UDPLITE"
...
fixes #5034
2020-11-12 08:59:47 +01:00
f50f00b5ea
errno.h not sys/errno.h
2020-11-11 13:24:48 +01:00
ab544c3a0e
asyncsendto.c: use named enum.
...
see #502
2020-11-11 13:16:14 +01:00
30c27967ae
fix error message for IPV6. 2020
2020-11-05 21:59:25 +01:00
97fd716bd0
2020
2020-11-04 22:32:14 +01:00
057368701e
fix warning
2020-11-04 22:31:47 +01:00
32164d27d2
fix a couple of warnings
2020-11-02 00:26:13 +01:00
c41094c2af
exact same declaration for random_url[]
...
see #498
2020-11-01 23:29:08 +01:00
29797cf607
2019 => 2020
2020-10-31 11:36:06 +01:00
01d686078e
use tag as GITREF if available
2020-10-31 10:56:02 +01:00
56c66b5472
miniupnpd version 2.2.0
2020-10-31 10:23:44 +01:00
1331b42410
fix dd99f0eb75
2020-10-31 10:05:50 +01:00
dd99f0eb75
sysctl is not always in /sbin
2020-10-30 23:11:44 +01:00
72ec9e1943
update changelog / comments
2020-10-30 22:44:02 +01:00
c9939cc01e
fix portinuse.c for OpenBSD 5.5+
...
all CIRCLEQ have been replaced by TAILQ
fixes #496
2020-10-30 22:14:45 +01:00
1008ed1117
Merge branch 'issue-465' into master
2020-10-28 19:38:52 +01:00
90259ae803
Fix undefined behaviour: shifting signed int by 31 place
...
see #465
#0 0x555719469ec5 in AddAnyPortMapping.cfi /home/ryutaroh/miniupnpd-1018/miniupnp/miniupnpd/upnpsoap.c:703:42
#1 0x5557194705a7 in ExecuteSoapAction /home/ryutaroh/miniupnpd-1018/miniupnp/miniupnpd/upnpsoap.c:2335:5
SUMMARY: UndefinedBehaviorSanitizer: undefined-behavior upnpsoap.c:703:42 in
2020-10-26 08:46:37 +01:00
85f8123504
Merge branch 'issue-495' into master
2020-10-24 15:23:26 +02:00
946f6c19bb
fix Makefile.bsd
...
fixes #495
2020-10-24 15:17:59 +02:00
92ff8a6a7e
in_addr_t instead of struct in_addr
2020-10-22 23:20:50 +02:00
6b2070c6e9
fix 18a6ab0201
2020-10-22 23:19:59 +02:00
5e7f8b5183
netfilter_nft/nftnlrdr_misc.h: comment
2020-10-22 21:39:41 +02:00
1b5cab1e87
update Changelog.txt
2020-10-22 21:27:04 +02:00
68cc35156e
fix nftables shutdown_redirect()
...
see #481
2020-10-22 21:19:37 +02:00
04e245258e
For FreeBSD ports
...
see #495
2020-10-22 20:45:15 +02:00
18a6ab0201
AddAnyPortMapping(): Only try allowed ports
...
build an array of all allowed ports.
should fix #465
2020-10-18 00:20:24 +02:00
3a17dea056
pass rule type to the private arg of mnl_cb_run() callback
...
should fix #481
2020-10-17 23:20:29 +02:00
a3522723ae
fix .gitignore
2020-10-17 22:55:12 +02:00
2595275eb5
netfilter_nft: build testing
2020-10-17 22:52:34 +02:00
992565201b
fix testnftnlrdr.c
2020-09-29 01:00:29 +02:00
91ff44c9d2
netfilter_nft: fix test stuff
2020-09-29 00:43:55 +02:00
11dec5b25c
fix log
2020-09-29 00:17:58 +02:00
f9908a788b
Move chain name variables to netfilter/*
2020-09-28 22:44:24 +02:00
61d4aecb6e
fix warning
2020-09-28 21:58:08 +02:00
7db8ef0921
fix c9f6ddd
2020-09-28 21:57:50 +02:00
c9f6ddd102
miniupnpd/netfilter_nft: more logs in set_rdr_name()
...
see #481
2020-09-26 17:42:26 +02:00
dbb821a7c9
getifaddr.c: Fix mask for RFC7534 Direct Delegation AS112 Service
2020-07-12 13:45:30 +02:00
d7b40010d5
nftnlrdr_misc.c: add log in case of send_batch() failure
...
useful for #481
2020-07-09 11:16:47 +02:00
b44e5e7a83
fix update_portmapping() missing target when update filter table
2020-06-27 11:31:08 +08:00
24df04fc1b
update
2020-06-20 17:49:19 +02:00
7a9452fca9
miniupnpd: make sure "runtime_vars" are initialized
2020-06-20 17:02:19 +02:00
5bbcc0bb65
miniupnpd --help shows usage
2020-06-20 17:01:01 +02:00
417b496617
miniupnpd: add -v/-vv command line argument to enable more logs
...
fixes #477
2020-06-20 17:00:10 +02:00
686b41fc52
AddAnyPortMapping(): support wildcard in NewExternalPort
...
supported wildcard is either 0 or *
2020-06-20 16:38:14 +02:00
de71eef493
miniupnpd: AddAnyPortMapping() tries port above and below requested port
...
fixes #465
if the requested port is n, it will tries successively :
n, n+1, n-1, n+2, n-2, n+3, n-3, etc.
2020-06-20 16:38:14 +02:00
1e7fb305b6
Merge pull request #475 from miniupnp/issue-474
...
improve netfilter_nft code
2020-06-11 14:53:38 +02:00
1baa95277d
Fix manpage installation on BSD
...
Respect MANPREFIX when it's set, when not, use PREFIX
2020-06-10 14:38:23 -03:00
86b6aad797
ido not use depreacted nftnl_rule_set() and nftnl_chain_set()
...
now uses nftnl_rule_set_str() and nftnl_chain_set_str()
fixes #476
2020-06-10 11:55:42 +02:00
acbb9f09d7
update Changelog.txt 2.2.0-RC1
2020-06-08 12:10:17 +02:00
92ec4d05ab
nftnlrdr_misc.c: fix a memory leak in table_cb()
2020-06-08 10:08:44 +02:00
5f66d1852d
rewrite send_batch() for clarity
2020-06-07 21:43:03 +02:00
f23c3e68aa
fix previous commit
2020-06-07 21:30:12 +02:00
8ad596d846
fix previous commit
...
fixes a7eeb5938f
2020-06-07 21:02:51 +02:00
a7eeb5938f
improved error handling in parse_rule_nat()
2020-06-07 20:58:25 +02:00
Thomas Bernard
Sergey Ponomarev
Jo-Philipp Wich
Brian John
Sven Auhagen
Stijn Tintel
Pali Rohár
Michał Górny
Natanael Copa
SeaEagle1
Tim Gates
BERNARD Thomas
Chen Minqiang
Renato Botelho