summaryrefslogtreecommitdiffstats
path: root/network
diff options
context:
space:
mode:
authorAlok Barsode <alok.barsode@azingo.com>2008-09-08 13:39:38 +0530
committerAlok Barsode <alok.barsode@azingo.com>2008-09-08 14:31:43 +0530
commit2a8fb41c4c57b24a22f3adaab472b416faae122e (patch)
tree930c56d79ffd39c5143ccb07b817b38c558fc1bb /network
parent9de95d439b89c8003d953d0f82b94edc27c50bbc (diff)
Redefining adapter_get_address to take bdaddr_t as parameter.
Diffstat (limited to 'network')
-rw-r--r--network/manager.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/network/manager.c b/network/manager.c
index cafb7442..0abd2ce9 100644
--- a/network/manager.c
+++ b/network/manager.c
@@ -196,15 +196,14 @@ static int network_probe(struct btd_device *device, GSList *records,
{
struct btd_adapter *adapter = device_get_adapter(device);
const gchar *path = device_get_path(device);
- const char *source, *destination;
+ const char *destination;
bdaddr_t src, dst;
DBG("path %s", path);
- source = adapter_get_address(adapter);
+ adapter_get_address(adapter, &src);
destination = device_get_address(device);
- str2ba(source, &src);
str2ba(destination, &dst);
return connection_register(path, &src, &dst, id);
@@ -252,7 +251,6 @@ static void nap_remove(struct btd_device *device)
static int network_server_probe(struct btd_adapter *adapter, uint16_t id)
{
const gchar *path = adapter_get_path(adapter);
- const char *source;
bdaddr_t src;
DBG("path %s", path);
@@ -260,8 +258,7 @@ static int network_server_probe(struct btd_adapter *adapter, uint16_t id)
if (!conf.server_enabled)
return 0;
- source = adapter_get_address(adapter);
- str2ba(source, &src);
+ adapter_get_address(adapter, &src);
return server_register(path, &src, id);
}