9f687cef9c
use CPPFLAGS for -D/-I flags
...
The standard variable for preprocessor flags (e.g. -I and -D) is
CPPFLAGS. The default Makefile rules already use this variable
when compiling code, so we only need to convert the name.
2014-04-29 16:56:24 -04:00
30e510ac79
convert to LDLIBS
...
The standard variable for adding -l flags is LDLIBS, not LIBS.
The default Makefile rules (which this code already relies on)
will use that when linking.
This also fixes a problem where we do not want to list -l flags
in the dependency of make targets. When you do that, make will
do a file search in /lib and /usr/lib (hardcoded) and expand the
path to those absolute files. This breaks when you try to cross-
compile miniupnpd for other platforms.
2014-04-29 16:53:29 -04:00
77a2ce69b6
respect standard $PKG_CONFIG env var
...
Rather than hardcode `pkg-config`, allow people to set PKG_CONFIG to
point to a version customized for their build.
2014-04-29 16:47:01 -04:00
13037e57b7
miniupnpd/miniupnpd.conf: add a comment
2014-04-22 10:53:58 +02:00
80713ba39a
miniupnpd/Changelog.txt: catch up
2014-04-22 10:53:18 +02:00
7a2bafd071
miniupnpd/miniupnpd.conf: add https_port option and rename port to http_port
2014-04-22 00:44:37 +02:00
d31badae7d
miniupnpd/natpmp.c: replace macros by functions
...
see commit 67c28e7f8b
2014-04-21 21:36:45 +02:00
ca9b8217b4
miniupnpd/pcpserver.c: Fix CheckExternalAddress() for working with 0 IPv4 mapped address
...
fixes #69
2014-04-21 19:32:09 +02:00
8be1cc55c2
miniupnpd/pcpserver.c: Add comments to CheckExternalAddress()
2014-04-21 19:31:32 +02:00
743dfef265
miniupnpd/miniupnpd.c: display HTTP / HTTPS in logs
2014-04-20 18:40:26 +02:00
589b792873
miniupnpd/minissdp.c: comment about WFA.
2014-04-20 18:39:40 +02:00
1dd48971b9
Merge branch 'https'
...
Conflicts:
miniupnpd/Makefile
miniupnpd/pf/obsdrdr.c
2014-04-20 18:12:04 +02:00
1ff20069a1
miniupnpd/options.c: fix potential end of array access
2014-04-20 18:10:44 +02:00
415d14fbe9
miniupnpd/options.c: Add https_port= option
...
also add http_port= as a synonym to port=
2014-04-20 18:06:00 +02:00
7f85648277
miniupnpd/minissdp.c: clean up : port => http_port
2014-04-20 18:05:22 +02:00
a310b3a0dc
miniupnpd/bsd/ifacewatcher.c: RTM_ADD RTM_DELETE RTM_CHANGE
2014-04-18 10:26:58 +02:00
848218fe2d
miniupnpd/Makefile: fix for OpenBSD
2014-04-18 10:26:09 +02:00
dee1fbe394
miniupnpd/bsd/ifacewatcher.c: add case RTM_GET
2014-04-18 10:12:31 +02:00
a75719677a
miniupnpd/Makefile: comment out crappy pf/ipf detection
2014-04-17 12:54:14 +02:00
ed962213e8
miniupnpd/pf/obsdrdr.c: check that USE_PF is defined
...
also fix a warning
2014-04-16 09:59:49 +02:00
204a3db655
miniupnpd/Makefile: link testportinuse with $LIBS
2014-04-16 01:20:34 +02:00
1b8ed0b59d
miniupnpd/upnpsoap.c: DeviceProtection has to check peer certificate
2014-04-15 15:40:03 +02:00
9e3547cdec
miniupnpd/netfilter/iptables_*.sh: less usage of deprecated net-tools. Use iproute2 instead.
2014-04-15 15:57:10 +04:00
67c28e7f8b
miniupnpd/natpmp.c: Remove pointer casting, avoid possibility of unaligned memory access
2014-04-14 22:50:11 +02:00
db6de93f34
Merge pull request #65 from razzfazz/pcp_portinuse
...
miniupnpd/pcpserver.c: add PCP support for CHECK_PORTINUSE
2014-04-14 09:20:49 +02:00
1140e1bddb
miniupnpd/portinuse.c: minor cosmetic changes
2014-04-14 09:17:10 +02:00
eea9188eef
miniupnpd/portinuse.c: whitespace cleanup
2014-04-13 04:28:47 -07:00
90cc5ad3e7
miniupnpd/portinuse.c: add FreeBSD support for CHECK_PORTINUSE
2014-04-13 04:15:58 -07:00
b4e00165a0
miniupnpd/pcpserver.c: add PCP support for CHECK_PORTINUSE
2014-04-12 23:14:11 -07:00
974692e7ac
miniupnpd/Makefile.macosx: fix a typo
2014-04-12 09:37:06 +02:00
11e71207c8
miniupnpd/upnphttp.c: log OpenSSL version used
2014-04-11 09:48:50 +02:00
e8aca7a943
miniupnpd/genconfig.sh: adding HTTPS_CERTFILE / HTTPS_KEYFILE
2014-04-11 09:48:41 +02:00
4f230c809b
miniupnpd/asyncsendto.c: improve error handling in try_sendto()
...
to help investigate issue #64
2014-04-11 09:31:02 +02:00
f789a3bab7
miniupnpd/getifaddr.c: check if interface is up
2014-04-11 00:03:13 +02:00
947be5aafc
upnphttp.c: Configure OpenSSL client cert verification
2014-04-10 23:28:41 +02:00
e26174d05d
miniupnpd: free OpenSSL memory
2014-04-09 16:09:31 +02:00
e91bda48d7
upnpsoap.c: fix GetAssignedRoles()
2014-04-09 15:43:39 +02:00
b4be392156
miniupnpd/portinuse.c: fix display in case of error
2014-04-09 15:38:54 +02:00
e5757cdc45
miniupnpd.c: nothing important :)
2014-04-09 15:37:37 +02:00
974c05c7be
miniupnpd/pf/obsdrdr.c: remove compilation warning
2014-04-09 15:37:16 +02:00
123eca279c
upnpd/minissdp.c: enlarge SSDP packet buffer for sending
2014-04-09 15:36:38 +02:00
6794650f5a
miniupnpd/upnpsoap.c: Adding skeleton of DeviceProtection:1 implementation
2014-04-09 15:35:55 +02:00
bbe96a15b6
miniupnpd: adding HTTPS support
2014-04-09 15:35:06 +02:00
29e951c1e5
miniupnpd/Makefile: improve ipfw detection
2014-04-07 12:39:05 +02:00
c4d99670e7
miniupnpd: Use SA_LEN consistently
2014-04-01 11:44:39 +02:00
3491535854
miniupnpd/Makefile: Link test programs with LIBS
2014-04-01 11:44:08 +02:00
3bd2388d4f
miniupnpd/Makefile: remove -ansi flag
2014-04-01 11:43:31 +02:00
6a194ffcfb
miniupnpd/testportinuse.c: fix compilation with CHECK_PORTINUSE undefined
2014-03-28 13:15:09 +01:00
08127b85d4
Merge branch 'portinuse'
...
Conflicts:
miniupnpd/Makefile.linux
2014-03-28 12:52:18 +01:00
f6f4e56bdf
miniupnpd/portinuse: cleanup
2014-03-28 12:50:42 +01:00
0decb351e9
miniupnpd/pcpserver.c: check source address of PCP request
2014-03-24 15:03:12 +01:00
d233655630
miniupnpd/pcpserver.c: fix for IPv6
2014-03-24 12:15:50 +01:00
ad88cc0819
miniupnpd: start work to enable IPv6 PCP operations
2014-03-24 12:07:31 +01:00
f70484f27f
miniupnpd/minissdp.c: reduce syslog() verbosity
...
LOG_INFO => LOG_DEBUG
2014-03-24 10:33:52 +01:00
ba1875b52c
miniupnpd/pcpserver.c: add comments
2014-03-24 10:24:41 +01:00
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
814a6b253a
miniupnpd/pcpserver.c: use const where useful
2014-03-24 10:23:07 +01:00
b1fb9cfdc4
miniupnpd/pcpserver.c: take care of "nonce" value
2014-03-24 10:21:26 +01:00
4a7f97c7f3
miniupnpd/pcp_msg_struct.h: comments
2014-03-22 13:12:10 +01:00
6eab849b2e
miniupnpd/portinuse.c: Improve error handling in DragonFly BSD code
2014-03-20 14:07:52 +01:00
6419602e14
miniupnpd/portinuse: port_in_use() returns -1 in case of error
2014-03-20 13:49:10 +01:00
aea062a7ba
miniupnpd/portinuse.c: Add DragonFly BSD implementation
...
Thanks to YONETANI Tomokazu.
2014-03-20 13:40:53 +01:00
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
75cb38edda
miniupnpd/Makefile: allow to override FWNAME
2014-03-19 12:23:48 +01:00
601bd2618b
miniupnpd/Makefile: fix for DragonFly BSD
...
TYPE : chechyesno => checkyesno
2014-03-18 10:17:19 +01:00
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
708c83d873
miniupnpd/Makefile: fix for DragonFly BSD
2014-03-18 09:33:33 +01:00
e657211157
miniupnpd/Makefile.macosx: update for testasyncsendto and testportinuse
2014-03-17 15:36:10 +01:00
ba448fd7dd
miniupnpd/testasyncsendto.c: remove warning if struct timeval fields are not long int
2014-03-17 15:35:18 +01:00
a959e9e7de
miniupnpd/upnpevents.c: comments/logs/etc.
2014-03-15 10:54:23 +01:00
76170e5413
miniupnpd/upnphttp.c: Support for multiple URL in Callback: header (SUBSCRIBE)
2014-03-15 10:52:39 +01:00
19261b6fef
reject renewal of subscribtion that already timeouted
2014-03-15 10:51:32 +01:00
3629b10ff5
miniupnpd: add port_in_use() implementation for OpenBSD
2014-03-14 12:08:13 +01:00
dcce22647d
miniupnpd: add testportinuse test program
2014-03-14 12:07:03 +01:00
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
09bbaac63a
miniupnpd/portinuse.c: add #ifdef __linux__
...
TODO : BSD Code
2014-03-13 14:58:36 +01:00
15a2320c86
miniupnpd/portinuse.c/iptcrdr.c: cosmetic changes
2014-03-13 14:49:05 +01:00
c4e63048c4
miniupnpd: add CHECK_PORTINUSE to enable/disable port_in_use()
2014-03-13 14:48:52 +01:00
06764123fb
Merge remote branch 'origin/master' into portinuse
...
Conflicts:
miniupnpd/Makefile.linux
miniupnpd/natpmp.c
2014-03-13 14:19:44 +01:00
a7d9071c5a
miniupnpd/upnpevents.c: fix upnp_event_notify_connect() when ENABLE_IPV6 is set
2014-03-13 11:56:28 +01:00
8d93ddb076
miniupnpd: change IP change msg from LOG_DEBUG to LOG_INFO
2014-03-13 11:34:34 +01:00
9f665b572f
miniupnpd: fix BSD Makefile
2014-03-13 11:34:34 +01:00
62d6c860ce
catch up Changelog.txt
...
see commit 3ed3478398
2014-03-13 11:34:34 +01:00
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
15682180a5
miniupnpd: Work in IPv6 on system where PF_INET6 are restricted to IPv6 only
2014-03-13 11:34:08 +01:00
2a48074f45
miniupnpd: Enable PCP by default.
2014-03-13 11:24:04 +01:00
3ed3478398
miniupnpd/getifaddr.c: clean up and fix getifaddr_in6()
2014-03-13 10:42:07 +01:00
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
d397d73628
miniupnpd/getifaddr.c: fix getifaddr_in6()
...
-1 is returned if no address is found
2014-03-13 09:56:34 +01:00
081c46338c
miniupnpd/upnppermissions.c: disable match_permission_internal()
2014-03-13 09:53:44 +01:00
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
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
210876f2a7
miniupnpd/natpmp.c: make indentation consistant and add a comment
2014-03-11 09:47:09 +01:00
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
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
ecf414e160
miniupnpd/Changelog.txt: Catch up changes...
2014-03-10 00:12:20 +01:00
a27979afde
Merge branch 'fix_pf_redirect'
...
Conflicts:
miniupnpd/pf/testobsdrdr.c
2014-03-10 00:03:06 +01:00
0ff8e67c26
Merge pull request #57 from razzfazz/natpmp_avoid_port_zero
...
miniupnpd/natpmp.c: skip port zero when finding free eport
2014-03-08 01:03:43 +01:00
1db670d6ff
miniupnpd/natpmp.c: skip port zero when finding free eport
...
When skipping ports that are in use or not allowed, the existing
NAT-PMP code will consider port zero as a candidate eport after
wraparound occurs. Since this is not a legal port, we skip over it.
port zero as an eport value.
2014-03-07 11:02:04 -08:00
ba04327bb0
miniupnpd/natpmp.c: remove redundant break statements
...
These two break statements are redundant: The subsequent continue
statement will cause the loop condition to be re-evaluated, at which
point the loop will terminate if resp[3] != 0.
2014-03-07 07:42:40 -08:00
Mike Frysinger
Thomas Bernard
Dmitry Mostovenko
Daniel Becker
Daniel Becker