project/odhcpd.git
19 months agoRevert "odhcpd: Reduce error messages" staging/stintel/devel
Stijn Tintel [Tue, 14 Mar 2023 23:37:44 +0000 (01:37 +0200)]
Revert "odhcpd: Reduce error messages"

Silencing an error message without properly understanding why it occurs
is terrible practice. "I think this would be better served as debug."
doesn't inspire confidence the author actually understood what was going
on, so revert this commit.

This reverts commit 90d6cc9cd48a333b95604ff90f7ffe67fe14efe3.

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
19 months agoodhcpd: Reduce error messages
Peter Naulls [Tue, 24 Jan 2023 19:35:02 +0000 (14:35 -0500)]
odhcpd: Reduce error messages

When there's no network cable connected to LAN, then odhcpd does this:

Tue Jan 24 18:32:04 2023 daemon.err odhcpd[2017]: Failed to send to
ff02::1%lan@br-lan (Address not available)
Tue Jan 24 18:32:20 2023 daemon.err odhcpd[2017]: Failed to send to
ff02::1%lan@br-lan (Address not available)
Tue Jan 24 18:32:36 2023 daemon.err odhcpd[2017]: Failed to send to
ff02::1%lan@br-lan (Address not available)
Tue Jan 24 18:32:52 2023 daemon.err odhcpd[2017]: Failed to send to
ff02::1%lan@br-lan (Address not available)

Accurate, but not very interesting. I think this would be better served
as debug.

Signed-off-by: Peter Naulls <peter@chocky.org>
20 months agorouter: always check ra_default
stijn@linux-ipv6.be [Thu, 16 Feb 2023 20:30:41 +0000 (22:30 +0200)]
router: always check ra_default

We currently only check ra_default when an interface has valid
addresses. This results in ra_default being ignored in case we have an
interface with only link-local addresses. This effectively breaks the
use of value 2 for the ra_default parameter.

Fix this by always checking ra_lifetime, regardless of the interface
having public addresses or not.

Fixes: #11930
Fixes: 83e14f455817 ("router: advertise removed addresses as invalid in 3 consecutive RAs")
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Acked-by:Hans Dedecker <dedeckeh@gmail.com>

20 months agorouter: improve RA logging
stijn@linux-ipv6.be [Thu, 16 Feb 2023 20:30:40 +0000 (22:30 +0200)]
router: improve RA logging

We only set the RA lifetime to what is configured in UCI when there is a
default route and valid prefix. In any other case, we set it to 0. This
leads to confusion where people believe ra_lifetime is completely
ignored. In case there is a default route, but no valid prefix, a debug
message explains this, but if there is no default route, we silently
override ra_lifetime.

Add a debug message for the latter case, and explicitly mention
overriding ra_lifetime in both cases.

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Acked-by: Hans Dedecker <dedeckeh@gmail.com>
20 months agodhcpv4: detect noarp interfaces
Mikael Magnusson [Tue, 7 Feb 2023 16:53:00 +0000 (16:53 +0000)]
dhcpv4: detect noarp interfaces

Don't add ARP entries to interfaces with IFF_NOARP, it causes
problems with for example WireGuard interfaces (which requires
this change to be usable with DHCPv4-over-DHCPv6).

Signed-off-by: Mikael Magnusson <mikma@users.sourceforge.net>
2 years agodhcpv6-ia: make tmp lease file hidden
Kevin Darbyshire-Bryant [Fri, 21 Oct 2022 13:28:59 +0000 (14:28 +0100)]
dhcpv6-ia: make tmp lease file hidden

Use a hidden . prefixed temporary lease file instead of appending
'.tmp'.  Dnsmasq is capable of scanning files/directories using inotify
to receive file change notifications and updating its view of hostname
ip address mapping without being SIGHUPped.  Until dnsmasq v2.88 this
mechanism allows additions to hostnames, no deletions.  dnsmasq v2.88
when released will understand how to remove mappings.

Unfortunately without this change dnsmasq sees odhcpd's temporary lease
file via inotify and it also sees the change when odhcpd atomically
renames the file from '.tmp' to the correct name.

dnsmasq excludes hidden '.' files from it's inotify scans, thus changing
odhcpd to use a hidden temporary lease file reduces load and makes
sense.

Also, while here, only rename the temporary file if it actually contains
different content.

Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
2 years agofix null pointer dereference for INFORM messages
Rob Ekl [Fri, 14 Oct 2022 16:50:43 +0000 (11:50 -0500)]
fix null pointer dereference for INFORM messages

2 years agoodhcpd: Support for Option NTP and SNTP
Avinash Tekumalla [Wed, 8 Dec 2021 13:14:36 +0000 (18:44 +0530)]
odhcpd: Support for Option NTP and SNTP

Support for DHCPv6 Option NTP (Option-56) and SNTP (Option-31),
DHCP Option NTP(Option-42) is implemented.
ntp list is supported for IPv4, IPv6 and FQDN.

Signed-off-by: Avinash Tekumalla <avinash.tekumalla@technicolor.com>
Signed-off-by: Alin Nastac <alin.nastac@technicolor.com>
Signed-off-by: Ashutosh Shandilya <ashutosh.shandilya@technicolor.com>
Signed-off-by: Vidya Rajagopal <vidya.rajagopal@technicolor.com>
2 years agorouter: advertise removed addresses as invalid in 3 consecutive RAs
Alin Nastac [Wed, 15 Dec 2021 12:47:04 +0000 (13:47 +0100)]
router: advertise removed addresses as invalid in 3 consecutive RAs

