diff options
| author | Claudio Takahasi <claudio.takahasi@openbossa.org> | 2008-05-01 13:52:26 +0000 |
|---|---|---|
| committer | Claudio Takahasi <claudio.takahasi@openbossa.org> | 2008-05-01 13:52:26 +0000 |
| commit | 9491a544f622e40453265c30f24ce44a61440cc1 (patch) | |
| tree | 2c00a3c63c9f021444a6b89f6f22369bf3a3073f /network | |
| parent | 3f8860031e5241fbb145fdd71e1a46c2c28f393e (diff) | |
Moving authorization code to dbus-service.c
Diffstat (limited to 'network')
| -rw-r--r-- | network/main.c | 4 | ||||
| -rw-r--r-- | network/server.c | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/network/main.c b/network/main.c index 576ead8e..037ee062 100644 --- a/network/main.c +++ b/network/main.c @@ -29,12 +29,10 @@ #include <sys/socket.h> #include <bluetooth/bluetooth.h> -#include <glib.h> -#include <dbus/dbus.h> +#include "dbus.h" #include "plugin.h" #include "dbus-service.h" -#include "dbus.h" #include "logging.h" #include "manager.h" diff --git a/network/server.c b/network/server.c index f3e6a995..0915d9d4 100644 --- a/network/server.c +++ b/network/server.c @@ -46,10 +46,10 @@ #include "logging.h" #include "dbus.h" -#include "plugin.h" #include "error.h" #include "textfile.h" #include "dbus-helper.h" +#include "dbus-service.h" #include "sdpd.h" #define NETWORK_SERVER_INTERFACE "org.bluez.network.Server" @@ -410,7 +410,7 @@ static void req_auth_cb(DBusError *derr, void *user_data) if (dbus_error_has_name(derr, DBUS_ERROR_NO_REPLY)) { bdaddr_t dst; str2ba(setup->address, &dst); - plugin_cancel_auth(&dst); + service_cancel_auth(&dst); } val = BNEP_CONN_NOT_ALLOWED; goto done; @@ -471,7 +471,7 @@ static int authorize_connection(struct network_server *ns, const char *address) uuid = bnep_uuid(ns->id); str2ba(address, &dst); - ret_val = plugin_req_auth(&ns->src, &dst, uuid, req_auth_cb, ns); + ret_val = service_req_auth(&ns->src, &dst, uuid, req_auth_cb, ns); if (ret_val < 0) return req_auth_old(address, uuid, ns); else |