From 509599f043fd77c5eee595ebce117ff9e11a5324 Mon Sep 17 00:00:00 2001 From: kremlin Date: Mon, 4 Aug 2014 21:03:58 -0500 Subject: [PATCH] (4) move on_name_acquired functionality to on_bus_acquired work that was previously done in foo_on_name_acquired(), such as attaching the interface to the name, is now done in foo_on_bus_acquired(), as GIO docs suggest. this fixed a bug with logind failing to export, the name_acquired function executed executed too late to export a big interface like logind. fix some minor error msg/consistency stuff in hostnamed, merge across pals. builds --- src/interfaces/hostnamed/hostnamed.c | 11 +++----- src/interfaces/localed/localed.c | 39 +++++++++++++++++----------- src/interfaces/logind/logind.c | 37 ++++++++++++++++---------- src/interfaces/timedated/timedated.c | 37 ++++++++++++++++---------- 4 files changed, 74 insertions(+), 50 deletions(-) diff --git a/src/interfaces/hostnamed/hostnamed.c b/src/interfaces/hostnamed/hostnamed.c index 979df6e..cf066b2 100644 --- a/src/interfaces/hostnamed/hostnamed.c +++ b/src/interfaces/hostnamed/hostnamed.c @@ -196,9 +196,8 @@ static void hostnamed_on_bus_acquired(GDBusConnection *conn, } else { dbus_interface_exported = TRUE; - g_printf("exported %s's interface on the system bus...", name); + g_printf("exported %s's interface on the system bus...\n", name); } - } static void hostnamed_on_name_acquired(GDBusConnection *conn, @@ -206,7 +205,6 @@ static void hostnamed_on_name_acquired(GDBusConnection *conn, gpointer user_data) { g_printf("success!\n"); - } static void hostnamed_on_name_lost(GDBusConnection *conn, @@ -215,12 +213,11 @@ static void hostnamed_on_name_lost(GDBusConnection *conn, if(!conn) { - g_printf("failed to connect to the system bus while trying to acquire name '%s': either dbus-daemon isn't running or we don't have permission to push names and/or their interfaces to it", name); - + g_printf("failed to connect to the system bus while trying to acquire name '%s': either dbus-daemon isn't running or we don't have permission to push names and/or their interfaces to it.\n", name); hostnamed_mem_clean(); } - g_printf("lost name %s, exiting...", name); + g_printf("lost name %s, exiting...\n", name); hostnamed_mem_clean(); } @@ -228,7 +225,7 @@ static void hostnamed_on_name_lost(GDBusConnection *conn, /* --- end bus/name handlers, begin misc unix functions --- */ /* safe call to clean and then exit - * this stops our GMainLoop safely before letting main() return */ + * this stops our GMainLoop safely before letting main() return */ void hostnamed_mem_clean() { g_printf("exiting...\n"); diff --git a/src/interfaces/localed/localed.c b/src/interfaces/localed/localed.c index c11ae36..10ae7b7 100644 --- a/src/interfaces/localed/localed.c +++ b/src/interfaces/localed/localed.c @@ -70,16 +70,8 @@ static void localed_on_bus_acquired(GDBusConnection *conn, const gchar *name, gpointer user_data) { - g_print("got bus, name: %s\n", name); - -} - -static void localed_on_name_acquired(GDBusConnection *conn, - const gchar *name, - gpointer user_data) { - - g_print("got '%s' on system bus\n", name); - + g_print("got bus/name, exporting %s's interface...\n", name); + localed_interf = locale1_skeleton_new(); /* attach function pointers to generated struct's method handlers @@ -93,25 +85,42 @@ static void localed_on_name_acquired(GDBusConnection *conn, "/org/freedesktop/locale1", NULL)) { - g_printf("Failed to export Locale1's interface!"); + g_printf("failed to export %s's interface!\n", name); + localed_mem_clean(); + + } else { + + dbus_interface_exported = TRUE; + g_printf("exported %s's interface on the system bus...\n", name); } +} +static void localed_on_name_acquired(GDBusConnection *conn, + const gchar *name, + gpointer user_data) { + + g_printf("success!\n"); } static void localed_on_name_lost(GDBusConnection *conn, const gchar *name, gpointer user_data) { - g_print("lost name %s, exiting...", name); + if(!conn) { - localed_mem_clean(); - g_dbus_interface_skeleton_unexport(G_DBUS_INTERFACE_SKELETON(localed_interf)); + g_printf("failed to connect to the system bus while trying to acquire name '%s': either dbus-daemon isn't running or we don't have permission to push names and/or their interfaces to it.\n", name); + localed_mem_clean(); + } + g_print("lost name %s, exiting...\n", name); + + localed_mem_clean(); } /* --- end bus/name handlers, begin misc unix functions --- */ -/* free()'s */ +/* safe call to clean and then exit + * this stops our GMainLoop safely before letting main() return */ void localed_mem_clean() { g_ptr_array_foreach(localed_freeable, (GFunc) g_free, NULL); diff --git a/src/interfaces/logind/logind.c b/src/interfaces/logind/logind.c index 3b9cab6..b08db9f 100644 --- a/src/interfaces/logind/logind.c +++ b/src/interfaces/logind/logind.c @@ -70,15 +70,7 @@ static void logind_on_bus_acquired(GDBusConnection *conn, const gchar *name, gpointer user_data) { - g_print("got bus, name: %s\n", name); - -} - -static void logind_on_name_acquired(GDBusConnection *conn, - const gchar *name, - gpointer user_data) { - - g_print("got '%s' on system bus\n", name); + g_print("got bus/name, exporting %s's interface...\n", name); logind_interf = login1_manager_skeleton_new(); @@ -93,25 +85,42 @@ static void logind_on_name_acquired(GDBusConnection *conn, "/org/freedesktop/login1_manager", NULL)) { - g_printf("Failed to export Login1Manager's interface!"); + g_printf("failed to export %s's interface!\n", name); + logind_mem_clean(); + + } else { + + dbus_interface_exported = TRUE; + g_printf("exported %s's interface on the system bus...\n", name); } +} +static void logind_on_name_acquired(GDBusConnection *conn, + const gchar *name, + gpointer user_data) { + + g_printf("success!\n"); } static void logind_on_name_lost(GDBusConnection *conn, const gchar *name, gpointer user_data) { - g_print("lost name %s, exiting...", name); + if(!conn) { - logind_mem_clean(); - g_dbus_interface_skeleton_unexport(G_DBUS_INTERFACE_SKELETON(logind_interf)); + g_printf("failed to connect to the system bus while trying to acquire name '%s': either dbus-daemon isn't running or we don't have permission to push names and/or their interfaces to it.\n", name); + } + + g_print("lost name %s, exiting...\n", name); + + logind_mem_clean(); } /* --- end bus/name handlers, begin misc unix functions --- */ -/* free()'s */ +/* safe call to clean and then exit + * this stops our GMainLoop sfaely before letting main() return */ void logind_mem_clean() { g_ptr_array_foreach(logind_freeable, (GFunc) g_free, NULL); diff --git a/src/interfaces/timedated/timedated.c b/src/interfaces/timedated/timedated.c index 8f30d01..3df5fc6 100644 --- a/src/interfaces/timedated/timedated.c +++ b/src/interfaces/timedated/timedated.c @@ -70,15 +70,7 @@ static void timedated_on_bus_acquired(GDBusConnection *conn, const gchar *name, gpointer user_data) { - g_print("got bus, name: %s\n", name); - -} - -static void timedated_on_name_acquired(GDBusConnection *conn, - const gchar *name, - gpointer user_data) { - - g_print("got '%s' on system bus\n", name); + g_print("got bus/name, exporting %s's interface...\n", name); timedated_interf = timedate1_skeleton_new(); @@ -93,25 +85,42 @@ static void timedated_on_name_acquired(GDBusConnection *conn, "/org/freedesktop/timedate1", NULL)) { - g_printf("Failed to export Timedate1's interface!"); + g_printf("failed to export %s's interface!\n", name); + timedated_mem_clean(); + + } else { + + dbus_interface_exported = TRUE; + g_printf("exported %s's interface on the system bus...\n", name); } +} + +static void timedated_on_name_acquired(GDBusConnection *conn, + const gchar *name, + gpointer user_data) { + g_printf("success!\n"); } static void timedated_on_name_lost(GDBusConnection *conn, const gchar *name, gpointer user_data) { - g_print("lost name %s, exiting...", name); + if(!conn) { - timedated_mem_clean(); - g_dbus_interface_skeleton_unexport(G_DBUS_INTERFACE_SKELETON(timedated_interf)); + g_printf("failed to connect to the system bus while trying to acquire name '%s': either dbus-daemon isn't running or we don't have permission to push names and/or their interfaces to it.\n", name); + timedated_mem_clean(); + } + g_print("lost name %s, exiting...\n", name); + + timedated_mem_clean(); } /* --- end bus/name handlers, begin misc unix functions --- */ -/* free()'s */ +/* safe call to clean and then exit + * this stops our GMainLoop safely before letting main() return */ void timedated_mem_clean() { g_ptr_array_foreach(timedated_freeable, (GFunc) g_free, NULL); -- 2.41.0