On prefix removal, router advertisement daemon is supposed to send
advertise with an invalid PI entry (see RFC 7084 L-13).

Signed-off-by: Alin Nastac <alin.nastac@gmail.com>
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
3 years agodhcpv4: fix uninitialized hostname in some ubus events
Mikael Magnusson [Wed, 11 Aug 2021 15:04:54 +0000 (17:04 +0200)]
dhcpv4: fix uninitialized hostname in some ubus events

The hostname buffer is uninitialized if the client doesn't provide
DHCPV4_OPT_HOSTNAME. Use hostname from the assignment which is present if
a static lease contains the hostname or if the client provides one, and
the hostname is valid. It's also used in the ubus ipv4leases method.

Signed-off-by: Mikael Magnusson <mikma@users.sourceforge.net>
3 years agodhcpv6-ia: allow up to 64 bit wide hostid
Mikael Magnusson [Wed, 14 Jul 2021 20:46:55 +0000 (22:46 +0200)]
dhcpv6-ia: allow up to 64 bit wide hostid

Add dhcpv6_hostid_len config option which controls the number
of bits in the host identifier of dynamically assigned IPv6
addresses. The default is 12 bits which is also the minimum.
The maximum is the whole interface identifier, i.e. 64 bits.

Allow up to 64 bit wide hostid in static leases.

Fixes #84 and #27.

Signed-off-by: Mikael Magnusson <mikma@users.sourceforge.net>
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
3 years agodhcpv6-ia: fix invalid preferred lifetime
Hans Dedecker [Sun, 18 Jul 2021 16:43:26 +0000 (18:43 +0200)]
dhcpv6-ia: fix invalid preferred lifetime

Preferred lifetime cannot be greater than the valid lifetime of an IA;
fix this by checking if the preferred lifetime does not exceed the
valid lifetime of an IA

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
3 years agoconfig: fix ra_flags none setting
Hans Dedecker [Sun, 13 Jun 2021 20:09:54 +0000 (22:09 +0200)]
config: fix ra_flags none setting

Fixes commit a12fcb3cee2d489b8648a2398812d7bed2f25faa which wrongly
removed setting ra_flags to 0

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
3 years agoconfig: log config parse failures to syslog
Hans Dedecker [Sat, 15 May 2021 18:52:41 +0000 (20:52 +0200)]
config: log config parse failures to syslog

An invalid config setting for an interface lead to a flush of all config
settings of the related interface and thus made the interface unusable.
Change the behavior by logging config parse failures to syslog and
not flushing all config settings

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
3 years agocmake: enforce additonal compiler checks
Hans Dedecker [Sat, 3 Apr 2021 18:54:57 +0000 (20:54 +0200)]
cmake: enforce additonal compiler checks

Let's catch compile errors by enabling extra compiler checks

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
3 years agoodhcpd: fix extra compiler warning
Hans Dedecker [Sat, 3 Apr 2021 19:11:16 +0000 (21:11 +0200)]
odhcpd: fix extra compiler warning

src/odhcpd.c:143:2: error: format not a string literal, argument types not checked [-Werror=format-nonliteral]
  snprintf(buf, sizeof(buf), sysctl_pattern, ifname, what);
  ^~~~~~~~
cc1: all warnings being treated as errors

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
3 years agodhcpv6-ia: apply prefix_filter on dhcpv6
Nick Hainke [Wed, 6 Jan 2021 12:04:02 +0000 (13:04 +0100)]
dhcpv6-ia: apply prefix_filter on dhcpv6

The prefix_filter allows to select which prefix should be assigned
to clients if you have multiple prefixes on an interface.
Currently, the filter only applies to RAs and does work with
a dhcpv6 server.

This commit enables the filter also on dhcpv6.

Signed-off-by: Nick Hainke <vincent@systemli.org>
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
3 years agoodhcpd: add option for setting preferred lifetime
Nick Hainke [Sat, 2 Jan 2021 22:27:03 +0000 (23:27 +0100)]
odhcpd: add option for setting preferred lifetime

"valid_lft" and "preferred_lft" are different. If the "preferred_lft"
is expired the prefix should be avoided in source prefix selection.
However, the interface is allowed to still receive downstream traffic.

preferred_lfetime:
  Limit for preferred lifetime of a prefix

If you want the old behavior, you have to set preferred_lifetime to
the same value as leasetime.

Signed-off-by: Nick Hainke <vincent@systemli.org>
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
3 years agodhcpv6-ia: remove assignment equal to 0 checks
Hans Dedecker [Thu, 24 Dec 2020 15:28:43 +0000 (16:28 +0100)]
dhcpv6-ia: remove assignment equal to 0 checks

Remove the checks as they're leftovers of the old static lease
implementation which created assigments with assigned equal to 0
whihc is not the case anymore in the reworked static lease
implementation

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
3 years agodhcpv6-ia: fix logic to include IA_PD prefix with lifetimes set to 0
Hans Dedecker [Thu, 24 Dec 2020 15:08:58 +0000 (16:08 +0100)]
dhcpv6-ia: fix logic to include IA_PD prefix with lifetimes set to 0

