[Bluez-devel] HCID D-Bus

[Bluez-devel] HCID D-Bus

[Claudio Takahasi]

[-- Attachment #1.1: Type: text/plain, Size: 1020 bytes --]

Hi Marcel,

In the last email about bluetoothd, you suggested send patches to enhance 
hcid. I studied the hcid code and I would like align our ideas before start 
coding. My suggestions are:

1. Develop a common code addressing all D-Bus versions
2. Send signals to connection complete and disconnection
3. Register a D-Bus hci object path as a initial point for bluetoothd and 
provide basic services(inquiry, auth, ...).

Do you agree? Do you have suggestions/comments?

I am sending a patch to solve the problem of D-Bus versions. Sorry, byte 
array is not being handled yet, but I will fix it. This is just a idea of 
how solve the problem of several D-Bus versions. Get the dbus major/minor 
version in the "configure" is a better approach, instead of check if the 
function dbus_message_iter_get_basic belongs to the dbus-1 library. If you 
allow change the makefiles(acinclude.m4, configure.in <http://configure.in>, 
config.h.in <http://config.h.in> ) I can modify it.

Regards,
Claudio.

[-- Attachment #1.2: Type: text/html, Size: 1112 bytes --]

[-- Attachment #2: hcid_dbus_patch00.01 --]
[-- Type: application/octet-stream, Size: 7348 bytes --]

--- bluez-utils-2.20/hcid/dbus.c	2005-08-27 10:37:14.000000000 -0300
+++ bluez-hcid-0.0.1/hcid/dbus.c	2005-09-08 16:08:38.772082600 -0300
@@ -46,6 +46,8 @@
 
 #include "hcid.h"
 
+#include "dbus-compat.h"
+
 static DBusConnection *connection;
 
 #define TIMEOUT (30 * 1000)		/* 30 seconds */
@@ -83,11 +85,7 @@
 	if (type != DBUS_TYPE_STRING)
 		goto error;
 
-#ifdef HAVE_DBUS_MESSAGE_ITER_GET_BASIC
-	dbus_message_iter_get_basic(&iter, &pin);
-#else
-	pin = dbus_message_iter_get_string(&iter);
-#endif
+	DBUS_MSG_ITER_GET_STR(&iter, pin);
 
 	len = strlen(pin);
 
@@ -171,9 +169,7 @@
 void hcid_dbus_inquiry_start(bdaddr_t *local)
 {
 	DBusMessage *message;
-#ifndef HAVE_DBUS_MESSAGE_ITER_GET_BASIC
 	DBusMessageIter iter;
-#endif
 	char *local_addr;	
 	bdaddr_t tmp;
 
@@ -186,15 +182,8 @@
 		goto failed;
 	}
 
-#ifdef HAVE_DBUS_MESSAGE_ITER_GET_BASIC
-	dbus_message_append_args(message,
-					DBUS_TYPE_STRING, &local_addr,
-					DBUS_TYPE_INVALID);
-#else
-	dbus_message_append_iter_init(message, &iter);
-
-	dbus_message_iter_append_string(&iter, local_addr);
-#endif
+	DBUS_MSG_APPEND_ITER_INIT(message, &iter);
+	DBUS_MSG_ITER_APPEND_STR(&iter, local_addr);
 
 	if (dbus_connection_send(connection, message, NULL) == FALSE) {
 		syslog(LOG_ERR, "Can't send D-BUS inquiry start message");
@@ -214,9 +203,7 @@
 void hcid_dbus_inquiry_complete(bdaddr_t *local)
 {
 	DBusMessage *message;
-#ifndef HAVE_DBUS_MESSAGE_ITER_GET_BASIC
 	DBusMessageIter iter;
-#endif
 	char *local_addr;
 	bdaddr_t tmp;
 
@@ -229,15 +216,8 @@
 		goto failed;
 	}
 
-#ifdef HAVE_DBUS_MESSAGE_ITER_GET_BASIC
-	dbus_message_append_args(message,
-					DBUS_TYPE_STRING, &local_addr,
-					DBUS_TYPE_INVALID);
-#else
-	dbus_message_append_iter_init(message, &iter);
-
-	dbus_message_iter_append_string(&iter, local_addr);
-#endif
+	DBUS_MSG_APPEND_ITER_INIT(message, &iter);
+	DBUS_MSG_ITER_APPEND_STR(&iter, local_addr);
 
 	if (dbus_connection_send(connection, message, NULL) == FALSE) {
 		syslog(LOG_ERR, "Can't send D-BUS inquiry complete message");
@@ -257,9 +237,7 @@
 void hcid_dbus_inquiry_result(bdaddr_t *local, bdaddr_t *peer, uint32_t class, int8_t rssi)
 {
 	DBusMessage *message;
-#ifndef HAVE_DBUS_MESSAGE_ITER_GET_BASIC
 	DBusMessageIter iter;
-#endif
 	char *local_addr, *peer_addr;
 	bdaddr_t tmp;
 
@@ -273,21 +251,11 @@
 		goto failed;
 	}
 
-#ifdef HAVE_DBUS_MESSAGE_ITER_GET_BASIC
-	dbus_message_append_args(message,
-					DBUS_TYPE_STRING, &local_addr,
-					DBUS_TYPE_STRING, &peer_addr,
-					DBUS_TYPE_UINT32, &class,
-					DBUS_TYPE_INT32, &rssi,
-					DBUS_TYPE_INVALID);
-#else
-	dbus_message_append_iter_init(message, &iter);
-
-	dbus_message_iter_append_string(&iter, local_addr);
-	dbus_message_iter_append_string(&iter, peer_addr);
-	dbus_message_iter_append_uint32(&iter, class);
-	dbus_message_iter_append_int32(&iter, rssi);
-#endif
+	DBUS_MSG_APPEND_ITER_INIT(message, &iter);
+	DBUS_MSG_ITER_APPEND_STR(&iter, local_addr);
+	DBUS_MSG_ITER_APPEND_STR(&iter, peer_addr);
+	DBUS_MSG_ITER_APPEND_UINT32(&iter, class);
+	DBUS_MSG_ITER_APPEND_INT32(&iter, rssi);
 
 	if (dbus_connection_send(connection, message, NULL) == FALSE) {
 		syslog(LOG_ERR, "Can't send D-BUS inquiry result message");
@@ -308,9 +276,7 @@
 void hcid_dbus_remote_name(bdaddr_t *local, bdaddr_t *peer, char *name)
 {
 	DBusMessage *message;
-#ifndef HAVE_DBUS_MESSAGE_ITER_GET_BASIC
 	DBusMessageIter iter;
-#endif
 	char *local_addr, *peer_addr;
 	bdaddr_t tmp;
 
@@ -324,19 +290,10 @@
 		goto failed;
 	}
 
-#ifdef HAVE_DBUS_MESSAGE_ITER_GET_BASIC
-	dbus_message_append_args(message,
-					DBUS_TYPE_STRING, &local_addr,
-					DBUS_TYPE_STRING, &peer_addr,
-					DBUS_TYPE_STRING, &name,
-					DBUS_TYPE_INVALID);
-#else
-	dbus_message_append_iter_init(message, &iter);
-
-	dbus_message_iter_append_string(&iter, local_addr);
-	dbus_message_iter_append_string(&iter, peer_addr);
-	dbus_message_iter_append_string(&iter, name);
-#endif
+	DBUS_MSG_APPEND_ITER_INIT(message, &iter);
+	DBUS_MSG_ITER_APPEND_STR(&iter, local_addr);
+	DBUS_MSG_ITER_APPEND_STR(&iter, peer_addr);
+	DBUS_MSG_ITER_APPEND_STR(&iter, name);
 
 	if (dbus_connection_send(connection, message, NULL) == FALSE) {
 		syslog(LOG_ERR, "Can't send D-BUS remote name message");
--- bluez-utils-2.20/hcid/dbus-compat.h	1969-12-31 21:00:00.000000000 -0300
+++ bluez-hcid-0.0.1/hcid/dbus-compat.h	2005-09-08 16:40:35.856641448 -0300
@@ -0,0 +1,81 @@
+/*
+ *
+ *  BlueZ - Bluetooth protocol stack for Linux
+ *
+ *  Copyright (C) 2000-2001  Qualcomm Incorporated
+ *  Copyright (C) 2002-2003  Maxim Krasnyansky <maxk@qualcomm.com>
+ *  Copyright (C) 2002-2005  Marcel Holtmann <marcel@holtmann.org>
+ *
+ *
+ *  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
+ *  published by the Free Software Foundation;
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ *  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+ *  IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY
+ *  CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES 
+ *  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 
+ *  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
+ *  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ *  ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 
+ *  COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 
+ *  SOFTWARE IS DISCLAIMED.
+ *
+ *
+ *  $Id: dbus-compat.h,v 1.24 2005/09/08 18:32:41 holtmann Exp $
+ */
+
+#ifndef __H_DBUS_COMPAT_H__
+#define __H_DBUS_COMPAT_H__
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define CHECK_DBUS_VERSION(major, minor) \
+		(DBUS_MAJOR_VER > (major) || \
+		 	(DBUS_MAJOR_VER == (major) && DBUS_MINOR_VER >= (minor)))
+	
+#if CHECK_DBUS_VERSION(0, 30)
+	/* For D-Bus version >= 0.30 */
+	/****** pending, requires chnages in the makefile  *****/
+#else /* < 0.30 */
+	/* For D-Bus version older than 0.30 */
+	
+#endif
+
+#if  HAVE_DBUS_MESSAGE_ITER_GET_BASIC
+	#warning "D-Bus > 0.30"
+	#define DBUS_MSG_ITER_GET_STR(iter, retvar) \
+		dbus_message_iter_get_basic((iter), &(retvar))
+	#define DBUS_MSG_ITER_APPEND_STR(iter, val) \
+		dbus_message_iter_append_basic((iter), DBUS_TYPE_STRING, &(val))
+	#define DBUS_MSG_APPEND_ITER_INIT(a, b) \
+		dbus_message_iter_init_append(a, b)	
+	#define DBUS_MSG_ITER_APPEND_INT32(iter, val) \
+		dbus_message_iter_append_basic((iter), DBUS_TYPE_INT32, &(val))
+	#define DBUS_MSG_ITER_APPEND_UINT32(iter, val) \
+		dbus_message_iter_append_basic((iter), DBUS_TYPE_UINT32, &(val))
+		
+#else
+	#warning "D-Bus < 0.30"
+	#define DBUS_MSG_ITER_GET_STR(iter, retvar) \
+		retvar = dbus_message_iter_get_string(iter)
+	#define DBUS_MSG_ITER_APPEND_STR(iter, val) \
+		dbus_message_iter_append_string((iter), (val))
+	#define DBUS_MSG_APPEND_ITER_INIT(a, b) \
+		dbus_message_append_iter_init(a, b)
+	#define DBUS_MSG_ITER_APPEND_INT32(iter, val) \
+		dbus_message_iter_append_int32((iter), (val))
+	#define DBUS_MSG_ITER_APPEND_UINT32(iter, val) \
+		dbus_message_iter_append_uint32((iter), (val))
+#endif
+
+
+
+
+
+#endif /*__H_DBUS_COMPAT_H__*/

Re: [Bluez-devel] HCID D-Bus

[Marcel Holtmann]

Hi Claudio,

> In the last email about bluetoothd, you suggested send patches to
> enhance hcid. I studied the hcid code and I would like align our ideas
> before start coding. My suggestions are:
> 
> 1. Develop a common code addressing all D-Bus versions

not needed, because my plan is to drop support for anything below D-Bus
version 0.5 (which should be compatible with D-Bus 0.3x) starting with
bluez-utils-0.22. My original plan was to do it in next release, but
there are some memory leak fixes and I want to get out a new version as
soon as possible. However maybe it is a good idea to drop support for
older D-Bus versions now.

It seems the only problematic distribution is Debian unstable. Every
other distribution (including Ubuntu) uses at least D-Bus 0.35.

> 2. Send signals to connection complete and disconnection

While I was adding the signals for the inquiry responses, I thought
about doing this, too. I added the needed functions for it and open the
filter for these messages. The only problem is that the disconnect uses
the ACL handle and not the device address. This means you have to keep
track of all handles. Normally the kernel does this all for us. This is
one reason for a good/new interface between the kernel and bluetoothd.
Coding everything twice is stupid.

> 3. Register a D-Bus hci object path as a initial point for bluetoothd
> and provide basic services(inquiry, auth, ...).

Go ahead. I would really welcome it.

I need a job where I can fulltime work on bluetoothd and add all the
cool things we talked about. If anyone know one or has one, let me know.

> I am sending a patch to solve the problem of D-Bus versions. Sorry,
> byte array is not being handled yet, but I will fix it. This is just a
> idea of how solve the problem of several D-Bus versions. Get the dbus
> major/minor version in the "configure" is a better approach, instead
> of check if the function dbus_message_iter_get_basic belongs to the
> dbus-1 library. If you allow change the makefiles(acinclude.m4,
> configure.in, config.h.in ) I can modify it.

I like to drop support for older D-Bus versions. After a private talk
with J5 it seems the only sane way to do.

Regards

Marcel




-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
Bluez-devel mailing list
Bluez-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bluez-devel

Re: [Bluez-devel] HCID D-Bus

[Peter Robinson]

[-- Attachment #1: Type: text/plain, Size: 774 bytes --]

> 
> > 1. Develop a common code addressing all D-Bus versions
> 
> not needed, because my plan is to drop support for anything below D-Bus
> version 0.5 (which should be compatible with D-Bus 0.3x) starting with
> bluez-utils-0.22. My original plan was to do it in next release, but
> there are some memory leak fixes and I want to get out a new version as
> soon as possible. However maybe it is a good idea to drop support for
> older D-Bus versions now.


I think 0.5 is compatible with >0.35. The current FC4 only uses 0.33 and I 
don't think its compatible with >0.35. I think this is similar for a number 
of the current releases (I think most with gnome 2.10) but obviously isn't 
the case for the development streams that aren't releases yet.

Pete

[-- Attachment #2: Type: text/html, Size: 963 bytes --]

Re: [Bluez-devel] HCID D-Bus

[Marcel Holtmann]

Hi Pete,

> I think 0.5 is compatible with >0.35. The current FC4 only uses  0.33
> and I don't think its compatible with > 0.35. I think this is similar
> for a number of the current releases (I think most with gnome 2.10)
> but obviously isn't the case for the development streams that aren't
> releases yet.

having 0.33 is better than 0.23 and this is what Debian unstable still
uses. However lets make a list of the distributions:

	SuSE Linux 10.0		D-Bus 0.35
	Fedora Core 4		D-Bus 0.33
	Ubuntu Breezy		D-Bus 0.36
	Debian unstable		D-Bus 0.23

The only bad guy is Debian unstable and I don't care anymore. They use
Xorg finally and have GCC 4.0 etc., but they can't move over to the next
D-Bus generation. I think that is their problem now and the release of
bluez-utils-0.22 will definitely drop the support for the old D-Bus 0.23
version.

I like to base everything around the current D-Bus 0.50 release, because
the C API should be quite stable now. I will accept small workarounds to
make D-Bus 0.3x work, but as soon as the distributions update their
D-Bus libraries I will drop them.

This is not a nice thing to do, I know, but a wrong usage of D-Bus lets
hcid segfault and this is not what I want.

Regards

Marcel




-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
Bluez-devel mailing list
Bluez-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bluez-devel

Re: [Bluez-devel] HCID D-Bus

[Sjoerd Simons]

On Fri, Sep 09, 2005 at 11:37:25AM +0200, Marcel Holtmann wrote:
> Hi Pete,
> 
> > I think 0.5 is compatible with >0.35. The current FC4 only uses  0.33
> > and I don't think its compatible with > 0.35. I think this is similar
> > for a number of the current releases (I think most with gnome 2.10)
> > but obviously isn't the case for the development streams that aren't
> > releases yet.
> 
> having 0.33 is better than 0.23 and this is what Debian unstable still
> uses. However lets make a list of the distributions:
> 
> 	SuSE Linux 10.0		D-Bus 0.35
> 	Fedora Core 4		D-Bus 0.33
> 	Ubuntu Breezy		D-Bus 0.36
> 	Debian unstable		D-Bus 0.23
    Debian experimental D-Bus 0.50
> 
> The only bad guy is Debian unstable and I don't care anymore. They use
> Xorg finally and have GCC 4.0 etc., but they can't move over to the next
> D-Bus generation. I think that is their problem now and the release of
> bluez-utils-0.22 will definitely drop the support for the old D-Bus 0.23
> version.

D-bus >= 0.3x has been in debian experimental for quite some time. There are
various transitions going on in debian unstable currently which makes it
inappropriate to do a dbus transition now too.
  
> I like to base everything around the current D-Bus 0.50 release, because
> the C API should be quite stable now. I will accept small workarounds to
> make D-Bus 0.3x work, but as soon as the distributions update their
> D-Bus libraries I will drop them.
> 
> This is not a nice thing to do, I know, but a wrong usage of D-Bus lets
> hcid segfault and this is not what I want.

As one of debian's dbus maintainers i would advise to indeed base everything on
dbus >= 0.50. Hopefully it won't take too long before we can move the new dbus
from experimental to unstable, so the workarounds for old dbus release are just
not worth it.

  Sjoerd
-- 
He keeps differentiating, flying off on a tangent.


-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
Bluez-devel mailing list
Bluez-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bluez-devel

Re: [Bluez-devel] HCID D-Bus

[Marcel Holtmann]

Hi Sjoerd,

> > having 0.33 is better than 0.23 and this is what Debian unstable still
> > uses. However lets make a list of the distributions:
> > 
> > 	SuSE Linux 10.0		D-Bus 0.35
> > 	Fedora Core 4		D-Bus 0.33
> > 	Ubuntu Breezy		D-Bus 0.36
> > 	Debian unstable		D-Bus 0.23
>     Debian experimental D-Bus 0.50

this is good.

> > The only bad guy is Debian unstable and I don't care anymore. They use
> > Xorg finally and have GCC 4.0 etc., but they can't move over to the next
> > D-Bus generation. I think that is their problem now and the release of
> > bluez-utils-0.22 will definitely drop the support for the old D-Bus 0.23
> > version.
> 
> D-bus >= 0.3x has been in debian experimental for quite some time. There are
> various transitions going on in debian unstable currently which makes it
> inappropriate to do a dbus transition now too.

Last time I looked at it, the complete KDE part was broken and full of
wrong dependencies. So breaking D-Bus wouldn't even be notified ;)

> > I like to base everything around the current D-Bus 0.50 release, because
> > the C API should be quite stable now. I will accept small workarounds to
> > make D-Bus 0.3x work, but as soon as the distributions update their
> > D-Bus libraries I will drop them.
> > 
> > This is not a nice thing to do, I know, but a wrong usage of D-Bus lets
> > hcid segfault and this is not what I want.
> 
> As one of debian's dbus maintainers i would advise to indeed base everything on
> dbus >= 0.50. Hopefully it won't take too long before we can move the new dbus
> from experimental to unstable, so the workarounds for old dbus release are just
> not worth it.

This means I will release bluez-utils-2.21 on the weekend, because of
some memory leak fixes and then I will drop D-Bus 0.23 support. So if
any patches need to go in before, please send them now.

Regards

Marcel




-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
Bluez-devel mailing list
Bluez-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bluez-devel

Re: [Bluez-devel] HCID D-Bus (Sig Fault)

[Claudio Takahasi]

[-- Attachment #1.1: Type: text/plain, Size: 3034 bytes --]

Hi Marcel,

I am sending a new patch that contains the following enhancements:
1. Support multiple D-Bus versions(0.23, 0.30...) 
2. Fixed error handling ServiceDoesNotExist, NoReply, UnknownService, ...
This condition is causing sig fault due the wrong pin value. Scenario: D-Bus 
pin helper enabled 
and an error different than wrong argument triggered.


Regards,
Claudio.

On 9/9/05, Marcel Holtmann <marcel@holtmann.org> wrote:
> 
> Hi Sjoerd,
> 
> > > having 0.33 is better than 0.23 and this is what Debian unstable still
> > > uses. However lets make a list of the distributions:
> > >
> > > SuSE Linux 10.0 D-Bus 0.35
> > > Fedora Core 4 D-Bus 0.33
> > > Ubuntu Breezy D-Bus 0.36
> > > Debian unstable D-Bus 0.23
> > Debian experimental D-Bus 0.50
> 
> this is good.
> 
> > > The only bad guy is Debian unstable and I don't care anymore. They use
> > > Xorg finally and have GCC 4.0 etc., but they can't move over to the 
> next
> > > D-Bus generation. I think that is their problem now and the release of
> > > bluez-utils-0.22 will definitely drop the support for the old D-Bus 
> 0.23
> > > version.
> >
> > D-bus >= 0.3x has been in debian experimental for quite some time. There 
> are
> > various transitions going on in debian unstable currently which makes it
> > inappropriate to do a dbus transition now too.
> 
> Last time I looked at it, the complete KDE part was broken and full of
> wrong dependencies. So breaking D-Bus wouldn't even be notified ;)
> 
> > > I like to base everything around the current D-Bus 0.50 release, 
> because
> > > the C API should be quite stable now. I will accept small workarounds 
> to
> > > make D-Bus 0.3x work, but as soon as the distributions update their
> > > D-Bus libraries I will drop them.
> > >
> > > This is not a nice thing to do, I know, but a wrong usage of D-Bus 
> lets
> > > hcid segfault and this is not what I want.
> >
> > As one of debian's dbus maintainers i would advise to indeed base 
> everything on
> > dbus >= 0.50. Hopefully it won't take too long before we can move the 
> new dbus
> > from experimental to unstable, so the workarounds for old dbus release 
> are just
> > not worth it.
> 
> This means I will release bluez-utils-2.21 on the weekend, because of
> some memory leak fixes and then I will drop D-Bus 0.23 support. So if
> any patches need to go in before, please send them now.
> 
> Regards
> 
> Marcel
> 
> 
> 
> 
> -------------------------------------------------------
> SF.Net email is Sponsored by the Better Software Conference & EXPO
> September 19-22, 2005 * San Francisco, CA * Development Lifecycle 
> Practices
> Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
> Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
> _______________________________________________
> Bluez-devel mailing list
> Bluez-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/bluez-devel
>

[-- Attachment #1.2: Type: text/html, Size: 4031 bytes --]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: hcid_dbus_0002.patch --]
[-- Type: text/x-patch; name="hcid_dbus_0002.patch", Size: 13505 bytes --]

--- bluez-utils-2.21.orig/hcid/dbus-compat.h	1969-12-31 21:00:00.000000000 -0300
+++ bluez-hcid-0.0.3/hcid/dbus-compat.h	2005-09-12 16:42:22.382630376 -0300
@@ -0,0 +1,114 @@
+/*
+ *
+ *  BlueZ - Bluetooth protocol stack for Linux
+ *
+ *  Copyright (C) 2000-2001  Qualcomm Incorporated
+ *  Copyright (C) 2002-2003  Maxim Krasnyansky <maxk@qualcomm.com>
+ *  Copyright (C) 2002-2005  Marcel Holtmann <marcel@holtmann.org>
+ *
+ *
+ *  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
+ *  published by the Free Software Foundation;
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ *  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+ *  IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY
+ *  CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES 
+ *  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 
+ *  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
+ *  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ *  ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 
+ *  COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 
+ *  SOFTWARE IS DISCLAIMED.
+ *
+ *
+ *  $Id: dbus-compat.h,v 1.24 2005/09/08 18:32:41 holtmann Exp $
+ */
+
+#ifndef __H_DBUS_COMPAT_H__
+#define __H_DBUS_COMPAT_H__
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define CHECK_DBUS_VERSION(major, minor) \
+		(DBUS_MAJOR_VER > (major) || \
+		 	(DBUS_MAJOR_VER == (major) && DBUS_MINOR_VER >= (minor)))
+	
+#if CHECK_DBUS_VERSION(0, 30)
+	/* For D-Bus version >= 0.30 */
+	/****** pending, requires chnages in the makefile  *****/
+#else /* < 0.30 */
+	/* For D-Bus version older than 0.30 */
+	
+#endif
+
+#if  HAVE_DBUS_MESSAGE_ITER_GET_BASIC
+	#warning "D-Bus > 0.30"
+	
+	/* Get iterators */
+	#define DBUS_MSG_ITER_GET_STR(iter, retvar) \
+			dbus_message_iter_get_basic((iter), &(retvar))
+	#define DBUS_MSG_ITER_GET_BYTE(iter, retvar) \
+			dbus_message_iter_get_basic((iter), &(retvar))
+			
+	/* Append iterators */
+	#define DBUS_MSG_APPEND_ITER_INIT(a, b) \
+			dbus_message_iter_init_append(a, b)	
+	#define DBUS_MSG_ITER_APPEND_BYTE(iter, val) \
+			dbus_message_iter_append_basic((iter), DBUS_TYPE_BYTE, &(val))
+	#define DBUS_MSG_ITER_APPEND_STR(iter, val) \
+			dbus_message_iter_append_basic((iter), DBUS_TYPE_STRING, &(val))
+	#define DBUS_MSG_ITER_APPEND_BOOL(iter, val) \
+			dbus_message_iter_append_basic((iter), DBUS_TYPE_BOOLEAN, &(val))
+	#define DBUS_MSG_ITER_APPEND_INT32(iter, val) \
+			dbus_message_iter_append_basic((iter), DBUS_TYPE_INT32, &(val))
+	#define DBUS_MSG_ITER_APPEND_UINT32(iter, val) \
+			dbus_message_iter_append_basic((iter), DBUS_TYPE_UINT32, &(val))
+
+	inline void DBUS_MSG_ITER_APPEND_BYTE_ARRAY(DBusMessageIter *iter, uint8_t *ptr, uint8_t size) 
+	{
+		DBusMessageIter array_iter;
+		const char array_sig[] = DBUS_TYPE_BYTE_AS_STRING;
+		int i;
+		
+		dbus_message_iter_open_container(iter, DBUS_TYPE_ARRAY, array_sig, &array_iter);
+		for ( i = 0; i < size; i++ ) {
+			DBUS_MSG_ITER_APPEND_BYTE(&array_iter, ptr);
+		}
+		dbus_message_iter_close_container(iter, &array_iter);
+	}
+#else
+	#warning "D-Bus < 0.30"
+	
+	/* Get iterators */
+	#define DBUS_MSG_ITER_GET_STR(iter, retvar) \
+			retvar = dbus_message_iter_get_string(iter)
+	#define DBUS_MSG_ITER_GET_BYTE(iter, retvar) \
+			retvar = dbus_message_iter_get_byte(iter)
+			
+	/* Append iterators */
+	#define DBUS_MSG_APPEND_ITER_INIT(a, b) \
+			dbus_message_append_iter_init(a, b)
+	#define DBUS_MSG_ITER_APPEND_BYTE(iter, val) \
+			dbus_message_iter_append_byte((iter), (val))
+	#define DBUS_MSG_ITER_APPEND_STR(iter, val) \
+			dbus_message_iter_append_string((iter), (val))
+	#define DBUS_MSG_ITER_APPEND_BOOL(iter, val) \
+			dbus_message_iter_append_boolean((iter), (val))
+	#define DBUS_MSG_ITER_APPEND_INT32(iter, val) \
+			dbus_message_iter_append_int32((iter), (val))
+	#define DBUS_MSG_ITER_APPEND_UINT32(iter, val) \
+			dbus_message_iter_append_uint32((iter), (val))
+	#define DBUS_MSG_ITER_APPEND_BYTE_ARRAY(iter, val, size) \
+		dbus_message_iter_append_byte_array(iter, val, size)
+
+#endif
+
+
+
+#endif /*__H_DBUS_COMPAT_H__*/
--- bluez-utils-2.21.orig/hcid/dbus.c	2005-08-27 10:37:14.000000000 -0300
+++ bluez-hcid-0.0.3/hcid/dbus.c	2005-09-12 17:19:44.362797584 -0300
@@ -45,15 +45,20 @@
 #include "glib-ectomy.h"
 
 #include "hcid.h"
+#include "dbus-compat.h"
 
 static DBusConnection *connection;
 
 #define TIMEOUT (30 * 1000)		/* 30 seconds */
 
-#define SERVICE_NAME "org.bluez.PinAgent"
-#define INTERFACE_NAME SERVICE_NAME
-#define REQUEST_NAME "PinRequest"
-#define PATH_NAME "/org/bluez/PinAgent"
+#define PINAGENT_DBUS_SERVICE		"org.bluez.PinAgent"
+#define PINAGENT_DBUS_INTERFACE 	PINAGENT_DBUS_SERVICE
+#define PINAGENT_DBUS_SVC_NAME_REQ 		"PinRequest"
+#define PINAGENT_DBUS_PATH 			"/org/bluez/PinAgent"
+
+#define HCI_DBUS_SERVICE		"org.bluez.bluetoothd.hci"
+#define HCI_DBUS_INTERFACE		HCI_DBUS_SERVICE
+#define HCI_DBUS_PATH			"/org/bluez/bluetoothd/hci"
 
 #define WRONG_ARGS_ERROR "org.bluez.Error.WrongArgs"
 
@@ -68,26 +73,34 @@
 	pin_code_reply_cp pr;
 	DBusMessage *message;
 	DBusMessageIter iter;
-	int type;
+	int arg_type;
+	int msg_type;
 	size_t len;
 	char *pin;
+	const char *error_msg;
 
 	message = dbus_pending_call_steal_reply(call);
+	msg_type = dbus_message_get_type(message);
+	dbus_message_iter_init(message, &iter);
 
-	if (dbus_message_is_error(message, WRONG_ARGS_ERROR))
-		goto error;
+	if(msg_type == DBUS_MESSAGE_TYPE_ERROR) {
+		DBUS_MSG_ITER_GET_STR(&iter, error_msg);
+		/* handling WRONG_ARGS_ERROR, DBUS_ERROR_NO_REPLY, DBUS_ERROR_SERVICE_UNKNOWN */
+		syslog(LOG_ERR, "%s: %s", dbus_message_get_error_name(message), error_msg);
 
-	dbus_message_iter_init(message, &iter);
+		hci_send_cmd(req->dev, OGF_LINK_CTL,
+			     OCF_PIN_CODE_NEG_REPLY, 6, &req->bda);
+	} else {
+		/* check signature */
+		arg_type = dbus_message_iter_get_arg_type(&iter);	
+		if (arg_type != DBUS_TYPE_STRING) {
+			syslog(LOG_ERR, "Wrong reply signature: expected PIN");
 
-	type = dbus_message_iter_get_arg_type(&iter);
-	if (type != DBUS_TYPE_STRING)
-		goto error;
-
-#ifdef HAVE_DBUS_MESSAGE_ITER_GET_BASIC
-	dbus_message_iter_get_basic(&iter, &pin);
-#else
-	pin = dbus_message_iter_get_string(&iter);
-#endif
+			hci_send_cmd(req->dev, OGF_LINK_CTL,
+				     OCF_PIN_CODE_NEG_REPLY, 6, &req->bda);
+		} else {
+		
+			DBUS_MSG_ITER_GET_STR(&iter, pin);
 
 	len = strlen(pin);
 
@@ -97,15 +110,12 @@
 	pr.pin_len = len;
 	hci_send_cmd(req->dev, OGF_LINK_CTL, OCF_PIN_CODE_REPLY,
 						PIN_CODE_REPLY_CP_SIZE, &pr);
+		}
+
+	}
 
 	dbus_message_unref(message);
 	dbus_pending_call_unref(call);
-
-	return;
-
-error:
-	hci_send_cmd(req->dev, OGF_LINK_CTL,
-				OCF_PIN_CODE_NEG_REPLY, 6, &req->bda);
 }
 
 static void free_pin_req(void *req)
@@ -116,16 +126,13 @@
 void hcid_dbus_request_pin(int dev, struct hci_conn_info *ci)
 {
 	DBusMessage *message;
-#ifdef HAVE_DBUS_MESSAGE_ITER_GET_BASIC
 	uint8_t *addr = (uint8_t *) &ci->bdaddr;
-#else
 	DBusMessageIter iter;
-#endif
 	DBusPendingCall *pending = NULL;
 	struct pin_request *req;
 
-	message = dbus_message_new_method_call(SERVICE_NAME, PATH_NAME,
-						INTERFACE_NAME, REQUEST_NAME);
+	message = dbus_message_new_method_call(PINAGENT_DBUS_SERVICE, PINAGENT_DBUS_PATH,
+						PINAGENT_DBUS_INTERFACE, PINAGENT_DBUS_SVC_NAME_REQ);
 	if (message == NULL) {
 		syslog(LOG_ERR, "Couldn't allocate D-BUS message");
 		goto failed;
@@ -135,17 +142,9 @@
 	req->dev = dev;
 	bacpy(&req->bda, &ci->bdaddr);
 
-#ifdef HAVE_DBUS_MESSAGE_ITER_GET_BASIC
-	dbus_message_append_args(message, DBUS_TYPE_BOOLEAN, &ci->out,
-			DBUS_TYPE_ARRAY, DBUS_TYPE_BYTE,
-			&addr, sizeof(bdaddr_t), DBUS_TYPE_INVALID);
-#else
-	dbus_message_append_iter_init(message, &iter);
-
-	dbus_message_iter_append_boolean(&iter, ci->out);
-	dbus_message_iter_append_byte_array(&iter,
-			(unsigned char *) &ci->bdaddr, sizeof(ci->bdaddr));
-#endif
+	DBUS_MSG_APPEND_ITER_INIT(message, &iter);
+	DBUS_MSG_ITER_APPEND_BOOL(&iter, ci->out);
+	DBUS_MSG_ITER_APPEND_BYTE_ARRAY(&iter, addr, sizeof(bdaddr_t));
 
 	if (dbus_connection_send_with_reply(connection, message,
 					&pending, TIMEOUT) == FALSE) {
@@ -171,30 +170,21 @@
 void hcid_dbus_inquiry_start(bdaddr_t *local)
 {
 	DBusMessage *message;
-#ifndef HAVE_DBUS_MESSAGE_ITER_GET_BASIC
 	DBusMessageIter iter;
-#endif
 	char *local_addr;	
 	bdaddr_t tmp;
 
 	baswap(&tmp, local); local_addr = batostr(&tmp);
 
-	message = dbus_message_new_signal("/org/bluez/DevAgent",
-				"org.bluez.DevAgent", "InquiryStart");
+	message = dbus_message_new_signal(HCI_DBUS_PATH,
+				HCI_DBUS_INTERFACE, "InquiryStart");
 	if (message == NULL) {
 		syslog(LOG_ERR, "Can't allocate D-BUS inquiry start message");
 		goto failed;
 	}
 
-#ifdef HAVE_DBUS_MESSAGE_ITER_GET_BASIC
-	dbus_message_append_args(message,
-					DBUS_TYPE_STRING, &local_addr,
-					DBUS_TYPE_INVALID);
-#else
-	dbus_message_append_iter_init(message, &iter);
-
-	dbus_message_iter_append_string(&iter, local_addr);
-#endif
+	DBUS_MSG_APPEND_ITER_INIT(message, &iter);
+	DBUS_MSG_ITER_APPEND_STR(&iter, local_addr);
 
 	if (dbus_connection_send(connection, message, NULL) == FALSE) {
 		syslog(LOG_ERR, "Can't send D-BUS inquiry start message");
@@ -214,30 +204,21 @@
 void hcid_dbus_inquiry_complete(bdaddr_t *local)
 {
 	DBusMessage *message;
-#ifndef HAVE_DBUS_MESSAGE_ITER_GET_BASIC
 	DBusMessageIter iter;
-#endif
 	char *local_addr;
 	bdaddr_t tmp;
 
 	baswap(&tmp, local); local_addr = batostr(&tmp);
 
-	message = dbus_message_new_signal("/org/bluez/DevAgent",
-				"org.bluez.DevAgent", "InquiryComplete");
+	message = dbus_message_new_signal(HCI_DBUS_PATH,
+				HCI_DBUS_INTERFACE, "InquiryComplete");
 	if (message == NULL) {
 		syslog(LOG_ERR, "Can't allocate D-BUS inquiry complete message");
 		goto failed;
 	}
 
-#ifdef HAVE_DBUS_MESSAGE_ITER_GET_BASIC
-	dbus_message_append_args(message,
-					DBUS_TYPE_STRING, &local_addr,
-					DBUS_TYPE_INVALID);
-#else
-	dbus_message_append_iter_init(message, &iter);
-
-	dbus_message_iter_append_string(&iter, local_addr);
-#endif
+	DBUS_MSG_APPEND_ITER_INIT(message, &iter);
+	DBUS_MSG_ITER_APPEND_STR(&iter, local_addr);
 
 	if (dbus_connection_send(connection, message, NULL) == FALSE) {
 		syslog(LOG_ERR, "Can't send D-BUS inquiry complete message");
@@ -257,37 +238,25 @@
 void hcid_dbus_inquiry_result(bdaddr_t *local, bdaddr_t *peer, uint32_t class, int8_t rssi)
 {
 	DBusMessage *message;
-#ifndef HAVE_DBUS_MESSAGE_ITER_GET_BASIC
 	DBusMessageIter iter;
-#endif
 	char *local_addr, *peer_addr;
 	bdaddr_t tmp;
 
 	baswap(&tmp, local); local_addr = batostr(&tmp);
 	baswap(&tmp, peer); peer_addr = batostr(&tmp);
 
-	message = dbus_message_new_signal("/org/bluez/DevAgent",
-				"org.bluez.DevAgent", "InquiryResult");
+	message = dbus_message_new_signal(HCI_DBUS_PATH,
+				HCI_DBUS_INTERFACE, "InquiryResult");
 	if (message == NULL) {
 		syslog(LOG_ERR, "Can't allocate D-BUS inquiry result message");
 		goto failed;
 	}
 
-#ifdef HAVE_DBUS_MESSAGE_ITER_GET_BASIC
-	dbus_message_append_args(message,
-					DBUS_TYPE_STRING, &local_addr,
-					DBUS_TYPE_STRING, &peer_addr,
-					DBUS_TYPE_UINT32, &class,
-					DBUS_TYPE_INT32, &rssi,
-					DBUS_TYPE_INVALID);
-#else
-	dbus_message_append_iter_init(message, &iter);
-
-	dbus_message_iter_append_string(&iter, local_addr);
-	dbus_message_iter_append_string(&iter, peer_addr);
-	dbus_message_iter_append_uint32(&iter, class);
-	dbus_message_iter_append_int32(&iter, rssi);
-#endif
+	DBUS_MSG_APPEND_ITER_INIT(message, &iter);
+	DBUS_MSG_ITER_APPEND_STR(&iter, local_addr);
+	DBUS_MSG_ITER_APPEND_STR(&iter, peer_addr);
+	DBUS_MSG_ITER_APPEND_UINT32(&iter, class);
+	DBUS_MSG_ITER_APPEND_INT32(&iter, rssi);
 
 	if (dbus_connection_send(connection, message, NULL) == FALSE) {
 		syslog(LOG_ERR, "Can't send D-BUS inquiry result message");
@@ -308,35 +277,24 @@
 void hcid_dbus_remote_name(bdaddr_t *local, bdaddr_t *peer, char *name)
 {
 	DBusMessage *message;
-#ifndef HAVE_DBUS_MESSAGE_ITER_GET_BASIC
 	DBusMessageIter iter;
-#endif
 	char *local_addr, *peer_addr;
 	bdaddr_t tmp;
 
 	baswap(&tmp, local); local_addr = batostr(&tmp);
 	baswap(&tmp, peer); peer_addr = batostr(&tmp);
 
-	message = dbus_message_new_signal("/org/bluez/DevAgent",
-				"org.bluez.DevAgent", "RemoteName");
+	message = dbus_message_new_signal(HCI_DBUS_PATH,
+				HCI_DBUS_INTERFACE, "RemoteName");
 	if (message == NULL) {
 		syslog(LOG_ERR, "Can't allocate D-BUS remote name message");
 		goto failed;
 	}
 
-#ifdef HAVE_DBUS_MESSAGE_ITER_GET_BASIC
-	dbus_message_append_args(message,
-					DBUS_TYPE_STRING, &local_addr,
-					DBUS_TYPE_STRING, &peer_addr,
-					DBUS_TYPE_STRING, &name,
-					DBUS_TYPE_INVALID);
-#else
-	dbus_message_append_iter_init(message, &iter);
-
-	dbus_message_iter_append_string(&iter, local_addr);
-	dbus_message_iter_append_string(&iter, peer_addr);
-	dbus_message_iter_append_string(&iter, name);
-#endif
+	DBUS_MSG_APPEND_ITER_INIT(message, &iter);
+	DBUS_MSG_ITER_APPEND_STR(&iter, local_addr);
+	DBUS_MSG_ITER_APPEND_STR(&iter, peer_addr);
+	DBUS_MSG_ITER_APPEND_STR(&iter, name);
 
 	if (dbus_connection_send(connection, message, NULL) == FALSE) {
 		syslog(LOG_ERR, "Can't send D-BUS remote name message");

Re: [Bluez-devel] HCID D-Bus (Seg Fault)

[Claudio Takahasi]

[-- Attachment #1: Type: text/plain, Size: 3476 bytes --]

Sorry,

segmentation fault :)

This problem happens because the pin will contains the long error message 
string instead of a short pin number.


On 9/12/05, Claudio Takahasi <cktakahasi@gmail.com> wrote:
> 
> Hi Marcel,
> 
> I am sending a new patch that contains the following enhancements:
> 1. Support multiple D-Bus versions(0.23, 0.30...) 
> 2. Fixed error handling ServiceDoesNotExist, NoReply, UnknownService, ...
> This condition is causing sig fault due the wrong pin value. Scenario: 
> D-Bus pin helper enabled 
> and an error different than wrong argument triggered.
> 
> 
> Regards,
> Claudio.
> 
> On 9/9/05, Marcel Holtmann <marcel@holtmann.org> wrote:
> > 
> > Hi Sjoerd,
> > 
> > > > having 0.33 is better than 0.23 and this is what Debian unstable 
> > still
> > > > uses. However lets make a list of the distributions:
> > > >
> > > > SuSE Linux 10.0 D-Bus 0.35
> > > > Fedora Core 4 D-Bus 0.33
> > > > Ubuntu Breezy D-Bus 0.36
> > > > Debian unstable D-Bus 0.23
> > > Debian experimental D-Bus 0.50
> > 
> > this is good. 
> > 
> > > > The only bad guy is Debian unstable and I don't care anymore. They 
> > use
> > > > Xorg finally and have GCC 4.0 etc., but they can't move over to the 
> > next
> > > > D-Bus generation. I think that is their problem now and the release 
> > of 
> > > > bluez-utils-0.22 will definitely drop the support for the old D-Bus 
> > 0.23
> > > > version.
> > >
> > > D-bus >= 0.3x has been in debian experimental for quite some time. 
> > There are
> > > various transitions going on in debian unstable currently which makes 
> > it 
> > > inappropriate to do a dbus transition now too.
> > 
> > Last time I looked at it, the complete KDE part was broken and full of
> > wrong dependencies. So breaking D-Bus wouldn't even be notified ;)
> > 
> > > > I like to base everything around the current D-Bus 0.50 release, 
> > because
> > > > the C API should be quite stable now. I will accept small 
> > workarounds to
> > > > make D-Bus 0.3x work, but as soon as the distributions update their
> > > > D-Bus libraries I will drop them. 
> > > >
> > > > This is not a nice thing to do, I know, but a wrong usage of D-Bus 
> > lets
> > > > hcid segfault and this is not what I want.
> > >
> > > As one of debian's dbus maintainers i would advise to indeed base 
> > everything on 
> > > dbus >= 0.50. Hopefully it won't take too long before we can move the 
> > new dbus
> > > from experimental to unstable, so the workarounds for old dbus release 
> > are just
> > > not worth it.
> > 
> > This means I will release bluez-utils-2.21 on the weekend, because of
> > some memory leak fixes and then I will drop D-Bus 0.23 support. So if
> > any patches need to go in before, please send them now.
> > 
> > Regards
> > 
> > Marcel
> > 
> > 
> > 
> > 
> > -------------------------------------------------------
> > SF.Net email is Sponsored by the Better Software Conference & EXPO
> > September 19-22, 2005 * San Francisco, CA * Development Lifecycle 
> > Practices
> > Agile & Plan-Driven Development * Managing Projects & Teams * Testing & 
> > QA 
> > Security * Process Improvement & Measurement * 
> > http://www.sqe.com/bsce5sf
> > _______________________________________________
> > Bluez-devel mailing list
> > Bluez-devel@lists.sourceforge.net
> > https://lists.sourceforge.net/lists/listinfo/bluez-devel
> > 
> 
> 
>

[-- Attachment #2: Type: text/html, Size: 4855 bytes --]

Re: [Bluez-devel] HCID D-Bus (Sig Fault)

[Marcel Holtmann]

Hi Claudio,

> I am sending a new patch that contains the following enhancements:
> 1. Support multiple D-Bus versions(0.23, 0.30...) 
> 2. Fixed error handling ServiceDoesNotExist, NoReply,
> UnknownService, ...
>    This condition is causing sig fault due the wrong pin value.
> Scenario: D-Bus pin helper enabled 
>    and an error different than wrong argument triggered.

since bluez-utils-2.21 is out, I am going do remove the support for the
old D-Bus 0.23 API now. So there is no need for any compat code.

Regards

Marcel




-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
Bluez-devel mailing list
Bluez-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bluez-devel

Re: [Bluez-devel] HCID D-Bus (Sig Fault)

[Claudio Takahasi]

[-- Attachment #1: Type: text/plain, Size: 1377 bytes --]

Hi Marcel,

Regarding the reply_handler_function, please check if it is relevant.
I you want I can send only the changes for handle the error messages.

Regards,
Claudio.


On 9/12/05, Marcel Holtmann <marcel@holtmann.org> wrote:
> 
> Hi Claudio,
> 
> > I am sending a new patch that contains the following enhancements:
> > 1. Support multiple D-Bus versions(0.23, 0.30...)
> > 2. Fixed error handling ServiceDoesNotExist, NoReply,
> > UnknownService, ...
> > This condition is causing sig fault due the wrong pin value.
> > Scenario: D-Bus pin helper enabled
> > and an error different than wrong argument triggered.
> 
> since bluez-utils-2.21 is out, I am going do remove the support for the
> old D-Bus 0.23 API now. So there is no need for any compat code.
> 
> Regards
> 
> Marcel
> 
> 
> 
> 
> -------------------------------------------------------
> SF.Net email is Sponsored by the Better Software Conference & EXPO
> September 19-22, 2005 * San Francisco, CA * Development Lifecycle 
> Practices
> Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
> Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
> _______________________________________________
> Bluez-devel mailing list
> Bluez-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/bluez-devel
>

[-- Attachment #2: Type: text/html, Size: 1935 bytes --]

Re: [Bluez-devel] HCID D-Bus (Sig Fault)

[Marcel Holtmann]

Hi Claudio,

> Regarding the reply_handler_function, please check if it is relevant.
> I you want I can send only the changes for handle the error messages.

please do so.

Regards

Marcel




-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
Bluez-devel mailing list
Bluez-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bluez-devel

Re: [Bluez-devel] HCID D-Bus (Seg Fault)

[Claudio Takahasi]

[-- Attachment #1.1: Type: text/plain, Size: 932 bytes --]

Hi Marcel,

The patch for reply_handler_function is attached.

Regards,
Claudio.

On 9/12/05, Marcel Holtmann <marcel@holtmann.org> wrote:
> 
> Hi Claudio,
> 
> > Regarding the reply_handler_function, please check if it is relevant.
> > I you want I can send only the changes for handle the error messages.
> 
> please do so.
> 
> Regards
> 
> Marcel
> 
> 
> 
> 
> -------------------------------------------------------
> SF.Net email is Sponsored by the Better Software Conference & EXPO
> September 19-22, 2005 * San Francisco, CA * Development Lifecycle 
> Practices
> Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
> Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
> _______________________________________________
> Bluez-devel mailing list
> Bluez-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/bluez-devel
>

[-- Attachment #1.2: Type: text/html, Size: 1425 bytes --]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: hcid_dbus_0003.patch --]
[-- Type: text/x-patch; name="hcid_dbus_0003.patch", Size: 1998 bytes --]

--- bluez-utils-2.21.orig/hcid/dbus.c	2005-08-27 10:37:14.000000000 -0300
+++ bluez-hcid-2.21/hcid/dbus.c	2005-09-13 09:01:20.409052488 -0300
@@ -68,27 +68,43 @@
 	pin_code_reply_cp pr;
 	DBusMessage *message;
 	DBusMessageIter iter;
-	int type;
+	int arg_type;
+	int msg_type;
 	size_t len;
 	char *pin;
+	const char *error_msg;
 
 	message = dbus_pending_call_steal_reply(call);
 
-	if (dbus_message_is_error(message, WRONG_ARGS_ERROR))
-		goto error;
-
+	if (message) {
+		msg_type = dbus_message_get_type(message);
 	dbus_message_iter_init(message, &iter);
 
-	type = dbus_message_iter_get_arg_type(&iter);
-	if (type != DBUS_TYPE_STRING)
-		goto error;
+		if (msg_type == DBUS_MESSAGE_TYPE_ERROR) {
+#ifdef HAVE_DBUS_MESSAGE_ITER_GET_BASIC
+		        dbus_message_iter_get_basic(&iter, &error_msg);
+#else
+		        erro_msg = dbus_message_iter_get_string(&iter);
+#endif
+			/* handling WRONG_ARGS_ERROR, DBUS_ERROR_NO_REPLY, DBUS_ERROR_SERVICE_UNKNOWN */
+			syslog(LOG_ERR, "%s: %s", dbus_message_get_error_name(message), error_msg);
 
+			hci_send_cmd(req->dev, OGF_LINK_CTL,
+				OCF_PIN_CODE_NEG_REPLY, 6, &req->bda);
+		} else {
+			/* check signature */
+			arg_type = dbus_message_iter_get_arg_type(&iter);	
+			if (arg_type != DBUS_TYPE_STRING) {
+				syslog(LOG_ERR, "Wrong reply signature: expected PIN");
+			
+				hci_send_cmd(req->dev, OGF_LINK_CTL,
+				     OCF_PIN_CODE_NEG_REPLY, 6, &req->bda);
+			} else {
 #ifdef HAVE_DBUS_MESSAGE_ITER_GET_BASIC
 	dbus_message_iter_get_basic(&iter, &pin);
 #else
 	pin = dbus_message_iter_get_string(&iter);
 #endif
-
 	len = strlen(pin);
 
 	memset(&pr, 0, sizeof(pr));
@@ -97,15 +113,12 @@
 	pr.pin_len = len;
 	hci_send_cmd(req->dev, OGF_LINK_CTL, OCF_PIN_CODE_REPLY,
 						PIN_CODE_REPLY_CP_SIZE, &pr);
+			}
 
+		}
 	dbus_message_unref(message);
+	}
 	dbus_pending_call_unref(call);
-
-	return;
-
-error:
-	hci_send_cmd(req->dev, OGF_LINK_CTL,
-				OCF_PIN_CODE_NEG_REPLY, 6, &req->bda);
 }
 
 static void free_pin_req(void *req)

Re: [Bluez-devel] HCID D-Bus (Seg Fault)

[Marcel Holtmann]

Hi Claudio,

> The patch for reply_handler_function is attached.

please redo it against the latest CVS, because I already dropped the
D-Bus 0.23 support.

Regards

Marcel




-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. 
Download it for free - -and be entered to win a 42" plasma tv or your very
own Sony(tm)PSP.  Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
Bluez-devel mailing list
Bluez-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bluez-devel

Re: [Bluez-devel] HCID D-Bus (Seg Fault)

[Claudio Takahasi]

[-- Attachment #1.1: Type: text/plain, Size: 877 bytes --]

Hi Marcel,

It's done! The changes was based on the dbus.c revision 1.15.

Regards,
Claudio.

On 9/13/05, Marcel Holtmann <marcel@holtmann.org> wrote:
> 
> Hi Claudio,
> 
> > The patch for reply_handler_function is attached.
> 
> please redo it against the latest CVS, because I already dropped the
> D-Bus 0.23 support.
> 
> Regards
> 
> Marcel
> 
> 
> 
> 
> -------------------------------------------------------
> SF.Net email is sponsored by:
> Tame your development challenges with Apache's Geronimo App Server.
> Download it for free - -and be entered to win a 42" plasma tv or your very
> own Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
> _______________________________________________
> Bluez-devel mailing list
> Bluez-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/bluez-devel
>

[-- Attachment #1.2: Type: text/html, Size: 1366 bytes --]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: hcid_dbus_0004.patch --]
[-- Type: text/x-patch; name="hcid_dbus_0004.patch", Size: 3290 bytes --]

--- bluez-utils-cvs.orig/hcid/dbus.c	2005-09-14 08:51:58.470937024 -0300
+++ bluez-utils-cvs/hcid/dbus.c	2005-09-14 08:46:09.853934864 -0300
@@ -64,43 +64,54 @@
 
 static void reply_handler_function(DBusPendingCall *call, void *user_data)
 {
-	struct pin_request *req = (struct pin_request *) user_data;
-	pin_code_reply_cp pr;
-	DBusMessage *message;
-	DBusMessageIter iter;
-	int type;
-	size_t len;
-	char *pin;
-
-	message = dbus_pending_call_steal_reply(call);
-
-	if (dbus_message_is_error(message, WRONG_ARGS_ERROR))
-		goto error;
-
-	dbus_message_iter_init(message, &iter);
-
-	type = dbus_message_iter_get_arg_type(&iter);
-	if (type != DBUS_TYPE_STRING)
-		goto error;
-
-	dbus_message_iter_get_basic(&iter, &pin);
-	len = strlen(pin);
-
-	memset(&pr, 0, sizeof(pr));
-	bacpy(&pr.bdaddr, &req->bda);
-	memcpy(pr.pin_code, pin, len);
-	pr.pin_len = len;
-	hci_send_cmd(req->dev, OGF_LINK_CTL, OCF_PIN_CODE_REPLY,
-						PIN_CODE_REPLY_CP_SIZE, &pr);
-
-	dbus_message_unref(message);
-	dbus_pending_call_unref(call);
-
-	return;
-
-error:
-	hci_send_cmd(req->dev, OGF_LINK_CTL,
-				OCF_PIN_CODE_NEG_REPLY, 6, &req->bda);
+        struct pin_request *req = (struct pin_request *) user_data;
+        pin_code_reply_cp pr;
+        DBusMessage *message;
+        DBusMessageIter iter;
+        int arg_type;
+        int msg_type;
+        size_t len;
+        char *pin;
+        const char *error_msg;
+
+        message = dbus_pending_call_steal_reply(call);
+
+        if (message) {
+                msg_type = dbus_message_get_type(message);
+                dbus_message_iter_init(message, &iter);
+
+                if (msg_type == DBUS_MESSAGE_TYPE_ERROR) {
+                        dbus_message_iter_get_basic(&iter, &error_msg);
+                        /* handling WRONG_ARGS_ERROR, DBUS_ERROR_NO_REPLY, DBUS_ERROR_SERVICE_UNKNOWN */
+                        syslog(LOG_ERR, "%s: %s", dbus_message_get_error_name(message), error_msg);
+
+                        hci_send_cmd(req->dev, OGF_LINK_CTL,
+                                OCF_PIN_CODE_NEG_REPLY, 6, &req->bda);
+                } else {
+                        /* check signature */
+                        arg_type = dbus_message_iter_get_arg_type(&iter);
+                        if (arg_type != DBUS_TYPE_STRING) {
+                                syslog(LOG_ERR, "Wrong reply signature: expected PIN");
+
+                                hci_send_cmd(req->dev, OGF_LINK_CTL,
+                                     OCF_PIN_CODE_NEG_REPLY, 6, &req->bda);
+                        } else {
+                                dbus_message_iter_get_basic(&iter, &pin);
+
+                                len = strlen(pin);
+
+                                memset(&pr, 0, sizeof(pr));
+                                bacpy(&pr.bdaddr, &req->bda);
+                                memcpy(pr.pin_code, pin, len);
+                                pr.pin_len = len;
+                                hci_send_cmd(req->dev, OGF_LINK_CTL, OCF_PIN_CODE_REPLY,
+                                        PIN_CODE_REPLY_CP_SIZE, &pr);
+                        }
+
+                }
+                dbus_message_unref(message);
+        }
+        dbus_pending_call_unref(call);
 }
 
 static void free_pin_req(void *req)

Re: [Bluez-devel] HCID D-Bus (Seg Fault)

[Marcel Holtmann]

Hi Claudio,

> It's done! The changes was based on the dbus.c revision 1.15.

you used spaces instead of tabs. Please redo it again.

Regards

Marcel




-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. 
Download it for free - -and be entered to win a 42" plasma tv or your very
own Sony(tm)PSP.  Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
Bluez-devel mailing list
Bluez-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bluez-devel

Re: [Bluez-devel] HCID D-Bus (Seg Fault)

[Claudio Takahasi]

[-- Attachment #1.1: Type: text/plain, Size: 796 bytes --]

sorry. It's done!

Regards,
Claudio.


On 9/14/05, Marcel Holtmann <marcel@holtmann.org> wrote:
> 
> Hi Claudio,
> 
> > It's done! The changes was based on the dbus.c revision 1.15.
> 
> you used spaces instead of tabs. Please redo it again.
> 
> Regards
> 
> Marcel
> 
> 
> 
> 
> -------------------------------------------------------
> SF.Net email is sponsored by:
> Tame your development challenges with Apache's Geronimo App Server.
> Download it for free - -and be entered to win a 42" plasma tv or your very
> own Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
> _______________________________________________
> Bluez-devel mailing list
> Bluez-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/bluez-devel
>

[-- Attachment #1.2: Type: text/html, Size: 1281 bytes --]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: hcid_dbus_0005.patch --]
[-- Type: text/x-patch; name="hcid_dbus_0005.patch", Size: 2242 bytes --]

--- bluez-utils-cvs.orig/hcid/dbus.c	2005-09-14 08:51:58.470937024 -0300
+++ bluez-utils-cvs/hcid/dbus.c	2005-09-14 13:02:06.553361696 -0300
@@ -68,39 +68,47 @@
 	pin_code_reply_cp pr;
 	DBusMessage *message;
 	DBusMessageIter iter;
-	int type;
+	int arg_type;
+	int msg_type;
 	size_t len;
 	char *pin;
-
+	const char *error_msg;
+        
 	message = dbus_pending_call_steal_reply(call);
-
-	if (dbus_message_is_error(message, WRONG_ARGS_ERROR))
-		goto error;
-
-	dbus_message_iter_init(message, &iter);
-
-	type = dbus_message_iter_get_arg_type(&iter);
-	if (type != DBUS_TYPE_STRING)
-		goto error;
-
-	dbus_message_iter_get_basic(&iter, &pin);
-	len = strlen(pin);
-
-	memset(&pr, 0, sizeof(pr));
-	bacpy(&pr.bdaddr, &req->bda);
-	memcpy(pr.pin_code, pin, len);
-	pr.pin_len = len;
-	hci_send_cmd(req->dev, OGF_LINK_CTL, OCF_PIN_CODE_REPLY,
-						PIN_CODE_REPLY_CP_SIZE, &pr);
-
-	dbus_message_unref(message);
+        
+	if (message) {
+		msg_type = dbus_message_get_type(message);
+		dbus_message_iter_init(message, &iter);
+		
+		if (msg_type == DBUS_MESSAGE_TYPE_ERROR) {
+			dbus_message_iter_get_basic(&iter, &error_msg);
+			/* handling WRONG_ARGS_ERROR, DBUS_ERROR_NO_REPLY, DBUS_ERROR_SERVICE_UNKNOWN */
+			syslog(LOG_ERR, "%s: %s", dbus_message_get_error_name(message), error_msg);
+			hci_send_cmd(req->dev, OGF_LINK_CTL,
+				     OCF_PIN_CODE_NEG_REPLY, 6, &req->bda);
+		} else {
+			/* check signature */
+			arg_type = dbus_message_iter_get_arg_type(&iter);
+			if (arg_type != DBUS_TYPE_STRING) {
+				syslog(LOG_ERR, "Wrong reply signature: expected PIN");
+				hci_send_cmd(req->dev, OGF_LINK_CTL,
+					     OCF_PIN_CODE_NEG_REPLY, 6, &req->bda);
+			} else {
+				dbus_message_iter_get_basic(&iter, &pin);
+				
+				len = strlen(pin);
+				
+				memset(&pr, 0, sizeof(pr));
+				bacpy(&pr.bdaddr, &req->bda);
+				memcpy(pr.pin_code, pin, len);
+				pr.pin_len = len;
+				hci_send_cmd(req->dev, OGF_LINK_CTL, OCF_PIN_CODE_REPLY,
+					     PIN_CODE_REPLY_CP_SIZE, &pr);
+			}
+                }
+		dbus_message_unref(message);
+	}
 	dbus_pending_call_unref(call);
-
-	return;
-
-error:
-	hci_send_cmd(req->dev, OGF_LINK_CTL,
-				OCF_PIN_CODE_NEG_REPLY, 6, &req->bda);
 }
 
 static void free_pin_req(void *req)

Re: [Bluez-devel] HCID D-Bus (Seg Fault)

[Marcel Holtmann]

Hi Claudio,

> sorry. It's done!

patch is in, but next time also use tabs for the second line of this:

	hci_send_cmd(req->dev, OGF_LINK_CTL,
	             OCF_PIN_CODE_NEG_REPLY, 6, &req->bda);

No spaces for indentation at all.

Regards

Marcel




-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. 
Download it for free - -and be entered to win a 42" plasma tv or your very
own Sony(tm)PSP.  Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
Bluez-devel mailing list
Bluez-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bluez-devel