Thomas Bernard
08127b85d4
Merge branch 'portinuse'
...
Conflicts:
miniupnpd/Makefile.linux
2014-03-28 12:52:18 +01:00
Thomas Bernard
f6f4e56bdf
miniupnpd/portinuse: cleanup
2014-03-28 12:50:42 +01:00
Thomas Bernard
0decb351e9
miniupnpd/pcpserver.c: check source address of PCP request
2014-03-24 15:03:12 +01:00
Thomas Bernard
d233655630
miniupnpd/pcpserver.c: fix for IPv6
2014-03-24 12:15:50 +01:00
Thomas Bernard
ad88cc0819
miniupnpd: start work to enable IPv6 PCP operations
2014-03-24 12:07:31 +01:00
Thomas Bernard
f70484f27f
miniupnpd/minissdp.c: reduce syslog() verbosity
...
LOG_INFO => LOG_DEBUG
2014-03-24 10:33:52 +01:00
Thomas Bernard
ba1875b52c
miniupnpd/pcpserver.c: add comments
2014-03-24 10:24:41 +01:00
Thomas Bernard
7137665101
miniupnpd/pcpserver.c: prepare code to be able to manage more than just TCP and UDP
2014-03-24 10:24:19 +01:00
Thomas Bernard
814a6b253a
miniupnpd/pcpserver.c: use const where useful
2014-03-24 10:23:07 +01:00
Thomas Bernard
b1fb9cfdc4
miniupnpd/pcpserver.c: take care of "nonce" value
2014-03-24 10:21:26 +01:00
Thomas Bernard
4a7f97c7f3
miniupnpd/pcp_msg_struct.h: comments
2014-03-22 13:12:10 +01:00
Thomas Bernard
6eab849b2e
miniupnpd/portinuse.c: Improve error handling in DragonFly BSD code
2014-03-20 14:07:52 +01:00
Thomas Bernard
6419602e14
miniupnpd/portinuse: port_in_use() returns -1 in case of error
2014-03-20 13:49:10 +01:00
Thomas Bernard
aea062a7ba
miniupnpd/portinuse.c: Add DragonFly BSD implementation
...
Thanks to YONETANI Tomokazu.
2014-03-20 13:40:53 +01:00
Thomas Bernard
5a3a670e89
miniupnpd/bsd/getifstats.c: fix for DragonFly BSD
...
struct ifnet is private to kernel code and is hidden from the userland
code unless you define a macro _KERNEL_STRUCTURES. Although other people
argue that it should be exposed as it is on other BSDs, that's the way
it is on DragonFly BSD.
Thanks to YONETANI Tomokazu for DragonFly BSD patches
2014-03-19 12:25:52 +01:00
Thomas Bernard
75cb38edda
miniupnpd/Makefile: allow to override FWNAME
2014-03-19 12:23:48 +01:00
Thomas Bernard
601bd2618b
miniupnpd/Makefile: fix for DragonFly BSD
...
TYPE : chechyesno => checkyesno
2014-03-18 10:17:19 +01:00
Thomas Bernard
f7b6b1ec19
miniupnpd/Makefile: Mac OS X switched from ipfw to pf
...
OS X 10.7 Lion switched to pf
2014-03-18 09:34:25 +01:00
Thomas Bernard
708c83d873
miniupnpd/Makefile: fix for DragonFly BSD
2014-03-18 09:33:33 +01:00
Thomas BERNARD
e657211157
miniupnpd/Makefile.macosx: update for testasyncsendto and testportinuse
2014-03-17 15:36:10 +01:00
Thomas BERNARD
ba448fd7dd
miniupnpd/testasyncsendto.c: remove warning if struct timeval fields are not long int
2014-03-17 15:35:18 +01:00
Thomas Bernard
a959e9e7de
miniupnpd/upnpevents.c: comments/logs/etc.
2014-03-15 10:54:23 +01:00
Thomas Bernard
76170e5413
miniupnpd/upnphttp.c: Support for multiple URL in Callback: header (SUBSCRIBE)
2014-03-15 10:52:39 +01:00
Thomas Bernard
19261b6fef
reject renewal of subscribtion that already timeouted
2014-03-15 10:51:32 +01:00
Thomas Bernard
3629b10ff5
miniupnpd: add port_in_use() implementation for OpenBSD
2014-03-14 12:08:13 +01:00
Thomas Bernard
dcce22647d
miniupnpd: add testportinuse test program
2014-03-14 12:07:03 +01:00
Thomas Bernard
7cb493919f
miniupnpd/getifaddr.c: don't use getifaddrs() in IPv4 only
...
should fix #62 :
Don't use getifaddrs() in IPv4 only
so we avoid problems if getifaddrs() implementation is buggy
2014-03-14 10:04:49 +01:00
Thomas Bernard
acbe15c5ea
miniupnpc: fix exported symbols in OS X dynlibs
...
fixes #63
2014-03-14 09:21:11 +01:00
Thomas Bernard
09bbaac63a
miniupnpd/portinuse.c: add #ifdef __linux__
...
TODO : BSD Code
2014-03-13 14:58:36 +01:00
Thomas Bernard
15a2320c86
miniupnpd/portinuse.c/iptcrdr.c: cosmetic changes
2014-03-13 14:49:05 +01:00
Thomas Bernard
c4e63048c4
miniupnpd: add CHECK_PORTINUSE to enable/disable port_in_use()
2014-03-13 14:48:52 +01:00
Thomas Bernard
06764123fb
Merge remote branch 'origin/master' into portinuse
...
Conflicts:
miniupnpd/Makefile.linux
miniupnpd/natpmp.c
2014-03-13 14:19:44 +01:00
Thomas Bernard
a7d9071c5a
miniupnpd/upnpevents.c: fix upnp_event_notify_connect() when ENABLE_IPV6 is set
2014-03-13 11:56:28 +01:00
Thomas Bernard
8d93ddb076
miniupnpd: change IP change msg from LOG_DEBUG to LOG_INFO
2014-03-13 11:34:34 +01:00
Thomas Bernard
9f665b572f
miniupnpd: fix BSD Makefile
2014-03-13 11:34:34 +01:00
Thomas Bernard
62d6c860ce
catch up Changelog.txt
...
see commit 3ed3478398
2014-03-13 11:34:34 +01:00
Thomas Bernard
7b13adafbd
miniupnpd: reduce number of global variables by using more runtime_flags
...
change ipv6_enabled/ipv6fc_inbound_pinhole_allowed/ipv6fc_firewall_enabled
global vars to flags in runtime_flags
2014-03-13 11:34:33 +01:00
Thomas Bernard
15682180a5
miniupnpd: Work in IPv6 on system where PF_INET6 are restricted to IPv6 only
2014-03-13 11:34:08 +01:00
Thomas Bernard
2a48074f45
miniupnpd: Enable PCP by default.
2014-03-13 11:24:04 +01:00
Thomas Bernard
3ed3478398
miniupnpd/getifaddr.c: clean up and fix getifaddr_in6()
2014-03-13 10:42:07 +01:00
Thomas Bernard
81fa1bcd57
miniupnpd/getifaddr.c: getifaddr_in6() only return IPv4 address when IPV6 disabled
...
see if it can help for issue #62
pcp/CheckAddress() is likely to need more changes.
2014-03-13 10:00:42 +01:00
Thomas Bernard
d397d73628
miniupnpd/getifaddr.c: fix getifaddr_in6()
...
-1 is returned if no address is found
2014-03-13 09:56:34 +01:00
Thomas Bernard
081c46338c
miniupnpd/upnppermissions.c: disable match_permission_internal()
2014-03-13 09:53:44 +01:00
Thomas Bernard
b01152666c
Adding Daniel Becker to thanks list
2014-03-12 09:04:47 +01:00
Daniel Becker
408a0b55f6
miniupnpd/pcpserver.c: return error code if PCP mapping fails
...
This change causes CreatePCPMap to return a PCP_ERR_NO_RESOURCES
response when upnp_redirect_internal does not succeed;
previously, no error code was returned in this case.
2014-03-11 02:06:38 -07:00
Thomas BERNARD
2ee9c05843
Merge pull request #59 from razzfazz/port_natpmp_updates_to_pcp
...
miniupnpd/pcpserver.c: port NAT-PMP updates to PCP
2014-03-11 10:00:28 +01:00
Daniel Becker
efbb95aa10
miniupnpd/pcpserver.c: port NAT-PMP updates to PCP
...
This change ports the recent updates to the permissions checking
and eport selection code for NAT-PMP to the PCP MAP handler.
2014-03-11 01:54:10 -07:00
Thomas Bernard
210876f2a7
miniupnpd/natpmp.c: make indentation consistant and add a comment
2014-03-11 09:47:09 +01:00
Daniel Becker
4f160366bd
miniupnpd/natpmp.c: remove obsolete assignment
...
The eport_first variable now gets initialized in the first
iteration of the while loop; the assignment right before the
loop should have been removed in the previous commit.
2014-03-10 11:14:49 -07:00
Daniel Becker
f4f4573f53
miniupnpd: fix eport selection and error handling
...
The find_available_eport function that was intended to check if
at least one eport is allowed for a given iaddr/iport does not
work as intended; for example, it does not properly handle rule
precedence (i.e., it considers allow rules even if they are
effectively masked by earlier deny rules), and it also does not
handle the case where no rules are specified at all (which
should default to accept in order to be consistent with
check_upnp_rule_against_permissions). The present change removes
this function and instead integrates the check into the existing
while loop that iterates over all eports.
2014-03-10 00:32:23 -07:00