rpms/bluez-utils/devel bluez-utils-3.11-cups-discovery.patch, NONE, 1.1 bluez-utils.spec, 1.57, 1.58
Bastien Nocera (hadess)
fedora-extras-commits at redhat.com
Fri Jun 1 13:47:51 UTC 2007
Author: hadess
Update of /cvs/pkgs/rpms/bluez-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18368
Modified Files:
bluez-utils.spec
Added Files:
bluez-utils-3.11-cups-discovery.patch
Log Message:
* Fri Jun 01 2007 - Bastien Nocera <bnocera at redhat.com> - 3.11-2
- Add upstream patch to list discovered printer devices in the
CUPS backend
bluez-utils-3.11-cups-discovery.patch:
--- NEW FILE bluez-utils-3.11-cups-discovery.patch ---
? cups/.deps
? cups/.libs
? cups/Makefile
? cups/Makefile.in
? cups/bluetooth
Index: cups/Makefile.am
===================================================================
RCS file: /cvsroot/bluez/utils/cups/Makefile.am,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile.am
--- cups/Makefile.am 20 Aug 2006 02:21:03 -0000 1.9
+++ cups/Makefile.am 1 Jun 2007 13:37:01 -0000
@@ -8,8 +8,13 @@ noinst_PROGRAMS = bluetooth
endif
bluetooth_SOURCES = main.c sdp.c spp.c hcrp.c
-bluetooth_LDADD = @BLUEZ_LIBS@
+bluetooth_LDADD = @DBUS_LIBS@ @GLIB_LIBS@ @BLUEZ_LIBS@ $(top_builddir)/common/libhelper.a
-AM_CFLAGS = @BLUEZ_CFLAGS@
+if EXPAT
+bluetooth_LDADD += -lexpat
+endif
+
+AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ -I$(top_srcdir)/common/
MAINTAINERCLEANFILES = Makefile.in
+
Index: cups/main.c
===================================================================
RCS file: /cvsroot/bluez/utils/cups/main.c,v
retrieving revision 1.6
diff -u -p -r1.6 main.c
--- cups/main.c 3 Jan 2006 13:28:57 -0000 1.6
+++ cups/main.c 1 Jun 2007 13:37:02 -0000
@@ -38,12 +38,502 @@
#include <bluetooth/sdp.h>
#include <bluetooth/sdp_lib.h>
+#include <glib.h>
+#include <dbus/dbus.h>
+
+#include "dbus.h"
+#include "sdp-xml.h"
+
extern int sdp_search_spp(sdp_session_t *sdp, uint8_t *channel);
extern int sdp_search_hcrp(sdp_session_t *sdp, unsigned short *ctrl_psm, unsigned short *data_psm);
extern int spp_print(bdaddr_t *src, bdaddr_t *dst, uint8_t channel, int fd, int copies);
extern int hcrp_print(bdaddr_t *src, bdaddr_t *dst, unsigned short ctrl_psm, unsigned short data_psm, int fd, int copies);
+#define PRINTER_SERVICE_CLASS_NAME "printer"
+
+typedef struct cups_device {
+ char *bdaddr;
+ char *name;
+ char *id;
+};
+
+static GSList *device_list = NULL;
+static GMainLoop *loop = NULL;
+static DBusConnection *conn = NULL;
+
+#define ATTRID_1284ID 0x0300
+
+static char *parse_xml_sdp(const char *xml)
+{
+ sdp_record_t *sdp_record;
+ sdp_list_t *l;
+ char *str = NULL;
+
+ sdp_record = sdp_xml_parse_record(xml, strlen(xml));
+ if (sdp_record == NULL)
+ return NULL;
+ for (l = sdp_record->attrlist; l != NULL; l = l->next) {
+ sdp_data_t *data;
+
+ data = (sdp_data_t *) l->data;
+ if (data->attrId != ATTRID_1284ID)
+ continue;
+ /* Ignore the length, it's null terminated */
+ str = g_strdup(data->val.str + 2);
+ break;
+ }
+ sdp_record_free(sdp_record);
+
+ return str;
+}
+
+static char *device_get_ieee1284_id(const char *adapter, const char *bdaddr)
+{
+ guint service_handle;
+ DBusMessage *message, *reply;
+ DBusMessageIter iter, reply_iter, iter_array;
+ const char *svc_id = "00001126-0000-1000-8000-00805F9B34FB";
+ char *xml, *id;
+
+ /* Look for the service handle of the HCRP service */
+ message = dbus_message_new_method_call("org.bluez", adapter,
+ "org.bluez.Adapter",
+ "GetRemoteServiceHandles");
+ dbus_message_iter_init_append(message, &iter);
+ dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &bdaddr);
+ dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &svc_id);
+
+ reply = dbus_connection_send_with_reply_and_block(conn,
+ message, -1, NULL);
+ if (!reply) {
+ dbus_message_unref(message);
+ return NULL;
+ }
+
+ dbus_message_iter_init(reply, &reply_iter);
+ if (dbus_message_iter_get_arg_type(&reply_iter) != DBUS_TYPE_ARRAY) {
+ dbus_message_unref(reply);
+ return NULL;
+ }
+
+ /* Hopefully we only get one handle, or take a punt */
+ dbus_message_iter_recurse(&reply_iter, &iter_array);
+ while (dbus_message_iter_get_arg_type(&iter_array) == DBUS_TYPE_UINT32) {
+ dbus_message_iter_get_basic(&iter_array, &service_handle);
+ dbus_message_iter_next(&iter_array);
+ }
+
+ dbus_message_unref(reply);
+
+ /* Now get the XML for the HCRP service record */
+ message = dbus_message_new_method_call("org.bluez", adapter,
+ "org.bluez.Adapter",
+ "GetRemoteServiceRecordAsXML");
+ dbus_message_iter_init_append(message, &iter);
+ dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &bdaddr);
+ dbus_message_iter_append_basic(&iter, DBUS_TYPE_UINT32, &service_handle);
+
+ reply = dbus_connection_send_with_reply_and_block(conn,
+ message, -1, NULL);
+ dbus_message_unref(message);
+ if (!reply) {
+ return NULL;
+ }
+
+ dbus_message_iter_init(reply, &reply_iter);
+ dbus_message_iter_get_basic(&reply_iter, &xml);
+
+ id = parse_xml_sdp(xml);
+
+ dbus_message_unref(reply);
+
+ return id;
+}
+
+static void add_device_to_list(const char *name, const char *bdaddr, const char *id)
+{
+ struct cups_device *device;
+ GSList *l;
+
+ /* Look for the device in the list */
+ for (l = device_list; l != NULL; l = l->next) {
+ device = (struct cups_device *) l->data;
+
+ if (strcmp(device->bdaddr, bdaddr) == 0) {
+ g_free(device->name);
+ device->name = g_strdup(name);
+ return;
+ }
+ }
+
+ /* Or add it to the list if it's not there */
+ device = g_new0(struct cups_device, 1);
+ device->bdaddr = g_strdup(bdaddr);
+ device->name = g_strdup(name);
+ device->id = g_strdup(id);
+
+ device_list = g_slist_prepend(device_list, device);
+}
+
+static char *escape_name(const char *str, char orig, char dest)
+{
+ char *ret, *s;
+
+ ret = g_strdup(str);
+ while ((s = strchr(ret, orig)) != NULL)
+ s[0] = dest;
+ return ret;
+}
+
+static void print_printer_details(const char *name, const char *bdaddr, const char *id)
+{
+ char *uri, *escaped;
+ guint len;
+
+ escaped = escape_name(name, '\"', '\'');
+ len = strlen("bluetooth://") + 12 + 1;
+ uri = g_malloc(len);
+ snprintf(uri, len, "bluetooth://%c%c%c%c%c%c%c%c%c%c%c%c",
+ bdaddr[0], bdaddr[1],
+ bdaddr[3], bdaddr[4],
+ bdaddr[6], bdaddr[7],
+ bdaddr[9], bdaddr[10],
+ bdaddr[12], bdaddr[13],
+ bdaddr[15], bdaddr[16]);
+ printf("network %s \"Unknown\" \"%s (Bluetooth)\"", uri, escaped);
+ if (id != NULL)
+ printf(" \"%s\"\n", id);
+ else
+ printf ("\n");
+ g_free(escaped);
+ g_free(uri);
+}
+
+static gboolean device_is_printer(const char *adapter, const char *bdaddr)
+{
+ char *class;
+ DBusMessage *message, *reply;
+ DBusMessageIter iter, reply_iter;
+
+ message = dbus_message_new_method_call("org.bluez", adapter,
+ "org.bluez.Adapter",
+ "GetRemoteMinorClass");
+ dbus_message_iter_init_append(message, &iter);
+ dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &bdaddr);
+
+ reply = dbus_connection_send_with_reply_and_block(conn,
+ message, -1, NULL);
+ dbus_message_unref(message);
+ if (!reply) {
+ return FALSE;
+ }
+
+ dbus_message_iter_init(reply, &reply_iter);
+ dbus_message_iter_get_basic(&reply_iter, &class);
+
+ if (class != NULL && strcmp(class, PRINTER_SERVICE_CLASS_NAME) == 0) {
+ dbus_message_unref(reply);
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+static char *device_get_name(const char *adapter, const char *bdaddr)
+{
+ char *name;
+ DBusMessage *message, *reply;
+ DBusMessageIter iter, reply_iter;
+
+ message = dbus_message_new_method_call("org.bluez", adapter,
+ "org.bluez.Adapter",
+ "GetRemoteName");
+ dbus_message_iter_init_append(message, &iter);
+ dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &bdaddr);
+
+ reply = dbus_connection_send_with_reply_and_block(conn,
+ message, -1, NULL);
+ dbus_message_unref(message);
+ if (!reply)
+ return NULL;
+
+ dbus_message_iter_init(reply, &reply_iter);
+ dbus_message_iter_get_basic(&reply_iter, &name);
+
+ name = g_strdup(name);
+ dbus_message_unref(reply);
+ return name;
+}
+
+static void remote_device_found(const char *adapter, const char *bdaddr, guint class, int rssi)
+{
+ uint8_t major_index = (class >> 8) & 0x1F;
+ uint8_t minor_index;
+ uint8_t shift_minor = 0;
+ gboolean found = FALSE;
+ char *name, *id;
+
+ /* Check if we have a printer
+ * From hcid/dbus-adapter.c minor_class_str() */
+ if (major_index != 6)
+ return;
+
+ minor_index = (class >> 4) & 0x0F;
+ while (shift_minor < 4) {
+ if (((minor_index >> shift_minor) & 0x01) == 0x01) {
+ if (shift_minor == 3) {
+ found = TRUE;
+ break;
+ }
+ }
+ shift_minor++;
+ }
+
+ if (!found)
+ return;
+
+ name = device_get_name(adapter, bdaddr);
+ id = device_get_ieee1284_id(adapter, bdaddr);
+ add_device_to_list(name, bdaddr, id);
+ g_free(name);
+ g_free(id);
+}
+
+static void remote_name_updated(const char *bdaddr, const char *name)
+{
+ add_device_to_list(name, bdaddr, NULL);
+}
+
+static void discovery_completed(void)
+{
+ GSList *l;
+
+ for (l = device_list; l != NULL; l = l->next) {
+ struct cups_device *device = (struct cups_device *) l->data;
+
+ if (device->name == NULL) {
+ device->name = escape_name(device->bdaddr,
+ ':', '-');
+ }
+ print_printer_details(device->name, device->bdaddr, device->id);
+ g_free(device->name);
+ g_free(device->bdaddr);
+ g_free(device->id);
+ g_free(device);
+ }
+
+ g_slist_free(device_list);
+ device_list = NULL;
+
+ g_main_loop_quit(loop);
+}
+
+static void remote_device_disappeared(const char *bdaddr)
+{
+ GSList *l;
+
+ for (l = device_list; l != NULL; l = l->next) {
+ struct cups_device *device = (struct cups_device *) l->data;
+
+ if (strcmp(device->bdaddr, bdaddr) == 0) {
+ g_free(device->name);
+ g_free(device->bdaddr);
+ g_free(device);
+ device_list = g_slist_delete_link(device_list, l);
+ return;
+ }
+ }
+}
+
+static gboolean list_known_printers(const char *adapter)
+{
+ DBusMessageIter reply_iter, iter_array;
+ DBusError error;
+ DBusMessage *message, *reply;
+
+ message = dbus_message_new_method_call ("org.bluez", adapter,
+ "org.bluez.Adapter",
+ "ListRemoteDevices");
+ if (message == NULL)
+ return FALSE;
+
+ dbus_error_init(&error);
+ reply = dbus_connection_send_with_reply_and_block(conn,
+ message, -1,
+ &error);
+ dbus_message_unref(message);
+ if (&error != NULL && dbus_error_is_set(&error))
+ return FALSE;
+
+ dbus_message_iter_init(reply, &reply_iter);
+ if (dbus_message_iter_get_arg_type(&reply_iter) != DBUS_TYPE_ARRAY) {
+ dbus_message_unref(reply);
+ return FALSE;
+ }
+
+ dbus_message_iter_recurse(&reply_iter, &iter_array);
+ while (dbus_message_iter_get_arg_type(&iter_array) == DBUS_TYPE_STRING) {
+ char *bdaddr;
+
+ dbus_message_iter_get_basic(&iter_array, &bdaddr);
+ if (device_is_printer(adapter, bdaddr)) {
+ char *name, *id;
+ name = device_get_name(adapter, bdaddr);
+ id = device_get_ieee1284_id(adapter, bdaddr);
+ add_device_to_list(name, bdaddr, id);
+ g_free(name);
+ g_free(id);
+ }
+ dbus_message_iter_next(&iter_array);
+ }
+
+ dbus_message_unref(reply);
+
+ return FALSE;
+}
+
+static DBusHandlerResult filter_func(DBusConnection *connection, DBusMessage *message, void *user_data)
+{
+ const char *adapter;
+
+ if (dbus_message_is_signal(message, "org.bluez.Adapter",
+ "RemoteDeviceFound")) {
+ char *bdaddr;
+ guint class;
+ int rssi;
+
+ dbus_message_get_args(message, NULL,
+ DBUS_TYPE_STRING, &bdaddr,
+ DBUS_TYPE_UINT32, &class,
+ DBUS_TYPE_INT32, &rssi,
+ DBUS_TYPE_INVALID);
+ adapter = dbus_message_get_path(message);
+ remote_device_found(adapter, bdaddr, class, rssi);
+ } else if (dbus_message_is_signal(message, "org.bluez.Adapter",
+ "RemoteNameUpdated")) {
+ char *bdaddr, *name;
+
+ dbus_message_get_args(message, NULL,
+ DBUS_TYPE_STRING, &bdaddr,
+ DBUS_TYPE_STRING, &name,
+ DBUS_TYPE_INVALID);
+ remote_name_updated(bdaddr, name);
+ } else if (dbus_message_is_signal(message, "org.bluez.Adapter",
+ "RemoteDeviceDisappeared")) {
+ char *bdaddr;
+
+ dbus_message_get_args(message, NULL,
+ DBUS_TYPE_STRING, &bdaddr,
+ DBUS_TYPE_INVALID);
+ remote_device_disappeared(bdaddr);
+ } else if (dbus_message_is_signal(message, "org.bluez.Adapter",
+ "DiscoveryCompleted")) {
+ discovery_completed();
+ }
+
+ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+}
+
+static void list_printers(void)
+{
+ /* 1. Connect to the bus
+ * 2. Get the manager
+ * 3. Get the default adapter
+ * 4. Get a list of devices
+ * 5. Get the class of each device
+ * 6. Print the details from each printer device
+ */
+ DBusError error;
+ dbus_bool_t hcid_exists;
+ DBusMessage *reply, *message;
+ DBusMessageIter reply_iter;
+ char *adapter, *match;
+ guint len;
+
+ conn = init_dbus(NULL, NULL, NULL);
+ if (conn == NULL)
+ return;
+
+ dbus_error_init(&error);
+ hcid_exists = dbus_bus_name_has_owner(conn, "org.bluez", &error);
+ if (&error != NULL && dbus_error_is_set(&error))
+ return;
+
+ if (!hcid_exists)
+ return;
+
+ /* Get the default adapter */
+ message = dbus_message_new_method_call("org.bluez", "/org/bluez",
+ "org.bluez.Manager",
+ "DefaultAdapter");
+ if (message == NULL) {
+ dbus_connection_unref(conn);
+ return;
+ }
+ reply = dbus_connection_send_with_reply_and_block(conn,
+ message, -1,
+ &error);
+ dbus_message_unref(message);
+ if (&error != NULL && dbus_error_is_set(&error)) {
+ dbus_connection_unref(conn);
+ return;
+ }
+
+ dbus_message_iter_init(reply, &reply_iter);
+ if (dbus_message_iter_get_arg_type(&reply_iter) != DBUS_TYPE_STRING) {
+ dbus_message_unref(reply);
+ dbus_connection_unref(conn);
+ return;
+ }
+ dbus_message_iter_get_basic(&reply_iter, &adapter);
+ adapter = g_strdup(adapter);
+ dbus_message_unref(reply);
+
+ if (!dbus_connection_add_filter(conn, filter_func, adapter, g_free)) {
+ g_free(adapter);
+ dbus_connection_unref(conn);
+ return;
+ }
+
+#define MATCH_FORMAT \
+ "type='signal'," \
+ "interface='org.bluez.Adapter'," \
+ "sender='org.bluez'," \
+ "path='%s'"
+
+ len = strlen(MATCH_FORMAT) - 2 + strlen(adapter) + 1;
+ match = g_malloc(len);
+ snprintf(match, len, "type='signal',"
+ "interface='org.bluez.Adapter',"
+ "sender='org.bluez',"
+ "path='%s'",
+ adapter);
+ dbus_bus_add_match(conn, match, &error);
+ g_free(match);
+
+ message = dbus_message_new_method_call("org.bluez", adapter,
+ "org.bluez.Adapter",
+ "DiscoverDevicesWithoutNameResolving");
+
+ if (!dbus_connection_send_with_reply(conn,
+ message, NULL, -1)) {
+ dbus_message_unref(message);
+ dbus_connection_unref(conn);
+ g_free(adapter);
+ return;
+ }
+ dbus_message_unref(message);
+
+ /* Also add the the recent devices */
+ g_timeout_add(0, (GSourceFunc) list_known_printers, adapter);
+
+ loop = g_main_loop_new(NULL, TRUE);
+ g_main_loop_run(loop);
+
+ dbus_connection_unref(conn);
+}
+
/*
* Usage: printer-uri job-id user title copies options [file]
*
@@ -73,7 +563,7 @@ int main(int argc, char *argv[])
#endif /* HAVE_SIGSET */
if (argc == 1) {
- puts("network bluetooth \"Unknown\" \"Bluetooth printer\"");
+ list_printers();
return 0;
}
Index: bluez-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-utils/devel/bluez-utils.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- bluez-utils.spec 29 May 2007 16:05:05 -0000 1.57
+++ bluez-utils.spec 1 Jun 2007 13:47:16 -0000 1.58
@@ -1,7 +1,7 @@
Summary: Bluetooth utilities
Name: bluez-utils
Version: 3.11
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPL
Group: Applications/System
Source: http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz
@@ -14,6 +14,7 @@
Source8: hidd.conf
Source9: bluetooth.conf
Patch0: bluez-utils-2.3-conf.patch
+Patch1: bluez-utils-3.11-cups-discovery.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
URL: http://www.bluez.org/
@@ -21,6 +22,8 @@
BuildRequires: flex
BuildRequires: dbus-devel >= 0.90
BuildRequires: libusb-devel, glib2-devel
+# For patch1
+BuildRequires: automake autoconf libtool
ExcludeArch: s390 s390x
Obsoletes: bluez-pan, bluez-sdp
Requires: initscripts, bluez-libs >= %{version}
@@ -54,6 +57,9 @@
%setup -q
%patch0 -p1
+%patch1 -p0
+
+autoreconf --install
%build
%configure --with-bluez-libs=%{_libdir} --enable-pie --enable-debug \
@@ -124,6 +130,10 @@
/usr/lib/cups/backend/bluetooth
%changelog
+* Fri Jun 01 2007 - Bastien Nocera <bnocera at redhat.com> - 3.11-2
+- Add upstream patch to list discovered printer devices in the
+ CUPS backend
+
* Sat May 26 2007 - Bastien Nocera <bnocera at redhat.com> - 3.11-1
- Update to bluez-utils 3.11
- Move the cups backend to its expected location (#237482)
More information about the fedora-extras-commits
mailing list