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

network: drop dhcp4_init()

Browse Source 
It is now called by only dhcp4_configure(). Let's merge them.
This commit is contained in:
Yu Watanabe
2020-10-28 15:44:10 +09:00
parent 3def88503a
commit 5360b089e1
1 changed files with 9 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/networkd-dhcp4.c
+9 -22
View File
@@ -1309,25 +1309,6 @@ static int dhcp4_set_request_address(Link *link) {
return sd_dhcp_client_set_request_address(link->dhcp_client, &a->in_addr.in);
}
static int dhcp4_init(Link *link) {
int r;
assert(link);
if (link->dhcp_client)
return 0;
r = sd_dhcp_client_new(&link->dhcp_client, link->network->dhcp_anonymize);
if (r < 0)
return r;
r = sd_dhcp_client_attach_event(link->dhcp_client, link->manager->event, 0);
if (r < 0)
return r;
return 0;
}
int dhcp4_configure(Link *link) {
sd_dhcp_option *send_option;
void *request_options;
@@ -1343,9 +1324,15 @@ int dhcp4_configure(Link *link) {
if (r < 0)
return r;
r = dhcp4_init(link);
if (r < 0)
return log_link_error_errno(link, r, "DHCP4 CLIENT: Failed to initialize DHCP4 client: %m");
if (!link->dhcp_client) {
r = sd_dhcp_client_new(&link->dhcp_client, link->network->dhcp_anonymize);
if (r < 0)
return log_link_error_errno(link, r, "DHCP4 CLIENT: Failed to allocate DHCP4 client: %m");
r = sd_dhcp_client_attach_event(link->dhcp_client, link->manager->event, 0);
if (r < 0)
return log_link_error_errno(link, r, "DHCP4 CLIENT: Failed to attach event to DHCP4 client: %m");
}
r = sd_dhcp_client_set_mac(link->dhcp_client,
(const uint8_t *) &link->mac,