X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?a=blobdiff_plain;f=src%2Finterfaces%2Fhostnamed%2Fhostnamed.c;h=42137cde94e27b8418da12ab4fa3bfb85343c648;hb=929eb2a9b45b11b5e3d76f1d4ac744853b7ab2fe;hp=f41892d9991b6f4220c458920302d08d03561756;hpb=ff1030d487f7ce362452dac0d5c6e06248b0a38b;p=systembsd.git diff --git a/src/interfaces/hostnamed/hostnamed.c b/src/interfaces/hostnamed/hostnamed.c index f41892d..42137cd 100644 --- a/src/interfaces/hostnamed/hostnamed.c +++ b/src/interfaces/hostnamed/hostnamed.c @@ -1,7 +1,5 @@ #include -#include "hostnamed.h" -GMainLoop *loop; GDBusNodeInfo *spect_data; static void handle_method_call(GDBusConnection *conn, @@ -13,9 +11,7 @@ static void handle_method_call(GDBusConnection *conn, GDBusMethodInvocation *invc, gpointer usrdat) { - //g_printf("%s wants to call %s, at %s with interface %s\n", sender, method_name, obj_path, interf_name); - - if(g_strcmp0(method_name, "Introspect" + //if(g_strcmp0(method_name, "Introspect" GVariant *xml_ret_gvar; GString *xml_ret; @@ -99,9 +95,9 @@ static void on_name_lost(GDBusConnection *conn, const gchar *name, gpointer user_data) { - g_print("lost name %s, exiting...\n", name); - //g_print("you might need to run hacks/punch_config.sh\n"); - g_main_loop_quit(loop); + g_print("lost name %s, exiting...", name); + //TODO exit through g_main_loop properly... + exit(0); } /* safe call to try and start hostnamed */ @@ -109,8 +105,7 @@ GError * hostnamed_init() { guint bus_descriptor; GError *err = NULL; - - spect_data = g_dbus_node_info_new_for_xml(SYSTEMD_HOSTNAMED_XML, &err); + bus_descriptor = g_bus_own_name(G_BUS_TYPE_SYSTEM, (gchar *)"org.freedesktop.hostname1", G_BUS_NAME_OWNER_FLAGS_NONE, @@ -120,9 +115,6 @@ GError * hostnamed_init() { NULL, NULL); - loop = g_main_loop_new(NULL, FALSE); - g_main_loop_run(loop); - //TODO: malloc and return reference as if a main() closed return err; }