Make sure IA_PD prefixes for which no preferred and valid lifetimes
can be returned are included in the reply with a preferred and valid
lifetime to 0.
Therefore exclude IPv6 prefixes with an invalid prefix length as
well so IA_PD prefixes for which not a preferred/valid lifetime is
returned are included with a preferred and valid lifetime set to 0

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
3 years agodhcpv6-ia: fix prefix delegation behavior
Hans Dedecker [Thu, 24 Dec 2020 14:41:37 +0000 (15:41 +0100)]
dhcpv6-ia: fix prefix delegation behavior

When an IPv6 address change is triggered each PD assignment is checked
if it is still consistent with the updated IPv6 prefix list.
If not consistent anymore a reconfigure is triggered for the assignment
and a best effort is made to assign a new IA_PD prefix.
If it not possible anymore to assign an IA_PD prefix delete the PD
assignment now so it will result into a NO BINDING status code for the
given IA_PD in the DHCPv6 reply when the client tries to renew the IA_PD prefix.

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
3 years agoconfig: remove local mkdir_p implementation
Daniel Golle [Sun, 13 Dec 2020 00:08:23 +0000 (00:08 +0000)]
config: remove local mkdir_p implementation

Replace local mkdir_p implementation in favour of using mkdir_p now
added to libubox.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
3 years agoubus: add add_lease method
Santiago Piccinini [Wed, 2 Dec 2020 22:07:05 +0000 (19:07 -0300)]
ubus: add add_lease method

Allows sharing leases between odhcpd instances running
in multiple hosts.

Signed-off-by: Santiago Piccinini <spiccinini@altermundi.net>
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
3 years agoconfig: add option to indicate dns service presence
icpz [Fri, 20 Nov 2020 16:55:25 +0000 (00:55 +0800)]
config: add option to indicate dns service presence

Adds the config option to set if ipv6 dns service is availiable on the
interface. In some cases the dns service may not be listening on the
ipv6 address of the interface, and thus should not be announced to clients.

Signed-off-by: Paizhuo Chen <cc@icpz.dev>
3 years agodhcpv6-ia : write statefile atomically
Hans Dedecker [Sat, 8 Aug 2020 23:08:23 +0000 (19:08 -0400)]
dhcpv6-ia : write statefile atomically

Applications (e.g. unbound) need a consistent view of the statefile;
therefore write all the lease info to a temporary file which is later
renamed to the configured statefile name

Suggested-by : John Fremlin <john@fremlin.org>
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
4 years agodhcpv6: fix size_t fields in syslog format
Mikael Magnusson [Sun, 1 Nov 2020 13:52:39 +0000 (14:52 +0100)]
dhcpv6: fix size_t fields in syslog format

Signed-off-by: Mikael Magnusson <mikma@users.sourceforge.net>
4 years agodhcpv6: add explicit dhcpv4o6 server address
Mikael Magnusson [Mon, 26 Oct 2020 21:52:27 +0000 (22:52 +0100)]
dhcpv6: add explicit dhcpv4o6 server address

Include the All_DHCP_Relay_Agents_and_Servers multicast address
in the option explicitly. It shouldn't be needed according
to RFC 7341 section 7.2 but ISC dhclient logs an error otherwise:

dhcp4-o-dhcp6-server: expecting at least 16 bytes; got 0

Signed-off-by: Mikael Magnusson <mikma@users.sourceforge.net>
4 years agodhcpv6: add DHCPv4-over-DHCPv6 support
Mikael Magnusson [Mon, 26 Oct 2020 21:52:17 +0000 (22:52 +0100)]
dhcpv6: add DHCPv4-over-DHCPv6 support

Add support for DHCPv4-over-DHCPv6 (DHCP 4o6) Transport (RFC 7341).

Signed-off-by: Mikael Magnusson <mikma@users.sourceforge.net>
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
4 years agodhcpv6: check message type
Mikael Magnusson [Wed, 4 Mar 2020 00:25:50 +0000 (01:25 +0100)]
dhcpv6: check message type

Signed-off-by: Mikael Magnusson <mikma@users.sourceforge.net>
4 years agorouter: fix advertisement interval option
Hans Dedecker [Mon, 7 Sep 2020 19:35:42 +0000 (21:35 +0200)]
router: fix advertisement interval option

The variable maxival contains the maximum time in seconds between
successive unsolicited Router Advertisement messages; RFC6275 defines
the Advertisement Interval option as the time in milliseconds.
Therefore convert maxival to milliseconds when populating the
Advertisement Interval option.

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
4 years agoodhcpd: fix compilation with GCC10
Rosen Penev [Mon, 22 Jun 2020 04:37:36 +0000 (21:37 -0700)]
odhcpd: fix compilation with GCC10

