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
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
ecf414e160
miniupnpd/Changelog.txt: Catch up changes...
2014-03-10 00:12:20 +01:00
e385db03b9
miniupnpd: improved permission checking for NAT-PMP
...
NAT-PMP now searches an allowed eport if the one from
request is not, instead of returning an error
2014-03-07 11:48:17 +01:00
b71e0c028f
Merge branch 'limit_eport_search'
2014-02-28 13:36:28 +01:00
3c90f6a30d
miniupnpd/natpmp.c: avoid hang when all external ports in use
...
reorganize a bit
2014-02-28 13:34:46 +01:00
8fc7f0b5e1
miniupnpd: log message when shutting down
2014-02-28 13:16:22 +01:00
6dff4263bd
miniupnpd/Changelog.txt catch up...
2014-02-28 13:16:06 +01:00
ec1686f29f
miniupnpd/minissdp: Introduce SSDP_RESPOND_SAME_VERSION
...
changes something when compiled as IGDv2.
2014-02-25 11:45:51 +01:00
16ea0db411
miniupnpd: Fix PCP Map renewal
2014-02-11 10:41:26 +01:00
18f02dccb3
miniupnpd: possibility to disable ipv6 at runtime
...
fixes #049
2014-02-06 10:57:39 +01:00
b7a4f8d696
minixml.c: now handle XML comments
2014-02-03 11:28:31 +01:00
538c002373
miniupnpd: PCP Add support for ANNOUNCE requests
2014-02-03 10:50:29 +01:00
fa87b3aff7
miniupnpd: attempt to compile for OS X/pf
2013-12-16 13:03:54 +01:00
278f6b5e45
update Changelog.txt :)
2013-12-13 16:57:07 +01:00
9b72af6f36
Merge branch 'master' into portinuse
2013-12-13 12:29:01 +01:00
d19048ef9e
miniupnpd: Make all manufacturer info configurable
2013-12-13 12:03:28 +01:00
50ec2fce4a
Have distinct UUID for the 3 devices (IGD, WAN Device, WAN Connection Device)
2013-06-13 16:03:36 +02:00
63ece30b87
update upnpreplyparse to allow larger values (128 chars instead of 64)
...
also add testcase
2013-06-06 23:41:23 +02:00
74c3c18380
miniupnpd/minissdp.c: Don't advertise WANPPPConnection in UPNP_STRICT mode
2013-06-05 11:19:23 +02:00
4077b0069d
miniupnpd/upnpsoap: check Service ID in SetDefaultConnectionService method
2013-06-05 11:11:53 +02:00
58827720da
Remove namespace from variable name elements in Events "propertyset" to comply with UDAv1.1
...
See UPNP Device Architecture v1.1, section 4.3.2 :
<variableName>
REQUIRED. Element is name of a state variable that changed (<name> sub element of
<stateVariable> element in service description). MUST NOT be qualified with any namespace. Value
is the new value for this state variable. Case sensitive. Single data type as specified by UPnP service
description.
2013-05-29 23:29:29 +02:00
50cb93be4a
miniupnpd/ipf: Adding support for IP Filter version 5.x
2013-05-20 02:14:04 +02:00
51563f038a
miniupnpd/upnpsoap.c: refuses non integer <NewPortMappingIndex> values
2013-05-16 12:43:11 +02:00
0f401fe2d5
Update upnpreplyparse.c to take into account "empty" elements
2013-05-14 23:05:08 +02:00
71dcf3565d
miniupnpd: Use pkg-config under linux to find libiptc.
...
Thanks to Olivier Langlois
2013-05-03 11:33:36 +02:00
47390f48a0
miniupnpd: Add warning message when using IPv4 address for listening_ip with IPv6 enabled
2013-04-29 12:22:24 +02:00
333c28a502
miniupnpd/getifaddr.c: Uses ifr_addr if ifr_netmask is not defined in struct ifreq
2013-04-27 17:51:53 +02:00
18887cb1e4
miniupnpd: Correctly handle truncated snprintf() in SSDP code
2013-04-26 17:18:28 +02:00
8432646a76
miniupnpd/genconfig.sh : to avoid build race conditions, use a temporary file
2013-04-24 19:04:00 +02:00
e21e724b81
miniupnpd/upnputils.c: use scope in get_lan_for_peer() for IPv6 addresses
...
see #032
2013-04-20 11:06:17 +02:00
961e1c35d3
miniupnpd: autodetect LAN interface netmask instead of defaulting to /24
...
Fix #23
2013-03-23 11:50:57 +01:00
01ec54aec3
Update Changelog.txt files
2013-02-11 11:40:01 +01:00
91f34d6c38
Merge branch 'master' into portinuse
...
Conflicts:
README
2013-02-07 16:48:16 +01:00
bb1e3b75f0
minissdp.c: Refactored SendSSDPNotifies() and SendSSDPGoodbye()
...
add missing ssdp:alive and ssdp:byebye messages with NT uuid value.
2013-02-07 13:27:09 +01:00
ac1d36d872
upnphttp.c: Added Ext: header to HTTP responses to conform to UDA
2013-02-07 11:26:48 +01:00
6ca8ee1dcf
minissdp.c: ignore SSDP packets missing the MX: header in UPNP_STRICT mode
2013-02-07 11:00:15 +01:00
39a1d85f7a
minissdp.c: Fix SSDP packets sent with uuid as ST: header to conform to UDA
2013-02-07 10:59:31 +01:00
5217fdc090
minissdp.c: Add DATE: header in SSDP packets
2013-02-07 10:56:38 +01:00
f2d54a84aa
miniupnpd: prepare for version 1.8
2013-02-06 15:20:48 +01:00
c7419a5de6
miniupnpd: filter HTTP and SSDP based on source IP
...
Check source address of incomining HTTP connections and SSDP
packets in order to filter out WAN SSDP and HTTP trafic.
2013-02-06 15:20:04 +01:00
43d3939602
miniupnpd: Implement get_src_for_route_to() for *BSD
...
Also modify get_src_for_route_to() to return
the network interface index
2013-02-06 15:08:10 +01:00
dce91afe3c
upnpsoap.c: fix 2 memory leaks in GetListOfPortMappings()
2013-02-06 15:03:25 +01:00
50965a6ae1
upnphttp.c: add comments about ParseHttpHeaders()
2013-01-29 22:56:27 +01:00
ea141830f6
upnphttp.c: remove strchr() call in ParseHttpHeaders()
2013-01-29 22:55:57 +01:00
72e570186c
upnphttp.c: Fix and comment the findendheaders() function
2013-01-29 22:54:55 +01:00
60d1db157a
miniupnpd: More return value check for malloc() and realloc()
2012-12-11 22:10:57 +01:00
f365c3a9ea
minor modifications to linux/getroute.c and testgetroute.c
2012-10-23 14:35:50 +02:00
38939ac2d9
miniupnpd/upnpevents.c: Better error checking after connect()
2012-10-05 00:32:04 +02:00
5de71bc396
miniupnpd/upnpsoap: More argument check for SOAP actions in UPNP_STRICT mode
2012-10-05 00:31:08 +02:00
67bd1f9b42
updated DEFAULTCONNECTIONSERVICE_MAGICALVALUE for IGDv2
2012-10-05 00:29:55 +02:00
5e48745eb3
miniupnpd/upnphttp: fix buffer allocation for response
...
increased default buffer size for HTTP response
check size of h->res_buf before building HTTP response
2012-10-05 00:28:06 +02:00
1a458fe869
Ignore "-Wmissing-field-initializers" in upnpdescgen.c
2012-10-05 00:26:44 +02:00
4ce891ec17
miniupnpd/upnphttp: Check compliance of headers for (UN)SUBSCRIBE
...
Enforce compliance for SUBSCRIBE messages (UPNP_STRICT mode)
Enforce compliance for UNSUBSCRIBE messages (UPNP_STRICT mode)
2012-10-05 00:25:08 +02:00
50b70ae90d
miniupnpd/upnpevent.c: fix newSubscriber() for IP6FirewallControl and DeviceProtection services
2012-10-05 00:23:02 +02:00
f65edba8fa
miniupnpd/minissdp.c: properly set service/device version in SSDP messages
2012-10-05 00:21:00 +02:00
c0d4c9d24a
upnpsoap.c: Fix atoi() on null pointers
2012-10-05 00:19:26 +02:00
7227e55dba
ENABLE_HTTP_DATE : add a Date: header to all HTTP responses
2012-10-05 00:17:40 +02:00
239739a6f7
late update of miniupnpd/Changelog.txt
2012-09-28 11:14:10 +02:00
e5d7653002
miniupnpd/minissdp.c: Manage services/devices versions
2012-09-28 11:13:48 +02:00
8b8772eed1
miniupnpd: Support Expect: 100-continue for POST HTTP requests
2012-09-28 11:12:50 +02:00
9d94d08bd8
miniupnpd: Content-Type is now text/xml; charset="utf-8" to conform with UDA v1.1
2012-09-28 11:12:01 +02:00
727eaeb2e8
miniupnpd/upnphttp: Support for Accept-Language/Content-Language HTTP headers
2012-09-28 11:10:20 +02:00
988594dfe6
miniupnpd: SetDefaultConnectionService() checks its argumnents in UPNP_STRICT mode
2012-09-28 11:07:12 +02:00
ee0815ac85
miniupnpd: UPC must be a 12 decimal digit code
2012-09-28 11:05:34 +02:00
840031dea7
miniupnpd: Fixes with DISABLE_CONFIG_FILE and UPNP_STRICT
2012-09-28 11:04:04 +02:00
8d9900e728
miniupnpd: update of Changelog.txt and Makefile for recent ipfw changes
2012-09-28 10:55:55 +02:00
03005fa291
miniupnpd/netfilter: Fixing a bug in clean_pinhole_list()
2012-09-18 10:31:10 +02:00
dd9cbbb7e8
Adding an informational message at startup
2012-09-15 17:36:10 +02:00
d148904d2b
update/fix changelogs
2012-08-29 09:59:06 +02:00
34c5af41ad
miniupnpd: install miniupnpd.8 man page in Makefile.linux
2012-08-24 20:13:15 +02:00
d8d416f409
Moved man page to section 8
2012-08-24 20:11:39 +02:00
9805bb6872
improved SubmitServicesToMiniSSDPD() function fiability
2012-08-21 19:33:26 +02:00
04e56b13e1
miniupnpd: Add -A command line option to add permission rules
...
fixes #15
2012-07-17 21:39:40 +02:00
6451a6906d
miniupnpd: Add -z command line option to change friendly name (thanks to Shawn Fisher)
...
see 896425597e
2012-07-14 17:31:30 +02:00
013b0df388
miniupnpd: detect port in use / already forwarded
...
Patch submitted by David Kerr
2012-07-10 23:25:29 +02:00
6de4711f8b
miniupnpd: Add command line parsing for clean_ruleset_interval option
2012-06-29 21:48:32 +02:00
0df9f7f62a
miniupnpd: added DISABLE_CONFIG_FILE in options.h to disable miniupnpd.conf parsing
2012-06-29 21:39:34 +02:00
dcae1caf72
update miniupnpd/Changelog.txt
2012-06-29 21:37:52 +02:00
779a71bb6c
miniupnpd: IPv6 address used for LOCATION:
...
in UPNP_STRICT mode, the literal IPv6 address in "location:" of SSDP
messages is now the source address used to send the message.
For linux only at the moment
Also added testgetroute
2012-06-24 01:41:47 +02:00
b32c1c7cc6
Disable -ansi in Makefile.linux
2012-06-08 20:17:35 +02:00
28746efd66
Improvements in autodetecting firewall under (Free)BSD
2012-05-31 15:33:16 +02:00
adb9941296
Cleanup HTTP request handling. Answer 405 when relevant
2012-05-31 15:29:18 +02:00
2e468c0b69
VERSION 1.7
2012-05-28 01:21:12 +02:00
4cdc0b762e
set natpmp socket non blocking
2012-05-28 01:18:06 +02:00
0d56822a71
clean linux/ifacewatcher.c
2012-05-28 01:16:58 +02:00
fffeee019f
more solaris fixes
2012-05-24 18:52:27 +02:00
fe37de7e2c
Clean signal handling
2012-05-24 18:17:31 +02:00
ff397acf8f
Clean expired IPv6 pinholes correctly. and also with linux/netfilter
2012-05-08 22:51:23 +02:00
457092c60a
Finalizing netfilter version of get_pinhole_info()
2012-05-08 00:21:03 +02:00
ddbc22865f
Add netfilter implementation for delete_pinhole()/update_pinhole()/get_pinhole_info()
2012-05-02 00:47:42 +02:00
89212758f2
Move IPv6FirewallControl related code from upnpredirect.c to upnppinhole.c
2012-05-01 22:25:30 +02:00
4edb1c03ce
Also fix a couple of integer/pointer comparaisons
2012-05-01 11:53:36 +02:00
e42dfd3284
Remove Warnings caused by signed/unsigned integer comparaisons
2012-05-01 11:52:21 +02:00
ad95793e93
Add UNUSED(arg) macro to remove unused argument warning.
2012-05-01 11:49:23 +02:00
a0f540b1f4
Clean up settings of CFLAGS in Makefile's
2012-05-01 11:34:41 +02:00
19d728d9d8
Fix error handling in upnpevents.c (was causing segfault on Solaris !)
2012-05-01 11:29:40 +02:00
0440f0b8a7
Started to implement add_pinhole() for netfilter (linux)
2012-04-26 16:08:39 +02:00
d9cb61b124
Fix a bug in upnphttp
...
Thanks to Chiaki ISHIKAWA
2012-04-26 00:30:32 +02:00
e0efe74a7c
AddPinhole() and DeletePinhole() works ! (only with pf)
2012-04-20 16:53:34 +02:00
b165afbba7
First working experiment of IPv6 "pinhole" with pf
2012-04-19 01:43:50 +02:00
e982ebc9f5
Add command line arguments to genconfig.sh config script
2012-04-15 00:35:31 +02:00
50cb647305
More C++ => ANSI C comments to compile with -ansi option
2012-04-15 00:34:57 +02:00
76da677016
Set TTL on SSDP Notify sockets (IPv4)
...
TTL is set to 2 (recommendation from UPnP Device Architecture v1.1)
2012-04-12 23:37:59 +02:00
593dc26608
Send SSDP NOTIFY ssdp:alive and ssdp:goodbye in IPv6 too
2012-04-06 19:30:19 +02:00
c28d256b30
Use UPnP/1.1 in SERVER: string as required in UDA 1.1
...
UDA = UPnP Device architecture 1.1
2012-04-06 19:28:05 +02:00
6d32d69608
Allow LAN interface to be given as interface names.
...
(instead of interface IP addresses)
It will allow IPv6 operations.
2012-04-06 17:31:24 +02:00
225b59a6d3
fix linux/getifstats.c when bitrate is unknown
2012-04-06 17:30:22 +02:00
70c5e194a3
Only remove pidfile if one was written in the first place
2012-03-31 09:22:50 +02:00
31d0dfa345
update miniupnpd/Changelog.txt
...
Fix ipfilter support (thanks dhowland https://github.com/dhowland )
Changes to miniupnpd.init.d.script by Shawn Landden
2012-03-19 22:15:06 +01:00
2665ed123b
Merge branch 'master' of https://github.com/shawnl/miniupnp
...
Conflicts:
miniupnpd/upnpredirect.c
2012-03-05 05:59:52 +01:00
57ff044fb7
fixed reload_from_lease_file()
...
iport and timestamp where mixed
leaseduration always negative and NAT-PMP forwards
with non-null timestamp always deleted
2012-03-05 05:44:02 +01:00
5c224accbf
remove trailing whitespace from miniupnpd
2012-02-29 17:48:41 -08:00
b1cc7aad36
upnppermissions.c: allow 192.168.1.1/255.255.255.0 as ip/mask
...
Change read_permission_line() to allow 192.168.1.1/255.255.255.0 in
addition to 192.168.1.1/24 in permission line (in configuration file).
2012-02-15 23:49:56 +01:00
f01dc59aa3
miniupnpd.c: parselanaddr() pow parses 192.168.1.1/255.255.255.0
...
Change parselanaddr() function to allow 192.168.1.1/255.255.255.0 in
addition to 192.168.1.1/24 in configuration file.
2012-02-15 23:48:20 +01:00
0cc68c47b6
More syntax checks in upnppermissions.c
2012-02-12 14:03:42 +01:00
a08258f549
Fix ipfw/Mac OS X specific source files to compile ok with -ansi flag
2012-02-12 13:42:37 +01:00
d7de40d8cd
Make SSDP receive sockets non blocking
...
Also use sockaddr_to_string() in SendSSDPAnnonce2 to handle IPv6 addresses
2012-02-09 21:33:24 +01:00
edfce7672f
Make HTTP listen socket non blocking (so accept() can't block)
2012-02-09 21:29:20 +01:00
af60fee984
Make HTTP (SOAP) sockets non blocking
2012-02-07 01:26:15 +01:00
439ab615e3
fixed typos
2012-02-07 00:13:56 +01:00
65e277883b
options.c: Save a few bytes
...
Use a string repository, instead of a fixed size buffer for each option value.
Also check realloc() error
2012-02-05 01:31:27 +01:00
9ee74defc8
Compile miniupnpd OK with -ansi flag.
2012-02-05 00:40:50 +01:00
a0a1e45ac5
Added friendl_name= option to config file
2012-02-05 00:24:13 +01:00
87a8a06640
automatic -lip4tc and -lip6tc in Makefile.linux
...
Added test of presence of /lib/libip4tc.so and /lib/libip6tc.so files in
Makefile.linux in order to add -lip4tc and -lip6tc to LIBS accordingly.
2012-02-03 16:12:22 +01:00
874283b36f
Anchor name (PF) is now configurable through the config file with anchor=
2012-02-03 13:14:10 +01:00
73ef11624a
always handle EAGAIN, EWOULDBLOCK and EINTR after recv()/recvfrom() calls
2012-02-02 18:45:43 +01:00
b30d2f8edc
Support for OpenBSD 5.0
...
.onrdomain field was added in ps with OpenBSD 5.0.
Add PFRULE_HAS_ONRDOMAIN
2012-01-20 23:00:37 +01:00
c07408ef1f
Always #include <netinet/in.h> before #include <arpa/inet.h> (for OpenBSD)
2012-01-20 22:55:43 +01:00
dd7273c6d5
Tomato specifics in genconfig.sh
2012-01-20 22:53:15 +01:00
8f68347464
added additional checks on structure returned by getifaddrs()
2012-01-02 11:12:52 +01:00
63a83f8a0a
Fixing netfilter/iptables_*.sh scripts for new ifconfig output format
...
see http://miniupnp.tuxfamily.org/forum/viewtopic.php?p=2623
2012-01-02 10:58:02 +01:00
24065dbaba
Replaced SendResp_upnphttp()+CloseSocket_upnphttp() by SendRespAndClose_upnphttp()
2011-11-18 12:23:16 +01:00
0ff86e4975
avoid infinite loop in SendResp_upnphttp() in case of error
2011-11-18 12:15:24 +01:00
0d96346588
Adding miniupnpd
2011-09-28 21:13:20 +02:00
Thomas Bernard
Shawn Landen