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

dispatcher: use GDBusConnection instead of GDBusProxy in "nm-dispatcher.c"

Browse source 
- drops nm_dispatcher_init(), which was called early in the main loop
  and created a proxy synchronously. Instead, the GDBusConnection is
  always ready.

- reuse the GDBusConnection of NMDBusManager. This means, we won't even
  try from in "initrd" configure-and-quit mode.

- as before, there is no "manager" instance. Instead, the data is stored
  in a global variable. That's ok. What is not OK is how the entire
  shutdown is handled (calling dispatcher blockingly, not waiting for
  requests to complete). That is fixable, but a lot of work. It is
  independent of whether we use a manager object or not.
This commit is contained in:
Thomas Haller 2019-05-23 16:13:47 +02:00
parent c3e2959a5a
commit 3dbda5addc
3 changed files with 76 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main.c
View file

@ -436,8 +436,6 @@ main (int argc, char *argv[])
nm_manager_dbus_set_property_handle,
manager);
nm_dispatcher_init ();
g_signal_connect (manager, NM_MANAGER_CONFIGURE_QUIT, G_CALLBACK (manager_configure_quit), config);
if (!nm_manager_start (manager, &error)) {

148
src/nm-dispatcher.c
View file

@ -65,9 +65,6 @@
/*****************************************************************************/
static GDBusProxy *dispatcher_proxy;
static GHashTable *requests = NULL;
struct NMDispatcherCallId {
NMDispatcherFunc callback;
gpointer user_data;
@ -78,6 +75,36 @@ struct NMDispatcherCallId {
/*****************************************************************************/
static struct {
GDBusConnection *dbus_connection;
GHashTable *requests;
guint request_id_counter;
} gl;
/*****************************************************************************/
static void dispatcher_call_id_free (NMDispatcherCallId *info);
/*****************************************************************************/
static void
_init_dispatcher (void)
{
if (G_UNLIKELY (gl.requests == NULL)) {
gl.requests = g_hash_table_new_full (nm_direct_hash,
NULL,
NULL,
(GDestroyNotify) dispatcher_call_id_free);
gl.dbus_connection = nm_g_object_ref (NM_MAIN_DBUS_CONNECTION_GET);
if (!gl.dbus_connection)
_LOGD ("No D-Bus connection to talk with NetworkManager-dispatcher service");
}
}
/*****************************************************************************/
static void
dump_proxy_to_props (NMProxyConfig *proxy, GVariantBuilder *builder)
{
@ -325,17 +352,6 @@ dispatcher_call_id_free (NMDispatcherCallId *call_id)
g_slice_free (NMDispatcherCallId, call_id);
}
static void
_ensure_requests (void)
{
if (G_UNLIKELY (requests == NULL)) {
requests = g_hash_table_new_full (nm_direct_hash,
NULL,
NULL,
(GDestroyNotify) dispatcher_call_id_free);
}
}
static const char *
dispatch_result_to_string (DispatchResult result)
{
@ -384,15 +400,17 @@ dispatcher_results_process (guint32 request_id,
}
static void
dispatcher_done_cb (GObject *proxy, GAsyncResult *result, gpointer user_data)
dispatcher_done_cb (GObject *source, GAsyncResult *result, gpointer user_data)
{
gs_unref_variant GVariant *ret = NULL;
gs_free_error GError *error = NULL;
NMDispatcherCallId *call_id = user_data;
ret = _nm_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), result,
G_VARIANT_TYPE ("(a(sus))"),
&error);
nm_assert ((gpointer) source == gl.dbus_connection);
ret = g_dbus_connection_call_finish (G_DBUS_CONNECTION (source),
result,
&error);
if (!ret) {
if (_nm_dbus_error_has_name (error, "org.freedesktop.systemd1.LoadFailed")) {
g_dbus_error_strip_remote_error (error);
@ -408,7 +426,7 @@ dispatcher_done_cb (GObject *proxy, GAsyncResult *result, gpointer user_data)
if (call_id->callback)
call_id->callback (call_id, call_id->user_data);
g_hash_table_remove (requests, call_id);
g_hash_table_remove (gl.requests, call_id);
}
static const char *action_table[] = {
@ -462,27 +480,26 @@ _dispatcher_call (NMDispatcherAction action,
GVariantBuilder vpn_ip4_props;
GVariantBuilder vpn_ip6_props;
NMDispatcherCallId *call_id = NULL;
static guint request_counter = 0;
guint reqid = ++request_counter;
guint request_id;
const char *connectivity_state_string = "UNKNOWN";
g_return_val_if_fail (!blocking || (!callback && !user_data), FALSE);
NM_SET_OUT (out_call_id, NULL);
if (!dispatcher_proxy)
_init_dispatcher ();
if (!gl.dbus_connection)
return FALSE;
/* Wrapping protection */
if (G_UNLIKELY (!reqid))
reqid = ++request_counter;
g_assert (!blocking || (!callback && !user_data));
_ensure_requests ();
request_id = ++gl.request_id_counter;
if (G_UNLIKELY (!request_id))
request_id = ++gl.request_id_counter;
/* All actions except 'hostname' and 'connectivity-change' require a device */
if ( action == NM_DISPATCHER_ACTION_HOSTNAME
|| action == NM_DISPATCHER_ACTION_CONNECTIVITY_CHANGE) {
_LOG2D (reqid,
_LOG2D (request_id,
"dispatching action '%s'%s",
action_to_string (action),
blocking
@ -491,7 +508,7 @@ _dispatcher_call (NMDispatcherAction action,
} else {
g_return_val_if_fail (NM_IS_DEVICE (device), FALSE);
_LOG2D (reqid,
_LOG2D (request_id,
"(%s) dispatching action '%s'%s",
vpn_iface ?: nm_device_get_iface(device),
action_to_string (action),
@ -581,39 +598,46 @@ _dispatcher_call (NMDispatcherAction action,
gs_unref_variant GVariant *ret = NULL;
gs_free_error GError *error = NULL;
ret = _nm_dbus_proxy_call_sync (dispatcher_proxy,
"Action",
g_steal_pointer (&parameters_floating),
G_VARIANT_TYPE ("(a(sus))"),
G_DBUS_CALL_FLAGS_NONE,
CALL_TIMEOUT,
NULL,
&error);
ret = g_dbus_connection_call_sync (gl.dbus_connection,
NM_DISPATCHER_DBUS_SERVICE,
NM_DISPATCHER_DBUS_PATH,
NM_DISPATCHER_DBUS_INTERFACE,
"Action",
g_steal_pointer (&parameters_floating),
G_VARIANT_TYPE ("(a(sus))"),
G_DBUS_CALL_FLAGS_NONE,
CALL_TIMEOUT,
NULL,
&error);
if (!ret) {
g_dbus_error_strip_remote_error (error);
_LOG2W (reqid, "failed: %s", error->message);
_LOG2W (request_id, "failed: %s", error->message);
return FALSE;
}
dispatcher_results_process (reqid, action, ret);
dispatcher_results_process (request_id, action, ret);
return TRUE;
}
call_id = g_slice_new (NMDispatcherCallId);
*call_id = (NMDispatcherCallId) {
.action = action,
.request_id = reqid,
.request_id = request_id,
.callback = callback,
.user_data = user_data,
};
g_dbus_proxy_call (dispatcher_proxy,
"Action",
g_steal_pointer (&parameters_floating),
G_DBUS_CALL_FLAGS_NONE,
CALL_TIMEOUT,
NULL,
dispatcher_done_cb,
call_id);
g_hash_table_add (requests, call_id);
g_dbus_connection_call (gl.dbus_connection,
NM_DISPATCHER_DBUS_SERVICE,
NM_DISPATCHER_DBUS_PATH,
NM_DISPATCHER_DBUS_INTERFACE,
"Action",
g_steal_pointer (&parameters_floating),
G_VARIANT_TYPE ("(a(sus))"),
G_DBUS_CALL_FLAGS_NONE,
CALL_TIMEOUT,
NULL,
dispatcher_done_cb,
call_id);
g_hash_table_add (gl.requests, call_id);
NM_SET_OUT (out_call_id, call_id);
return TRUE;
}
@ -824,7 +848,7 @@ void
nm_dispatcher_call_cancel (NMDispatcherCallId *call_id)
{
if ( !call_id
|| g_hash_table_lookup (requests, call_id) != call_id
|| g_hash_table_lookup (gl.requests, call_id) != call_id
|| !call_id->callback)
g_return_if_reached ();
@ -834,23 +858,3 @@ nm_dispatcher_call_cancel (NMDispatcherCallId *call_id)
_LOG3D (call_id, "cancelling dispatcher callback action");
call_id->callback = NULL;
}
void
nm_dispatcher_init (void)
{
GError *error = NULL;
dispatcher_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES |
G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS,
NULL,
NM_DISPATCHER_DBUS_SERVICE,
NM_DISPATCHER_DBUS_PATH,
NM_DISPATCHER_DBUS_INTERFACE,
NULL, &error);
if (!dispatcher_proxy) {
_LOGE ("could not get dispatcher proxy! %s", error->message);
g_clear_error (&error);
}
}

2
src/nm-dispatcher.h
View file

@ -86,6 +86,4 @@ gboolean nm_dispatcher_call_connectivity (NMConnectivityState state,
void nm_dispatcher_call_cancel (NMDispatcherCallId *call_id);
void nm_dispatcher_init (void);
#endif /* __NM_DISPATCHER_H__ */