GCC10 mandates the C++ one definition rule, which breaks on multiple
definitions of config. Add the appropriate extern declaration.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
4 years agorouter: fix Lan host reachibility due to identical RIO and PIO prefixes (FS#3056)
Hans Dedecker [Sun, 3 May 2020 19:17:53 +0000 (21:17 +0200)]
router: fix Lan host reachibility due to identical RIO and PIO prefixes (FS#3056)

odhcpd includes RIO RA options according to requirement L3 in RFC7084.
However if the delegated prefix length received on the wan is equal to the
downstream delegated prefix length on the Lan this may pollute the
routing table of type C hosts as the RIO routing entry can take
precedence of the PIO routing entry meaning all traffic for the on link
hosts will go via the router iso direct on link communication.
If the traffic is dropped in the router hosts are unreachable; therefore
don't include RIO options with prefixes and prefix length identical to
those in a PIO RA option

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
4 years agodhcpv6-ia: fix preferred and valid lifetimes in ubus ipv6leases
Hans Dedecker [Thu, 2 Apr 2020 19:26:57 +0000 (21:26 +0200)]
dhcpv6-ia: fix preferred and valid lifetimes in ubus ipv6leases

Since commit 6db312a698e920ff61505ef1f42469880829774d the preferred and
valid lifetimes of the addresses/prefixes is based on the configured leasetime;
as a result the displayed preferred and valid lifetimes need to be
calculated based on the assignment lifetime as this is set to the lowest
valid lifetime of the addresses/prefixes.

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
4 years agoodhcpd: fix compilation with musl 1.2.0
Rosen Penev [Thu, 26 Mar 2020 23:07:12 +0000 (16:07 -0700)]
odhcpd: fix compilation with musl 1.2.0

SYS_clock_gettime is gone with musl 1.2.0. Switched to the function.

Also fixed two format strings that fail as time_t is 64-bit with 1.2.0.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
4 years agoubus: use dhcpv6 ia assignment flag
Hans Dedecker [Sat, 14 Mar 2020 20:03:11 +0000 (21:03 +0100)]
ubus: use dhcpv6 ia assignment flag

Further align the code to use DHCPv6 assignment flags to distinguish
between prefix delegation and non temporary address assignments

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
4 years agodhcpv6-ia: avoid setting lifetime to infinite for static assignments
Hans Dedecker [Sun, 16 Feb 2020 20:27:42 +0000 (21:27 +0100)]
dhcpv6-ia: avoid setting lifetime to infinite for static assignments

Don't set the valid lifetime to infinite for static assignments
but rather set it to the IA lifetime given to the client.
This makes it possible to display the leasetime for static assigments
and simplifies the code in several places

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
4 years agodhcpv4: avoid setting lifetime to infinite for static assignments
Hans Dedecker [Sun, 16 Feb 2020 20:15:28 +0000 (21:15 +0100)]
dhcpv4: avoid setting lifetime to infinite for static assignments

Don't set the valid lifetime to infinite for static assignments
but rather set it to the leasetime given to the client.
This makes it possible to display the leasetime for static assigments
and simplifies the code in several places

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
4 years agodhcpv6-ia: use dhcp leasetime to set preferred/valid statefull lifetimes
Hans Dedecker [Tue, 14 Jan 2020 20:16:48 +0000 (21:16 +0100)]
dhcpv6-ia: use dhcp leasetime to set preferred/valid statefull lifetimes

Allow to set the preferred/valid lifetimes of IA_NA/IA_PD options based
on the configured dhcp leasetime.
DHCP leqasetime will be used to set the preferred/valid lifetimes in the
IA_NA/IA_PD options unless the preferred/valid lifetimes of the IPv6
address are smaller then the DHCP leasetime.
This will avoid IA_NA/IA_PD options being sent with infinite lifetimes
due to the IPv6 address having infinite preferred/valid lifetimes
like IPv6 ULA addresses.
While at it rename dhcpv4_leasetime into dhcp_leasetime as the leasetime
is used both for DHCPv4 and DHCPv6

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
4 years agodhcpv6-ia: introduce DHCPv6 pd and ia assignments flags
Hans Dedecker [Thu, 2 Jan 2020 17:26:51 +0000 (18:26 +0100)]
dhcpv6-ia: introduce DHCPv6 pd and ia assignments flags

Simplify the code by using specific flags which identify the assignment
either as a DHCPv6 PD or NA assignment. This allows to remove implicit
checks for PD and NA assignments based on the value of the assignment
length parameter.

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
4 years agodhcpv6-ia: cleanup prefix delegation routes
Hans Dedecker [Tue, 31 Dec 2019 15:30:34 +0000 (16:30 +0100)]
dhcpv6-ia: cleanup prefix delegation routes

Remove prefix delegation routes as well in free_dhcpv6_assignment when
cleaning up the assignment resources

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
4 years agodhcpv6-ia: remove passing interface as parameter to apply_lease
Hans Dedecker [Tue, 31 Dec 2019 15:13:08 +0000 (16:13 +0100)]
dhcpv6-ia: remove passing interface as parameter to apply_lease

As the assignment struct holds a pointer to the interface struct
use this one in apply_lease iso passing interface as a parameter

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
4 years agotreewide: optimize syslog priority values
Hans Dedecker [Sun, 15 Dec 2019 19:17:32 +0000 (20:17 +0100)]
treewide: optimize syslog priority values

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
5 years agondp: fix endian issue
Hans Dedecker [Sun, 13 Oct 2019 18:37:14 +0000 (20:37 +0200)]
ndp: fix endian issue

Fix endian issue introduced in commit 91a28e4 by using
ND_NA_FLAG_SOLICITED defined in netinet/icmp6.h

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
5 years agonetlink: fix potential infinite loops
Hans Dedecker [Mon, 23 Sep 2019 20:06:00 +0000 (22:06 +0200)]
netlink: fix potential infinite loops

Fix potential infinite loops by checking the return code of
nl_send_auto_complete; if nl_send_auto_complete fails pending
will always have the value 1 as the finish callback will not
be called resulting into an infinite loop

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
5 years agonetlink: rename netlink callback handlers
Hans Dedecker [Sun, 15 Sep 2019 17:26:37 +0000 (19:26 +0200)]
netlink: rename netlink callback handlers

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
5 years agondp: answer global-addressed NS manually
sfan5 [Sat, 2 Feb 2019 21:48:18 +0000 (22:48 +0100)]
ndp: answer global-addressed NS manually

An upstream router may address solicits to the global address of the target,
these will not be answered by the kernel and not routed either due to link-local
source. The NS will eventually be retried as multicast, but we want to avoid this.

see also https://forum.archive.openwrt.org/viewtopic.php?id=40871

Signed-off-by: Stefan Alfers <sfan5@live.de>
5 years agodhcpv6: retry failed PD assignments on addrlist change
Tian Hao [Thu, 29 Aug 2019 17:08:17 +0000 (01:08 +0800)]
dhcpv6: retry failed PD assignments on addrlist change

Currently only assignments with prefixes larger than the largest
available one will be re-assigned on addrlist change events.
Previously failed PD assignments are not taken into account, and these
assignments will never have a chance to recover even if the address just
added to the interface could satisfy them.

Failed PD assignments could be very common when upstream prefix is obtained
from a PPPoE WAN, as ISPs tend to terminate the PPPoE session after a fixed
time period. Addresses on LAN could disappear and re-appear during WAN redial,
and all existing PD assignments to clients in LAN will become failed when the
addresses disappear. These assignments will not be recovered after WAN has been
brought back up, and clients in LAN could no longer receive any PD prefix.

This commit fixes the issue by including failed PD assignments in the
re-assign list on addrlist change event, so that newly added prefixes can be
put into use right after they are added to the interface.

Signed-off-by: Tian Hao <haotia@gmail.com>
5 years agoconfig: ra_management compatibility support
Hans Dedecker [Mon, 9 Sep 2019 20:12:51 +0000 (22:12 +0200)]
config: ra_management compatibility support

Keep supporting ra_management for backwards compatibility support;
ra_management will only be processed if neither ra_slaac and ra_flags
are set.

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
5 years agoodhcpd: router: Fix out of scope memory access
Hauke Mehrtens [Mon, 2 Sep 2019 20:29:49 +0000 (22:29 +0200)]
odhcpd: router: Fix out of scope memory access

A pointer to search_buf is accessed by search_domain outside of the
if branch which defines search_buf. The compiler could already reuse
this memory.

Coverity: #1445747
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
5 years agodhcpv6-ia: free assignment when validity timer expires
Hans Dedecker [Tue, 27 Aug 2019 20:00:26 +0000 (22:00 +0200)]
dhcpv6-ia: free assignment when validity timer expires

In case clid_len is set free assignment when validity timer expires

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
5 years agorouter: speed up initial router advertisements
Hans Dedecker [Fri, 16 Aug 2019 19:22:11 +0000 (21:22 +0200)]
router: speed up initial router advertisements

Speed up sending initial router advertisement messages as documented in
RFC2461 point 6.2.4

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
5 years agorouter: close socket upon NETEV_IFINDEX_CHANGE fixed
Koen Aerts [Mon, 19 Aug 2019 11:18:04 +0000 (13:18 +0200)]
router: close socket upon NETEV_IFINDEX_CHANGE fixed

Make sure the raw socket is removed from the uloop file descriptor
list before the socket is closed as introduced in
https://github.com/openwrt/odhcpd/commit/000182fe4f94a5a6ec139456a2b74f0cdea13b9c

Related to  https://github.com/openwrt/odhcpd/issues/135

Signed-off-by: Koen Aerts <aertskoen5@gmail.com>
5 years agorouter: fix previous commit
Hans Dedecker [Fri, 16 Aug 2019 19:14:07 +0000 (21:14 +0200)]
router: fix previous commit

After closing the router socket the value needs to be set to -1

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
5 years agorouter: close socket upon NETEV_IFINDEX_CHANGE
Koen Aerts [Tue, 13 Aug 2019 13:02:19 +0000 (15:02 +0200)]
router: close socket upon NETEV_IFINDEX_CHANGE

Make sure the socket is closed in a case where the bridge goes down
as a result of NO-CARRIER on the bridge.
If not present Router Discovery and Router Advertisement will break
permanently after the bridge went down.

Related to  https://github.com/openwrt/odhcpd/issues/135

Signed-off-by: Koen Aerts <aertskoen5@gmail.com>
5 years agorouter: fix lingering uloop socket descriptor
Hans Dedecker [Thu, 8 Aug 2019 19:42:15 +0000 (21:42 +0200)]
router: fix lingering uloop socket descriptor

In case setting one of the socket options fails; make sure the raw
socket is removed from the uloop file descriptor list before the
socket is closed.
In case this is not done and a new raw socket is created with the
same fd value odhcpd will not be triggered by uloop in case RS messages
are received on the socket as reported in https://github.com/openwrt/odhcpd/issues/135

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
5 years agorouter: support ra_lifetime being 0
Jan-Philipp Litza [Thu, 4 Jul 2019 11:31:25 +0000 (13:31 +0200)]
router: support ra_lifetime being 0

The value 0 has the special meaning of not being a default router. This
is useful to only advertise prefixes or DNS settings without being a
real router.

Signed-off-by: Jan-Philipp Litza <janphilipp@litza.de>
5 years agorouter: make RA flags configurable (FS#2019)
Hans Dedecker [Fri, 17 May 2019 19:29:25 +0000 (21:29 +0200)]
router: make RA flags configurable (FS#2019)

Replace the config option ra_management by the config options ra_flags
and ra_slaac. The latter allows to configure the autonomous-address
config flag used for stateless address configuration while the former
allows to configure the RA flags in the form of a list.
The list can hold the following values :
managed-config
other-config
home-agent
none

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
5 years agoconfig: remove 'ignore' config option
Dainis Jonitis [Fri, 12 Apr 2019 10:46:43 +0000 (13:46 +0300)]
config: remove 'ignore' config option

1. Remove 'ignore' config option for interface. Interface is still used if
   any of 'ra', 'ndp', 'dhcpv4' or 'dhcpv6' options are different from
   default 'disabled' mode. In config_parse_interface() update runtime
   ignore value according to all mode values.
2. Reset ignore, ra, ndp, dhcpv4 and dhcpv6 values in set_interface_defaults().
   Otherwise if option is deleted from config file and config is reloaded,
   it will use the value from old config, potentiallly not turning services off.
3. Do not use implicit checks that 0 server mode means MODE_DISABLED.
4. Simplify code of all service setup functions if passed enabled = true
   argument, but service mode is disabled.

Signed-off-by: Dainis Jonitis <dainis.jonitis@ubnt.com>
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
5 years agotreewide: init assignment lists head
Hans Dedecker [Tue, 14 May 2019 14:18:51 +0000 (16:18 +0200)]
treewide: init assignment lists head

When allocating an assignment in alloc_assignment; init the circular head
and lease_list circular lists. Avoids checking NULL pointer when freeing
the assignment in free_assignment.

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
5 years agoconfig: use list safe iterator in lease_delete
Hans Dedecker [Tue, 14 May 2019 13:18:08 +0000 (15:18 +0200)]
config: use list safe iterator in lease_delete

As the current assignment is freed in lease_delete use list_for_each_entry_safe

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
5 years agodhcpv4: fix lease ordering by ip address
Dainis Jonitis [Mon, 29 Apr 2019 11:57:13 +0000 (14:57 +0300)]
dhcpv4: fix lease ordering by ip address

1. Maintaining of sorted list was wrong for static lease case.
   Add dhcpv4_insert_assignment() helper function and use it from all places.
2. Add ip4toa() helper function to print ipv4 address that is stored as
   network byte-order uint32_t.

Signed-off-by: Dainis Jonitis <dainis.jonitis@ubnt.com>
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
5 years agoconfig: use multi-stage parsing of uci sections
Dainis Jonitis [Mon, 29 Apr 2019 11:47:13 +0000 (14:47 +0300)]
config: use multi-stage parsing of uci sections

When loading uci sections from config file, in one pass do not
mix sections from different types. First load odhcpd global
settings, then all interface sections and finally static leases.
It ensures that section order in file can't affect what information
is already parsed. For example static lease section may need
information about all interfaces, to decide whether ip address
belongs to any of currently defined interfaces/address pools.

Signed-off-by: Dainis Jonitis <dainis.jonitis@ubnt.com>
5 years agotreewide: always init interface list heads during initialization
Dainis Jonitis [Mon, 29 Apr 2019 11:40:14 +0000 (14:40 +0300)]
treewide: always init interface list heads during initialization

When allocating interface, init dhcpv4_assignments, dhcpv4_fr_ips
and ia_assignments circular list heads to point to self. Avoids
checking whether next pointer is not null all over the place.

Signed-off-by: Dainis Jonitis <dainis.jonitis@ubnt.com>
5 years agodhcpv4: do not allow pool end address to overlap with broadcast address
Dainis Jonitis [Mon, 26 Nov 2018 12:53:51 +0000 (14:53 +0200)]
dhcpv4: do not allow pool end address to overlap with broadcast address

Signed-off-by: Dainis Jonitis <dainis.jonitis@ubnt.com>
5 years agotreewide: give file descriptors safe initial value
Dainis Jonitis [Mon, 26 Nov 2018 12:45:53 +0000 (14:45 +0200)]
treewide: give file descriptors safe initial value

Since main problem of assuming that fd==0 is invalid value
was fixed in upstream odhcpd by e7b1d4bf3a2297192638b9c84208b3dcb306ecd8
then what is left are minor problems of static initialization
of some global fd variables.

Signed-off-by: Dainis Jonitis <dainis.jonitis@ubnt.com>
5 years agodhcpv4: DHCP pool size is off-by-one
Dainis Jonitis [Mon, 26 Nov 2018 12:43:45 +0000 (14:43 +0200)]
dhcpv4: DHCP pool size is off-by-one

1. "limit" option should specify the size of dynamic pool. The dhcpv4_end
   includes the last valid pool address.
2. Also handle 7 bit host addresses when not directly specified in config file.
3. Make sure code does what documentation says and default 'start'/'limit'
   pool options to 100 and 150 respectively.

Signed-off-by: Dainis Jonitis <dainis.jonitis@ubnt.com>
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
5 years agodhcpv4: add support for Parameter Request List option 55
Dainis Jonitis [Mon, 26 Nov 2018 12:36:28 +0000 (14:36 +0200)]
dhcpv4: add support for Parameter Request List option 55

Add client "reqopts" in ubus "ipv4leases" output.

Signed-off-by: Roman Yeryomin <roman.yeryomin@ubnt.com>
Signed-off-by: Dainis Jonitis <dainis.jonitis@ubnt.com>
5 years agodhcpv4: fix DHCP packet size
Hans Dedecker [Fri, 26 Apr 2019 12:15:55 +0000 (14:15 +0200)]
dhcpv4: fix DHCP packet size

Calculate the DHCP packet size based on the number of DHCP options in the
message. Make sure the DHCP packet size does not go lower than 300 bytes
as some clients ignore DHCP messages smaller than 300 bytes.

Based on a patch by Dainis Jonitis <dainis.jonitis@ubnt.com>

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
5 years agondp: fix syslog flooding (FS#2242)
Hans Dedecker [Tue, 23 Apr 2019 13:07:52 +0000 (15:07 +0200)]
ndp: fix syslog flooding (FS#2242)

Only log a syslog error in case adding of a proxy neighbor fails as a delete
failure cannot be considered as a syslog error for all cases.

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
5 years agoconfig: set default loglevel to LOG_WARNING
Hans Dedecker [Tue, 23 Apr 2019 11:45:28 +0000 (13:45 +0200)]
config: set default loglevel to LOG_WARNING

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
5 years agorouter: fix dns search list option
Hans Dedecker [Fri, 19 Apr 2019 11:16:58 +0000 (13:16 +0200)]
router: fix dns search list option

Fix regression issue introduced in commit 0523bdd as empty DNS search
list option was sent making the RA message invalid

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
5 years agorouter: use ra_lifetime as lifetime for RA options (FS#2206)
Hans Dedecker [Wed, 17 Apr 2019 09:22:43 +0000 (11:22 +0200)]
router: use ra_lifetime as lifetime for RA options (FS#2206)

Use the RA lifetime as lifetime for the recursive DNS and DNS search options
For the route options use as lifetime the smallest value of either the valid
lifetime of the address associated with the route or the RA lifetime.
This avoids routes having infinite lifetime being installed in downstream
clients which can results into routes pointing to a removed router.

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
5 years agorouter: improve code readibility
Hans Dedecker [Thu, 11 Apr 2019 20:48:28 +0000 (22:48 +0200)]
router: improve code readibility

No functional changes; just improve code readibilty in send_router_advert()

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
5 years agoRevert "router:"
Hans Dedecker [Tue, 16 Apr 2019 20:46:26 +0000 (22:46 +0200)]
Revert "router:"

This reverts commit f1d7da9801adc0a77c1a35363e4242544c4915e7.

5 years agotreewide: align syslog loglevels
Hans Dedecker [Tue, 16 Apr 2019 13:27:42 +0000 (15:27 +0200)]
treewide: align syslog loglevels

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
5 years agorouter:
Hans Dedecker [Fri, 12 Apr 2019 13:47:29 +0000 (15:47 +0200)]
router:

5 years agotreewide: fix compiler warnings
Hans Dedecker [Thu, 11 Apr 2019 20:00:15 +0000 (22:00 +0200)]
treewide: fix compiler warnings

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
5 years agoCMakeList.txt: enable extra compiler checks
Hans Dedecker [Thu, 11 Apr 2019 19:50:12 +0000 (21:50 +0200)]
CMakeList.txt: enable extra compiler checks

Enforce additional compiler checks in order to catch
possible errors during compilation

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
5 years agondp: create ICMPv6 socket per interface
Hans Dedecker [Thu, 4 Apr 2019 14:57:47 +0000 (16:57 +0200)]
ndp: create ICMPv6 socket per interface

Get rid of the global raw ICMPv6 socket by creating a raw ICMPv6 ping socket
per interface. This fixes an open raw ICMPv6 socket in case all ndp interfaces
are configured as disabled.

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
5 years agorouter: create ICMPv6 socket per interface
Hans Dedecker [Wed, 3 Apr 2019 14:29:19 +0000 (16:29 +0200)]
router: create ICMPv6 socket per interface

Get rid of the global raw ICMPv6 socket by creating a raw ICMPv6 socket per
interface. This fixes an open raw ICMPv6 socket in case all ra interfaces
are configured as disabled.

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
5 years agotreewide: initialize properly file descriptors
Hans Dedecker [Thu, 4 Apr 2019 10:01:46 +0000 (12:01 +0200)]
treewide: initialize properly file descriptors

Initialzie properly the dhcpv6, dhcpv4 and ndp ffile descriptors
when creating an interface.
As such the check for a valid descriptor can be done correct now
in the different modules

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
5 years agonetlink: rework IPv4 address refresh logic
Hans Dedecker [Fri, 29 Mar 2019 14:10:29 +0000 (15:10 +0100)]
netlink: rework IPv4 address refresh logic

Rework logic to refresh IPv4 addresses so we can get rid of the
second for loop

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
5 years agonetlink: rework IPv6 address refresh logic
Hans Dedecker [Fri, 29 Mar 2019 11:01:19 +0000 (12:01 +0100)]
netlink: rework IPv6 address refresh logic

Rework logic to refresh IPv6 addresses so we can get rid of the
second for loop

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
5 years agonetlink: fix IPv6 address updates (FS#2204)
Hans Dedecker [Wed, 27 Mar 2019 15:55:19 +0000 (16:55 +0100)]
netlink: fix IPv6 address updates (FS#2204)

Keep the valid and preferred lifetimes in sync with the kernel by always
updating the cached IPv6 addresses in refesh_iface_addr6().
This fixes invalid preferred and valid IA lifetimes in DHCPv6 reply
messages due to the cached preferred and valid lifetimes not being in
sync with the preferred and valid kernel lifetimes

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
5 years agodhcpv6: extra syslog tracing
Hans Dedecker [Thu, 21 Mar 2019 14:37:56 +0000 (15:37 +0100)]
dhcpv6: extra syslog tracing

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
5 years agodhcpv6/router: add support for mutiple master interfaces
Hans Dedecker [Thu, 21 Mar 2019 13:43:52 +0000 (14:43 +0100)]
dhcpv6/router: add support for mutiple master interfaces

Support multiple master interfaces for dhcpv6 and ra; it allows
to forward dhcpv6 mesaages and RS on multiple upstream links

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
5 years agondp: fix adding proxy neighbor entries
Hans Dedecker [Thu, 21 Mar 2019 13:17:50 +0000 (14:17 +0100)]
ndp: fix adding proxy neighbor entries

In case multiple logical OpenWrt interfaces are stacked on the same device
and one of the interfaces is configured in relay and the other not; adding
a proxy neighbor entry will result into it immediately being deleted if
the interface in non relay mode comes last.
Fix this by not doing a delete on the interface which is not configured in
relay mode.

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
5 years agorouter: add extra syslog tracing
Hans Dedecker [Thu, 21 Mar 2019 08:19:00 +0000 (09:19 +0100)]
router: add extra syslog tracing

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
5 years agonetlink: fix neighbor event handling (FS#2160)
Hans Dedecker [Wed, 20 Mar 2019 15:33:19 +0000 (16:33 +0100)]
netlink: fix neighbor event handling (FS#2160)

Commit a54cee0 introduced a regression in the handling of netlink neighbor
events as it did not set the interface pointer in the netevent_handler_info
struct resulting into a breakage of ndp relay mode

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
5 years agoubus: always trigger an update if interface is not found
Hans Dedecker [Wed, 27 Feb 2019 10:10:29 +0000 (11:10 +0100)]
ubus: always trigger an update if interface is not found

Commit 9f25dd8af76dc30e54ddcbb4a284058e598951d5 changed the logic of
handle_update by only triggering an update if the interface is
found in the interface list and is not set as to be ignored.
However this breaks the behavior of loading the dhcp config for
interfaces which were previously not yet known by netifd and as
result were not yet created in the interface list.

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
5 years agodhcpv4: fix adding assignment in list (FS#2142)
Hans Dedecker [Mon, 25 Feb 2019 09:48:44 +0000 (10:48 +0100)]
dhcpv4: fix adding assignment in list (FS#2142)

Add assignment to the tail of the list in case the last element
is not bigger

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
5 years agodhcpv4: fix static lease lookup
Hans Dedecker [Mon, 25 Feb 2019 09:46:18 +0000 (10:46 +0100)]
dhcpv4: fix static lease lookup

Function config_find_lease_by_ip_addr expects IP address in network
byte order

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
5 years agodhcp: rework assignment free logic
Hans Dedecker [Mon, 18 Feb 2019 17:22:24 +0000 (18:22 +0100)]
dhcp: rework assignment free logic

Replace the separate dhcpv4/dhcpv6 assignment free functions by
the function free_assignment which calls the dhcp specific
free function via a callback

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
5 years agoconfig: fix build failure in case DHCPv4 support is disabled
Hans Dedecker [Mon, 18 Feb 2019 14:35:04 +0000 (15:35 +0100)]
config: fix build failure in case DHCPv4 support is disabled

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
5 years agodhcpv4: fix assignment of requested IP address
Hans Dedecker [Mon, 18 Feb 2019 13:11:12 +0000 (14:11 +0100)]
dhcpv4: fix assignment of requested IP address

Fix assignment of requested IP address by a client in case the
assignment list is empty.

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
5 years agodhcp: rework static lease logic
Hans Dedecker [Tue, 12 Feb 2019 15:07:24 +0000 (16:07 +0100)]
dhcp: rework static lease logic

Rework the static lease logic as the existing logic had different issues.
Static leases are now added in a vlist tree which makes it easier to handle
static lease config changes.
For both DHCPv4 and DHCPv6 static assignments are now created upon the
receival of DHCPv4/DHCPv6 messages as before the static assignment was
created even if the client was not physically present.
In case a hostname is specified in a static lease it won't be overriden
anymore by the hostname received from the client.

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
5 years agodhcpv6: rapid commit support
Hans Dedecker [Wed, 13 Feb 2019 11:07:49 +0000 (12:07 +0100)]
dhcpv6: rapid commit support

Add support for rapid commit according to RFC8415 18.3.1

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
5 years agodhcpv6: fix parsing of DHCPv6 relay messages
Hans Dedecker [Wed, 13 Feb 2019 10:07:38 +0000 (11:07 +0100)]
dhcpv6: fix parsing of DHCPv6 relay messages

Commit 0db69b0b85c83fedd74ac77e850669a17c4e6617 broke parsing of DHCPv6
relay messages as the DHCPv6 client header pointer was not updated
after parsing the nested relay forward message(s).

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
5 years agodhcpv4: fix compile issue
Hans Dedecker [Tue, 12 Feb 2019 13:14:50 +0000 (14:14 +0100)]
dhcpv4: fix compile issue

Fix compile issue introduced in commit 671ccaabc893b53be8a1891aaf2236b657d6ce06

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
5 years agodhcpv6-ia: move function definitions to odhcpd.h
Hans Dedecker [Mon, 11 Feb 2019 14:46:29 +0000 (15:46 +0100)]
dhcpv6-ia: move function definitions to odhcpd.h

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>