diff options
| author | Mikel Astiz <mikel.astiz@bmw-carit.de> | 2012-10-19 17:39:18 +0200 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2012-10-25 13:34:08 +0300 |
| commit | 1541c28068b6daa097b56e0845ad0b410e80e81d (patch) | |
| tree | 850d1c3a1fb8c0d6301f40aa6dc250c23ea35321 | |
| parent | 0cdd6a2c0929ba130e6411bbaf093e9dd51089bc (diff) | |
network: Specify id while registering server
Only one type of server is being installed (BNEP_SVC_NAP), but the
server API actually supports having several of them. Therefore, it is
more accurate to specify BNEP_SVC_NAP in the manager's side.
| -rw-r--r-- | profiles/network/manager.c | 4 | ||||
| -rw-r--r-- | profiles/network/server.c | 9 | ||||
| -rw-r--r-- | profiles/network/server.h | 4 |
3 files changed, 8 insertions, 9 deletions
diff --git a/profiles/network/manager.c b/profiles/network/manager.c index aa564bd3..fe3324b6 100644 --- a/profiles/network/manager.c +++ b/profiles/network/manager.c @@ -102,7 +102,7 @@ static int network_server_probe(struct btd_profile *p, DBG("path %s", path); - return server_register(adapter); + return server_register(adapter, BNEP_SVC_NAP); } static void network_server_remove(struct btd_profile *p, @@ -112,7 +112,7 @@ static void network_server_remove(struct btd_profile *p, DBG("path %s", path); - server_unregister(adapter); + server_unregister(adapter, BNEP_SVC_NAP); } static struct btd_profile network_profile = { diff --git a/profiles/network/server.c b/profiles/network/server.c index ccf6e695..7b4460df 100644 --- a/profiles/network/server.c +++ b/profiles/network/server.c @@ -766,7 +766,7 @@ static struct network_adapter *create_adapter(struct btd_adapter *adapter) return na; } -int server_register(struct btd_adapter *adapter) +int server_register(struct btd_adapter *adapter, uint16_t id) { struct network_adapter *na; struct network_server *ns; @@ -780,7 +780,7 @@ int server_register(struct btd_adapter *adapter) adapters = g_slist_append(adapters, na); } - ns = find_server(na->servers, BNEP_SVC_NAP); + ns = find_server(na->servers, id); if (ns) return 0; @@ -802,7 +802,7 @@ int server_register(struct btd_adapter *adapter) } bacpy(&ns->src, adapter_get_address(adapter)); - ns->id = BNEP_SVC_NAP; + ns->id = id; ns->na = na; ns->record_id = 0; na->servers = g_slist_append(na->servers, ns); @@ -812,11 +812,10 @@ int server_register(struct btd_adapter *adapter) return 0; } -int server_unregister(struct btd_adapter *adapter) +int server_unregister(struct btd_adapter *adapter, uint16_t id) { struct network_adapter *na; struct network_server *ns; - uint16_t id = BNEP_SVC_NAP; na = find_adapter(adapters, adapter); if (!na) diff --git a/profiles/network/server.h b/profiles/network/server.h index 4c3ab85b..2edd3425 100644 --- a/profiles/network/server.h +++ b/profiles/network/server.h @@ -23,5 +23,5 @@ int server_init(gboolean secure); void server_exit(void); -int server_register(struct btd_adapter *adapter); -int server_unregister(struct btd_adapter *adapter); +int server_register(struct btd_adapter *adapter, uint16_t id); +int server_unregister(struct btd_adapter *adapter, uint16_t id); |