fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-09 05:58:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

dhcp: nettools: change event handler signature

Browse source
This commit is contained in:
Beniamino Galvani 2020-07-15 18:23:35 +02:00
parent 7f217d0345
commit b609088ae6
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/dhcp/nm-dhcp-nettools.c
View file

@ -1067,7 +1067,7 @@ bound4_handle (NMDhcpNettools *self, NDhcp4ClientLease *lease, gboolean extended
options); options);
} }
static gboolean static void
dhcp4_event_handle (NMDhcpNettools *self, dhcp4_event_handle (NMDhcpNettools *self,
NDhcp4ClientEvent *event) NDhcp4ClientEvent *event)
{ {
@ -1083,19 +1083,19 @@ dhcp4_event_handle (NMDhcpNettools *self,
r = n_dhcp4_client_lease_get_server_identifier (event->offer.lease, &server_id); r = n_dhcp4_client_lease_get_server_identifier (event->offer.lease, &server_id);
if (r) { if (r) {
_LOGW ("selecting lease failed: %d", r); _LOGW ("selecting lease failed: %d", r);
return TRUE; return;
} }
if (nm_dhcp_client_server_id_is_rejected (NM_DHCP_CLIENT (self), &server_id)) { if (nm_dhcp_client_server_id_is_rejected (NM_DHCP_CLIENT (self), &server_id)) {
_LOGD ("server-id %s is in the reject-list, ignoring", _LOGD ("server-id %s is in the reject-list, ignoring",
nm_utils_inet_ntop (AF_INET, &server_id, addr_str)); nm_utils_inet_ntop (AF_INET, &server_id, addr_str));
return TRUE; return;
} }
r = n_dhcp4_client_lease_select (event->offer.lease); r = n_dhcp4_client_lease_select (event->offer.lease);
if (r) { if (r) {
_LOGW ("selecting lease failed: %d", r); _LOGW ("selecting lease failed: %d", r);
return TRUE; return;
} }
break; break;
case N_DHCP4_CLIENT_EVENT_RETRACTED: case N_DHCP4_CLIENT_EVENT_RETRACTED:
@ -1131,8 +1131,6 @@ dhcp4_event_handle (NMDhcpNettools *self,
_LOGW ("unhandled DHCP event %d", event->event); _LOGW ("unhandled DHCP event %d", event->event);
break; break;
} }
return TRUE;
} }
static gboolean static gboolean