Thomas Bernard
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
Thomas Bernard
24d54ba13a
SA_SIZE() is >= sizeof(long)
2015-11-19 12:55:44 +01:00
Thomas Bernard
834a7f5db9
use bash or ksh to execute ./testupnppermissions.sh
2015-11-19 12:54:56 +01:00
Thomas Bernard
3d50adc170
bsd/getroute.c: check message length. Avoid buffer overread
2015-11-18 09:53:58 +01:00
Thomas Bernard
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
Daniel Becker
e5d30a1f4b
explicitly request interface name as well
2015-11-17 17:29:09 -08:00
Daniel Becker
eb5f179c9f
make get_src_for_route_to() actually return the source address on *BSD
2015-11-17 17:06:05 -08:00
Thomas BERNARD
7d19326ef9
get_src_for_route_to() is tested with Mac OS X 10.4
2015-11-17 11:25:10 +01:00
Thomas Bernard
191940467f
define SA_SIZE if needed
2015-11-17 10:55:17 +01:00
Daniel Becker
7ab525700d
fix parsing of sockaddr entries returned by routing socket on BSD
2015-11-17 10:16:51 +01:00
Thomas Bernard
5cfa875477
fill sa_len in address for rt_msg
2015-11-17 10:15:36 +01:00
Thomas Bernard
84b609849a
fix get_src_for_route_to() with IPv6
...
fixes #160
2015-11-16 23:01:44 +01:00
Thomas Bernard
66dceb5e94
Fix get_src_for_route_to() when args are NULL
...
fixes #160 ???
2015-11-16 20:32:02 +01:00
Thomas Bernard
5856fb0f7d
test get_src_for_route_to() with NULL args
2015-11-16 20:19:00 +01:00
Thomas Bernard
372ad64bb5
update Changelog.txt files
2015-11-05 12:04:26 +01:00
Thomas Bernard
f5f3ad1631
clarify multiple LAN interfaces / listening_ip=
2015-11-05 11:51:02 +01:00
Thomas Bernard
be70a04c66
use LOG_INFO instead of LOG_ERR for PCP PEER and MAP success
...
fixes #158
2015-11-02 23:30:28 +01:00
Thomas Bernard
92cc93f6f8
use name server from query in SOAP responses (continued)
...
see a4b97cf105
and 1e7b2342fa
2015-10-30 19:53:08 +01:00
Thomas Bernard
4ed5bc6fee
remove a warning :)
2015-10-30 19:52:41 +01:00
Thomas Bernard
4afc6fcf7f
fix : properly call find_ipv6_addr() with the 1st LAN interface
2015-10-30 19:36:42 +01:00
Thomas BERNARD
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
Thomas BERNARD
f4b730af9b
clean up UTF-8 chars
2015-10-25 16:19:21 +01:00
Thomas Bernard
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
Thomas Bernard
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
Thomas Bernard
8fde9568cc
make it work with Darwin (Mac OS X)
2015-10-08 14:03:15 +02:00
Thomas Bernard
6c46d285aa
fix testupnppermissions.sh for non DEBUG builds
...
cleanup tests also
2015-09-22 17:13:26 +02:00
Thomas Bernard
6837787f1c
validategetifaddr
2015-09-22 16:51:56 +02:00
Thomas Bernard
aa1e24acf8
bash is needed for arrays
2015-09-22 16:19:24 +02:00
Thomas Bernard
71a7846479
add "make check" to miniupnpd
2015-09-22 16:02:19 +02:00
Thomas Bernard
146613a493
update Changelog.txt
2015-09-22 12:13:32 +02:00
Thomas Bernard
3b12b8fb4e
copy ext_ip in response only if needed
2015-09-22 11:52:24 +02:00
Thomas Bernard
68b3cab718
add a warning syslog() in parsePCPOptions
2015-09-22 11:36:09 +02:00
Thomas Bernard
c87809a608
remove redundant test about ports
2015-09-22 11:35:24 +02:00
Thomas Bernard
c3660a5aa7
add include guard
2015-09-22 10:24:47 +02:00
Thomas Bernard
13aeb88feb
remove #pragma directive
2015-09-22 10:24:38 +02:00
Thomas Bernard
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
Thomas Bernard
a6b947e0ca
move READNUxx/WRITENUxx macros to macros.h
2015-09-21 23:58:00 +02:00
Thomas Bernard
2372d7bdd9
Merge branch 'uda_20'
2015-09-21 22:40:16 +02:00
Thomas Bernard
7ae5783d85
UPNP_VERSION_MAJOR / UPNP_VERSION_MINOR macros defined in config.h
2015-09-21 22:39:30 +02:00
Thomas Bernard
50c68a9f03
rename macro UPNP_VERSION to MINIUPNPD_DATE
...
(a more meaningful name)
2015-09-21 22:37:50 +02:00
Thomas Bernard
861c5f5796
add comments with usual namespace
...
see a4b97cf105
2015-09-21 17:10:15 +02:00
Thomas Bernard
7b3cda0f9a
add testdescs to .gitignore
2015-09-15 16:17:29 +02:00
Thomas Bernard
1e7b2342fa
use name server from query in SOAP responses (continued)
...
see a4b97cf105
2015-09-15 09:39:50 +02:00
Thomas Bernard
a4b97cf105
use name server from query in SOAP responses
...
to be finished :)
2015-09-15 00:02:56 +02:00
Thomas Bernard
fde90d221b
fix typo in "urn" (url)
2015-09-14 23:35:14 +02:00
Thomas Bernard
32f1981520
ipfwrdr.c: remove unused argument warnings
2015-09-10 16:01:26 +02:00
Thomas Bernard
8ecb5fcd92
fix includes for old Mac OS X
2015-09-04 18:50:54 +02:00
Thomas Bernard
5873c5a6b4
miniupnpd: improve warning log
2015-08-26 10:04:23 +02:00
Thomas Bernard
f8f5f2eb97
miniupnpd: bind to device using SO_BINDTODEVICE
2015-08-26 09:46:05 +02:00
Thomas Bernard
0cf182e51e
miniupnpd: remove int_if_name, use ip_mreqn if available
2015-08-25 20:33:47 +02:00
Timothy Redaelli
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
Thomas Bernard
6db99a1a40
use mktemp properly ?
...
-t option to put in /tmp dir
2015-07-16 17:16:52 +02:00
Thomas Bernard
904399cd62
=> (c) 2015
2015-07-16 17:16:09 +02:00
Thomas Bernard
d02b1d4ec3
genconfig.sh: 2014 => 2015
2015-07-15 18:13:01 +02:00
Thomas Bernard
81d03ad41d
DECODELENGTH_READ
2015-07-15 18:11:27 +02:00
Thomas Bernard
a3179fb284
Check malloc/calloc return values
2015-07-15 18:10:10 +02:00
Thomas Bernard
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
Thomas Bernard
8d08346c60
pcpserver.c: Don't overwrite lifetime.
...
fix #131
2015-07-09 12:28:05 +02:00
Chocobo1
24307d2951
Comparing array address with 0 is not useful, use strlen() instead
2015-06-24 16:24:01 +08:00
Chocobo1
61289d42fb
Correctly terminate the string
2015-06-24 16:24:01 +08:00
Chocobo1
7e088a9039
Fix memory leak
2015-06-24 13:14:14 +08:00
Thomas Bernard
6400a13a50
miniupnpd/pcpserver.c: fix for compilation with PCP_FLOWP defined
2015-06-22 11:51:23 +02:00
Thomas Bernard
8a180b1cac
Merge remote-tracking branch 'edrikk/master'
2015-06-16 09:49:02 +02:00
edrikk
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
edrikk
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
Thomas Bernard
df85522c73
miniupnpd/miniupnpd.c: commenting #endif + minor cleaning
2015-06-09 15:13:25 +02:00
edrikk
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
edrikk
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
edrikk
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
edrikk
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
?at=shibby-arm#cl-265
2015-06-05 22:14:47 -04:00
Thomas Bernard
a43beeccf1
fix minor typo
2015-05-27 15:31:49 +02:00
Thomas Bernard
01eb15af3d
Adding linux/nftables support
2015-04-30 10:52:11 +02:00
Thomas Bernard
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
Tomofumi Hayashi
8fedfdc4ae
Fix compiler warning.
2015-04-28 17:23:09 +09:00
Tomofumi Hayashi
a39365279c
Fix d_printf() compile error.
2015-04-28 17:22:46 +09:00
Tomofumi Hayashi
af3ac20395
Change printf to d_printf (only valid in case of -DDEBUG)
2015-04-28 17:13:09 +09:00
Tomofumi Hayashi
79d4028a93
Change message.
2015-04-28 17:13:08 +09:00
Tomofumi Hayashi
7948b7d754
Fix SEGV issue (due to invalid memory alloc case).
2015-04-28 17:13:08 +09:00
Tomofumi Hayashi
101c443192
Update README.md
...
Fix format.
2015-04-28 17:13:08 +09:00
Tomofumi Hayashi
73f02afca9
Remove .travis.yml and rename README.md
2015-04-28 17:13:08 +09:00
Tomofumi Hayashi
e167cc1675
Move travisCI to top.
2015-04-28 17:13:07 +09:00
Tomofumi Hayashi
1e97b408f1
First commit for travisCI.
2015-04-28 17:13:07 +09:00
Tomofumi Hayashi
cc0a6eecbb
Add libmnl flags in Makefile.linux_nft.
2015-04-28 17:13:07 +09:00
Tomofumi Hayashi
050845156a
Fix to remove rule with correct handle.
2015-04-28 17:13:07 +09:00
Tomofumi Hayashi
9e10d91347
Skip to parse rules not in miniupnpd chain.
2015-04-28 17:13:07 +09:00
Tomofumi Hayashi
e54c5ff773
Fix to get NAT port as uint16_t.
2015-04-28 17:13:07 +09:00
Tomofumi Hayashi
26a5c9a3aa
In case of remove filter, just remove one rule.
2015-04-28 17:13:07 +09:00
Tomofumi Hayashi
c2af2650d9
Add expr_set_reg_val_u16 for network port num.
2015-04-28 17:13:07 +09:00
Tomofumi Hayashi
7f57e686d0
Fix NAT issue (cannot snat/dnat actually).
...
Port number endian is failed.
2015-04-28 17:13:06 +09:00
Tomofumi Hayashi
01ecb49d0e
Add egress if index val and rename ifidx to ingress_ifidx.
2015-04-28 17:13:06 +09:00
Tomofumi Hayashi
ad1e380d10
Changes init script (only add chains).
2015-04-28 17:13:06 +09:00
Tomofumi Hayashi
12f6bdb274
Fix init script.
2015-04-28 17:13:06 +09:00
Tomofumi Hayashi
55fba2b6c4
Add README.
2015-04-28 17:13:06 +09:00
Tomofumi Hayashi
b2b6f025fb
Initial commit to support nftables.
2015-04-28 17:13:06 +09:00
Thomas Bernard
2a08805783
minissdp.c: Dont try to close sockets with fd=-1
...
fixes #112
2015-04-28 09:08:35 +02:00
Thomas Bernard
c52657f7fb
update Changelog.txt
2015-04-26 16:44:57 +02:00
Thomas Bernard
a224264194
Merge remote-tracking branch 'Chocobo1/typo'
2015-04-26 16:29:08 +02:00
Thomas Bernard
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
Thomas Bernard
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
Chocobo1
3fcd2b5117
miniupnpd.conf: Fix typos, capitalize each sentence.
2015-04-25 16:10:15 +08:00
Thomas Bernard
60db6230ab
minor README edit
2015-04-24 23:02:38 +02:00
Tomofumi Hayashi
0df3555a8c
Update README.md
...
Fix format.
2015-04-24 16:57:40 +09:00
Tomofumi Hayashi
c70e3a4637
Remove .travis.yml and rename README.md
2015-04-24 16:54:23 +09:00
Tomofumi Hayashi
8cd268dd9d
Move travisCI to top.
2015-03-18 15:56:42 +09:00
Tomofumi Hayashi
4199ce46ca
First commit for travisCI.
2015-03-18 15:52:22 +09:00
Tomofumi Hayashi
40871bb4cc
Add libmnl flags in Makefile.linux_nft.
2015-03-18 15:27:57 +09:00
Tomofumi Hayashi
c6ebb70f35
Fix to remove rule with correct handle.
2015-03-16 19:58:02 +09:00
Tomofumi Hayashi
841b2fb1f3
Skip to parse rules not in miniupnpd chain.
2015-03-16 19:39:06 +09:00
Tomofumi Hayashi
af780b8255
Fix to get NAT port as uint16_t.
2015-03-16 19:38:28 +09:00
Tomofumi Hayashi
d2bc556733
In case of remove filter, just remove one rule.
2015-03-16 19:35:23 +09:00
Tomofumi Hayashi
939b3262c3
Add expr_set_reg_val_u16 for network port num.
2015-03-16 18:02:07 +09:00
Tomofumi Hayashi
75fd37e958
Fix NAT issue (cannot snat/dnat actually).
...
Port number endian is failed.
2015-03-16 17:29:20 +09:00
Tomofumi Hayashi
c19b87ee07
Add egress if index val and rename ifidx to ingress_ifidx.
2015-03-16 17:28:03 +09:00
Tomofumi Hayashi
3e635dbe17
Changes init script (only add chains).
2015-03-16 17:24:31 +09:00
Tomofumi Hayashi
f7288efb5e
Fix init script.
2015-03-12 15:17:33 +09:00
Tomofumi Hayashi
7065b0040f
Add README.
2015-03-11 22:18:26 +09:00
Tomofumi Hayashi
dcf218c452
Initial commit to support nftables.
2015-03-11 21:10:25 +09:00
Thomas Bernard
b137df30d9
Merge remote-tracking branch 's1061123/fix_range1'
2015-03-09 10:59:49 +01:00
Tomofumi Hayashi
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
Thomas Bernard
85841abd5f
miniupnpd/Changelog.txt: eb72ab5330
2015-03-07 16:57:40 +01:00
Thomas Bernard
eb72ab5330
miniupnpd.c: don't die when IPv6 is enabled and interface has no IPv4 address
2015-02-20 18:31:55 +01:00
Thomas Bernard
e896e298f3
miniupnpd: remove warnings
2015-02-16 22:41:40 +01:00
Thomas Bernard
e13525c3e7
miniupnpd: UPnP/1.1 => UPnP/2.0
2015-02-16 11:23:05 +01:00
Thomas BERNARD
d5ccd5e86e
Merge pull request #101 from pyzhu/master
...
avoid compile warning
2015-02-11 23:33:47 +01:00
Thomas Bernard
6e5d8ce954
miniupnpd: Allow wildcard (empty string) remote host for AddPinhole()
2015-02-10 16:04:10 +01:00
Thomas Bernard
5df35db6ab
fix c7d7efd230
2015-02-08 10:46:13 +01:00
Thomas Bernard
7c1a04ab30
upnpsoap.c: 2014 => 2015
2015-02-08 10:23:54 +01:00
Thomas Bernard
c7d7efd230
fix realloc failure issues detected thanks to cppcheck
2015-02-08 10:23:22 +01:00
Thomas Bernard
241ede9ddf
miniupnpd: improve (some) logs
2015-01-20 14:13:18 +01:00
Thomas Bernard
f795af5f54
2014 => 2015
2015-01-20 14:12:10 +01:00
Thomas Bernard
bbb6df523d
miniupnpd/natpmp.c: #if IPV6_PKTINFO => #ifdef IPV6_PKTINFO
2014-12-31 01:38:15 +01:00
Thomas Bernard
c336b23706
miniupnpd/upnpglobalvars.c: documentation about CONFIGID.UPNP.ORG
2014-12-15 12:02:42 +01:00
Thomas Bernard
c4b167537f
miniupnpd/Makefile.linux: fix clean (testporinuse.o)
2014-12-15 11:59:17 +01:00
Thomas Bernard
22bc695f91
remove unused bsdqueue.h
2014-12-15 11:58:57 +01:00
Thomas Bernard
2d89a05982
miniupnpd/miniupnpd.c: minor fixes in usage output
2014-12-10 10:44:32 +01:00
Thomas Bernard
99a1bafc1f
miniupnpd: use time for BOOTID.UPNP.ORG value
2014-12-10 10:41:10 +01:00
Thomas Bernard
00d878eba3
miniupnpd: configurable BOOTID.UPNP.ORG SSDP header
2014-12-10 10:40:41 +01:00
Thomas Bernard
2d52890608
miniupnpd/upnpglobalvars.c: document BOOTID.UPNP.ORG and CONFIGID.UPNP.ORG
2014-12-10 10:03:13 +01:00
Thomas Bernard
e283270274
miniupnpd/pf/pfpinhole.c: reduce log verbosity
...
also remove a "argument not used" warning
2014-12-10 09:46:57 +01:00
Thomas Bernard
e013870cca
miniupnpd/upnpsoap.c: remove an unneeded \n in log
2014-12-09 18:32:31 +01:00
Thomas Bernard
181850ad1f
miniupnpd/upnphttp.c: check ':' in HTTP header names
2014-12-09 18:28:23 +01:00
Thomas Bernard
98cc73a372
miniupnpd/upnphttp: Checking Host: HTTP request header to prevent DNS rebinding attack
2014-12-09 17:49:02 +01:00
Thomas Bernard
31986d8190
miniupnpd/upnphttp.c: fix 526e1dcd40
2014-12-09 17:48:14 +01:00
Thomas Bernard
9e30117cac
miniupnpd/upnphttp.c: fix ec94c5663f
...
thanks to Stephen Röttger
2014-12-09 11:44:28 +01:00
Thomas Bernard
526e1dcd40
miniupnpd/upnphttp.c: skip only spaces and tab (stop on CR and LF)
2014-12-09 11:38:50 +01:00
Thomas Bernard
064c78730c
miniupnpd/upnphttp.c: cosmetical changes
2014-12-09 11:04:38 +01:00
Thomas Bernard
ec94c5663f
miniupnpd: check if BuildHeader_upnphttp() failed to allocate memory
2014-12-09 11:04:15 +01:00
Thomas Bernard
dd39ecaa93
miniupnpd/upnphttp.c: fix buffer overrun in ParseHttpHeaders() if Content-Length doesn't contain any digit
...
Credits goes to Stephen Röttger of the Google Security Team for identifying
the vulnerabilities
2014-12-09 11:02:57 +01:00
Thomas Bernard
e6bc04aa06
miniupnpd/upnpsoap.c: fix potential memory corruption in upnpsoap.c/GetListOfPortMappings()
...
Credits goes to Stephen Röttger of the Google Security Team for identifying
the vulnerabilities
2014-12-09 11:01:37 +01:00
Thomas Bernard
7c91c4e933
miniupnpd/upnpredirect.c: check inet_aton() return
2014-12-09 10:53:52 +01:00