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
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
b7ee469980
miniupnpd/pf: update testobsdrdr.c
2014-03-06 14:24:58 +01:00
60e129d131
miniupnpd/pf: delete_redirect_and_filter_rules() now take internal address into account
2014-03-06 14:24:10 +01:00
acc149ee99
miniupnpd/pf: fix add_filter_rule2() by adding internal address
2014-03-06 14:23:13 +01:00
65b776f1ed
miniupnpd/pf: add clear_filter_rules() for testing
...
also add a --clear / -c argument to testobsdrdr programm
2014-03-06 14:21:39 +01:00
f49a70aab0
miniupnpd/testgetifaddr.c: also test find_ipv6_addr()
2014-03-03 12:37:01 +01:00
e5146cdf24
miniupnpd/Makefile.linux: fixes for testasyncsendto
...
also update dependencies
2014-03-03 12:35:12 +01:00
edd501f59c
miniupnpd/natpmp.c: return correct error code when all external ports in use
...
Instead of returning code 3 ("Network Failure"), we should the
more appropriate code 4 ("Out of resources") when no external
port is available for a mapping.
2014-02-28 14:47:53 -08:00
5512d022ac
miniupnpd/pf/obsdrdr.c: add UNUSED() when necessary
2014-02-28 21:28:12 +01:00
9d23b88cef
miniupnpd/pf: replace delete_filter_rule()
...
now use delete_redirect_and_filter_rules()
2014-02-28 21:26:52 +01:00
37208eecae
miniupnpd/pf/obsdrdr.c: improve documentation
2014-02-28 21:22:52 +01:00
9c7df04b13
miniupnpd/pcpserver.c: fix defines
...
with OpenBSD, <netinet/in.h> must be included before <arpa/inet.h>
2014-02-28 20:26:02 +01:00
56aca98164
miniupnpd/pf: catch up test programs
2014-02-28 20:20:51 +01:00
802ad22f4d
miniupnpd: minor stuff (remove warning, add debug log)
2014-02-28 16:40:20 +01:00
dbdad6a79b
miniupnpd: improve finalize_sendto()
2014-02-28 16:39:59 +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
c6a8879c87
miniupnpd/natpmp.c: avoid hang when all external ports in use
...
The NAT-PMP code attempts to find a different eport if the
requested one is already in use. If all eports are in use, that
would previously cause the code to iterate through the range of
eports forever. To avoid this case, we keep track of the first
eport we attempted to use and abort the loop once we've cycled
through all possible values exactly once (which takes us back
to the initial eport).
2014-02-28 00:00:26 -08:00
1efb4cc03c
* fix incorrect filter port in pf redirect.
2014-02-28 11:28:07 +09:00
c492b6f56f
minissdp.c: try again write after EINTR in SubmitServicesToMiniSSDPD()
2014-02-26 02:02:34 +01:00
34d0954718
Merge branch 'sendto_schedule'
2014-02-25 11:47:30 +01:00
ec1686f29f
miniupnpd/minissdp: Introduce SSDP_RESPOND_SAME_VERSION
...
changes something when compiled as IGDv2.
2014-02-25 11:45:51 +01:00
9832adc456
miniupnpd/minissdp.c: send ssdp:alive packets more than once
...
fixes #35
2014-02-25 11:37:36 +01:00
a06c695fe3
miniupnpd/asyncsendto: finalize_sendto()
2014-02-25 11:36:58 +01:00
02165b70dc
minissdp.c: wait for a delay before answering M-SEARCH
2014-02-25 11:16:34 +01:00
c1e624ecd4
miniupnpd: use asyncsendto
2014-02-25 11:15:30 +01:00
cbc1a3c96a
miniupnpd: add sendto() queuing
2014-02-25 11:10:05 +01:00
1985cbf3ef
asyncsendto: remove failed sendto() from queue
2014-02-25 11:08:27 +01:00
d20d959920
miniupnpd/asyncsendto.h: improve comments/doc
2014-02-25 11:07:47 +01:00
e00c1bc6e9
miniupnpd.c: init random number generator in init()
2014-02-25 10:24:22 +01:00
8691c9c0e0
miniupnpd.c: improve comment for init()
2014-02-25 10:23:59 +01:00
06d9d36e99
miniupnpd/asyncsendto: make sendto_schedule work
2014-02-20 16:08:20 +01:00
b2143eff94
implementation of queuing of messages to send.
2014-02-18 09:34:42 +01:00
86d3e7c053
Corrent the binary permission from 555 to 755
2014-02-14 16:56:10 +08:00
16ea0db411
miniupnpd: Fix PCP Map renewal
2014-02-11 10:41:26 +01:00
50f8f6c76f
miniupnpd/pcpserver.c: add info message for Mapping renewal
2014-02-11 10:40:46 +01:00
32b6e8c0fa
miniupnpd/commonrdr.h: improve comments
2014-02-11 10:38:50 +01:00
bc67a7133b
miniupnpd/upnputils.c: improve log in get_lan_for_peer()
2014-02-06 10:57:51 +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
46905418ca
miniupnpd: various PCP fixes
2014-02-03 10:49:59 +01:00
f6b5408e87
miniupnpd: define min/max_lifetime only when needed
2014-02-03 10:47:47 +01:00
3712118bc4
miniupnpd: removed unused code
...
ScanNATPMPforExpiration() CleanExpiredNATPMP() are not used anymore
2014-02-03 10:45:59 +01:00
18db1145ea
miniupnpd.c: comments in parselanaddr()
2014-02-03 10:44:24 +01:00
49780a99ea
miniupnpd/minissdp.c: check return value of AddMulticastMembershipIPv6()
2014-02-03 10:42:38 +01:00
064fcd2739
miniupnpd/pcpserver.c: Removed IPV6_ADDR_COPY and other simplifications
...
modifications that were forgotten in commit e23c589972
2014-01-27 12:07:54 +01:00
0734265092
Makefile.linux: update dependencies
2014-01-27 11:09:30 +01:00
401c624bcf
miniupnpd/INSTALL: update infos
...
rdr-anchor lines should be removed in OpenBSD since 4.7
rephrased a bit the part about permissions
2014-01-14 09:26:24 +01:00
a93393df44
update README's to include PCP
2014-01-14 09:25:19 +01:00
3b0055f1a5
Merge remote branch 'origin/config_manufacturer'
2013-12-24 15:38:19 +01:00
4fe0fb1809
miniupnpd/pcpserver.c: minor syntax fixes
2013-12-16 17:04:45 +01:00
e23c589972
miniupnpd/pcpserver.c: Removed IPV6_ADDR_COPY and other simplifications
2013-12-16 17:04:00 +01:00
fa87b3aff7
miniupnpd: attempt to compile for OS X/pf
2013-12-16 13:03:54 +01:00
d05abb5921
Added option to enable vendor configuration
2013-12-13 19:40:52 +01:00
e2a1c4d4c9
pcpserver.c: small code simplification
2013-12-13 17:15:51 +01:00
f774a54bac
remove C++ style comments
2013-12-13 17:01:41 +01:00
1e08e9ed4d
getifaddr: more portable code (works with old OpenBSD)
2013-12-13 16:59:51 +01:00
6a8a580e6f
Makefile: add pcpserver.o
2013-12-13 16:57:42 +01:00
278f6b5e45
update Changelog.txt :)
2013-12-13 16:57:07 +01:00
f7cb8a6848
update .gitignore
2013-12-13 14:43:15 +01:00
00adeeaaad
typo fix
2013-12-13 14:41:21 +01:00
b9daf5cc27
testupnpdescgen.c: minor fix on getifaddr()
2013-12-13 12:35:36 +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
d200fb748f
Made all manufacturer related information configurable:
...
- manufacturer_name, default is "`uname -s`"
- manufacturer_url, default is URL of OS verndor
- model_name, default is "`uname -s` router"
- model_description, default is "`uname -s` router"
- model_url, default is URL of OS verndor
2013-10-20 23:02:19 +02:00
55099d5fc6
upnpsoap.c: adding TODO... to be done later for compliance
2013-08-19 18:25:54 +02:00
940b36b94b
Merge pull request #42 from libpcp/master
...
PCP fixes
2013-07-30 04:34:27 -07:00
98fcc3c757
fix 58827720da
2013-07-30 08:59:13 +02:00
4bdec457a2
Add IPv4 permission check into PCP MAP operation
2013-07-23 08:59:03 +02:00
3f85c8b859
Fix PCP MAP mapping refresh
2013-07-23 08:59:03 +02:00
9e1ffd5cd9
Add initial PCP support
2013-07-11 09:38:55 +02:00
87a7f05be6
minissdp.c: Also send byebye with all UUIDs
2013-06-15 14:51:28 +02:00
04dec5cf7b
send UUID based SSDP notify for each device
2013-06-14 19:10:59 +02:00
50ec2fce4a
Have distinct UUID for the 3 devices (IGD, WAN Device, WAN Connection Device)
2013-06-13 16:03:36 +02:00
01bffe494d
miniupnpd/minissdp.c: rename SendSSDPAnnounce2() to SendSSDPResponse()
2013-06-11 20:03:15 +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
9b193b0546
comment unused function...
2013-05-14 23:11:43 +02:00
Thomas Bernard
Daniel Becker
Daniel Becker
hashiz
Christopher Meng
Leo Moll
Peter Tatrai