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

dispatcher: add D-Bus method "Ping"

Browse source 
This is only for testing the service. As nm-dispatcher is D-Bus activated,
have a simple method to test whether it works.
This commit is contained in:
Thomas Haller 2021-08-03 17:58:30 +02:00
parent d25a33f604
commit ff8e85ab53
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 33 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/nm-dispatcher/nm-dispatcher.c
View file

@ -20,6 +20,7 @@
#include "libnm-core-aux-extern/nm-dispatcher-api.h" #include "libnm-core-aux-extern/nm-dispatcher-api.h"
#include "libnm-glib-aux/nm-dbus-aux.h" #include "libnm-glib-aux/nm-dbus-aux.h"
#include "libnm-glib-aux/nm-io-utils.h" #include "libnm-glib-aux/nm-io-utils.h"
#include "libnm-glib-aux/nm-time-utils.h"
#include "nm-dispatcher-utils.h" #include "nm-dispatcher-utils.h"
/*****************************************************************************/ /*****************************************************************************/
@ -42,6 +43,8 @@ static struct {
guint request_id_counter; guint request_id_counter;
guint dbus_regist_id; guint dbus_regist_id;
gint64 start_timestamp_msec;
bool name_requested; bool name_requested;
bool exit_with_failure; bool exit_with_failure;
@ -853,6 +856,26 @@ _method_call_action(GDBusMethodInvocation *invocation, GVariant *parameters)
} }
} }
static void
_method_call_ping(GDBusMethodInvocation *invocation, GVariant *parameters)
{
gs_free char *msg = NULL;
gint64 running_msec;
const char * arg_s;
g_variant_get(parameters, "(&s)", &arg_s);
running_msec = nm_utils_clock_gettime_msec(CLOCK_BOOTTIME) - gl.start_timestamp_msec;
msg = g_strdup_printf("pid=%lu, unique-name=%s, since=%" G_GINT64_FORMAT ".%03d, pong=%s",
(unsigned long) getpid(),
g_dbus_connection_get_unique_name(gl.dbus_connection),
(gint64) (running_msec / 1000),
(int) (running_msec % 1000),
arg_s);
g_dbus_method_invocation_return_value(invocation, g_variant_new("(s)", msg));
}
static void static void
_method_call(GDBusConnection * connection, _method_call(GDBusConnection * connection,
const char * sender, const char * sender,
@ -868,6 +891,10 @@ _method_call(GDBusConnection * connection,
_method_call_action(invocation, parameters); _method_call_action(invocation, parameters);
return; return;
} }
if (nm_streq(method_name, "Ping")) {
_method_call_ping(invocation, parameters);
return;
}
} }
g_dbus_method_invocation_return_error(invocation, g_dbus_method_invocation_return_error(invocation,
G_DBUS_ERROR, G_DBUS_ERROR,
@ -879,6 +906,10 @@ _method_call(GDBusConnection * connection,
static GDBusInterfaceInfo *const interface_info = NM_DEFINE_GDBUS_INTERFACE_INFO( static GDBusInterfaceInfo *const interface_info = NM_DEFINE_GDBUS_INTERFACE_INFO(
NM_DISPATCHER_DBUS_INTERFACE, NM_DISPATCHER_DBUS_INTERFACE,
.methods = NM_DEFINE_GDBUS_METHOD_INFOS( .methods = NM_DEFINE_GDBUS_METHOD_INFOS(
NM_DEFINE_GDBUS_METHOD_INFO(
"Ping",
.in_args = NM_DEFINE_GDBUS_ARG_INFOS(NM_DEFINE_GDBUS_ARG_INFO("arg", "s"), ),
.out_args = NM_DEFINE_GDBUS_ARG_INFOS(NM_DEFINE_GDBUS_ARG_INFO("arg", "s"), ), ),
NM_DEFINE_GDBUS_METHOD_INFO( NM_DEFINE_GDBUS_METHOD_INFO(
"Action", "Action",
.in_args = NM_DEFINE_GDBUS_ARG_INFOS( .in_args = NM_DEFINE_GDBUS_ARG_INFOS(
@ -1095,6 +1126,8 @@ main(int argc, char **argv)
source_term = nm_g_unix_signal_add_source(SIGTERM, signal_handler, GINT_TO_POINTER(SIGTERM)); source_term = nm_g_unix_signal_add_source(SIGTERM, signal_handler, GINT_TO_POINTER(SIGTERM));
source_int = nm_g_unix_signal_add_source(SIGINT, signal_handler, GINT_TO_POINTER(SIGINT)); source_int = nm_g_unix_signal_add_source(SIGINT, signal_handler, GINT_TO_POINTER(SIGINT));
gl.start_timestamp_msec = nm_utils_clock_gettime_msec(CLOCK_BOOTTIME);
gl.quit_cancellable = g_cancellable_new(); gl.quit_cancellable = g_cancellable_new();
if (!parse_command_line(&argc, &argv, &error)) { if (!parse_command_line(&argc, &argv, &error)) {