summaryrefslogtreecommitdiffstats
path: root/udev_dbus.c
diff options
context:
space:
mode:
authorgreg@kroah.com <greg@kroah.com>2003-12-09 03:01:28 +0100
committerGreg KH <gregkh@suse.de>2005-04-27 06:13:06 +0200
commit8e15f01dc8e25eca49b99e97059dccf793e6c4d4 (patch)
tree882ad0ea82c6c3424b3938d6170f9370c94eba35 /udev_dbus.c
parent[PATCH] move all of the DBUS logic into one file and remove all of the #ifdef... (diff)
downloadsystemd-8e15f01dc8e25eca49b99e97059dccf793e6c4d4.tar.xz
systemd-8e15f01dc8e25eca49b99e97059dccf793e6c4d4.zip
[PATCH] fix formatting of udev_dbus.c to use tabs. Also get it to build properly now.
Diffstat (limited to 'udev_dbus.c')
-rw-r--r--udev_dbus.c178
1 files changed, 93 insertions, 85 deletions
diff --git a/udev_dbus.c b/udev_dbus.c
index 57685163c5..947a5c1b5d 100644
--- a/udev_dbus.c
+++ b/udev_dbus.c
@@ -1,6 +1,16 @@
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <errno.h>
+#include <ctype.h>
+
#define DBUS_API_SUBJECT_TO_CHANGE
#include <dbus/dbus.h>
+#include "udev.h"
+#include "udev_version.h"
#include "udev_dbus.h"
@@ -12,46 +22,46 @@ static DBusConnection* sysbus_connection;
/** Disconnect from the system message bus */
void sysbus_disconnect(void)
{
- if (sysbus_connection == NULL)
- return;
+ if (sysbus_connection == NULL)
+ return;
- dbus_connection_disconnect(sysbus_connection);
- sysbus_connection = NULL;
+ dbus_connection_disconnect(sysbus_connection);
+ sysbus_connection = NULL;
}
/** Connect to the system message bus */
void sysbus_connect(void)
{
- DBusError error;
-
- /* Connect to a well-known bus instance, the system bus */
- dbus_error_init(&error);
- sysbus_connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error);
- if (sysbus_connection == NULL) {
- dbg("cannot connect to system message bus, error %s: %s",
- error.name, error.message);
- dbus_error_free(&error);
- return;
- }
-
- /* Acquire the org.kernel.udev service such that listeners
- * know that the message is really from us and not from a
- * random attacker. See the file udev_sysbus_policy.conf for
- * details.
- *
- * Note that a service can have multiple owners (though there
- * is a concept of a primary owner for reception of messages)
- * so no race is introduced if two copies of udev is running
- * at the same time.
- */
- dbus_bus_acquire_service(sysbus_connection, "org.kernel.udev", 0,
- &error);
- if (dbus_error_is_set(&error)) {
- printf("cannot acquire org.kernel.udev service, error %s: %s'",
- error.name, error.message);
- sysbus_disconnect();
- return;
- }
+ DBusError error;
+
+ /* Connect to a well-known bus instance, the system bus */
+ dbus_error_init(&error);
+ sysbus_connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error);
+ if (sysbus_connection == NULL) {
+ dbg("cannot connect to system message bus, error %s: %s",
+ error.name, error.message);
+ dbus_error_free(&error);
+ return;
+ }
+
+ /* Acquire the org.kernel.udev service such that listeners
+ * know that the message is really from us and not from a
+ * random attacker. See the file udev_sysbus_policy.conf for
+ * details.
+ *
+ * Note that a service can have multiple owners (though there
+ * is a concept of a primary owner for reception of messages)
+ * so no race is introduced if two copies of udev is running
+ * at the same time.
+ */
+ dbus_bus_acquire_service(sysbus_connection, "org.kernel.udev", 0,
+ &error);
+ if (dbus_error_is_set(&error)) {
+ printf("cannot acquire org.kernel.udev service, error %s: %s'",
+ error.name, error.message);
+ sysbus_disconnect();
+ return;
+ }
}
@@ -62,31 +72,31 @@ void sysbus_connect(void)
*/
void sysbus_send_create(struct udevice *dev, const char *path)
{
- char filename[255];
- DBusMessage* message;
- DBusMessageIter iter;
-
- if (sysbus_connection == NULL)
- return;
-
- strncpy(filename, udev_root, sizeof(filename));
- strncat(filename, dev->name, sizeof(filename));
-
- /* object, interface, member */
- message = dbus_message_new_signal("/org/kernel/udev/NodeMonitor",
- "org.kernel.udev.NodeMonitor",
- "NodeCreated");
-
- dbus_message_iter_init(message, &iter);
- dbus_message_iter_append_string(&iter, filename);
- dbus_message_iter_append_string(&iter, path);
-
- if ( !dbus_connection_send(sysbus_connection, message, NULL) )
- dbg("error sending d-bus signal");
-
- dbus_message_unref(message);
-
- dbus_connection_flush(sysbus_connection);
+ char filename[255];
+ DBusMessage* message;
+ DBusMessageIter iter;
+
+ if (sysbus_connection == NULL)
+ return;
+
+ strncpy(filename, udev_root, sizeof(filename));
+ strncat(filename, dev->name, sizeof(filename));
+
+ /* object, interface, member */
+ message = dbus_message_new_signal("/org/kernel/udev/NodeMonitor",
+ "org.kernel.udev.NodeMonitor",
+ "NodeCreated");
+
+ dbus_message_iter_init(message, &iter);
+ dbus_message_iter_append_string(&iter, filename);
+ dbus_message_iter_append_string(&iter, path);
+
+ if ( !dbus_connection_send(sysbus_connection, message, NULL) )
+ dbg("error sending d-bus signal");
+
+ dbus_message_unref(message);
+
+ dbus_connection_flush(sysbus_connection);
}
/** Send out a signal that a device node is deleted
@@ -96,31 +106,29 @@ void sysbus_send_create(struct udevice *dev, const char *path)
*/
void sysbus_send_remove(const char* name, const char *path)
{
- char filename[255];
- DBusMessage* message;
- DBusMessageIter iter;
-
- if (sysbus_connection == NULL)
- return;
-
- strncpy(filename, udev_root, sizeof(filename));
- strncat(filename, name, sizeof(filename));
-
- /* object, interface, member */
- message = dbus_message_new_signal("/org/kernel/udev/NodeMonitor",
- "org.kernel.udev.NodeMonitor",
- "NodeDeleted");
-
- dbus_message_iter_init(message, &iter);
- dbus_message_iter_append_string(&iter, filename);
- dbus_message_iter_append_string(&iter, path);
-
- if ( !dbus_connection_send(sysbus_connection, message, NULL) )
- dbg("error sending d-bus signal");
-
- dbus_message_unref(message);
-
- dbus_connection_flush(sysbus_connection);
-}
+ char filename[255];
+ DBusMessage* message;
+ DBusMessageIter iter;
+
+ if (sysbus_connection == NULL)
+ return;
+
+ strncpy(filename, udev_root, sizeof(filename));
+ strncat(filename, name, sizeof(filename));
+
+ /* object, interface, member */
+ message = dbus_message_new_signal("/org/kernel/udev/NodeMonitor",
+ "org.kernel.udev.NodeMonitor",
+ "NodeDeleted");
+ dbus_message_iter_init(message, &iter);
+ dbus_message_iter_append_string(&iter, filename);
+ dbus_message_iter_append_string(&iter, path);
+ if ( !dbus_connection_send(sysbus_connection, message, NULL) )
+ dbg("error sending d-bus signal");
+
+ dbus_message_unref(message);
+
+ dbus_connection_flush(sysbus_connection);
+}