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
8bc6d6f556
PERFORMSTUN => PERFORMSTUNMASK. allow to specify stun using -o option
2018-07-06 13:23:22 +02:00
8c91ff515e
reserved[] is const
2018-07-06 13:20:30 +02:00
5262990d8e
miniupnpd: support newer libnftnl versions
2018-07-01 23:50:12 +02:00
ef179a45e3
do not check empty string with strlen(s) == 0
...
see #292
2018-06-01 10:55:45 +02:00
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
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
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
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
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
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
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
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
582375b64f
miniupnpd: VERSION 2.1
2018-05-08 23:40:27 +02:00
e11bbf0bc0
miniupnpd/pcp: Send PCP announcment at startup
...
fixes #254
2018-05-08 23:06:19 +02:00
b3849ef311
Fix OS detection for Debian kFreeBSD
2018-05-08 21:59:15 +08:00
d2bbdee995
fix typo introduced in 00abd9e6c8
2018-05-03 09:54:02 +02:00
a92138345b
add option LEASEFILE_USE_REMAINING_TIME
...
new function lease_file_rewrite()
that is called just before exiting, and when SIGUSR2 is received
see #295
2018-05-02 09:40:12 +02:00
d0e7958617
lease_file_remove(): replace strncpy/strncat by snprintf()
2018-05-01 13:04:20 +02:00
f6ac854f0f
miniupnpd: fix storing of unlimited lease time in lease_file
...
see #295
2018-05-01 11:26:49 +02:00
17773f0a72
if LEASEFILE_USE_REMAINING_TIME is defined, only the remaining time is stored
...
see #295
2018-04-30 17:25:26 +02:00
00abd9e6c8
miniupnpd: store UNIX time in lease_file
...
fixes #295
2018-04-30 16:59:40 +02:00
491ee9f8bf
miniupnpd/upnpevents.c: Add log when error
2018-04-27 00:08:06 +02:00
239d048489
Merge branch 'pf_use_ext_ip_addr'
2018-04-22 21:27:44 +02:00
5dcd40aece
netfilter/iptpinhole.c: remove warning: implicit declaration of function 'upnp_time'
...
fixes ef94635100
2018-04-22 21:24:30 +02:00
0366cd0ba0
replace strlen(s) > 0 by s[0] != '\0'
...
see #292
2018-04-22 21:21:58 +02:00
2b6fa0839f
no more strlen(xxx) == 0.
...
Fixes #292
2018-04-20 17:19:52 +02:00
53e8185725
miniupnpd/pf: set dst address in rule if use_ext_ip_addr is set
...
fixes #231
2018-04-12 11:36:12 +02:00
1fe8d21cf2
fixes #272
2018-04-12 10:49:53 +02:00
eaaf4f10ae
miniupnpd: introduce upnp_gettimeofday() which is monotonic :)
...
fixes #288
2018-04-12 10:07:11 +02:00
0bbff2bb0f
miniupnpd: update Changelog
...
see 82ec7bc3df
2018-04-06 13:00:23 +02:00
82ec7bc3df
miniupnpd: Add options for netfilter scripts
2018-03-16 23:57:39 +08:00
ef94635100
miniupnpd: time() => upnp_time()
...
I had forgotten some
see #288
2018-03-14 00:09:42 +01:00
9516c9a007
miniupnpd: fix warnings
2018-03-13 11:53:33 +01:00
dd2aa84204
miniupnpd: use monotonic clock for timeouts, etc.
...
fixes #288
also changed set_startup_time()
2018-03-13 11:43:07 +01:00
f0511d761b
miniupnpd: Add -1 option
...
fixes #277
see #282
2018-02-22 14:02:52 +01:00
9efd7fda66
ChangeLog for #282
2018-02-22 13:53:39 +01:00
80779ff4f7
Fix commit 6cbf0ba
...
Use the "flags" global variable to store the option value
Save a lot of complexity.
2018-02-22 13:47:48 +01:00
c6bf0ba6f3
Allow runtime override of igd to v1 for people running binaries with v2 enabled
...
Towards miniupnp/miniupnp#277
2018-02-19 22:14:05 -08:00
7f17837253
miniupnpd/minissdp.c: Fix submission of services to minissdpd
...
Version was hardcoded to 1 in "ST:"
2018-02-03 18:14:31 +01:00
3158862058
miniupnpd/miniupnpd.8: update man page
2018-02-03 01:46:09 +08:00
718deea11e
Update file headers. 2017 => 2018 etc.
2018-01-16 02:06:46 +01:00
ed35fc6cd4
miniupnpd/testminissdp.c: int => size_t. 2018
2018-01-15 17:47:22 +01:00
d492fa39ef
fix typo
2018-01-09 09:33:31 +08:00
a55234d806
upnpreplyparse.c: NameValueParserEndElt() rename arg to avoid confusion
2017-12-12 12:47:33 +01:00
bf4f616f58
miniupnpd/Makefile.linux: add testminissdp
2017-12-12 12:46:59 +01:00
a4d6939193
miniupnpd: update Changelog.txt
2017-12-12 10:51:36 +01:00
9fcc0a72f0
minissdpc.c: Fix buffer overrun in SSDP packet parsing
...
fixes #267
there were several errors in ProcessSSDPData()
in the parsing of ST: MX: and MAN: headers
so a few bytes could be read after the end of the buffer.
2017-12-12 10:42:54 +01:00
256b93e5d3
miniupnpd: add a test for ProcessSSDPData()
...
see #267
2017-12-12 10:08:44 +01:00
a0573e2518
minixml.c: fix heap buffer overflow
...
should fix #268
2017-12-11 14:59:29 +01:00
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
7492fe42c2
pcpserver.c: send ANNOUNCE when IP changed
...
see #254
2017-11-27 23:04:51 +01:00
cc0fad78d7
miniupnpd: use epoch_origin for NAT-PMP as well
...
see #254
2017-11-27 23:02:34 +01:00
165c5f0d57
upnpdescgen.c: check for stack overflow in genXML()
...
remove two TODO's ! ;)
2017-11-24 11:00:34 +01:00
ba9315b9b4
natpmp.c: improve error logging
2017-11-05 11:10:13 +01:00
9bd290fccb
more explicit explanations about public address change
2017-11-05 10:52:47 +01:00
6ce6a70973
PCP : reset epoch after address change
...
see #254
2017-11-02 17:27:24 +01:00
665478a47f
two words about signals
2017-11-02 17:25:39 +01:00
ad22fe5c08
copyright notice => 2017
2017-11-02 16:52:07 +01:00
f7ec37d92f
added rc-once script to initialize uuid on first start
2017-09-03 16:59:19 +02:00
7befb60ab0
Add source IP and port to syslog for upnp_event_send() error.
...
Adds the IP and port of requesting host when a send error is logged to syslog so that it is possible to identify the application causing the problem. Copied the syntax used for Connect() errors in same file.
2017-08-06 10:33:28 -04:00
d13f840a4a
=>2017. http => https
2017-07-06 00:03:12 +02:00
2946f9e105
=> 2017
2017-07-05 23:06:16 +02:00
8870da723e
char * => const char *
2017-07-05 23:06:07 +02:00
9ac353cb5e
Adding Tomato ifdef for netfilter chain to check
...
To allow for "drop-in" upgrades of Miniupnp within Tomato firmware, submitting this change back upstream.
Original source: b9d9e4b0ed
2017-07-05 14:40:51 -04:00
e56b0587a7
Mainly adding fd_set related header missing
2017-06-12 09:27:26 +02:00
5923d5de6f
=> 2017
2017-05-27 10:25:53 +02:00
74bb1827cb
miniupnpd: update Changelog.txt about randomize_url
2017-05-26 17:59:45 +02:00
552f6d37cf
Merge branch 'master' into randomize_url
2017-05-26 17:58:13 +02:00
e40a433a99
disable URL randomization by default
...
see http://miniupnp.tuxfamily.org/forum/viewtopic.php?p=4470
https://github.com/filetofirewall/fof
2017-05-26 17:44:45 +02:00
772c70ee41
miniupnpd/testgetifaddr.sh: fix for FreeBSD
2017-05-26 17:36:44 +02:00
11fcf5a008
Merge branch 'master' into randomize_url
2017-05-26 17:30:18 +02:00
e362e84e9e
=> 2017
2017-05-25 00:53:55 +02:00
08c554104d
Update Changelog.txt
2017-05-25 00:48:18 +02:00
50d21a38d0
SSDP: use receiving interface index to check if from LAN
2017-05-25 00:44:29 +02:00
9303816a5b
check receiving interface index when receiving SSDP
2017-05-25 00:44:12 +02:00
6ed6b4e607
minissdp.c: const int on = 1; for setsockopt() arg
2017-05-24 11:04:20 +02:00
57a74f2739
Merge branch 'master' into randomize_url
2017-04-21 11:33:25 +02:00
7c45f219e4
Please make the build reproducible
...
Whilst working on the Reproducible Builds effort [0], we noticed that
miniupnpd could not be built reproducibly due to embedded timestamps.
[0] https://reproducible-builds.org/
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
2017-04-13 22:09:42 +02:00
b4ed41eae8
add -w parameter to iptables for locking
...
fixes #232
2017-03-13 13:07:22 +01:00
0cc906169a
use LinkLocal address for HTTP when needed
...
should fix #229
should be tested...
2017-03-13 13:01:00 +01:00
da64fd85cb
pass ext_if_name arg to add_pinhole()
...
should fix #228
2017-03-13 11:47:21 +01:00
2c02ef2b7b
right printf format in testobsdrdr.c and tespfpinhole.c
2017-03-13 11:37:43 +01:00
07a3729b59
sanitize <RemoteHost> arg of AddPinhole
...
see #228
2017-03-13 11:30:44 +01:00
93845c5abe
DEfault to client address for AddPortMapping when <NewInternalClient> is empty
...
see #236
2017-03-13 11:03:58 +01:00
859b986385
bsd/getroute.c: proper SA_SIZE() definition
...
fixes #227
2017-01-30 18:12:11 +01:00
a39fd6d280
bsd/getroute.c: output offset
...
see #227
2017-01-30 17:44:48 +01:00
0e69178412
miniupnpd: improve README
2016-12-28 12:44:38 +01:00
7aaf82a654
miniupnpd: Update conf instructions in INSTALL
...
see #102
https://github.com/miniupnp/miniupnp/issues/102
2016-12-28 12:43:27 +01:00
ee2f6ac2ce
miniupnpd: FreeBSD uses /etc/defaults/rc.conf
...
fixes #24
2016-12-28 12:10:06 +01:00
2c77721888
do not split conditional statement #184
...
closes #184
2016-12-28 11:58:21 +01:00
3571a41d1b
Fix UDA-1.2.10 Man header empty or invalid
2016-12-23 12:12:49 +01:00
9fc3b09017
miniupnpd: update changelog and 2016
2016-12-16 10:18:41 +01:00
32855b854c
dot not try to find IPv6 address if IPv6 is disabled
...
see #49
2016-12-16 09:39:19 +01:00
2a1cc8d798
do not try to call OpenAndConfPCPv6Socket() when IPv6 is off
...
see #49
2016-12-16 09:32:41 +01:00
cfa01c5c32
fix 1a6c57847a
2016-12-01 12:14:10 +01:00
3d9b606a88
update Changelog.txt
2016-12-01 12:05:40 +01:00
1a6c57847a
Fix "AddPinhole Twice" test
...
UCTT 2.0 test case - AddPinhole Twice
see http://miniupnp.tuxfamily.org/forum/viewtopic.php?p=4731
2016-12-01 12:00:16 +01:00
144eeefd19
Merge branch 'master' into randomize_url
...
Conflicts:
miniupnpd/genconfig.sh
miniupnpd/testupnpdescgen.c
miniupnpd/upnpdescgen.c
miniupnpd/upnpglobalvars.c
miniupnpd/upnpglobalvars.h
2016-11-11 18:01:35 +01:00
d9fdb58a05
fixes testgetifaddr.sh for Solaris
2016-11-11 09:44:45 -05:00
77968a09d9
Solaris 11 compilation fixes
2016-11-11 09:42:22 -05:00
81d348207c
Add makefile specific for Solaris/SunOS
2016-11-11 09:40:56 -05:00
1579f4a2af
2015 => 2016
2016-10-07 11:16:03 +02:00
3f04f69163
2015 => 2016
2016-10-07 10:56:56 +02:00
8aa6c73a85
genconfig.sh add a comment
...
comment about DragonFly BSD 2.8 version detection for
PFRULE_INOUT_COUNTS
2016-08-16 11:39:54 +02:00
18e9a376c7
net.inet6.ip6.v6only, 1 by default, has been removed on DragonFly
...
Build on DragonFly with ENABLE_IPV6 defined has been broken unless
this sysctl node is turned off. Since we cannot turn it off now and
it's been that way for almost 2 years, simply treat it as 1.
http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/2fd1df03f3071b4559ce3bbe36924b2305631edd
Signed-off-by: YONETANI Tomokazu <y0n3t4n1@gmail.com>
2016-07-23 16:14:03 +09:00
07ae540724
Fix build error on DragonFly for missing inp_vflag
...
DragonFly has dropped V4-mapped address support some time ago,
and here's how to fix the related code:
http://lists.dragonflybsd.org/pipermail/users/2014-December/207284.html
Signed-off-by: YONETANI Tomokazu <y0n3t4n1@gmail.com>
2016-07-23 16:12:36 +09:00
c92b9fa296
DragonFly v2.8+ needs PFRULE_INOUT_COUNTS defined
...
This removes a couple of warnings from the compiler.
http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/70224baa0d7c2fcfc9b51076bdc46f77a8e1e2a7
Signed-off-by: YONETANI Tomokazu <y0n3t4n1@gmail.com>
2016-07-23 16:12:33 +09:00
9a5eaaa767
remove extra curly brace in tomato_load()
...
fixes #195 which was introduced in 6532b02cab
2016-04-24 22:20:14 +02:00
1337158fcf
miniupnpd & miniupnpc version 2.0
2016-04-19 23:17:29 +02:00
60b38bf556
Fix test of iptables(libiptc) version
...
fix for versions >= 1.5.x
2016-04-18 11:00:53 +02:00
688b13586c
netfilter/iptcrdr.c: do not add MASQUERADE rule if iport==eport
...
fixes #193
2016-03-08 10:29:47 +01:00
6532b02cab
Fix tomato_load() leaseduration
...
fixes #192
2016-03-04 19:33:18 +01:00
ee22350d5f
Changelog.txt: Update
2016-02-20 20:13:34 +01:00
36c4c0ded4
do not use multicast global scope
2016-02-19 14:20:45 +01:00
984a6f144e
set IPv6 Hop limit to 10
2016-02-19 14:20:31 +01:00
fd82e4c2d9
upnpevents.c: properly enclose IPv6 address in []
...
in the HOST: header of NOTIFY http requests
2016-02-19 12:38:32 +01:00
19ee0577e3
fix compliance issue on 64bit machines
...
ui4 values should wrap to 0 after overflowing (2^32 - 1)
2016-02-19 11:59:52 +01:00
0f7747496d
update Changelog
2016-02-16 13:16:57 +01:00
be733d5f62
more checks on argument value
2016-02-16 12:07:22 +01:00
527dd946ef
check invalid values for ExternalPort
2016-02-16 10:58:11 +01:00
a712218af8
Second-infinite is deprecated
2016-02-16 10:57:22 +01:00
92e6173a97
with UDA 1.1 content-type should include charset
2016-02-16 10:56:32 +01:00
22f7836816
reorder elements in XML descriptions to follow UDA 1.1
2016-02-16 10:55:48 +01:00
13a6a38241
add configId attribute to <root> element (UDA 1.1)
2016-02-16 10:55:03 +01:00
8c5e90db3a
do not delete/re-add pf rule if the desc/label is unchanged
2016-02-15 18:48:23 +01:00
0d6d6afc32
try to support better IPPROTO_UDPLITE :)
2016-02-15 13:36:30 +01:00
34883b7113
use a proto_itoa() function
2016-02-15 13:34:22 +01:00
430dcc7b22
update leasefile
2016-02-12 16:57:22 +01:00
680862915a
accept udp in lowercase
2016-02-12 16:55:13 +01:00
7112203428
pf/obsdrdr.c: add_timestamp_entry()
2016-02-12 16:35:46 +01:00
4eda8234c2
reject mappings with wildcard ExternalPort
2016-02-12 15:58:19 +01:00
9c28a0745f
remove warning
2016-02-12 15:31:21 +01:00
b439bd7791
check uuid-dev / libuuid
2016-02-12 15:29:49 +01:00
68dd51559c
minimal support for ipf
2016-02-12 15:13:59 +01:00
ff4b9c5d75
netfilter/iptcrdr.c: improve debug output
2016-02-12 15:02:44 +01:00
db6f272bba
miniupnpd: update some TODO
2016-02-12 15:02:06 +01:00
bdac007771
add update_portmapping() / update_portmapping_desc_timestamp() functions
2016-02-12 15:01:30 +01:00
34f80a011f
Add light version of iptables_display.sh script
2016-02-12 14:56:10 +01:00
8bad6cd338
netfilter/iptcrdr.c: remove old USE_INDEX_FROM_DESC_LIST code
2016-02-12 14:55:09 +01:00
cc35c1d450
AddPortMapping return error 729 - ConflictWithOtherMechanisms if IGD v2 is enabled
2016-02-12 14:54:13 +01:00
dd9bf47c68
iptcrdr.c: add iptc_init() check in init_redirect()
2016-02-12 14:51:59 +01:00
c4f2397d5c
upnpevents.c: quick syntax fix...
2016-02-11 11:42:59 +01:00
6059f000f7
use Linux libuuid uuid_generate() / BSD uuid_create() API
2016-02-11 11:39:28 +01:00
19211d20d1
add debug log in remove_unused_rules()
2016-02-11 10:31:49 +01:00
cac8668a7d
miniupnpd/Makefile: linking uses LDFLAGS, not CFLAGS
2016-02-10 21:37:00 +01:00
42c7bf935c
ClearOS specifics
2016-02-10 20:44:46 +01:00
81e0ca10df
upnphttp.c: fix when compiling with UPNP_STRICT
2016-02-09 10:17:58 +01:00
d23bb8d670
improve config.h comment :)
2016-02-09 10:16:45 +01:00
06049f1e7d
add ENABLE_PORT_TRIGGERING macro in config.h
...
enabled by default. Will allow people to disable the code :)
2016-02-09 10:09:19 +01:00
5f74a08dd6
update README and INSTALL
2016-01-28 23:10:25 +01:00
0deaf32796
update Changelog.txt about port triggering
2016-01-28 23:09:45 +01:00
3284d113c7
remove ifname arg from addmasqueraderule()
...
also improve comment and remove useless log :)
2016-01-28 22:16:07 +01:00
40aa39679f
improve comments
2016-01-26 19:51:07 +01:00
141e861c3a
remove call to addpeernatrule() ...
2016-01-26 18:17:05 +01:00
9059966122
netfilter/iptcrdr.c: improve comments
...
give which iptables command is equivalent for adding the rule
2016-01-26 18:16:23 +01:00
d3635faeed
add upnp_nat_postrouting_chain .conf option
...
fixes #190
MINIUPNPD-PCP-PEER has also been renamed to MINIUPNPD-POSTROUTING
( 1ba4362910
2016-01-26 16:59:04 +01:00
1ba4362910
MINIUPNPD-PCP-PEER => MINIUPNPD-POSTROUTING
...
renamed
miniupnpd_peer_chain = "MINIUPNPD-PCP-PEER"
to
miniupnpd_nat_postrouting_chain = "MINIUPNPD-POSTROUTING";
2016-01-26 16:50:48 +01:00
ba91c4ec23
add addmasqueraderule()
...
see issue #166
http://miniupnp.tuxfamily.org/forum/viewtopic.php?t=1820
iptables -t nat -I POSTROUTING -o <extif> -s <iaddr> -p UDP --sport <iport> -j MASQUERADE --to-ports <eport>
2016-01-26 16:38:32 +01:00
f4324d45e5
fix netfilter/Makefile dependencies, fix iptables_display.sh
2016-01-26 16:38:32 +01:00
55cf34a101
fix iptc_init_verify_and_append() calls
2016-01-26 16:38:32 +01:00
aa4e0a4549
add netfilter/test_nfct_get
2016-01-26 16:38:31 +01:00
21a98adc5d
update Changelog.txt
2016-01-19 11:06:06 +01:00
f1ce2301da
shutdown_iptpinhole() frees memory
2016-01-19 10:53:14 +01:00
6f8951d40d
find_pinhole() return -2 if not found
2016-01-19 10:52:36 +01:00
f16b291cfa
add pf/BSD files to .gitignore
2016-01-18 22:48:18 +01:00
be124b6508
add find_pinhole() to pf/ code also
...
see #188
2016-01-18 22:46:30 +01:00
e252acef88
PCP: check pinhole before adding in CreatePCPMap_FW()
...
fixes #188
2016-01-18 20:16:06 +01:00
a8ab2149f4
Remove some bugs in DeletePCPPeer and DeletePCPMap
2016-01-13 13:26:20 +03:00
e405f78b89
Fix output specifier
2016-01-04 12:13:00 +08:00
948b883966
Fix memory leak when realloc fails
2016-01-04 11:51:49 +08:00
e076899a37
buffer overflow fix
...
in MULTIPLE_EXTERNAL_IP code which is not used normally...
2015-12-31 00:41:24 +01:00
58b130116b
revert to UPnP/1.1 (UDA v1.1) as default.
...
see https://github.com/miniupnp/miniupnp/issues/167
fixes #167
2015-12-19 11:52:38 +01:00
fb1c29f732
cleanup
2015-12-16 11:26:40 +01:00
1ab8cf0a22
improve syslog message for incoming HTTP requests
2015-12-16 11:26:03 +01:00
6f89608a2c
ExecuteSoapAction() : add namespace to log messages
2015-12-15 12:14:05 +01:00
ba1c9239c0
update Changelog.txt
2015-12-15 12:13:45 +01:00
9d8a988b82
add comments in upnpdescgen.c
2015-12-15 11:17:15 +01:00
0139addbda
Merge branch 'desc_test'
2015-12-15 10:57:14 +01:00
9e31ceb630
add --disable-pppconn genconfig.sh option to disable WANPPPConnection
...
fixes #176
2015-12-13 15:57:49 +01:00
66b087b9b1
Merge pull request #174 from razzfazz/new_subscriber_uuid_cleanup
...
use sizeof() instead of hard-coded UUID length in newSubscriber()
2015-12-13 00:32:01 +01:00
f076f368bd
fix DeviceProtection#GetSupportedProtocols response
...
add CDATA to escape XML document in response :
ProtocolList content is an XML document that should be escaped
See section 2.4.3.1 of the DeviceProtection spec
http://upnp.org/specs/gw/UPnP-gw-DeviceProtection-v1-Service.pdf
see PR #178
2015-12-13 00:24:05 +01:00
e76dd788c4
Merge remote-tracking branch 'razzfazz/fix_dp_setup_ready_notify'
...
PR #182
2015-12-12 12:02:36 +01:00
04b344b6f8
actually return a value in SetupReady notifications
2015-12-12 02:42:13 -08:00
db0ef3022e
fix parsing of input arguments in SendSetupMessage()
2015-12-12 02:33:30 -08:00
f77d701489
update changelog and year => 2015
...
see 1cc3d1a5fa6430805381
2015-12-12 10:38:40 +01:00
a4a3e5a3f8
add comments. see 0298b66365
2015-12-12 09:31:22 +01:00
9f32a1de1d
add "uname -a" result to config.h
2015-12-12 09:13:05 +01:00
58f6626179
add --uda-version to usage help + fix
...
fixes 9e65fbbded
2015-12-12 09:10:54 +01:00
128bbee806
Merge pull request #180 from razzfazz/fix_dp_action_args
...
fix action arguments for DeviceProtection service (IGDv2)
2015-12-12 08:58:25 +01:00
aa34dd2e45
Merge branch 'fix_advertised_versions'
2015-12-12 08:47:32 +01:00
e97be7f37f
add comments to previous commit
2015-12-12 08:47:06 +01:00
ce3d66a3ee
fix tags for DeviceProtection action responses
2015-12-11 23:36:19 -08:00
2a654e0ef4
Merge remote-tracking branch 'razzfazz/renew_cleanup'
2015-12-12 08:28:48 +01:00
0298b66365
fix argument names for DeviceProtection actions
2015-12-11 23:12:11 -08:00
7774c24daa
add missing parameters for DeviceProtection service actions
2015-12-11 22:56:20 -08:00
1cc3d1a5fa
advertise correct service and device versions when IGDv2 is enabled
2015-12-11 18:08:18 -08:00
6430805381
return SID in renew response
2015-12-11 16:29:32 -08:00
5fd754c4e2
use sizeof() instead of hard-coded UUID length in newSubscriber()
2015-12-11 16:21:32 -08:00
0d0728e2d1
name WANIPv6FirewallControl:1 service WANUPv6Firewall1
...
done according to http://upnp.org/specs/gw/UPnP-gw-InternetGatewayDevice-v2-Device.pdf
2.2 (page 9)
2015-12-11 14:40:13 +01:00
9e65fbbded
allow to set UPnP Device architecture version using commandline
...
--uda-version=x.x
2015-12-11 14:37:59 +01:00
d89e4aaf70
fix Layer3Forwarding serviceId to be consistent with IGDv2 spec
2015-12-11 02:13:42 -08:00
76a5f9930b
Changes to WANIPCn.xml
...
Add default values for :
RSIPAvailable
NATEnabled
LastConnectionError
ConnectionStatus
follow the Specification regarding ConnectionType / PossibleConnectionTypes
allowed values
2015-12-11 10:57:25 +01:00
24d54ba13a
SA_SIZE() is >= sizeof(long)
2015-11-19 12:55:44 +01:00
834a7f5db9
use bash or ksh to execute ./testupnppermissions.sh
2015-11-19 12:54:56 +01:00
3d50adc170
bsd/getroute.c: check message length. Avoid buffer overread
2015-11-18 09:53:58 +01:00
35aae6debb
bsd/getroute.c: fix parsing of address with SA_LEN() = 0
...
at least with OpenBSD 4.3, the minimum is 4 bytes
2015-11-18 09:52:54 +01:00
e5d30a1f4b
explicitly request interface name as well
2015-11-17 17:29:09 -08:00
eb5f179c9f
make get_src_for_route_to() actually return the source address on *BSD
2015-11-17 17:06:05 -08:00
7d19326ef9
get_src_for_route_to() is tested with Mac OS X 10.4
2015-11-17 11:25:10 +01:00
191940467f
define SA_SIZE if needed
2015-11-17 10:55:17 +01:00
7ab525700d
fix parsing of sockaddr entries returned by routing socket on BSD
2015-11-17 10:16:51 +01:00
5cfa875477
fill sa_len in address for rt_msg
2015-11-17 10:15:36 +01:00
84b609849a
fix get_src_for_route_to() with IPv6
...
fixes #160
2015-11-16 23:01:44 +01:00
66dceb5e94
Fix get_src_for_route_to() when args are NULL
...
fixes #160 ???
2015-11-16 20:32:02 +01:00
5856fb0f7d
test get_src_for_route_to() with NULL args
2015-11-16 20:19:00 +01:00
372ad64bb5
update Changelog.txt files
2015-11-05 12:04:26 +01:00
f5f3ad1631
clarify multiple LAN interfaces / listening_ip=
2015-11-05 11:51:02 +01:00
be70a04c66
use LOG_INFO instead of LOG_ERR for PCP PEER and MAP success
...
fixes #158
2015-11-02 23:30:28 +01:00
92cc93f6f8
use name server from query in SOAP responses (continued)
...
see a4b97cf1051e7b2342fa
2015-10-30 19:53:08 +01:00
4ed5bc6fee
remove a warning :)
2015-10-30 19:52:41 +01:00
4afc6fcf7f
fix : properly call find_ipv6_addr() with the 1st LAN interface
2015-10-30 19:36:42 +01:00
d4ee1ee7e6
Add "make check" to BSD Makefile.
...
Also make sure files are removed properly when using "make clean"
2015-10-25 16:33:24 +01:00
f4b730af9b
clean up UTF-8 chars
2015-10-25 16:19:21 +01:00
359c5d8805
add a validation of SSDP packet generation
...
checks it doesn't overflow SSDP_PACKET_MAX_LEN
2015-10-24 17:02:11 +02:00
3bd1886d2a
move SSDP_PACKET_MAX_LEN to config.h
...
also set it to 1024 by default. See #129
2015-10-24 13:11:31 +02:00
8fde9568cc
make it work with Darwin (Mac OS X)
2015-10-08 14:03:15 +02:00
6c46d285aa
fix testupnppermissions.sh for non DEBUG builds
...
cleanup tests also
2015-09-22 17:13:26 +02:00
6837787f1c
validategetifaddr
2015-09-22 16:51:56 +02:00
aa1e24acf8
bash is needed for arrays
2015-09-22 16:19:24 +02:00
71a7846479
add "make check" to miniupnpd
2015-09-22 16:02:19 +02:00
146613a493
update Changelog.txt
2015-09-22 12:13:32 +02:00
3b12b8fb4e
copy ext_ip in response only if needed
2015-09-22 11:52:24 +02:00
68b3cab718
add a warning syslog() in parsePCPOptions
2015-09-22 11:36:09 +02:00
c87809a608
remove redundant test about ports
2015-09-22 11:35:24 +02:00
c3660a5aa7
add include guard
2015-09-22 10:24:47 +02:00
13aeb88feb
remove #pragma directive
2015-09-22 10:24:38 +02:00
3d8986b646
Dont read/write PCP messages as C struct to remove dependency to the "pack" feature.
...
structs are left (commented out) in pcp_msg_struct.h for information
2015-09-22 10:22:06 +02:00
a6b947e0ca
move READNUxx/WRITENUxx macros to macros.h
2015-09-21 23:58:00 +02:00
2372d7bdd9
Merge branch 'uda_20'
2015-09-21 22:40:16 +02:00
7ae5783d85
UPNP_VERSION_MAJOR / UPNP_VERSION_MINOR macros defined in config.h
2015-09-21 22:39:30 +02:00
50c68a9f03
rename macro UPNP_VERSION to MINIUPNPD_DATE
...
(a more meaningful name)
2015-09-21 22:37:50 +02:00
861c5f5796
add comments with usual namespace
...
see a4b97cf105
2015-09-21 17:10:15 +02:00
7b3cda0f9a
add testdescs to .gitignore
2015-09-15 16:17:29 +02:00
1e7b2342fa
use name server from query in SOAP responses (continued)
...
see a4b97cf105
2015-09-15 09:39:50 +02:00
a4b97cf105
use name server from query in SOAP responses
...
to be finished :)
2015-09-15 00:02:56 +02:00
fde90d221b
fix typo in "urn" (url)
2015-09-14 23:35:14 +02:00
a8f80040c9
Randomize URLs to avoid http://www.filet-o-firewall.com/
2015-09-14 12:10:15 +02:00
32f1981520
ipfwrdr.c: remove unused argument warnings
2015-09-10 16:01:26 +02:00
8ecb5fcd92
fix includes for old Mac OS X
2015-09-04 18:50:54 +02:00
5873c5a6b4
miniupnpd: improve warning log
2015-08-26 10:04:23 +02:00
f8f5f2eb97
miniupnpd: bind to device using SO_BINDTODEVICE
2015-08-26 09:46:05 +02:00
0cf182e51e
miniupnpd: remove int_if_name, use ip_mreqn if available
2015-08-25 20:33:47 +02:00
138ec9e972
miniupnpd: Bind to device
...
This is needed when you have two interfaces with the same IP address
(for example using tinc)
2015-08-21 16:05:26 +02:00
6db99a1a40
use mktemp properly ?
...
-t option to put in /tmp dir
2015-07-16 17:16:52 +02:00
904399cd62
=> (c) 2015
2015-07-16 17:16:09 +02:00
d02b1d4ec3
genconfig.sh: 2014 => 2015
2015-07-15 18:13:01 +02:00
81d03ad41d
DECODELENGTH_READ
2015-07-15 18:11:27 +02:00
a3179fb284
Check malloc/calloc return values
2015-07-15 18:10:10 +02:00
769f4d4708
pcpserver.c: correctly return NOT_AUTHORIZED PCP error
...
When trying to remove PCP Map when nonce is bad
fixes #132
2015-07-09 12:46:51 +02:00
8d08346c60
pcpserver.c: Don't overwrite lifetime.
...
fix #131
2015-07-09 12:28:05 +02:00
24307d2951
Comparing array address with 0 is not useful, use strlen() instead
2015-06-24 16:24:01 +08:00
61289d42fb
Correctly terminate the string
2015-06-24 16:24:01 +08:00
7e088a9039
Fix memory leak
2015-06-24 13:14:14 +08:00
6400a13a50
miniupnpd/pcpserver.c: fix for compilation with PCP_FLOWP defined
2015-06-22 11:51:23 +02:00
8a180b1cac
Merge remote-tracking branch 'edrikk/master'
2015-06-16 09:49:02 +02:00
d002502e68
Make Tomato's OS_VERSION shorter to stop SendSSDPNotify log messages
...
As discussed in this thread:
http://www.linksysinfo.org/index.php?threads/tomato-shibbys-releases.33858/page-53#post-262636
It appears that the Tomato OS_VERSION has gotten long enough, that it's causing SSDP_PACKET_MAX_LEN being larger than 512 by a few characters.
This change reduces unnecessary "verbiage" at the end of the Tomato OS_VERSION string.
In short, what was previously (as example):
Tomato 1.28.0000 MIPSR2-130 K26AC USB AIO-64K
will become
Tomato MIPSR2-130 K26AC
2015-06-15 12:47:34 -04:00
70a2eee3e2
Define "TOMATO" in Tomato portion of config file creation
...
Define "TOMATO" in Tomato portion of config file creation
2015-06-09 15:53:11 -04:00
df85522c73
miniupnpd/miniupnpd.c: commenting #endif + minor cleaning
2015-06-09 15:13:25 +02:00
ec0707d559
Add Tomato modifications exactly as is, wrapped by ifdef TOMATO
...
Add Tomato modifications exactly as is in Tomato firmware, wrapped by #ifdef TOMATO so that it is dormant in base miniupnpd.
This will ease merging upstream changes back to Tomato.
2015-06-05 23:19:52 -04:00
9fe747894c
Drop log severity level to reduce verbosity
...
Dropping syslog message severity from WARNING to INFO.
Tomato makes this change each update, to reduce verbosity. This change will allow for easier merging of upstream changes back into Tomato.
2015-06-05 22:31:28 -04:00
bc69cece0e
Add client address to syslog message
...
Align with Tomato, to ease merges back downstream.
Adds client address to syslog message, corrects typo "inexpectedly" -> "unexpectedly"
2015-06-05 22:27:20 -04:00
2c8e3c1fc2
Align with active Tomato builds genconfig.sh entry
...
The current active Tomato builds do not incorporate these two lines. Removing to ease merging upstream changes.
Toastman:
http://repo.or.cz/w/tomato.git/blob/refs/heads/Toastman-RT-N:/release/src/router/miniupnpd/genconfig.sh#l249
Shibby:
f799186a9d/release/src-rt-6.x.4708/router/miniupnpd/genconfig.sh
2015-06-05 22:14:47 -04:00
a43beeccf1
fix minor typo
2015-05-27 15:31:49 +02:00
01eb15af3d
Adding linux/nftables support
2015-04-30 10:52:11 +02:00
42a5e2ae22
Merge remote-tracking branch 's1061123/nft_support' into nft_support
...
Conflicts:
miniupnpd/Makefile.linux_nft
miniupnpd/netfilter_nft/README.md
miniupnpd/netfilter_nft/nftnlrdr.c
miniupnpd/netfilter_nft/nftnlrdr_misc.c
2015-04-30 10:49:11 +02:00
8fedfdc4ae
Fix compiler warning.
2015-04-28 17:23:09 +09:00
a39365279c
Fix d_printf() compile error.
2015-04-28 17:22:46 +09:00
af3ac20395
Change printf to d_printf (only valid in case of -DDEBUG)
2015-04-28 17:13:09 +09:00
79d4028a93
Change message.
2015-04-28 17:13:08 +09:00
7948b7d754
Fix SEGV issue (due to invalid memory alloc case).
2015-04-28 17:13:08 +09:00
101c443192
Update README.md
...
Fix format.
2015-04-28 17:13:08 +09:00
73f02afca9
Remove .travis.yml and rename README.md
2015-04-28 17:13:08 +09:00
e167cc1675
Move travisCI to top.
2015-04-28 17:13:07 +09:00
1e97b408f1
First commit for travisCI.
2015-04-28 17:13:07 +09:00
cc0a6eecbb
Add libmnl flags in Makefile.linux_nft.
2015-04-28 17:13:07 +09:00
050845156a
Fix to remove rule with correct handle.
2015-04-28 17:13:07 +09:00
9e10d91347
Skip to parse rules not in miniupnpd chain.
2015-04-28 17:13:07 +09:00
e54c5ff773
Fix to get NAT port as uint16_t.
2015-04-28 17:13:07 +09:00
26a5c9a3aa
In case of remove filter, just remove one rule.
2015-04-28 17:13:07 +09:00
c2af2650d9
Add expr_set_reg_val_u16 for network port num.
2015-04-28 17:13:07 +09:00
7f57e686d0
Fix NAT issue (cannot snat/dnat actually).
...
Port number endian is failed.
2015-04-28 17:13:06 +09:00
01ecb49d0e
Add egress if index val and rename ifidx to ingress_ifidx.
2015-04-28 17:13:06 +09:00
ad1e380d10
Changes init script (only add chains).
2015-04-28 17:13:06 +09:00
12f6bdb274
Fix init script.
2015-04-28 17:13:06 +09:00
55fba2b6c4
Add README.
2015-04-28 17:13:06 +09:00
b2b6f025fb
Initial commit to support nftables.
2015-04-28 17:13:06 +09:00
2a08805783
minissdp.c: Dont try to close sockets with fd=-1
...
fixes #112
2015-04-28 09:08:35 +02:00
c52657f7fb
update Changelog.txt
2015-04-26 16:44:57 +02:00
a224264194
Merge remote-tracking branch 'Chocobo1/typo'
2015-04-26 16:29:08 +02:00
940909890e
remove dependency on libnfnetlink
...
fixes #110
still allow to use libnfnetlink by defining USE_LIBNFNETLINK
if you really want/need to
2015-04-26 16:18:39 +02:00
f8c122034c
remove dependency on libnfnetlink
...
fixes #110
still allow to use libnfnetlink by defining USE_LIBNFNETLINK
if you really want/need to
2015-04-26 16:15:41 +02:00
3fcd2b5117
miniupnpd.conf: Fix typos, capitalize each sentence.
2015-04-25 16:10:15 +08:00
60db6230ab
minor README edit
2015-04-24 23:02:38 +02:00
0df3555a8c
Update README.md
...
Fix format.
2015-04-24 16:57:40 +09:00
c70e3a4637
Remove .travis.yml and rename README.md
2015-04-24 16:54:23 +09:00
8cd268dd9d
Move travisCI to top.
2015-03-18 15:56:42 +09:00
4199ce46ca
First commit for travisCI.
2015-03-18 15:52:22 +09:00
40871bb4cc
Add libmnl flags in Makefile.linux_nft.
2015-03-18 15:27:57 +09:00
c6ebb70f35
Fix to remove rule with correct handle.
2015-03-16 19:58:02 +09:00
841b2fb1f3
Skip to parse rules not in miniupnpd chain.
2015-03-16 19:39:06 +09:00
af780b8255
Fix to get NAT port as uint16_t.
2015-03-16 19:38:28 +09:00
d2bc556733
In case of remove filter, just remove one rule.
2015-03-16 19:35:23 +09:00
939b3262c3
Add expr_set_reg_val_u16 for network port num.
2015-03-16 18:02:07 +09:00
75fd37e958
Fix NAT issue (cannot snat/dnat actually).
...
Port number endian is failed.
2015-03-16 17:29:20 +09:00
c19b87ee07
Add egress if index val and rename ifidx to ingress_ifidx.
2015-03-16 17:28:03 +09:00
3e635dbe17
Changes init script (only add chains).
2015-03-16 17:24:31 +09:00
f7288efb5e
Fix init script.
2015-03-12 15:17:33 +09:00
7065b0040f
Add README.
2015-03-11 22:18:26 +09:00
dcf218c452
Initial commit to support nftables.
2015-03-11 21:10:25 +09:00
b137df30d9
Merge remote-tracking branch 's1061123/fix_range1'
2015-03-09 10:59:49 +01:00
3b472b59e0
Fix get_portmappings_in_range() in non-expand case.
...
In get_portmappings_in_range(), array[] is not updated when
realloc() is not called, hence get_portmappings_in_range() is
always null. This fix changes to fill array[].
2015-03-09 17:33:10 +09:00
85841abd5f
miniupnpd/Changelog.txt: eb72ab5330
2015-03-07 16:57:40 +01:00
eb72ab5330
miniupnpd.c: don't die when IPv6 is enabled and interface has no IPv4 address
2015-02-20 18:31:55 +01:00
e896e298f3
miniupnpd: remove warnings
2015-02-16 22:41:40 +01:00
e13525c3e7
miniupnpd: UPnP/1.1 => UPnP/2.0
2015-02-16 11:23:05 +01:00
d5ccd5e86e
Merge pull request #101 from pyzhu/master
...
avoid compile warning
2015-02-11 23:33:47 +01:00
6e5d8ce954
miniupnpd: Allow wildcard (empty string) remote host for AddPinhole()
2015-02-10 16:04:10 +01:00
5df35db6ab
fix c7d7efd230
2015-02-08 10:46:13 +01:00
7c1a04ab30
upnpsoap.c: 2014 => 2015
2015-02-08 10:23:54 +01:00
c7d7efd230
fix realloc failure issues detected thanks to cppcheck
2015-02-08 10:23:22 +01:00
241ede9ddf
miniupnpd: improve (some) logs
2015-01-20 14:13:18 +01:00
f795af5f54
2014 => 2015
2015-01-20 14:12:10 +01:00
bbb6df523d
miniupnpd/natpmp.c: #if IPV6_PKTINFO => #ifdef IPV6_PKTINFO
2014-12-31 01:38:15 +01:00
c336b23706
miniupnpd/upnpglobalvars.c: documentation about CONFIGID.UPNP.ORG
2014-12-15 12:02:42 +01:00
c4b167537f
miniupnpd/Makefile.linux: fix clean (testporinuse.o)
2014-12-15 11:59:17 +01:00
22bc695f91
remove unused bsdqueue.h
2014-12-15 11:58:57 +01:00
2d89a05982
miniupnpd/miniupnpd.c: minor fixes in usage output
2014-12-10 10:44:32 +01:00
99a1bafc1f
miniupnpd: use time for BOOTID.UPNP.ORG value
2014-12-10 10:41:10 +01:00
00d878eba3
miniupnpd: configurable BOOTID.UPNP.ORG SSDP header
2014-12-10 10:40:41 +01:00
2d52890608
miniupnpd/upnpglobalvars.c: document BOOTID.UPNP.ORG and CONFIGID.UPNP.ORG
2014-12-10 10:03:13 +01:00
e283270274
miniupnpd/pf/pfpinhole.c: reduce log verbosity
...
also remove a "argument not used" warning
2014-12-10 09:46:57 +01:00
e013870cca
miniupnpd/upnpsoap.c: remove an unneeded \n in log
2014-12-09 18:32:31 +01:00
181850ad1f
miniupnpd/upnphttp.c: check ':' in HTTP header names
2014-12-09 18:28:23 +01:00
98cc73a372
miniupnpd/upnphttp: Checking Host: HTTP request header to prevent DNS rebinding attack
2014-12-09 17:49:02 +01:00
31986d8190
miniupnpd/upnphttp.c: fix 526e1dcd40
2014-12-09 17:48:14 +01:00
9e30117cac
miniupnpd/upnphttp.c: fix ec94c5663f
...
thanks to Stephen Röttger
2014-12-09 11:44:28 +01:00
526e1dcd40
miniupnpd/upnphttp.c: skip only spaces and tab (stop on CR and LF)
2014-12-09 11:38:50 +01:00
064c78730c
miniupnpd/upnphttp.c: cosmetical changes
2014-12-09 11:04:38 +01:00
ec94c5663f
miniupnpd: check if BuildHeader_upnphttp() failed to allocate memory
2014-12-09 11:04:15 +01:00
Thomas Bernard
Nils Andreas Svee
Pali Rohár
yangfl
Nye Liu
Thorsten Liepert
David Kerr
edrikk
David Carlier
Chris Lamb
YONETANI Tomokazu
vvsvic
Chocobo1
Daniel Becker
Timothy Redaelli
edrikk
Tomofumi Hayashi