SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

network/dhcp6: shorten dhcp6_handler()

Browse Source 
Note, currently dhcp6_lease_information_acquired() do nothing, so this
does not change any behavior.
This commit is contained in:
Yu Watanabe
2023-10-08 16:18:49 +09:00
parent 34290c6aa9
commit 814d8f962f
1 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/networkd-dhcp6.c
+5 -12
View File
@@ -366,7 +366,7 @@ static int dhcp6_lease_lost(Link *link) {
static void dhcp6_handler(sd_dhcp6_client *client, int event, void *userdata) {
Link *link = ASSERT_PTR(userdata);
int r;
int r = 0;
assert(link->network);
@@ -378,31 +378,24 @@ static void dhcp6_handler(sd_dhcp6_client *client, int event, void *userdata) {
case SD_DHCP6_CLIENT_EVENT_RESEND_EXPIRE:
case SD_DHCP6_CLIENT_EVENT_RETRANS_MAX:
r = dhcp6_lease_lost(link);
if (r < 0)
link_enter_failed(link);
break;
case SD_DHCP6_CLIENT_EVENT_IP_ACQUIRE:
r = dhcp6_lease_ip_acquired(client, link);
if (r < 0) {
link_enter_failed(link);
return;
}
break;
_fallthrough_;
case SD_DHCP6_CLIENT_EVENT_INFORMATION_REQUEST:
r = dhcp6_lease_information_acquired(client, link);
if (r < 0)
link_enter_failed(link);
break;
default:
if (event < 0)
log_link_warning_errno(link, event, "DHCPv6 error: %m");
log_link_warning_errno(link, event, "DHCPv6 error, ignoring: %m");
else
log_link_warning(link, "DHCPv6 unknown event: %d", event);
return;
}
if (r < 0)
link_enter_failed(link);
}
int dhcp6_start_on_ra(Link *link, bool information_request) {