Clean up Out Of Band D-Bus interface naming

This commit is contained in:
Johan Hedberg 2011-03-28 19:16:19 +03:00
parent 6412978a44
commit 9d5936a515
2 changed files with 8 additions and 8 deletions

View File

@ -4,10 +4,10 @@ BlueZ D-Bus Out Of Band Pairing API description
Copyright (C) 2011 Szymon Janc <szymon.janc@tieto.com> for ST-Ericsson
Service org.bluez
Interface org.bluez.Oob
Interface org.bluez.OutOfBand
Object path [variable prefix]/{hci0,hci1,...}
Methods array{byte} hash, array{byte} randomizer ReadLocalOobData()
Methods array{byte} hash, array{byte} randomizer ReadLocalData()
This method reads local OOB data from adapter. Return
value is pair of arrays 16 bytes each.
@ -18,7 +18,7 @@ Methods array{byte} hash, array{byte} randomizer ReadLocalOobData()
Possible errors: org.bluez.Error.Failed
org.bluez.Error.InProgress
void AddRemoteOobData(string address, array{byte} hash,
void AddRemoteData(string address, array{byte} hash,
array{byte} randomizer)
This method adds new Out Of Band data for
@ -28,7 +28,7 @@ Methods array{byte} hash, array{byte} randomizer ReadLocalOobData()
Possible errors: org.bluez.Error.Failed
org.bluez.Error.InvalidArguments
void RemoveRemoteOobData(string address)
void RemoveRemoteData(string address)
This method removes Out Of Band data for specified
address. If data for specified address does not exist

View File

@ -45,7 +45,7 @@
#include "oob.h"
#define REQUEST_TIMEOUT (60 * 1000) /* 60 seconds */
#define OOB_INTERFACE "org.bluez.Oob"
#define OOB_INTERFACE "org.bluez.OutOfBand"
struct oob_request {
struct btd_adapter *adapter;
@ -177,9 +177,9 @@ static DBusMessage *remove_remote_data(DBusConnection *conn, DBusMessage *msg,
}
static GDBusMethodTable oob_methods[] = {
{"AddRemoteOobData", "sayay", "", add_remote_data},
{"RemoveRemoteOobData", "s", "", remove_remote_data},
{"ReadLocalOobData", "", "ayay", read_local_data,
{"AddRemoteData", "sayay", "", add_remote_data},
{"RemoveRemoteData", "s", "", remove_remote_data},
{"ReadLocalData", "", "ayay", read_local_data,
G_DBUS_METHOD_FLAG_ASYNC},
{}
};