colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core/dispatcher: factorize code

Browse Source 
Move common code from nm_dispatcher_call_device() and
nm_dispatcher_call_device_sync() to a new function; it will also be
used in the next commits by a new variant of the function.
This commit is contained in:
Beniamino Galvani
2023-09-26 17:29:46 +02:00
parent e686ab35b3
commit fa6ce51a0b
1 changed files with 42 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
src/core/nm-dispatcher.c
View File

@@ -723,6 +723,40 @@ nm_dispatcher_call_hostname(NMDispatcherFunc callback,
out_call_id); out_call_id);
} }
static gboolean
_dispatcher_call_device(NMDispatcherAction action,
NMDevice *device,
gboolean blocking,
NMActRequest *act_request,
NMDispatcherFunc callback,
gpointer user_data,
NMDispatcherCallId **out_call_id)
{
nm_assert(NM_IS_DEVICE(device));
if (!act_request) {
act_request = nm_device_get_act_request(device);
if (!act_request)
return FALSE;
}
nm_assert(NM_IN_SET(nm_active_connection_get_device(NM_ACTIVE_CONNECTION(act_request)),
NULL,
device));
return _dispatcher_call(
action,
blocking,
device,
nm_act_request_get_settings_connection(act_request),
nm_act_request_get_applied_connection(act_request),
nm_active_connection_get_activation_type(NM_ACTIVE_CONNECTION(act_request))
== NM_ACTIVATION_TYPE_EXTERNAL,
NM_CONNECTIVITY_UNKNOWN,
NULL,
NULL,
callback,
user_data,
out_call_id);
}
/** /**
* nm_dispatcher_call_device: * nm_dispatcher_call_device:
* @action: the %NMDispatcherAction * @action: the %NMDispatcherAction
@@ -747,26 +781,10 @@ nm_dispatcher_call_device(NMDispatcherAction action,
gpointer user_data, gpointer user_data,
NMDispatcherCallId **out_call_id) NMDispatcherCallId **out_call_id)
{ {
nm_assert(NM_IS_DEVICE(device)); return _dispatcher_call_device(action,
if (!act_request) {
act_request = nm_device_get_act_request(device);
if (!act_request)
return FALSE;
}
nm_assert(NM_IN_SET(nm_active_connection_get_device(NM_ACTIVE_CONNECTION(act_request)),
NULL,
device));
return _dispatcher_call(
action,
FALSE,
device, device,
nm_act_request_get_settings_connection(act_request), FALSE,
nm_act_request_get_applied_connection(act_request), act_request,
nm_active_connection_get_activation_type(NM_ACTIVE_CONNECTION(act_request))
== NM_ACTIVATION_TYPE_EXTERNAL,
NM_CONNECTIVITY_UNKNOWN,
NULL,
NULL,
callback, callback,
user_data, user_data,
out_call_id); out_call_id);
@@ -789,29 +807,7 @@ nm_dispatcher_call_device_sync(NMDispatcherAction action,
NMDevice *device, NMDevice *device,
NMActRequest *act_request) NMActRequest *act_request)
{ {
nm_assert(NM_IS_DEVICE(device)); return _dispatcher_call_device(action, device, TRUE, act_request, NULL, NULL, NULL);
if (!act_request) {
act_request = nm_device_get_act_request(device);
if (!act_request)
return FALSE;
}
nm_assert(NM_IN_SET(nm_active_connection_get_device(NM_ACTIVE_CONNECTION(act_request)),
NULL,
device));
return _dispatcher_call(
action,
TRUE,
device,
nm_act_request_get_settings_connection(act_request),
nm_act_request_get_applied_connection(act_request),
nm_active_connection_get_activation_type(NM_ACTIVE_CONNECTION(act_request))
== NM_ACTIVATION_TYPE_EXTERNAL,
NM_CONNECTIVITY_UNKNOWN,
NULL,
NULL,
NULL,
NULL,
NULL);
} }
/** /**