Various dhcpcd fixups.

dhcpcd-dbus.c

 /*
  * dhcpcd-dbus
  * Copyright 2009 Roy Marples <roy@marples.name>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 464 matching lines @@
         if (dbus_message_is_method_call(msg, DBUS_INTERFACE_INTROSPECTABLE,
                                         "Introspect")) {
                 return introspect(con, msg);
         } else if (IsMethod(msg, "GetVersion")) {
                 return version(con, msg, VERSION);
         } else if (IsMethod(msg, "GetInterfaces")) {
                 return dhcpcd_get_interfaces(con, msg);
         } else if (IsMethod(msg, "GetStatus")) {
                 return return_status(con, msg);
         } else if (IsMethod(msg, "Rebind")) {
-                bind_interface(ifaces);         /* XXX */
+                start_interface(ifaces);
                 return dbus_ack(con, msg);
         } else if (IsMethod(msg, "Release")) {
-                raise(SIGHUP);
+                send_release(ifaces);
+                stop_interface(ifaces);
                 return dbus_ack(con, msg);
         } else if (IsMethod(msg, "Stop")) {
-                /* NB: must ack first 'cuz handle_signal exit's */
+                stop_interface(ifaces);
                 (void) dbus_ack(con, msg);
-                raise(SIGINT);
-                /*NOTREACHED*/
+                exit(EXIT_FAILURE);
+        } else if (dbus_message_is_signal(msg, DBUS_INTERFACE_LOCAL,
+                                          "Disconnected")) {
+                stop_interface(ifaces);
+                exit(EXIT_FAILURE);
         }
         return return_dbus_error(con, msg, S_EINVAL, S_ARGS);
 #undef IsMethod
 }
 
 static void
 dbus_event(int revents, void *watch)
 {
         int flags;
 
@@ skipping 66 matching lines @@
         connection = dbus_bus_get(DBUS_BUS_SYSTEM, &err);
         if (connection == NULL) {
                 if (dbus_error_is_set(&err))
                         syslog(LOG_ERR, "%s", err.message);
                 else
                         syslog(LOG_ERR, "failed to get a dbus connection");
                 return -1;
         }
         atexit(dhcpcd_dbus_close);
 
-#if 0
-        ret = dbus_bus_request_name(connection, DHCPCD_SERVICE,
-            DBUS_NAME_FLAG_REPLACE_EXISTING, &err);
-        if (dbus_error_is_set(&err)) {
-                syslog(LOG_ERR, "%s", err.message);
-                return -1;
-        }
-#endif
         if (!dbus_connection_set_watch_functions(connection,
                 add_watch, remove_watch, NULL, NULL, NULL))
         {
                 syslog(LOG_ERR, "dbus: failed to set watch functions");
                 return -1;
         }
         if (!dbus_connection_register_object_path(connection,
                 DHCPCD_PATH, &vt, NULL))
         {
                 syslog(LOG_ERR, "dbus: failed to register object path");
@@ skipping 11 matching lines @@
 
                 if (write_lease(ifp, ifp->state->new) == -1)
                         syslog(LOG_ERR, "write_lease: %m");
         }
         return 0;
 }
 
 int
 run_script(const struct interface *ifp)
 {
-        syslog(LOG_DEBUG, "executing `%s', reason %s",
-            ifp->name, ifp->state->reason);
-#if 0
-        /* push state over d-bus */
-        dhcpcd_dbus_configure(ifp, ifp->state->reason);
-#endif
         return 0;
 }