summaryrefslogtreecommitdiffstats
path: root/hcid/dbus.h
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@nokia.com>2006-09-27 16:25:11 +0000
committerJohan Hedberg <johan.hedberg@nokia.com>2006-09-27 16:25:11 +0000
commit255528bec9a5ffdd81ce509f2166a3a405b958d3 (patch)
tree4f0f3944f4d5f26525f8618647d3e1c453b4dc1e /hcid/dbus.h
parent247635fe3905e4cc084a167c6db6e53dd7b0554d (diff)
Return correct error reply for CreateBonding when using security mode 3
Diffstat (limited to 'hcid/dbus.h')
-rw-r--r--hcid/dbus.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/hcid/dbus.h b/hcid/dbus.h
index e754622e..05edc48b 100644
--- a/hcid/dbus.h
+++ b/hcid/dbus.h
@@ -88,8 +88,9 @@ struct bonding_request_info {
DBusMessage *rq;
GIOChannel *io;
guint io_id;
+ int hci_status;
int cancel;
- int connected;
+ int auth_active;
};
struct pending_pin_info {
@@ -158,6 +159,8 @@ DBusHandlerResult bluez_new_failure_msg(DBusConnection *conn, DBusMessage *msg,
DBusMessage *dev_signal_factory(const int devid, const char *prop_name, const int first, ...);
+DBusMessage *new_authentication_return(DBusMessage *msg, uint8_t status);
+
int get_default_dev_id(void);
DBusHandlerResult error_failed(DBusConnection *conn, DBusMessage *msg, int err);
@@ -177,7 +180,6 @@ DBusHandlerResult error_bonding_does_not_exist(DBusConnection *conn, DBusMessage
DBusHandlerResult error_bonding_in_progress(DBusConnection *conn, DBusMessage *msg);
DBusHandlerResult error_bonding_not_in_progress(DBusConnection *conn, DBusMessage *msg);
DBusHandlerResult error_authentication_canceled(DBusConnection *conn, DBusMessage *msg);
-DBusHandlerResult error_authentication_failed(DBusConnection *conn, DBusMessage *msg);
DBusHandlerResult error_discover_in_progress(DBusConnection *conn, DBusMessage *msg);
DBusHandlerResult error_connect_in_progress(DBusConnection *conn, DBusMessage *msg);
DBusHandlerResult error_connect_not_in_progress(DBusConnection *conn, DBusMessage *msg);