Make sure to disconnect network on removal

[connman] / scripts / dhclient-script.c

diff --git a/scripts/dhclient-script.c b/scripts/dhclient-script.c
index 39b235c..94543a0 100644 (file)
--- a/scripts/dhclient-script.c
+++ b/scripts/dhclient-script.c
@@ -2,7 +2,7 @@
  *
  *  Connection Manager
  *
- *  Copyright (C) 2007  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2007-2009  Intel Corporation. All rights reserved.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -29,6 +29,9 @@
 
 #include <dbus/dbus.h>
 
+#define DHCLIENT_INTF "org.isc.dhclient"
+#define DHCLIENT_PATH "/org/isc/dhclient"
+
 extern char **environ;
 
 static void append(DBusMessageIter *dict, const char *pattern)
@@ -56,6 +59,7 @@ static void append(DBusMessageIter *dict, const char *pattern)
 int main(int argc, char *argv[])
 {
        DBusConnection *conn;
+       DBusError error;
        DBusMessage *msg;
        DBusMessageIter iter, dict;
        dbus_uint32_t pid;
@@ -67,17 +71,28 @@ int main(int argc, char *argv[])
        reason = getenv("reason");
        interface = getenv("interface");
 
-       conn = dbus_bus_get(DBUS_BUS_SYSTEM, NULL);
-       if (conn == NULL)
-               exit(1);
+       dbus_error_init(&error);
+
+       conn = dbus_bus_get(DBUS_BUS_SYSTEM, &error);
+       if (conn == NULL) {
+               if (dbus_error_is_set(&error) == TRUE) {
+                       fprintf(stderr, "%s\n", error.message);
+                       dbus_error_free(&error);
+               } else
+                       fprintf(stderr, "Failed to get on system bus\n");
+               return 0;
+       }
 
-       msg = dbus_message_new_method_call(busname, "/org/isc/dhclient",
-                                               "org.isc.dhclient", "notify");
+       msg = dbus_message_new_method_call(busname, DHCLIENT_PATH,
+                                               DHCLIENT_INTF, "notify");
        if (msg == NULL) {
                dbus_connection_unref(conn);
-               exit(1);
+               fprintf(stderr, "Failed to allocate method call\n");
+               return 0;
        }
 
+       dbus_message_set_no_reply(msg, TRUE);
+
        dbus_message_append_args(msg, DBUS_TYPE_UINT32, &pid,
                                DBUS_TYPE_STRING, &reason, DBUS_TYPE_INVALID);
 
@@ -100,7 +115,10 @@ int main(int argc, char *argv[])
 
        dbus_message_iter_close_container(&iter, &dict);
 
-       dbus_connection_send(conn, msg, NULL);
+       if (dbus_connection_send(conn, msg, NULL) == FALSE)
+               fprintf(stderr, "Failed to send message\n");
+
+       dbus_connection_flush(conn);
 
        dbus_message_unref(msg);