Thomas Bernard
1331b42410
fix dd99f0eb75
2020-10-31 10:05:50 +01:00
Thomas Bernard
dd99f0eb75
sysctl is not always in /sbin
2020-10-30 23:11:44 +01:00
Thomas Bernard
72ec9e1943
update changelog / comments
2020-10-30 22:44:02 +01:00
Thomas Bernard
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
Thomas Bernard
1008ed1117
Merge branch 'issue-465' into master
2020-10-28 19:38:52 +01:00
Thomas Bernard
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
Thomas Bernard
85f8123504
Merge branch 'issue-495' into master
2020-10-24 15:23:26 +02:00
Thomas Bernard
946f6c19bb
fix Makefile.bsd
...
fixes #495
2020-10-24 15:17:59 +02:00
Thomas Bernard
92ff8a6a7e
in_addr_t instead of struct in_addr
2020-10-22 23:20:50 +02:00
Thomas Bernard
6b2070c6e9
fix 18a6ab0201
2020-10-22 23:19:59 +02:00
Thomas Bernard
5e7f8b5183
netfilter_nft/nftnlrdr_misc.h: comment
2020-10-22 21:39:41 +02:00
Thomas Bernard
1b5cab1e87
update Changelog.txt
2020-10-22 21:27:04 +02:00
Thomas Bernard
68cc35156e
fix nftables shutdown_redirect()
...
see #481
2020-10-22 21:19:37 +02:00
Thomas Bernard
04e245258e
For FreeBSD ports
...
see #495
2020-10-22 20:45:15 +02:00
Thomas Bernard
18a6ab0201
AddAnyPortMapping(): Only try allowed ports
...
build an array of all allowed ports.
should fix #465
2020-10-18 00:20:24 +02:00
Thomas Bernard
3a17dea056
pass rule type to the private arg of mnl_cb_run() callback
...
should fix #481
2020-10-17 23:20:29 +02:00
Thomas Bernard
a3522723ae
fix .gitignore
2020-10-17 22:55:12 +02:00
Thomas Bernard
2595275eb5
netfilter_nft: build testing
2020-10-17 22:52:34 +02:00
Thomas Bernard
992565201b
fix testnftnlrdr.c
2020-09-29 01:00:29 +02:00
BERNARD Thomas
91ff44c9d2
netfilter_nft: fix test stuff
2020-09-29 00:43:55 +02:00
Thomas Bernard
11dec5b25c
fix log
2020-09-29 00:17:58 +02:00
Thomas Bernard
f9908a788b
Move chain name variables to netfilter/*
2020-09-28 22:44:24 +02:00
Thomas Bernard
61d4aecb6e
fix warning
2020-09-28 21:58:08 +02:00
Thomas Bernard
7db8ef0921
fix c9f6ddd
2020-09-28 21:57:50 +02:00
Thomas Bernard
c9f6ddd102
miniupnpd/netfilter_nft: more logs in set_rdr_name()
...
see #481
2020-09-26 17:42:26 +02:00
Pali Rohár
dbb821a7c9
getifaddr.c: Fix mask for RFC7534 Direct Delegation AS112 Service
2020-07-12 13:45:30 +02:00
Thomas Bernard
d7b40010d5
nftnlrdr_misc.c: add log in case of send_batch() failure
...
useful for #481
2020-07-09 11:16:47 +02:00
Chen Minqiang
b44e5e7a83
fix update_portmapping() missing target when update filter table
2020-06-27 11:31:08 +08:00
Thomas Bernard
24df04fc1b
update
2020-06-20 17:49:19 +02:00
Thomas Bernard
7a9452fca9
miniupnpd: make sure "runtime_vars" are initialized
2020-06-20 17:02:19 +02:00
Thomas Bernard
5bbcc0bb65
miniupnpd --help shows usage
2020-06-20 17:01:01 +02:00
Thomas Bernard
417b496617
miniupnpd: add -v/-vv command line argument to enable more logs
...
fixes #477
2020-06-20 17:00:10 +02:00
Thomas Bernard
686b41fc52
AddAnyPortMapping(): support wildcard in NewExternalPort
...
supported wildcard is either 0 or *
2020-06-20 16:38:14 +02:00
Thomas Bernard
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
Thomas BERNARD
1e7fb305b6
Merge pull request #475 from miniupnp/issue-474
...
improve netfilter_nft code
2020-06-11 14:53:38 +02:00
Renato Botelho
1baa95277d
Fix manpage installation on BSD
...
Respect MANPREFIX when it's set, when not, use PREFIX
2020-06-10 14:38:23 -03:00
Thomas Bernard
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
Thomas Bernard
acbb9f09d7
update Changelog.txt 2.2.0-RC1
2020-06-08 12:10:17 +02:00
Thomas Bernard
92ec4d05ab
nftnlrdr_misc.c: fix a memory leak in table_cb()
2020-06-08 10:08:44 +02:00
Thomas Bernard
5f66d1852d
rewrite send_batch() for clarity
2020-06-07 21:43:03 +02:00
Thomas Bernard
f23c3e68aa
fix previous commit
2020-06-07 21:30:12 +02:00
Thomas Bernard
8ad596d846
fix previous commit
...
fixes a7eeb5938f
2020-06-07 21:02:51 +02:00
Thomas Bernard
a7eeb5938f
improved error handling in parse_rule_nat()
2020-06-07 20:58:25 +02:00
Thomas Bernard
d41aceffb5
improve table_cb() to remove memory leak
2020-06-07 20:12:12 +02:00
Thomas Bernard
a64d4f937b
rewrite table_cb() to better handle errors
2020-06-07 20:00:52 +02:00
Thomas Bernard
70b9526834
remove unecessary if in flush_nft_cache()
2020-06-07 19:58:48 +02:00
Thomas Bernard
7245a68e5c
improve error handling in nft_mnl_connect()
2020-06-07 19:57:29 +02:00
Thomas Bernard
ed48113355
refresh_nft_cache() return error status
...
fixes 037639c07a
2020-06-07 19:56:03 +02:00
Thomas Bernard
037639c07a
improve error handling in refresh_nft_cache() and send_batch()
...
to help debug #474
2020-06-07 19:29:22 +02:00
Thomas Bernard
61ce33a51b
Changelog.txt: pf symetric nat implementation
2020-06-06 19:39:49 +02:00
Thomas Bernard
563576878c
Merge branch 'pf-nat-rules'
2020-06-06 19:39:08 +02:00
Thomas Bernard
0af141d9c5
miniupnpd: fix processing of v4 M-SEARCH received on v6 socket
...
So we don't answer with the v6 LOCATION to v4 clients anymore !
should fix #467
see #461
2020-06-05 22:39:59 +02:00
Thomas Bernard
409ba9c0f2
nftpinhole.c: fix get_pinhole_info()
...
this whole file should be reviewed carefully
fixes #459
2020-06-05 10:36:17 +02:00
Thomas Bernard
3716381308
improve syslog in PinholeVerification()
2020-06-05 10:19:15 +02:00
Thomas Bernard
d5ba9c368e
fix memroy leak in PinholeVerification()
...
see #459
2020-06-05 10:13:13 +02:00
Thomas Bernard
f151cc1dd4
minor checks on PCPSendUnsolicitedAnnounce()
2020-06-04 00:56:16 +02:00
Thomas Bernard
45191081f1
fix 9b32a523bf
2020-06-04 00:46:41 +02:00
Thomas Bernard
9b32a523bf
improve get_redirect_rule_count() for netfilter_nft too
2020-06-04 00:37:17 +02:00
Thomas Bernard
95d611e7a0
fix 67465c3cc0
2020-06-04 00:30:01 +02:00
Thomas Bernard
26c46e5a49
improve upnp_get_portmapping_number_of_entries()
2020-06-04 00:27:49 +02:00
Thomas Bernard
ddf328845a
keep memory of ./configure parameters
2020-06-03 23:54:24 +02:00
Thomas Bernard
8a665a1c8e
configure --disable-fork to disable going to background
...
fixes #468
2020-06-03 23:43:58 +02:00
Thomas Bernard
eaf23f0d10
fix bug introduced in d458f1a222
...
dev is also used in pfpinhole.c and should be global
2020-06-03 23:15:28 +02:00
Thomas Bernard
67465c3cc0
OpenBSD: Disable pledge()
...
see #455
2020-06-03 23:11:15 +02:00
Thomas Bernard
e1f3478519
miniupnpd/netfilter_nft: fix get_redirect_rule_by_index()
...
should fix #462
2020-06-03 00:30:14 +02:00
Thomas Bernard
c8cbf9f6ce
miniupnpd/netfilter_nft: replace calls to inet_ntoa by inet_ntop()
2020-06-03 00:30:09 +02:00
Thomas Bernard
bc645c108d
same fix as 827fc6f04
for SendSSDPGoodbye()
...
see #459
2020-06-02 09:08:59 +02:00
Thomas Bernard
b8c8cec26b
fix bug introduced in c3d71b97ab
...
see #459
2020-06-02 09:02:45 +02:00
Thomas Bernard
fb63cf3455
miniupnpd/netfilter_nft: properly store timestamps
...
should fix #466
2020-06-02 01:00:04 +02:00
Thomas Bernard
c0ea7926c0
upnpdescgen.c: error message when memory alloc fails
2020-06-02 00:24:15 +02:00
Thomas Bernard
7b9489fb84
the buffer passed to mnl_nlmsg_batch_start() must be double of MNL_SOCKET_BUFFER_SIZE
...
see https://www.netfilter.org/projects/libmnl/doxygen/html/group__batch.html
http://www.lt.netfilter.org/projects/libmnl/doxygen/group__batch.html#ga28488fc4dee4c3e9eda5918f049db2af
2020-06-02 00:07:39 +02:00
Thomas Bernard
5dbdc50aa7
check return value of nftnl_expr_get()
2020-06-01 20:20:29 +02:00
Thomas Bernard
1e37a9f7b5
improve parse_rule_cmp()
...
see #459
2020-06-01 20:14:20 +02:00
Thomas Bernard
c09f485482
nftnlrdr.c: fix writing to iaddr instead of rhost
...
fixes #462
https://github.com/miniupnp/miniupnp/issues/462
https://github.com/miniupnp/miniupnp/issues/459#issuecomment-636402954
2020-06-01 17:56:38 +02:00
Thomas Bernard
c3d71b97ab
nftnlrdr_misc.c: malloc/memcpy instead of strndup()
...
see #466
2020-06-01 17:35:26 +02:00
Thomas Bernard
3b20182c86
miniupnpd/upnpdescgen.c: check string length before memcmp() in genServiceDesc()
...
see https://github.com/miniupnp/miniupnp/issues/459
2020-05-30 11:06:24 +02:00
Thomas Bernard
a711165e6e
miniupnpd: improve AddAnyPortMapping()
...
try with next port when -3 permission check failed
see #465
2020-05-30 10:29:24 +02:00
Thomas Bernard
a30e3de4ba
miniupnpd/netfilter_nft: add debug messages about lease timestamps/duration
...
in order to debug issue #466
2020-05-30 10:09:22 +02:00
Thomas Bernard
f97367c87d
miniupnpd/p: delete_nat_rule()
...
also clear_nat_rules()
2020-05-30 00:32:29 +02:00
Thomas Bernard
6cd5ca6e9a
call nftnl_rule_is_set(NFTNL_RULE_USERDATA) before nftnl_rule_get_data(NFTNL_RULE_USERDATA)
...
see #459 and #461
2020-05-29 18:10:30 +02:00
Thomas Bernard
827fc6f041
miniupnpd: prevent buffer overread of known_devices_types
...
should fix #459
2020-05-29 18:01:39 +02:00
Thomas Bernard
7be0b48022
fix GetExternalIPAddress()
...
a bug was introduced by cce19781e6
may fix #460
2020-05-29 08:55:44 +02:00
Thomas Bernard
e3395f12fc
miniupnpd/pf: minor changes
2020-05-21 02:24:59 +02:00
Thomas Bernard
2cf50c57fa
miniupnpd/pf: add_nat_rule()
2020-05-21 02:24:39 +02:00
Thomas Bernard
abefb6c6d0
miniupnpd/pf: fix test
2020-05-21 02:21:49 +02:00
Thomas Bernard
d458f1a222
minor stuff
2020-05-17 23:16:45 +02:00
Thomas Bernard
e823722b5d
some cp implementations do not support the -v option
2020-05-11 23:31:53 +02:00
Thomas Bernard
02e41f7346
miniupnpd: BSD: allow to build from another directory
...
$ cd miniupnpd
$ mkdir build
$ cd build
$ ../configure && make
2020-05-11 23:30:19 +02:00
Thomas Bernard
384f6592a8
miniupnpd: update Changelog
2020-05-10 20:01:30 +02:00
Thomas Bernard
f9002bfaa7
https://miniupnp.tuxfamily.org/
2020-05-10 20:01:24 +02:00
Thomas Bernard
a04d6d405d
miniupnpd/Makefile.linux_nft: update CFLAGS / LDFLAGS
2020-05-10 20:00:50 +02:00
Thomas Bernard
e166f541e8
=> 2020
2020-05-10 20:00:37 +02:00
Thomas Bernard
194566a5bd
support for libcap-ng
...
fixes #405
2020-05-10 15:34:45 +02:00
Thomas Bernard
5abb714d34
drop linux capabilities
2020-05-10 15:34:44 +02:00
Pali Rohár
9e41cad6a8
upnpstun.c: TEST: Require root user
...
New version of /sbin/iptables binary prints nonsense error message when is
called by ordinary non-root user:
iptables v1.8.2 (nf_tables): unknown option "--dport"
Under root user it works correctly and understands --dport argument.
/sbin/iptables binary obviously does not work without root user, so rather
print error message as debugging why /sbin/iptables printed that nonsense
error message about unknown option.
2020-05-08 16:32:16 +02:00
Pali Rohár
0cad5296c6
upnpstun.c: TEST: Redirect syslog() call to printf()
...
When compiling Testing Linux application, replace syslog() call by
printf(). openlog() does not honor LOG_CONS flag, it works only when
application cannot connect to syslog (which is rare). There is way to force
syslog() call to print to stdout, so replace openlog() and syslog() calls
by normal printf() call via preprocessor macro when compiling Testing Linux
application.
2020-05-08 16:29:31 +02:00
Pali Rohár
d7f60e3fdf
upnpstun.c: Show more debug information
2020-05-08 16:26:39 +02:00
Pali Rohár
92a1ee9a7d
upnpstun.c: Parse more fields from STUN packet
...
These fields are sent by e.g. stun.ekiga.net
2020-05-08 16:25:43 +02:00
Pali Rohár
420cfaf208
upnpstun.c: Do not stop processing STUN packet when XOR-MAPPED-ADDRESS is found
2020-05-08 16:23:58 +02:00
Thomas Bernard
388d93d678
minipnpd: move check target to check.mk
2020-05-07 01:02:48 +02:00
Thomas Bernard
2b4d9f5ee5
miniupnpd: fix build for nftables
2020-05-07 00:47:26 +02:00
Thomas Bernard
44c30b0a4e
miniupnpd: fix build for nftables
2020-05-07 00:41:59 +02:00
Thomas Bernard
1cdc352788
miniupnpd/testupnppermissions.sh: do not require bash or ksh anymore
2020-05-07 00:34:44 +02:00
Thomas Bernard
ea90d39892
miniupnpd: update linux makefiles
2020-05-07 00:34:44 +02:00
Thomas Bernard
4f67061e08
miniupnpd: allow to build in another directory. use .d for depends
2020-05-07 00:34:40 +02:00
Thomas Bernard
9ffc336b5c
linux: detect libcap-ng or libcap
2020-05-04 00:09:42 +02:00
Thomas Bernard
ca0a3b30ba
miniupnpd: update Changelog.txt
2020-05-04 00:08:50 +02:00
Thomas Bernard
55d2535a6f
miniupnpd: move many scripts from Makefile.linux to configure
2020-05-02 18:28:05 +02:00
Thomas Bernard
1833a538ef
miniupnpd/Makefile.linux: move some compile config to configure script
2020-05-02 18:28:00 +02:00
Thomas Bernard
125030132e
genconfig.sh -> configure
2020-05-02 18:26:45 +02:00
Thomas Bernard
69137442fb
Makefile => Makefile.bsd
...
copy the right Makefile to "Makefile"
TODO : rename genconfig.sh to configure
2020-05-02 18:26:36 +02:00
Thomas Bernard
2a8368a2de
gitrev.mk: CFLAGS => CPPFLAGS
2020-05-02 18:25:48 +02:00
Thomas Bernard
7800de9429
miniupnpd: fix for bridges
...
you now can setup :
listening_ip=igb1 bridge0 xxx0 xxx1 ...
miniupnpd will use igd1 address, but will not complain when receiving
packets from either igb1, bridge0, xxx0 or xxx1
fixes #379
see also #408
2020-04-29 00:03:54 +02:00
Thomas Bernard
a965520085
fix warning (int promotion)
...
also add (c) Thomas Bernard
2020-04-29 00:01:44 +02:00
Thomas Bernard
fcac8b9690
upnpstun.c: support for more attributes types
...
0x0009: /* ERROR-CODE */
0x0020: /* XOR-MAPPED-ADDRESS (RFC 5389) */
0x802b: /* RESPONSE-ORIGIN (RFC 5780) */
0x802c: /* OTHER-ADDRESS (RFC 5780) */
2020-04-21 23:25:17 +02:00
Thomas Bernard
78956a97df
upnpstun.c: improve error and debug log
2020-04-21 23:24:58 +02:00
Thomas Bernard
38c3419ea5
miniupnpd/Changelog.txt: update about e49d44f700
2020-04-21 18:38:09 +02:00
Chen Minqiang
e49d44f700
miniupnpd: set SNAT to support bidirectional mapping
...
we cannot expect that iport == eport on all the case in firewall.
Signed-off-by: Chen Minqiang <ptpt52@gmail.com>
2020-04-21 07:41:58 +08:00
Thomas Bernard
db82286683
genconfig.sh: allow --firewall option on BSD's too
2020-04-21 00:24:11 +02:00
Thomas Bernard
89e63507ac
Remove FW API detecting code from Makefile (BSD)
...
generate bsdmake.inc
2020-04-21 00:24:07 +02:00
Thomas Bernard
07abee862c
miniupnpd: Fix "IGD2 Port Triggering" in update_portmapping()
2020-04-20 23:37:24 +02:00
Chen Minqiang
7662088603
miniupnpd: fix typo
...
Signed-off-by: Chen Minqiang <ptpt52@gmail.com>
2020-04-20 15:05:13 +08:00
Chen Minqiang
93c89c209c
miniupnpd: update snat rules on update_portmapping
...
We forget to update the snat rule when update the
portmapping.
Signed-off-by: Chen Minqiang <ptpt52@gmail.com>
2020-04-20 15:05:00 +08:00
Thomas Bernard
c51c5b7d58
miniupnpd: be more explicit about usage of ext_ip= in double nat setups
2020-04-12 19:44:27 +02:00
Thomas Bernard
3f04f7992c
miniupnpd/pf: disabled setting dst address in rule by default
...
see #433
was introduced by 53e8185725
to fix #231
2020-04-12 19:30:37 +02:00
Thomas Bernard
a774830fe0
miniupnpd: Option to disable IPv6 at runtime : -4 / ipv6_disable=yes
2020-04-09 21:12:20 +02:00
Thomas Bernard
040fbc40f8
miniupnpd/Makefile: fix FreeBSD firewall detection
...
see 5e11ef3245
fixes #431
2020-04-06 12:00:09 +02:00
Thomas Bernard
c3fab25f86
update Changelog.txt
2020-03-29 11:08:15 +02:00
Thomas Bernard
5e11ef3245
miniupnpd: fix FreeBSD Firewall detection
...
fixes #431
2020-03-29 10:54:26 +02:00
Blink
05e09f9e6d
fix build for macos
2020-03-21 17:38:46 +08:00
HanJong Jang
5eaf3ec0fe
Correct typo
2020-03-05 22:46:01 +09:00
Thomas Bernard
927e2f3666
miniupnpd/Changelog.txt: update
2019-12-24 01:38:55 +01:00
Thomas Bernard
351b28c5ad
Fix PCPSendUnsolicitedAnnounce() when IPv6 is not available
...
IPV6 can be enabled at compile time but unavailable at runtime
see https://miniupnp.tuxfamily.org/forum/viewtopic.php?t=2395
2019-12-18 01:18:56 +01:00
Khem Raj
533f46cb7e
Add OpenEmbedded cross compile case
...
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-11-01 08:24:51 -07:00
Thomas Bernard
aa08b09068
miniupnpd version prints backend
2019-10-22 20:11:02 +02:00
Thomas Bernard
1876efc823
https://miniupnp.tuxfamily.org/
2019-10-22 20:11:02 +02:00
Thomas Bernard
733c3c25f7
INSTALL: update about apt-get packages to install for nftables
2019-10-22 17:49:48 +02:00
Thomas Bernard
0d7ccf1388
2019
2019-10-06 22:53:20 +02:00
Thomas Bernard
d17912b95b
ignore validateversion
2019-10-06 22:44:32 +02:00
Thomas Bernard
ce9cf89f07
Makefile.linux_nft: fix depends
2019-10-06 22:41:47 +02:00
Thomas Bernard
f200b1b7e8
netfilter_nft/nftpinhole.c: fix after function renames
...
nft_send_request() => nft_send_rule()
reflesh_nft_cache_filter() => refresh_nft_cache_filter()
2019-10-06 22:30:36 +02:00
Thomas Bernard
8ac3784fe2
Merge branch 'version'
2019-10-06 22:17:25 +02:00
Paul Chambers
913194cf75
Move print_rule to the file it's used in.
2019-10-06 21:47:50 +02:00
Paul Chambers
9d1680455e
cleanup some formatting inconsistencies
2019-10-06 21:38:58 +02:00
Thomas Bernard
4ac428cbc9
netfilter_nft: remove dead code
2019-10-06 21:25:03 +02:00
Paul Chambers
35fa178ec8
encapsulate debug printing of rules. keeps stack layout the same between debug & non-debug builds.
2019-10-06 21:15:25 +02:00
Thomas Bernard
a87011f933
fix checking of "~Man:" header"
...
bug introduced in 3571a41d1b
2019-10-06 00:17:52 +02:00
Thomas Bernard
b747e222a8
miniupnpd/.gitignore: dox/
2019-10-05 23:55:44 +02:00
Thomas Bernard
0a35f97db7
Makefile.linux: validate version
2019-10-05 22:44:36 +02:00
Thomas Bernard
49d3b57441
miniupnpd: Add --version commandline option
...
fixes #370
2019-10-05 22:44:31 +02:00
Thomas Bernard
700b86eeda
compatibility with OpenSSL 1.1.x
...
Use OpenSSL TLS_server_method() instead of TLSv1_server_method()
Also fix ERR_remove_state(0) call
2019-10-05 22:44:31 +02:00
Paul Chambers
123e589266
establish persistent mnl/netlink socket at init_redirect (needs elevated privileges)
2019-10-05 22:39:05 +02:00
Thomas Bernard
22223da9a1
use OpenBSD pledge() to drop privileges
...
To be tested
see #405
2019-10-03 23:23:53 +02:00
Thomas Bernard
174db857f8
fix end of file
2019-10-03 00:15:50 +02:00
Thomas Bernard
49a60028e7
2019
2019-10-03 00:15:32 +02:00
Thomas Bernard
6f4057ee82
update Changelog.txt
2019-10-03 00:15:13 +02:00
Thomas Bernard
57bc67f72a
2019
2019-10-02 23:42:55 +02:00
Paul Chambers
7ea314412c
make rdr_name_type enum values more unique
2019-10-02 23:42:15 +02:00
Paul Chambers
b36a6e94f8
NFT_RULE_USERDATA is sized, not null-terminated. Must use strndup()
2019-10-02 23:42:15 +02:00
Paul Chambers
fda82bceef
remove lingering debug stuff, add my name to file headers
2019-10-02 13:08:22 -07:00
Paul Chambers
dcad93615f
set the family attribute on the chain
2019-10-01 01:12:10 -07:00
Paul Chambers
2a496a1c1c
Minimize attributes set if chain_op is not NFT_MSG_NEWCHAIN
2019-10-01 00:40:05 -07:00
Paul Chambers
6a53e6e765
use the same name for all three tables, like sshguard does
2019-09-30 11:20:16 -07:00
Paul Chambers
13b63da3fb
bump the priority of miniupnpd's forward chain, so it processes packets before other filter chains
2019-09-30 09:40:40 -07:00
Paul Chambers
75bdb777cf
rework nft-specific globals, create & destroy tables/chains at init & shutdown
2019-09-30 00:12:08 -07:00
Paul Chambers
d5773600f9
add --firewall=<name> to genconfig.sh & tweak Makefiles to match
2019-09-28 22:17:51 -07:00
Paul Chambers
48f2339759
parse_rule_cmp: promote repeated code in cases outside the switch
2019-09-27 21:25:34 -07:00
Paul Chambers
dbdaabd21e
insert omitted break statements causing compiler warnings
2019-09-27 21:00:28 -07:00
Paul Chambers
b5021ef57f
suppress warnings for some intentional fallthrough cases in switch statements
2019-09-27 20:47:53 -07:00
Thomas Bernard
2c45b0793e
fix genconfig.sh for OpenBSD
...
see 70a215d693
2019-09-26 23:46:24 +02:00
Thomas Bernard
ace2250533
cast time_t to long long instead of long
2019-09-24 16:07:42 +02:00
Thomas Bernard
70a215d693
net.inet6.ip6.v6only has been removed in recent OpenBSD versions
2019-09-24 16:06:38 +02:00
Thomas Bernard
8c00d0747a
include <sys/select.h> for fd_set
2019-09-24 16:06:12 +02:00
Thomas Bernard
2917d99c58
2019
2019-09-24 16:05:44 +02:00
Thomas Bernard
a6291ca391
update miniupnpd/Changelog.txt and README
2019-09-24 13:02:20 +02:00
Thomas Bernard
1976452125
handle both IP_PKTINFO and IP_RECVIF defined.
...
fixes #391
2019-09-24 12:26:57 +02:00
Thomas Bernard
8cb006c538
macros.h: add FALL_THROUGH macro
2019-09-24 12:04:40 +02:00
Paul Chambers
ed9ef746a0
Distinguish between iptables and nftables in genconfig.sh, adding USE_IPTABLES or USE_NFTABLES defines.
2019-09-24 11:57:39 +02:00
Thomas Bernard
81e0d83403
build doc with Doxygen
2019-09-24 11:57:27 +02:00
Paul Chambers
8a56bb50cf
add 'dox' make target for nftables, which generates docs using doxygen. Also modify the uuid in the installed copy of miniupnpd.conf, not the pristine local copy that is under revision control.
2019-09-17 18:22:11 -07:00
Thomas Bernard
dec239d340
pfpinhole.c: fix includes
2019-09-02 02:03:41 +02:00
Thomas Bernard
5ab641e9e6
update Changelog
2019-09-02 01:01:43 +02:00
Thomas Bernard
d1d7059e75
fix file modes for nft_display.sh (chmod +x)
2019-09-02 00:57:49 +02:00
Guilherme Senges
62d62e4f88
Applied patch to OpenWRT compatibility
2019-09-02 00:28:45 +02:00
Paul Chambers
f24ca07640
Fix the error messages produced by nft_init.sh in normal operation. Simplify the script.
2019-08-31 23:22:30 -07:00
Paul Chambers
60b57a442a
Rework nft_removeall.sh to preserve nftables structures miniupnpd didn't add. Important for firewalld and sshguard co-existance.
2019-08-31 20:47:11 -07:00
Thomas Bernard
6317e73342
iptpinhole.c: fix ressource leak in ip6tc_init_verify_append()
...
fixes #393
2019-08-24 10:55:33 +02:00
Thomas Bernard
a77d1ff9d3
iptcrdr.c: memory allocation fix in get_portmappings_in_range()
...
fixes #394
2019-08-24 10:54:46 +02:00
Thomas Bernard
4f8a4abcd1
nftnlrdr: list_redirect_rule() only in DEBUG
2019-06-30 22:23:36 +02:00
Thomas Bernard
4e480a7c4e
nftnlrdr_misc.c: use syslog() instead of perror()
...
do not exit()
2019-06-30 22:02:15 +02:00
Thomas Bernard
9402b49456
update headers
2019-06-30 21:51:15 +02:00
Thomas Bernard
d8368f7651
test_nfct_get.c: openlog()
2019-06-30 21:50:55 +02:00
Thomas Bernard
9070e175d4
Merge remote-tracking branch 'svenauhagen/fixes/nftablesipv6'
2019-06-30 21:25:01 +02:00
Sven Auhagen
b377305db0
This commits fixes an error setting the NFT Chain in DNAT instead of Filter
2019-06-30 19:46:35 +02:00
Sven Auhagen
b581b5d8af
pinhole fixes
2019-06-28 11:02:19 +02:00
Thomas Bernard
3cf6efa912
miniupnpd/Changelog.txt update
2019-06-25 23:30:12 +02:00
Sven Auhagen
f67f6ae5f0
NFTables fixes and scripts
...
This commit fixes the list detection and uses the inet chain for ipv4.
The scripts got reworked as well and a display script was added.
2019-06-25 09:44:51 +02:00
sven
ee84a3949d
Update nftnlrdr_misc.h
...
Fix compiler warnings
2019-06-13 21:34:52 +02:00
Sven Auhagen
00ff23c428
This commit fixes IPv4 and adds IPv6 pinhole to nftables.
...
Signed-off-by: Sven Auhagen <sven.auhagen@voleatech.de>
2019-06-12 23:09:20 +02:00
Thomas Bernard
765156b04a
nftnlrdr.c: fix indent and spaces before eol
2019-06-04 23:02:52 +02:00
Thomas Bernard
a1ceec3dba
miniupnpd: Allow to use two different network interfaces for IPv4 and IPv6 internet
...
-i / -I
ext_ifname= / ext_ifname6=
see :
df906367be
/
thanks to "sfstudio"
2019-05-21 10:42:40 +02:00
Thomas Bernard
f89d01d06a
silent warning in GCC 7 (switch/case fallthrough)
2019-05-20 21:59:41 +02:00
Thomas Bernard
585a1d64e2
getifaddr.c: properly use strncpy()
...
silent a gcc8 warning
2019-05-20 21:55:17 +02:00
Vladislav Grishenko
08b80d5abd
miniupnpd: fix ssdp notify on unrelated interfaces
...
If several different interfaces share same ipv4 address on different
subnets (i.e. eth0 192.168.1.1/24 + eth1 192.168.1.1/16), miniupnpd
may pick any one of them, possibly wrong one w/o respecting exact
listening_ip interface.
syslog will contain something similar to:
miniupnpd: sendto(udp_notify=6, 192.168.1.1): No such device
miniupnpd: sendto(udp_notify=6, 192.168.1.1): No such device
miniupnpd: try_sendto(sock=6, len=464, dest=239.255.255.250:1900): sendto: No such device
miniupnpd: try_sendto(sock=6, len=464, dest=239.255.255.250:1900): sendto: No such device
miniupnpd: try_sendto failed to send 11 packets
Fix that with specifying exact outgoing mcast interface for each
notify socket with help of IP_MULTICAST_IF/mreqn struct.
Since OpenAndConfSSDPNotifySocket() now takes lan_addr_s struct,
OpenAndConfSSDPNotifySocketIPv6() was similary changed for api
consistency.
2019-05-02 15:36:06 +05:00
Thomas Bernard
2ffc7afae9
minissdp.c: fix indentation
2019-05-02 12:09:28 +02:00
Thomas Bernard
1ef1deec01
upnpevents.c: properly handle urls in the form http://ip:port
...
Fix buffer over-read in upnpevents.c with urls in the form http://ip:port
(without path).
Assume / when the path is empty
fixes #361
2019-04-09 22:06:21 +02:00
Thomas Bernard
922372bff3
2019
2019-04-08 14:46:11 +02:00
Thomas Bernard
2f16cf7387
AddPortMapping supports error 606 in IGDv2
...
see #359
2019-04-07 23:01:51 +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
8f403ae8ae
Makefile.linux: clean testminissdp.o and testssdppktgen.o
2019-03-22 15:36:58 +01:00
Thomas Bernard
2d873ce908
miniupnpd_functions.sh parsing fix.
...
both MINIUPNPD and MINIUPNPD-PREROUTING were matched by
/$CHAIN/.
2019-03-22 15:35:23 +01:00
Thomas Bernard
476974ab52
use iptables -I instead of -A to add rules
...
So the rules are added at the head of the chains, taking
priority over the preloaded rules.
should fix #354
2019-03-22 15:33:57 +01:00
Thomas Bernard
c3f752db4a
miniupnpd/netfilter: fix iptables_init.sh for postrouting chain
...
should fix #334
2019-03-09 16:16:00 +01:00
Steven Mestdagh
dedbee16b1
AddAnyPortMapping: check against NULL
...
this avoids a crash in strcasecmp by passing an empty protocol argument
2019-03-09 10:24:38 +01:00
Thomas Bernard
a613992892
update Changelog
2019-03-07 23:37:11 +01:00
Rodrigo Osorio
e0ddc97997
Update portinuse code to reflect changes made in FreeBSD 12.0
...
Structures xtcpcb and xinpcb returned by the kernel
hide now part of its members after r315662. The fix
was inspired by changes made in usr.bin/systat/netstat.c
tool.
2019-03-07 17:22:36 +01:00
Thomas Bernard
e0b5b4efe6
linux/getifstats.c: use custom strtoul() implementation to roll over after 2^32-1
...
fixes #349
http://upnp.org/specs/gw/UPnP-gw-WANCommonInterfaceConfig-v1-Service.pdf
2.2.9 2.2.10 2.2.11 2.2.12 :
This variable represents the cumulative counter for total number
of bytes sent upstream across all connection service instances on
WANDevice. The count rolls over to 0 after it reaching the maximum
value (2^32) –1
2019-02-12 15:10:49 +01:00
Thomas Bernard
08e955de40
Update Changelogs + 2019
2019-02-10 16:11:16 +01:00
Thomas Bernard
30a89be85e
update miniupnpd/minixml.h
2019-02-10 16:10:07 +01:00
Thomas Bernard
e94a724ae5
Merge remote-tracking branch 'sorz/install-nft-script'
...
see pull request #345
2019-02-04 19:39:35 +01:00
Shachar Menashe
51b5e09e04
miniupnpd: add secure compilation flags for Linux
2019-02-04 17:23:42 +02:00
Thomas Bernard
f7d65cdaad
miniupnpd/netfilter/ipctcrdr.c: conditionnaly use NFC_UNKNOWN as well
...
fix #346
2019-02-03 19:04:44 +01:00
Thomas Bernard
6106111972
miniupnpd/netfilter: build with linux kernel 5.0
...
should fix #346
2019-02-03 13:26:27 +01:00
Thomas Bernard
510a6e9630
fix check of valid HTTPS socket
2019-01-23 09:25:10 +01:00
sorz
031915f856
Install nftables scripts
2019-01-18 16:21:25 +08:00
Thomas Bernard
86030db849
fix error from commit 13585f15c7
2018-12-18 23:47:54 +01:00
Thomas Bernard
cb8a02af7a
pcpserver.c: copyIPv6IfDifferent() check for NULL src argument
2018-12-18 23:04:14 +01:00
Thomas Bernard
f321c2066b
upnp_redirect(): accept NULL desc argument
2018-12-18 22:59:18 +01:00
Thomas Bernard
13585f15c7
GetOutboundPinholeTimeout: check args
2018-12-18 22:54:51 +01:00
Thomas Bernard
bec6ccec63
upnp_event_prepare(): check the return value of snprintf()
2018-12-18 22:37:14 +01:00
Thomas Bernard
6b4e9bd855
upnpstun.c: fix generate_transaction_id()
2018-12-15 18:02:46 +01:00
Steven Mestdagh
f6fc66ee41
avoid off-by-one buffer overread
...
similar to commit 9fcc0a72f0
2018-12-06 00:11:21 +01:00
Thomas Bernard
e7fa40f60b
update INSTALL about running a NAT behind NAT setup.
...
also update 2017->2018
2018-10-31 18:33:56 +01:00
Thomas Bernard
bde31cd4f1
update miniupnpd/Changelog.txt
2018-09-07 17:28:42 +02:00
Thomas Bernard
95d707a71f
pcpserver.c: properly fill the opcode field of response
...
fixes #327
2018-09-07 17:24:43 +02:00
Pali Rohár
a2baa36312
Fix compilation with nftables
...
Fixes #324
2018-09-06 17:44:41 +02:00
Thomas Bernard
11785205f1
Merge remote-tracking branch 'Lochnair/fix_nftables' into travis-ci-nftables
2018-07-15 12:59:25 +02:00
Nils Andreas Svee
181428e843
miniupnpd: add update_portmappings functions for nft
2018-07-14 19:59:26 +02:00
Thomas Bernard
ac796a4077
linux: add -lrt when building for glibc < 2.17
2018-07-14 14:23:13 +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