Attachment 9637 Details for Bug 10577 – Patch 1 of 2

[patch] Patch 1 of 2

0001-Fix-bug-10577.patch (text/plain), 7.47 KB, created by Luiz Augusto von Dentz on 2007-04-17 10:36:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Luiz Augusto von Dentz

Created: 2007-04-17 10:36:09 UTC

Size: 7.47 KB

patch

obsolete

>diff --git a/hald/linux/probing/Makefile.am b/hald/linux/probing/Makefile.am
>index b081e48..64eb058 100644
>--- a/hald/linux/probing/Makefile.am
>+++ b/hald/linux/probing/Makefile.am
>@@ -10,7 +10,7 @@ INCLUDES = \
> 
> if HALD_COMPILE_LINUX
> libexec_PROGRAMS = hald-probe-input hald-probe-hiddev hald-probe-storage hald-probe-volume hald-probe-printer \
>-	           hald-probe-pc-floppy hald-probe-smbios hald-probe-serial hald-probe-ieee1394-unit
>+	           hald-probe-pc-floppy hald-probe-smbios hald-probe-serial hald-probe-ieee1394-unit hald-probe-net-bluetooth
> endif
> 
> hald_probe_smbios_SOURCES = probe-smbios.c ../../logger.c
>@@ -39,3 +39,6 @@ hald_probe_volume_LDADD = $(top_builddir)/libhal/libhal.la $(top_builddir)/partu
> 
> hald_probe_ieee1394_unit_SOURCES = probe-ieee1394-unit.c ../../logger.c
> hald_probe_ieee1394_unit_LDADD = $(top_builddir)/libhal/libhal.la
>+
>+hald_probe_net_bluetooth_SOURCES = probe-net-bluetooth.c ../../logger.c
>+hald_probe_net_bluetooth_LDADD = $(top_builddir)/libhal/libhal.la
>diff --git a/hald/linux/probing/probe-net-bluetooth.c b/hald/linux/probing/probe-net-bluetooth.c
>new file mode 100644
>index 0000000..2abaa70
>--- /dev/null
>+++ b/hald/linux/probing/probe-net-bluetooth.c
>@@ -0,0 +1,240 @@
>+/***************************************************************************
>+ * CVSID: $Id$
>+ *
>+ * probe-net-bluetooth.c : Probe bluetooth network devices
>+ *
>+ * Copyright (C) 2007 Luiz Augusto von Dentz, <luiz.dentz@indt.org.br>
>+ *
>+ * Licensed under the Academic Free License version 2.1
>+ *
>+ * This program is free software; you can redistribute it and/or modify
>+ * it under the terms of the GNU General Public License as published by
>+ * the Free Software Foundation; either version 2 of the License, or
>+ * (at your option) any later version.
>+ *
>+ * This program is distributed in the hope that it will be useful,
>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>+ * GNU General Public License for more details.
>+ *
>+ * You should have received a copy of the GNU General Public License
>+ * along with this program; if not, write to the Free Software
>+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>+ *
>+ **************************************************************************/
>+
>+#ifdef HAVE_CONFIG_H
>+#  include <config.h>
>+#endif
>+
>+#include <string.h>
>+
>+#include "../../logger.h"
>+#include "libhal/libhal.h"
>+
>+#define BLUEZ_SERVICE "org.bluez"
>+#define BLUEZ_PATH "/org/bluez"
>+#define BLUEZ_MANAGER_IFACE "org.bluez.Manager"
>+#define BLUEZ_NET_PATH "/org/bluez/network"
>+#define BLUEZ_NET_MANAGER_IFACE "org.bluez.network.Manager"
>+#define BLUEZ_NET_CONNECTION_IFACE "org.bluez.network.Connection"
>+#define BLUEZ_NET_SERVER_IFACE "org.bluez.network.Server"
>+
>+static void
>+get_properties (DBusConnection *conn, LibHalContext *ctx, const char *udi,
>+				const char *id, const char *path)
>+{
>+	DBusMessage *msg;
>+	DBusMessage *reply = NULL;
>+	DBusMessageIter reply_iter;
>+	DBusMessageIter dict_iter;
>+	DBusError error;
>+
>+	dbus_error_init (&error);
>+
>+	msg = dbus_message_new_method_call (id, path,
>+										BLUEZ_NET_CONNECTION_IFACE,
>+										"GetInfo");
>+
>+	if (msg == NULL)
>+		goto out;
>+
>+	HAL_INFO (("%s.GetInfo()", BLUEZ_NET_CONNECTION_IFACE));
>+	reply = dbus_connection_send_with_reply_and_block (conn, msg, -1, &error);
>+
>+	if (dbus_error_is_set (&error) || dbus_set_error_from_message (&error,
>+		reply)) {
>+		dbus_error_free (&error);
>+		goto out;
>+	}
>+
>+	dbus_message_iter_init (reply, &reply_iter);
>+
>+	if (dbus_message_iter_get_arg_type (&reply_iter) != DBUS_TYPE_ARRAY  &&
>+	    dbus_message_iter_get_element_type (&reply_iter) != DBUS_TYPE_DICT_ENTRY) {
>+		goto out;
>+	}
>+
>+	dbus_message_iter_recurse (&reply_iter, &dict_iter);
>+
>+	while (dbus_message_iter_get_arg_type (&dict_iter) == DBUS_TYPE_DICT_ENTRY) {
>+		DBusMessageIter dict_entry_iter, var_iter;
>+		const char *key;
>+		char prop[32];
>+
>+		dbus_message_iter_recurse (&dict_iter, &dict_entry_iter);
>+		dbus_message_iter_get_basic (&dict_entry_iter, &key);
>+
>+		dbus_message_iter_next (&dict_entry_iter);
>+		dbus_message_iter_recurse (&dict_entry_iter, &var_iter);
>+
>+		snprintf(prop, 32, "net.bluetooth.%s", key);
>+
>+		/* Make any property found annouced by hal */
>+		switch (dbus_message_iter_get_arg_type (&var_iter)) {
>+		case DBUS_TYPE_STRING:
>+		{
>+			const char *value;
>+
>+			dbus_message_iter_get_basic (&var_iter, &value);
>+
>+			HAL_INFO (("reply: %s:%s", key, value));
>+
>+			libhal_device_set_property_string (ctx, udi, prop, value, &error);
>+			break;
>+		}
>+		case DBUS_TYPE_INT32:
>+		{
>+			dbus_int32_t value;
>+
>+			dbus_message_iter_get_basic (&var_iter, &value);
>+
>+			HAL_INFO (("reply: %s:%d", key, value));
>+
>+			libhal_device_set_property_int (ctx, udi, prop, value, &error);
>+			break;
>+		}
>+		default:
>+			break;
>+		}
>+		dbus_message_iter_next (&dict_iter);
>+	}
>+
>+out:
>+	if (msg)
>+		dbus_message_unref (msg);
>+	if (reply)
>+		dbus_message_unref (reply);
>+	return;
>+}
>+
>+int
>+main (int argc, char *argv[])
>+{
>+	char *udi;
>+	char *iface;
>+	char *id;
>+	const char *connection;
>+	char network[8] = "network";
>+	const char *pnetwork = network;
>+	LibHalContext *ctx = NULL;
>+	DBusConnection *conn;
>+	DBusMessage *msg = NULL;
>+	DBusMessage *reply = NULL;
>+	DBusError error;
>+
>+	udi = getenv ("UDI");
>+	if (udi == NULL)
>+		goto out;
>+
>+	dbus_error_init (&error);
>+	if ((ctx = libhal_ctx_init_direct (&error)) == NULL)
>+		goto out;
>+
>+	iface = libhal_device_get_property_string (ctx, udi, "net.interface",
>+												NULL);
>+
>+	HAL_INFO (("Investigating '%s'", iface));
>+
>+	if (iface == NULL)
>+		goto out;
>+
>+	if ((conn = dbus_bus_get (DBUS_BUS_SYSTEM, &error)) == NULL)
>+		goto out;
>+
>+	msg = dbus_message_new_method_call (BLUEZ_SERVICE, BLUEZ_PATH,
>+										BLUEZ_MANAGER_IFACE,
>+										"ActivateService");
>+
>+	if (msg == NULL)
>+		goto out;
>+
>+	HAL_INFO (("%s.ActivateService('%s')", BLUEZ_MANAGER_IFACE, pnetwork));
>+	dbus_message_append_args (msg, DBUS_TYPE_STRING, &pnetwork,
>+								DBUS_TYPE_INVALID);
>+	reply = dbus_connection_send_with_reply_and_block (conn, msg, -1, &error);
>+
>+	if (dbus_error_is_set (&error) || dbus_set_error_from_message (&error,
>+		reply)) {
>+		dbus_error_free (&error);
>+		goto out;
>+	}
>+
>+	dbus_message_unref (msg);
>+	msg = NULL;
>+
>+	dbus_message_get_args (reply, &error, DBUS_TYPE_STRING, &id,
>+							DBUS_TYPE_INVALID);
>+	if (dbus_error_is_set (&error)) {
>+		dbus_error_free (&error);
>+		goto out;
>+	}
>+
>+	dbus_message_unref (reply);
>+	reply = NULL;
>+
>+	HAL_INFO (("Found Bluez Network service '%s'", id));
>+
>+	msg = dbus_message_new_method_call (id, BLUEZ_NET_PATH,
>+										BLUEZ_NET_MANAGER_IFACE,
>+										"FindConnection");
>+
>+	if (msg == NULL)
>+		goto out;
>+
>+	HAL_INFO (("%s.FindConnection('%s')", BLUEZ_NET_MANAGER_IFACE, iface));
>+	dbus_message_append_args (msg, DBUS_TYPE_STRING, &iface,
>+							DBUS_TYPE_INVALID);
>+	reply = dbus_connection_send_with_reply_and_block (conn, msg, -1, &error);
>+
>+	if (dbus_error_is_set (&error) || dbus_set_error_from_message (&error,
>+		reply)) {
>+		dbus_error_free (&error);
>+		goto out;
>+	}
>+
>+	dbus_message_unref (msg);
>+	msg = NULL;
>+
>+	dbus_message_get_args (reply, &error, DBUS_TYPE_STRING, &connection,
>+							DBUS_TYPE_INVALID);
>+	if (dbus_error_is_set (&error)) {
>+		dbus_error_free (&error);
>+		goto out;
>+	}
>+
>+	get_properties (conn, ctx, udi, id, connection);
>+
>+out:
>+	if (msg)
>+		dbus_message_unref (msg);
>+	if (reply)
>+		dbus_message_unref (reply);
>+	if (ctx != NULL) {
>+		dbus_error_init (&error);
>+		libhal_ctx_shutdown (ctx, &error);
>+		libhal_ctx_free (ctx);
>+	}
>+
>+	return 0;
>+}

Actions: View | Splinter Review

Attachments on bug 10577: 9529 | 9566 | 9567 | 9585 | 9586 | 9587 | 9588 | 9589 | 9637 | 9638

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.