picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

networkd-dhcp: Rename function and reduce its logging

Browse source 
Rename dhcp6_verify_link() to dhcp6_get_prefix_delegation() in order
to be clearer in what it does. Reduce unnecessary logging.
This commit is contained in:
Patrik Flykt 2018-10-02 12:29:06 -06:00
parent bca676e3d3
commit 03d4fc2ed2
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/network/networkd-dhcp6.c
View file

@ -20,16 +20,13 @@
static int dhcp6_lease_address_acquired(sd_dhcp6_client *client, Link *link);
static bool dhcp6_verify_link(Link *link) {
if (!link->network) {
log_link_info(link, "Link is not managed by us");
static bool dhcp6_get_prefix_delegation(Link *link) {
if (!link->network)
return false;
}
if (!IN_SET(link->network->router_prefix_delegation,
RADV_PREFIX_DELEGATION_DHCP6,
RADV_PREFIX_DELEGATION_BOTH)) {
log_link_debug(link, "Link does not request DHCPv6 prefix delegation");
return false;
}
@ -50,7 +47,7 @@ static bool dhcp6_enable_prefix_delegation(Link *dhcp6_link) {
if (l == dhcp6_link)
continue;
if (!dhcp6_verify_link(l))
if (!dhcp6_get_prefix_delegation(l))
continue;
return true;
@ -217,7 +214,7 @@ static int dhcp6_pd_prefix_distribute(Link *dhcp6_link, Iterator *i,
if (link == dhcp6_link)
continue;
if (!dhcp6_verify_link(link))
if (!dhcp6_get_prefix_delegation(link))
continue;
assigned_link = manager_dhcp6_prefix_get(manager, &prefix.in6);