summaryrefslogtreecommitdiffstats
path: root/hcid/dbus-security.h
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@nokia.com>2007-01-24 20:56:05 +0000
committerJohan Hedberg <johan.hedberg@nokia.com>2007-01-24 20:56:05 +0000
commit6a57492f40729ceee156d7ff80cb2e99109e1082 (patch)
tree5821e68d3001d845f981ef87075c73dfafb20ce8 /hcid/dbus-security.h
parent0e1bf963709b5fa4a953a7e97d9c343a2b617cd0 (diff)
Remove incorrect g_io_channel_unref call
Diffstat (limited to 'hcid/dbus-security.h')
-rw-r--r--hcid/dbus-security.h54
1 files changed, 15 insertions, 39 deletions
diff --git a/hcid/dbus-security.h b/hcid/dbus-security.h
index b492a8b5..f4f64bbe 100644
--- a/hcid/dbus-security.h
+++ b/hcid/dbus-security.h
@@ -24,46 +24,10 @@
#ifndef __BLUEZ_DBUS_SECURITY_H
#define __BLUEZ_DBUS_SECURITY_H
-#define SECURITY_INTERFACE "org.bluez.Security"
-
-struct passkey_agent {
- struct adapter *adapter;
- DBusConnection *conn;
- char *addr;
- char *name;
- char *path;
- GSList *pending_requests;
- int exited;
- guint timeout;
-};
-
-struct pending_agent_request {
- struct passkey_agent *agent;
- int dev;
- bdaddr_t sba;
- bdaddr_t bda;
- char *path;
- DBusPendingCall *call;
- int old_if;
- char *pin;
-};
+#include "dbus-adapter.h"
+#include "dbus-service.h"
-struct authorization_agent {
- DBusConnection *conn;
- char *name;
- char *path;
- GSList *pending_requests;
-};
-
-struct pend_auth_agent_req {
- DBusMessage *msg;
- struct authorization_agent *agent;
- char *adapter_path;
- char *address;
- char *service_path;
- char *action;
- DBusPendingCall *call;
-};
+#define SECURITY_INTERFACE "org.bluez.Security"
DBusHandlerResult handle_security_method(DBusConnection *conn, DBusMessage *msg, void *data);
@@ -81,4 +45,16 @@ void release_passkey_agents(struct adapter *adapter, bdaddr_t *bda);
void cancel_passkey_agent_requests(GSList *agents, const char *path, bdaddr_t *dba);
+DBusHandlerResult handle_authorize_request(DBusConnection *conn,
+ DBusMessage *msg,
+ struct service *service,
+ const char *address,
+ const char *path);
+
+DBusHandlerResult cancel_authorize_request(DBusConnection *conn,
+ DBusMessage *msg,
+ struct service *service,
+ const char *address,
+ const char *path);
+
#endif /* __BLUEZ_DBUS_SECURITY_H */