* [PATCH v3 03/10] adaptername: Retrieve config name from adapter
From: Frédéric Danis @ 2012-10-10 14:10 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1349878219-14359-1-git-send-email-frederic.danis@linux.intel.com>
Retrieve saved config name using adapter_get_config_name() instead
of reading it from storage file.
---
plugins/adaptername.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/plugins/adaptername.c b/plugins/adaptername.c
index f58fb0f..46dbbe8 100644
--- a/plugins/adaptername.c
+++ b/plugins/adaptername.c
@@ -198,7 +198,8 @@ static void set_pretty_name(struct btd_adapter *adapter,
static int adaptername_probe(struct btd_adapter *adapter)
{
int current_id;
- char name[MAX_NAME_LENGTH + 1];
+ char *name;
+ char str[MAX_NAME_LENGTH + 1];
char *pretty_hostname;
pretty_hostname = read_pretty_host_name();
@@ -211,8 +212,10 @@ static int adaptername_probe(struct btd_adapter *adapter)
adapter_set_allow_name_changes(adapter, TRUE);
current_id = adapter_get_dev_id(adapter);
- if (read_local_name(adapter_get_address(adapter), name) < 0)
- expand_name(name, MAX_NAME_LENGTH, main_opts.name, current_id);
+ if (adapter_get_config_name(adapter, &name) < 0) {
+ expand_name(str, MAX_NAME_LENGTH, main_opts.name, current_id);
+ name = str;
+ }
DBG("Setting name '%s' for device 'hci%d'", name, current_id);
adapter_set_name(adapter, name);
--
1.7.9.5
^ permalink raw reply related
* [PATCH v3 02/10] adapter: Read name in storage at init
From: Frédéric Danis @ 2012-10-10 14:10 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1349878219-14359-1-git-send-email-frederic.danis@linux.intel.com>
---
src/adapter.c | 34 ++++++++++++++++++++++++++++++++++
src/adapter.h | 1 +
2 files changed, 35 insertions(+)
diff --git a/src/adapter.c b/src/adapter.c
index ad8ee06..8b9af28 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -115,6 +115,10 @@ struct service_auth {
struct agent *agent; /* NULL for queued auths */
};
+struct btd_adapter_config {
+ char *name;
+};
+
struct btd_adapter {
uint16_t dev_id;
gboolean up;
@@ -155,6 +159,8 @@ struct btd_adapter {
gboolean pairable; /* pairable state */
gboolean initialized;
+ struct btd_adapter_config config;
+
gboolean off_requested; /* DEVDOWN ioctl was called */
gint ref;
@@ -780,11 +786,24 @@ int adapter_set_name(struct btd_adapter *adapter, const char *name)
adapter->name = g_strdup(maxname);
}
+ g_free(adapter->config.name);
+ adapter->config.name = g_strdup(maxname);
+
write_local_name(&adapter->bdaddr, maxname);
return 0;
}
+int adapter_get_config_name(struct btd_adapter *adapter, char **name)
+{
+ if (adapter->config.name == NULL)
+ return -EINVAL;
+
+ *name = adapter->config.name;
+
+ return 0;
+}
+
static void set_name(struct btd_adapter *adapter, const char *name,
GDBusPendingPropertySet id)
{
@@ -2665,6 +2684,18 @@ void btd_adapter_unref(struct btd_adapter *adapter)
g_free(path);
}
+static void load_config(struct btd_adapter *adapter)
+{
+ char name[MAX_NAME_LENGTH + 1];
+
+ /* Get name */
+ if (read_local_name(&adapter->bdaddr, name) < 0)
+ adapter->config.name = NULL;
+ else
+ adapter->config.name = g_strdup(name);
+
+}
+
gboolean adapter_init(struct btd_adapter *adapter, gboolean up)
{
adapter->up = up;
@@ -2684,6 +2715,7 @@ gboolean adapter_init(struct btd_adapter *adapter, gboolean up)
if (main_opts.gatt_enabled)
btd_adapter_gatt_server_start(adapter);
+ load_config(adapter);
load_drivers(adapter);
btd_profile_foreach(probe_profile, adapter);
clear_blocked(adapter);
@@ -2752,6 +2784,8 @@ void adapter_remove(struct btd_adapter *adapter)
/* Return adapter to down state if it was not up on init */
if (!adapter->already_up && adapter->up)
mgmt_set_powered(adapter->dev_id, FALSE);
+
+ g_free(adapter->config.name);
}
uint16_t adapter_get_dev_id(struct btd_adapter *adapter)
diff --git a/src/adapter.h b/src/adapter.h
index b5bff10..b575c1b 100644
--- a/src/adapter.h
+++ b/src/adapter.h
@@ -133,6 +133,7 @@ void adapter_update_found_devices(struct btd_adapter *adapter,
void adapter_emit_device_found(struct btd_adapter *adapter,
struct remote_dev_info *dev);
void adapter_mode_changed(struct btd_adapter *adapter, uint8_t scan_mode);
+int adapter_get_config_name(struct btd_adapter *adapter, char **name);
int adapter_set_name(struct btd_adapter *adapter, const char *name);
void adapter_name_changed(struct btd_adapter *adapter, const char *name);
void adapter_service_insert(struct btd_adapter *adapter, void *rec);
--
1.7.9.5
^ permalink raw reply related
* [PATCH v3 01/10] doc: Add settings storage documentation
From: Frédéric Danis @ 2012-10-10 14:10 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1349878219-14359-1-git-send-email-frederic.danis@linux.intel.com>
---
doc/settings-storage.txt | 102 ++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 102 insertions(+)
create mode 100644 doc/settings-storage.txt
diff --git a/doc/settings-storage.txt b/doc/settings-storage.txt
new file mode 100644
index 0000000..51d2220
--- /dev/null
+++ b/doc/settings-storage.txt
@@ -0,0 +1,102 @@
+Information related to local adapters and remote devices are stored in storage
+directory (default: /var/lib/bluetooth).
+Files are in ini-file format.
+
+There is one directory per adapter, named by its bluetooth address, which
+contains:
+ - a settings file for the local adapter
+ - an attribute_db file containing attributes of supported LE services
+ - names file containing names of all devices already seen
+ - one directory per remote device, named by remote device address, which
+ contains:
+ - a settings file
+ - a key file accessible only by root
+ - an attribute_db file containing attributes of remote LE services
+
+So the directory structure should be:
+ /var/lib/bluetooth/<adapter address>/
+ ./settings
+ ./attribute_db
+ ./names
+ ./<remote device address>/
+ ./settings
+ ./keys
+ ./attribute_db
+ ./<remote device address>/
+ ./settings
+ ./keys
+ ./attribute_db
+ ...
+
+Adapter directory files
+=======================
+
+Settings file contains 1 [General] group with adapter info:
+ [General]
+ Name=
+ Class=0x000000
+ Pairable=<true|false>
+ PairableTimeout=0
+ DiscoverableTimeout=0
+ Mode=<off|connectable|discoverable>
+ OnMode=<connectable|discoverable>
+
+The attribute_db file is a list of handles (group name) with UUID and Value as
+keys, for example:
+ [0x0001]
+ UUID=00002800-0000-1000-8000-00805f9b34fb
+ Value=0018
+
+ [0x0004]
+ UUID=00002803-0000-1000-8000-00805f9b34fb
+ Value=020600002A
+
+ [0x0006]
+ UUID=00002a00-0000-1000-8000-00805f9b34fb
+ Value=4578616D706C6520446576696365
+
+Names file contains 1 [Names] group with device address as key:
+ [Names]
+ <nn:nn:nn:nn:nn:nn>=device name a
+ <mm:mm:mm:mm:mm:mm>=device name b
+
+Device directory files
+======================
+
+Remote device settings file will include a [General] group with device infos
+and a [DeviceID] group with related infos:
+ [General]
+ Alias=
+ Class=0x000000
+ Manufacturer=0
+ LmpVersion=
+ LmpSubversion=
+ Features=0000000000000000
+ AddressType=<BR/EDR|LE>
+ LEAddressType=<public|random>
+ LastSeen=yyyy-mm-dd hh:mm:ss GMT
+ LastUsed=yyyy-mm-dd hh:mm:ss GMT
+ Trusted=<true|false>
+ Profiles=<128 bits UUID of profile 1>;<128 bits UUID of profile 2>;...
+
+ [DeviceID]
+ Assigner=0
+ Vendor=0
+ Product=0
+ Version=0
+
+Keys file includes informations related to link key or long term link key:
+ [LinkKey]
+ Key=
+ Type=0
+ PINLength=0
+
+ [LongTermKey]
+ Key=
+ Authenticated=<true|false>
+ EncSize=0
+ EDiv=0
+ Rand=0
+
+The attribute_db file is a list of handles (group name) with UUID and Value as
+keys (cf. attribute_db in adapter directory).
--
1.7.9.5
^ permalink raw reply related
* [PATCH v3 00/10] Move adapter config file to ini-file format
From: Frédéric Danis @ 2012-10-10 14:10 UTC (permalink / raw)
To: linux-bluetooth
Adapter saved configuration will be saved to /var/lib/bluetooth/<adapter address>/settings
in ini-file format for BlueZ 5.
If this file does not exist, we try to convert legacy config file to it.
Access to variables during run-time is performed in adapter structure which is populated by loading saved configuration during initialization.
First 6 patches remove access to config file from run-time.
Last patch move to ini-file format style (load, save and convert).
Frédéric Danis (10):
doc: Add settings storage documentation
adapter: Read name in storage at init
adaptername: Retrieve config name from adapter
adapter: Read device class in storage at init
adapter: Move pairable read to load_config()
adapter: Read pairable timeout in storage at init
adapter: Read discoverable timeout in storage at init
adapter: Read mode in storage at init
adapter: Move saved config to ini-file format
TODO: Add entry to remove storage convertion function
TODO | 6 +
doc/settings-storage.txt | 102 ++++++++++++++
plugins/adaptername.c | 9 +-
src/adapter.c | 330 +++++++++++++++++++++++++++++++++++-----------
src/adapter.h | 1 +
5 files changed, 370 insertions(+), 78 deletions(-)
create mode 100644 doc/settings-storage.txt
--
1.7.9.5
^ permalink raw reply
* Re: [PATCH v2 0/7] Move adapter config file to ini-file format
From: Johan Hedberg @ 2012-10-10 13:33 UTC (permalink / raw)
To: Marcel Holtmann; +Cc: Frédéric Danis, linux-bluetooth
In-Reply-To: <1349863391.27233.115.camel@aeonflux>
Hi Marcel,
On Wed, Oct 10, 2012, Marcel Holtmann wrote:
> > Adapter saved configuration will be saved to /var/lib/bluetooth/<adapter address>/settings
> > in ini-file format for BlueZ 5.
> > If this file does not exist, we try to convert legacy config file to it.
> >
> > Access to variables during run-time is performed in adapter structure which is populated by loading saved configuration during initialization.
> >
> > First 6 patches remove access to config file from run-time.
> > Last patch move to ini-file format style (load, save and convert).
>
> I am fine with the first 6 patches (7 in the end). Lets have Johan a
> second look at it.
Looks all pretty good to me.
Johan
^ permalink raw reply
* [PATCH 2/2] event: Use bool instead gboolean for legacy parameter
From: Szymon Janc @ 2012-10-10 13:19 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Szymon Janc
In-Reply-To: <1349875198-28913-1-git-send-email-szymon.janc@tieto.com>
This will avoid mixing bool and gboolean in btd_event_device_found
definition. Whole execution chain for legacy parameter is also
converted to bool type.
---
src/adapter.c | 4 ++--
src/adapter.h | 4 ++--
src/event.c | 2 +-
src/event.h | 2 +-
src/mgmt.c | 4 ++--
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/adapter.c b/src/adapter.c
index 368eedb..1b1aadb 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -3032,7 +3032,7 @@ void adapter_emit_device_found(struct btd_adapter *adapter,
static struct remote_dev_info *found_device_new(const bdaddr_t *bdaddr,
uint8_t bdaddr_type, const char *name,
const char *alias, uint32_t class,
- gboolean legacy, int flags)
+ bool legacy, int flags)
{
struct remote_dev_info *dev;
@@ -3145,7 +3145,7 @@ static gboolean connect_pending_cb(gpointer user_data)
void adapter_update_found_devices(struct btd_adapter *adapter,
const bdaddr_t *bdaddr,
uint8_t bdaddr_type, int8_t rssi,
- bool confirm_name, gboolean legacy,
+ bool confirm_name, bool legacy,
uint8_t *data, uint8_t data_len)
{
struct remote_dev_info *dev;
diff --git a/src/adapter.h b/src/adapter.h
index 6c29f2f..d36c717 100644
--- a/src/adapter.h
+++ b/src/adapter.h
@@ -83,7 +83,7 @@ struct remote_dev_info {
uint32_t class;
char *name;
char *alias;
- gboolean legacy;
+ bool legacy;
char **uuids;
size_t uuid_count;
GSList *services;
@@ -129,7 +129,7 @@ struct remote_dev_info *adapter_search_found_devices(struct btd_adapter *adapter
void adapter_update_found_devices(struct btd_adapter *adapter,
const bdaddr_t *bdaddr,
uint8_t bdaddr_type, int8_t rssi,
- bool confirm_name, gboolean legacy,
+ bool confirm_name, bool legacy,
uint8_t *data, uint8_t data_len);
void adapter_emit_device_found(struct btd_adapter *adapter,
struct remote_dev_info *dev);
diff --git a/src/event.c b/src/event.c
index 4f4fc93..5d0fd40 100644
--- a/src/event.c
+++ b/src/event.c
@@ -244,7 +244,7 @@ static void update_lastused(bdaddr_t *sba, bdaddr_t *dba, uint8_t dba_type)
void btd_event_device_found(bdaddr_t *local, bdaddr_t *peer, uint8_t bdaddr_type,
int8_t rssi, bool confirm_name,
- gboolean legacy, uint8_t *data,
+ bool legacy, uint8_t *data,
uint8_t data_len)
{
struct btd_adapter *adapter;
diff --git a/src/event.h b/src/event.h
index eca4409..1aa8704 100644
--- a/src/event.h
+++ b/src/event.h
@@ -25,7 +25,7 @@
int btd_event_request_pin(bdaddr_t *sba, bdaddr_t *dba, gboolean secure);
void btd_event_device_found(bdaddr_t *local, bdaddr_t *peer, uint8_t bdaddr_type,
int8_t rssi, bool confirm_name,
- gboolean legacy, uint8_t *data,
+ bool legacy, uint8_t *data,
uint8_t data_len);
void btd_event_remote_name(bdaddr_t *local, bdaddr_t *peer, char *name);
void btd_event_conn_complete(bdaddr_t *local, bdaddr_t *peer, uint8_t bdaddr_type,
diff --git a/src/mgmt.c b/src/mgmt.c
index 921c565..2a66be2 100644
--- a/src/mgmt.c
+++ b/src/mgmt.c
@@ -1635,7 +1635,7 @@ static void mgmt_device_found(int sk, uint16_t index, void *buf, size_t len)
uint16_t eir_len;
uint8_t *eir;
bool confirm_name;
- gboolean legacy;
+ bool legacy;
if (len < sizeof(*ev)) {
error("mgmt_device_found too short (%zu bytes)", len);
@@ -1668,7 +1668,7 @@ static void mgmt_device_found(int sk, uint16_t index, void *buf, size_t len)
index, addr, ev->rssi, flags, eir_len);
confirm_name = (flags & MGMT_DEV_FOUND_CONFIRM_NAME);
- legacy = (flags & MGMT_DEV_FOUND_LEGACY_PAIRING) ? TRUE : FALSE;
+ legacy = (flags & MGMT_DEV_FOUND_LEGACY_PAIRING);
btd_event_device_found(&info->bdaddr, &ev->addr.bdaddr,
ev->addr.type,
--
1.7.9.5
^ permalink raw reply related
* [PATCH 1/2] Pass confirm name as bool value
From: Szymon Janc @ 2012-10-10 13:19 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Szymon Janc
confirm_name is a boolean value and can be pass as such instead of
uint8_t.
---
src/adapter.c | 2 +-
src/adapter.h | 3 ++-
src/event.c | 2 +-
src/event.h | 2 +-
src/mgmt.c | 2 +-
5 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/adapter.c b/src/adapter.c
index ad8ee06..368eedb 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -3145,7 +3145,7 @@ static gboolean connect_pending_cb(gpointer user_data)
void adapter_update_found_devices(struct btd_adapter *adapter,
const bdaddr_t *bdaddr,
uint8_t bdaddr_type, int8_t rssi,
- uint8_t confirm_name, gboolean legacy,
+ bool confirm_name, gboolean legacy,
uint8_t *data, uint8_t data_len)
{
struct remote_dev_info *dev;
diff --git a/src/adapter.h b/src/adapter.h
index b5bff10..6c29f2f 100644
--- a/src/adapter.h
+++ b/src/adapter.h
@@ -28,6 +28,7 @@
#include <bluetooth/hci_lib.h>
#include <dbus/dbus.h>
#include <glib.h>
+#include <stdbool.h>
#define ADAPTER_INTERFACE "org.bluez.Adapter"
@@ -128,7 +129,7 @@ struct remote_dev_info *adapter_search_found_devices(struct btd_adapter *adapter
void adapter_update_found_devices(struct btd_adapter *adapter,
const bdaddr_t *bdaddr,
uint8_t bdaddr_type, int8_t rssi,
- uint8_t confirm_name, gboolean legacy,
+ bool confirm_name, gboolean legacy,
uint8_t *data, uint8_t data_len);
void adapter_emit_device_found(struct btd_adapter *adapter,
struct remote_dev_info *dev);
diff --git a/src/event.c b/src/event.c
index 83b6e90..4f4fc93 100644
--- a/src/event.c
+++ b/src/event.c
@@ -243,7 +243,7 @@ static void update_lastused(bdaddr_t *sba, bdaddr_t *dba, uint8_t dba_type)
}
void btd_event_device_found(bdaddr_t *local, bdaddr_t *peer, uint8_t bdaddr_type,
- int8_t rssi, uint8_t confirm_name,
+ int8_t rssi, bool confirm_name,
gboolean legacy, uint8_t *data,
uint8_t data_len)
{
diff --git a/src/event.h b/src/event.h
index a9afa1e..eca4409 100644
--- a/src/event.h
+++ b/src/event.h
@@ -24,7 +24,7 @@
int btd_event_request_pin(bdaddr_t *sba, bdaddr_t *dba, gboolean secure);
void btd_event_device_found(bdaddr_t *local, bdaddr_t *peer, uint8_t bdaddr_type,
- int8_t rssi, uint8_t confirm_name,
+ int8_t rssi, bool confirm_name,
gboolean legacy, uint8_t *data,
uint8_t data_len);
void btd_event_remote_name(bdaddr_t *local, bdaddr_t *peer, char *name);
diff --git a/src/mgmt.c b/src/mgmt.c
index 9353c7d..921c565 100644
--- a/src/mgmt.c
+++ b/src/mgmt.c
@@ -1634,7 +1634,7 @@ static void mgmt_device_found(int sk, uint16_t index, void *buf, size_t len)
uint32_t flags;
uint16_t eir_len;
uint8_t *eir;
- gboolean confirm_name;
+ bool confirm_name;
gboolean legacy;
if (len < sizeof(*ev)) {
--
1.7.9.5
^ permalink raw reply related
* Re: [PATCH v2 0/7] Move adapter config file to ini-file format
From: Szymon Janc @ 2012-10-10 13:01 UTC (permalink / raw)
To: Anderson Lizardo
Cc: Marcel Holtmann, Frédéric Danis,
linux-bluetooth@vger.kernel.org
In-Reply-To: <CAJdJm_OCcpXD7oPMQec-Z_UdhF7tfEOCs47Zfrq6+JQVrga2mQ@mail.gmail.com>
Hi,
On Wednesday 10 of October 2012 13:37:33 Anderson Lizardo wrote:
> Hi Marcel,
>
> On Wed, Oct 10, 2012 at 6:03 AM, Marcel Holtmann <marcel@holtmann.org> wrote:
> > For the actual change to the new format, can you first create a document
> > describing the new format. Something like doc/settings-storage.txt or
> > similar (if anyone can think of a better name).
>
> Would be interesting to update ./src/bluetoothd.8.in as well, or
> simply drop the description for config storage files?
I don't think man page should contain such information as description of data
stored by bluetoothd. This is a private daemon data that is not suppose to
be modified by hand.
Instead, it should contain comprehensive information about configuration files
located in /etc/bluetooth and note about location and purpose of data files.
(opposite to what is now in bluetoothd manual..)
By comprehensive I mean not necessarily full description of every option
possible (this could be located in separate manual or in example config files
as it is now) but clear description of what each file is responsible for, when
and how it is parsed etc.
--
BR
Szymon Janc
^ permalink raw reply
* Re: Agenda for Linux Wireless (802.11/Bluetooth/NFC) Mini-Summit 2012 (Barcelona!)
From: Michal Kazior @ 2012-10-10 11:53 UTC (permalink / raw)
To: John W. Linville
Cc: Johannes Berg, linux-wireless@vger.kernel.org,
linux-bluetooth@vger.kernel.org, alexander.smirnov@siemens.com
In-Reply-To: <20120822204122.GA2196@tuxdriver.com>
On 22/08/12 22:41, John W. Linville wrote:
> On Wed, Aug 22, 2012 at 10:39:35PM +0200, Johannes Berg wrote:
>> On Wed, 2012-08-22 at 16:19 -0400, John W. Linville wrote:
>>
>>> With that said, there are still a number of slots available for
>>> presentations or discussion topics. This is especially true for the
>>> 802.11 group... Please step-up with some suggested topics!
>>
>> Anyone want to carefully review & present Michal's and my work on
>> multi-channel in mac80211? :-)
>
> I would _really_ like to see this. Anyone (smarter than me) that is
> willing to do this for the group?
>
> John
>
Hi,
I'd like to do it. I'll update the wiki and put myself in a free
timeslot if that's okay.
-- Pozdrawiam / Best regards, Michal Kazior.
^ permalink raw reply
* Re: [PATCH v2 0/7] Move adapter config file to ini-file format
From: Anderson Lizardo @ 2012-10-10 10:37 UTC (permalink / raw)
To: Marcel Holtmann; +Cc: Frédéric Danis, linux-bluetooth
In-Reply-To: <1349863391.27233.115.camel@aeonflux>
Hi Marcel,
On Wed, Oct 10, 2012 at 6:03 AM, Marcel Holtmann <marcel@holtmann.org> wrote:
> For the actual change to the new format, can you first create a document
> describing the new format. Something like doc/settings-storage.txt or
> similar (if anyone can think of a better name).
Would be interesting to update ./src/bluetoothd.8.in as well, or
simply drop the description for config storage files?
Regards,
--
Anderson Lizardo
Instituto Nokia de Tecnologia - INdT
Manaus - Brazil
^ permalink raw reply
* Re: [RFCv1 3/6] Bluetooth: AMP: Add handle to hci_chan structure
From: Andrei Emeltchenko @ 2012-10-10 10:12 UTC (permalink / raw)
To: Marcel Holtmann; +Cc: linux-bluetooth
In-Reply-To: <1349863676.27233.120.camel@aeonflux>
Hi Marcel,
On Wed, Oct 10, 2012 at 12:07:56PM +0200, Marcel Holtmann wrote:
> Hi Andrei,
>
> > > > -
> > > > +struct hci_chan *hci_chan_lookup_handle(struct hci_conn *hcon, __u16 handle);
> > > > +struct hci_chan *hci_chan_lookup_handle_all(struct hci_dev *hdev,
> > > > + __u16 handle);
> > >
> > > this naming is pretty bad. I have no idea what one function does
> > > different compared to the other. Especially since none of them take a
> > > hci_chan as argument, but start with that prefix.
> > >
> > > Would be the naming hci_conn_lookup_chan be a lot clearer? Or maybe
> > > hci_chan_lookup_from_dev or similar.
> >
> > So are names like:
> >
> > hci_conn_lookup_hchan_by_handle
>
> since this one is only internal, you better have a shortcut version as
> just a static helper inside that code.
OK, will name this like __hci_chan_lookup_handle
>
> > hci_conn_lookup_hchan_from_hdev
>
> If we follow our naming convention then hci_chan_lookup_from_dev would
> come closest. However since you only need one of these, then
> hci_chan_lookup_handle would be fine and in sync with how we named
> everything else.
then this would be:
hci_chan_lookup_handle
Best regards
Andrei Emeltchenko
^ permalink raw reply
* Re: [RFCv1 3/6] Bluetooth: AMP: Add handle to hci_chan structure
From: Marcel Holtmann @ 2012-10-10 10:07 UTC (permalink / raw)
To: Andrei Emeltchenko; +Cc: linux-bluetooth
In-Reply-To: <20121010083438.GB7620@aemeltch-MOBL1>
Hi Andrei,
> > > -
> > > +struct hci_chan *hci_chan_lookup_handle(struct hci_conn *hcon, __u16 handle);
> > > +struct hci_chan *hci_chan_lookup_handle_all(struct hci_dev *hdev,
> > > + __u16 handle);
> >
> > this naming is pretty bad. I have no idea what one function does
> > different compared to the other. Especially since none of them take a
> > hci_chan as argument, but start with that prefix.
> >
> > Would be the naming hci_conn_lookup_chan be a lot clearer? Or maybe
> > hci_chan_lookup_from_dev or similar.
>
> So are names like:
>
> hci_conn_lookup_hchan_by_handle
since this one is only internal, you better have a shortcut version as
just a static helper inside that code.
> hci_conn_lookup_hchan_from_hdev
If we follow our naming convention then hci_chan_lookup_from_dev would
come closest. However since you only need one of these, then
hci_chan_lookup_handle would be fine and in sync with how we named
everything else.
I rather not have the prefixing h everywhere that we use in variable
names. That should be really only for variable names.
Regards
Marcel
^ permalink raw reply
* Re: [PATCH 2/9] Pass confirm name as gboolean value
From: Marcel Holtmann @ 2012-10-10 10:04 UTC (permalink / raw)
To: Szymon Janc; +Cc: linux-bluetooth@vger.kernel.org
In-Reply-To: <1505997.4TGEV3eNyH@uw000953>
Hi Szymon,
> > > confirm_name is a boolean value and can be pass as such instead of
> > > uint8_t.
> >
> > actually long term I want to move to bool usage. So maybe this is a good
> > start to get this going.
>
> OK, will send v2 with bool.
> Do you also want to stop introducing other glib types like gchar, gint etc?
> (at least for code that don't inherit this due to glib calls)
yes, please no more gchar and gint. These are horrible. We were young
and naive when we thought they were a good idea ;)
Regards
Marcel
^ permalink raw reply
* Re: [PATCH v2 0/7] Move adapter config file to ini-file format
From: Marcel Holtmann @ 2012-10-10 10:03 UTC (permalink / raw)
To: Frédéric Danis; +Cc: linux-bluetooth
In-Reply-To: <1349859520-8824-1-git-send-email-frederic.danis@linux.intel.com>
Hi Fred,
> Adapter saved configuration will be saved to /var/lib/bluetooth/<adapter address>/settings
> in ini-file format for BlueZ 5.
> If this file does not exist, we try to convert legacy config file to it.
>
> Access to variables during run-time is performed in adapter structure which is populated by loading saved configuration during initialization.
>
> First 6 patches remove access to config file from run-time.
> Last patch move to ini-file format style (load, save and convert).
I am fine with the first 6 patches (7 in the end). Lets have Johan a
second look at it.
For the actual change to the new format, can you first create a document
describing the new format. Something like doc/settings-storage.txt or
similar (if anyone can think of a better name).
Regards
Marcel
^ permalink raw reply
* Re: [PATCH v2 7/7] adapter: Move saved config to ini-file format
From: Marcel Holtmann @ 2012-10-10 10:00 UTC (permalink / raw)
To: Frédéric Danis; +Cc: linux-bluetooth
In-Reply-To: <1349859520-8824-8-git-send-email-frederic.danis@linux.intel.com>
Hi Fred,
> Read and write config file in ini-file format.
> If the file can not be loaded, try to convert legacy configuration.
> ---
> TODO | 6 ++
> src/adapter.c | 206 ++++++++++++++++++++++++++++++++++++++++++++++++---------
> 2 files changed, 180 insertions(+), 32 deletions(-)
split these also into two, one for the core and one for the TODO file.
Regards
Marcel
^ permalink raw reply
* Re: [PATCH 2/9] Pass confirm name as gboolean value
From: Szymon Janc @ 2012-10-10 9:57 UTC (permalink / raw)
To: Marcel Holtmann; +Cc: linux-bluetooth@vger.kernel.org
In-Reply-To: <1349794286.27233.95.camel@aeonflux>
On Tuesday 09 of October 2012 17:51:26 Marcel Holtmann wrote:
> Hi Szymon,
>
> > confirm_name is a boolean value and can be pass as such instead of
> > uint8_t.
>
> actually long term I want to move to bool usage. So maybe this is a good
> start to get this going.
OK, will send v2 with bool.
Do you also want to stop introducing other glib types like gchar, gint etc?
(at least for code that don't inherit this due to glib calls)
--
BR
Szymon Janc
^ permalink raw reply
* Re: [PATCH v2 1/7] adapter: Read name in storage at init
From: Marcel Holtmann @ 2012-10-10 9:57 UTC (permalink / raw)
To: Frédéric Danis; +Cc: linux-bluetooth
In-Reply-To: <1349859520-8824-2-git-send-email-frederic.danis@linux.intel.com>
Hi Fred,
> ---
> plugins/adaptername.c | 9 ++++++---
> src/adapter.c | 34 ++++++++++++++++++++++++++++++++++
> src/adapter.h | 1 +
> 3 files changed, 41 insertions(+), 3 deletions(-)
split this into two, one for the core, one for the plugin.
Regards
Marcel
^ permalink raw reply
* [PATCH v2 7/7] adapter: Move saved config to ini-file format
From: Frédéric Danis @ 2012-10-10 8:58 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1349859520-8824-1-git-send-email-frederic.danis@linux.intel.com>
Read and write config file in ini-file format.
If the file can not be loaded, try to convert legacy configuration.
---
TODO | 6 ++
src/adapter.c | 206 ++++++++++++++++++++++++++++++++++++++++++++++++---------
2 files changed, 180 insertions(+), 32 deletions(-)
diff --git a/TODO b/TODO
index 384d428..c6787cc 100644
--- a/TODO
+++ b/TODO
@@ -30,6 +30,12 @@ General
Priority: Low
Complexity: C1
+- Function in src/adapter.c to convert old storage files to new ini-file format
+ should be removed 6-8 months after first BlueZ 5 release.
+
+ Priority: Low
+ Complexity: C1
+
BlueZ 5
=======
diff --git a/src/adapter.c b/src/adapter.c
index 85c5da9..6b4197c 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -33,6 +33,7 @@
#include <stdlib.h>
#include <stdbool.h>
#include <sys/ioctl.h>
+#include <sys/file.h>
#include <bluetooth/bluetooth.h>
#include <bluetooth/uuid.h>
@@ -84,6 +85,8 @@
#define OFF_TIMER 3
+#define SETTINGS_PATH STORAGEDIR "/%s/settings"
+
static GSList *adapter_drivers = NULL;
enum session_req_type {
@@ -224,6 +227,54 @@ static uint8_t get_mode(const char *mode)
return MODE_UNKNOWN;
}
+static void write_config(struct btd_adapter *adapter)
+{
+ GKeyFile *key_file;
+ char filename[PATH_MAX + 1];
+ char address[18];
+ char *str;
+ gsize length = 0;
+
+ key_file = g_key_file_new();
+
+ g_key_file_set_string(key_file, "General", "Name",
+ adapter->config.name);
+
+ str = g_strdup_printf("0x%2.2x%2.2x%2.2x", adapter->config.class[2],
+ adapter->config.class[1],
+ adapter->config.class[0]);
+ g_key_file_set_string(key_file, "General", "Class", str);
+ g_free(str);
+
+ g_key_file_set_boolean(key_file, "General", "Pairable",
+ adapter->pairable);
+
+ if (adapter->pairable_timeout != main_opts.pairto)
+ g_key_file_set_integer(key_file, "General", "PairableTimeout",
+ adapter->pairable_timeout);
+
+ if (adapter->discov_timeout != main_opts.discovto)
+ g_key_file_set_integer(key_file, "General",
+ "DiscoverableTimeout",
+ adapter->discov_timeout);
+
+ g_key_file_set_string(key_file, "General", "Mode",
+ mode2str(adapter->config.mode));
+ g_key_file_set_string(key_file, "General", "OnMode",
+ mode2str(adapter->config.on_mode));
+
+ ba2str(&adapter->bdaddr, address);
+ snprintf(filename, PATH_MAX, SETTINGS_PATH, address);
+
+ create_file(filename, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
+
+ str = g_key_file_to_data(key_file, &length, NULL);
+ g_file_set_contents(filename, str, length, NULL);
+ g_free(str);
+
+ g_key_file_free(key_file);
+}
+
static struct session_req *session_ref(struct session_req *req)
{
req->refcount++;
@@ -293,7 +344,6 @@ static struct session_req *find_session_by_msg(GSList *list, const DBusMessage *
static int set_mode(struct btd_adapter *adapter, uint8_t new_mode)
{
int err;
- const char *modestr;
if (adapter->pending_mode != NULL)
return -EALREADY;
@@ -329,10 +379,9 @@ done:
if (new_mode != MODE_OFF)
adapter->config.on_mode = new_mode;
- modestr = mode2str(new_mode);
- write_device_mode(&adapter->bdaddr, modestr);
+ write_config(adapter);
- DBG("%s", modestr);
+ DBG("%s", mode2str(new_mode));
return 0;
}
@@ -475,7 +524,7 @@ void btd_adapter_pairable_changed(struct btd_adapter *adapter,
{
adapter->pairable = pairable;
- write_device_pairable(&adapter->bdaddr, pairable);
+ write_config(adapter);
g_dbus_emit_property_changed(btd_get_dbus_connection(), adapter->path,
ADAPTER_INTERFACE, "Pairable");
@@ -692,7 +741,7 @@ static void set_discoverable_timeout(struct btd_adapter *adapter,
adapter->discov_timeout = timeout;
- write_discoverable_timeout(&adapter->bdaddr, timeout);
+ write_config(adapter);
g_dbus_emit_property_changed(conn, adapter->path, ADAPTER_INTERFACE,
"DiscoverableTimeout");
@@ -712,7 +761,7 @@ static void set_pairable_timeout(struct btd_adapter *adapter,
adapter->pairable_timeout = timeout;
- write_pairable_timeout(&adapter->bdaddr, timeout);
+ write_config(adapter);
g_dbus_emit_property_changed(conn, adapter->path, ADAPTER_INTERFACE,
"PairableTimeout");
@@ -732,7 +781,7 @@ void btd_adapter_class_changed(struct btd_adapter *adapter, uint8_t *new_class)
adapter->config.class[1] = new_class[1];
adapter->config.class[2] = new_class[2];
- write_local_class(&adapter->bdaddr, new_class);
+ write_config(adapter);
adapter->dev_class = class;
@@ -792,7 +841,7 @@ int adapter_set_name(struct btd_adapter *adapter, const char *name)
g_free(adapter->config.name);
adapter->config.name = g_strdup(maxname);
- write_local_name(&adapter->bdaddr, maxname);
+ write_config(adapter);
return 0;
}
@@ -2479,17 +2528,15 @@ static void set_mode_complete(struct btd_adapter *adapter)
{
DBusConnection *conn = btd_get_dbus_connection();
struct session_req *pending;
- const char *modestr;
int err;
adapter->config.mode = adapter->mode;
if (adapter->mode != MODE_OFF)
adapter->config.on_mode = adapter->mode;
- modestr = mode2str(adapter->mode);
- write_device_mode(&adapter->bdaddr, modestr);
+ write_config(adapter);
- DBG("%s", modestr);
+ DBG("%s", mode2str(adapter->mode));
if (adapter->mode == MODE_OFF) {
g_slist_free_full(adapter->mode_sessions, session_free);
@@ -2656,56 +2703,151 @@ void btd_adapter_unref(struct btd_adapter *adapter)
g_free(path);
}
-static void load_config(struct btd_adapter *adapter)
+static void convert_config(struct btd_adapter *adapter, const char *filename,
+ GKeyFile *key_file)
{
- char name[MAX_NAME_LENGTH + 1];
char address[18];
- char mode[14];
+ char str[MAX_NAME_LENGTH + 1];
+ char config_path[PATH_MAX + 1];
+ char *converted;
+ uint8_t class[3];
+ gboolean flag;
int timeout;
+ char *data;
+ gsize length = 0;
+
+ ba2str(&adapter->bdaddr, address);
+ snprintf(config_path, PATH_MAX, STORAGEDIR "/%s/config", address);
+
+ converted = textfile_get(config_path, "converted");
+ if (converted) {
+ if (strcmp(converted, "yes") == 0) {
+ DBG("Legacy config file already converted");
+ return;
+ }
+
+ g_free(converted);
+ }
+
+ if (read_local_name(&adapter->bdaddr, str) == 0)
+ g_key_file_set_string(key_file, "General", "Name", str);
+
+ if (read_local_class(&adapter->bdaddr, class) == 0) {
+ sprintf(str, "0x%2.2x%2.2x%2.2x", class[2], class[1], class[0]);
+ g_key_file_set_string(key_file, "General", "Class", str);
+ }
+
+ if (read_device_pairable(&adapter->bdaddr, &flag) == 0)
+ g_key_file_set_boolean(key_file, "General", "Pairable", flag);
+
+ if (read_pairable_timeout(address, &timeout) == 0)
+ g_key_file_set_integer(key_file, "General",
+ "PairableTimeout", timeout);
+
+ if (read_discoverable_timeout(address, &timeout) == 0)
+ g_key_file_set_integer(key_file, "General",
+ "DiscoverableTimeout", timeout);
+
+ if (read_device_mode(address, str, sizeof(str)) == 0)
+ g_key_file_set_string(key_file, "General", "Mode", str);
+
+ if (read_on_mode(address, str, sizeof(str)) == 0)
+ g_key_file_set_string(key_file, "General", "OnMode", str);
+
+ create_file(filename, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
+
+ data = g_key_file_to_data(key_file, &length, NULL);
+ g_file_set_contents(filename, data, length, NULL);
+ g_free(data);
+
+ textfile_put(config_path, "converted", "yes");
+}
+
+static void load_config(struct btd_adapter *adapter)
+{
+ GKeyFile *key_file;
+ char filename[PATH_MAX + 1];
+ char address[18];
+ char *str;
+ GError *gerr = NULL;
ba2str(&adapter->bdaddr, address);
+ key_file = g_key_file_new();
+
+ snprintf(filename, PATH_MAX, SETTINGS_PATH, address);
+
+ if (!g_key_file_load_from_file(key_file, filename, 0, NULL))
+ convert_config(adapter, filename, key_file);
+
/* Get name */
- if (read_local_name(&adapter->bdaddr, name) < 0)
- adapter->config.name = NULL;
- else
- adapter->config.name = g_strdup(name);
+ adapter->config.name = g_key_file_get_string(key_file, "General",
+ "Name", NULL);
/* Get class */
- if (read_local_class(&adapter->bdaddr, adapter->config.class) < 0) {
+ str = g_key_file_get_string(key_file, "General", "Class", NULL);
+ if (str) {
+ char tmp[3];
+ int i;
+ uint8_t *class = adapter->config.class;
+
+ memset(tmp, 0, sizeof(tmp));
+ for (i = 0; i < 3; i++) {
+ memcpy(tmp, str + (i * 2) + 2, 2);
+ class[2 - i] = (uint8_t) strtol(tmp, NULL, 16);
+ }
+ } else {
uint32_t class = htobl(main_opts.class);
memcpy(adapter->config.class, &class, 3);
}
+ g_free(str);
/* Get pairable mode */
- if (read_device_pairable(&adapter->bdaddr, &adapter->pairable) < 0)
+ adapter->pairable = g_key_file_get_boolean(key_file, "General",
+ "Pairable", &gerr);
+ if (gerr) {
adapter->pairable = TRUE;
+ g_error_free(gerr);
+ gerr = NULL;
+ }
/* Get pairable timeout */
- if (read_pairable_timeout(address, &timeout) < 0)
+ adapter->pairable_timeout = g_key_file_get_integer(key_file, "General",
+ "PairableTimeout", &gerr);
+ if (gerr) {
adapter->pairable_timeout = main_opts.pairto;
- else
- adapter->pairable_timeout = timeout;
+ g_error_free(gerr);
+ gerr = NULL;
+ }
/* Get discoverable timeout */
- if (read_discoverable_timeout(address, &timeout) < 0)
+ adapter->discov_timeout = g_key_file_get_integer(key_file, "General",
+ "DiscoverableTimeout", &gerr);
+ if (gerr) {
adapter->discov_timeout = main_opts.discovto;
- else
- adapter->discov_timeout = timeout;
+ g_error_free(gerr);
+ gerr = NULL;
+ }
/* Get mode */
+ str = g_key_file_get_string(key_file, "General", "Mode", NULL);
if (main_opts.remember_powered == FALSE)
adapter->config.mode = main_opts.mode;
- else if (read_device_mode(address, mode, sizeof(mode)) == 0)
- adapter->config.mode = get_mode(mode);
+ else if (str)
+ adapter->config.mode = get_mode(str);
else
adapter->config.mode = main_opts.mode;
+ g_free(str);
/* Get on mode */
- if (read_on_mode(address, mode, sizeof(mode)) == 0)
- adapter->config.on_mode = get_mode(mode);
+ str = g_key_file_get_string(key_file, "General", "OnMode", NULL);
+ if (str)
+ adapter->config.on_mode = get_mode(str);
else
adapter->config.on_mode = MODE_CONNECTABLE;
+ g_free(str);
+
+ g_key_file_free(key_file);
}
gboolean adapter_init(struct btd_adapter *adapter, gboolean up)
--
1.7.9.5
^ permalink raw reply related
* [PATCH v2 6/7] adapter: Read mode in storage at init
From: Frédéric Danis @ 2012-10-10 8:58 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1349859520-8824-1-git-send-email-frederic.danis@linux.intel.com>
---
src/adapter.c | 61 ++++++++++++++++++++++++++++++++-------------------------
1 file changed, 34 insertions(+), 27 deletions(-)
diff --git a/src/adapter.c b/src/adapter.c
index 40df4a1..85c5da9 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -118,6 +118,8 @@ struct service_auth {
struct btd_adapter_config {
char *name;
uint8_t class[3];
+ uint8_t mode;
+ uint8_t on_mode;
};
struct btd_adapter {
@@ -210,7 +212,7 @@ static const char *mode2str(uint8_t mode)
}
}
-static uint8_t get_mode(const bdaddr_t *bdaddr, const char *mode)
+static uint8_t get_mode(const char *mode)
{
if (strcasecmp("off", mode) == 0)
return MODE_OFF;
@@ -218,15 +220,7 @@ static uint8_t get_mode(const bdaddr_t *bdaddr, const char *mode)
return MODE_CONNECTABLE;
else if (strcasecmp("discoverable", mode) == 0)
return MODE_DISCOVERABLE;
- else if (strcasecmp("on", mode) == 0) {
- char onmode[14], srcaddr[18];
-
- ba2str(bdaddr, srcaddr);
- if (read_on_mode(srcaddr, onmode, sizeof(onmode)) < 0)
- return MODE_CONNECTABLE;
-
- return get_mode(bdaddr, onmode);
- } else
+ else
return MODE_UNKNOWN;
}
@@ -331,6 +325,10 @@ static int set_mode(struct btd_adapter *adapter, uint8_t new_mode)
return err;
done:
+ adapter->config.mode = new_mode;
+ if (new_mode != MODE_OFF)
+ adapter->config.on_mode = new_mode;
+
modestr = mode2str(new_mode);
write_device_mode(&adapter->bdaddr, modestr);
@@ -390,7 +388,7 @@ static void set_powered(struct btd_adapter *adapter, gboolean powered,
int err;
if (powered) {
- mode = get_mode(&adapter->bdaddr, "on");
+ mode = adapter->config.on_mode;
return set_discoverable(adapter, mode == MODE_DISCOVERABLE,
id);
}
@@ -1403,7 +1401,7 @@ static DBusMessage *request_session(DBusConnection *conn,
if (!adapter->mode_sessions)
adapter->global_mode = adapter->mode;
- new_mode = get_mode(&adapter->bdaddr, "on");
+ new_mode = adapter->config.on_mode;
req = find_session(adapter->mode_sessions, sender);
if (req) {
@@ -2312,21 +2310,15 @@ void btd_adapter_get_mode(struct btd_adapter *adapter, uint8_t *mode,
uint16_t *discoverable_timeout,
gboolean *pairable)
{
- char str[14], address[18];
+ char address[18];
ba2str(&adapter->bdaddr, address);
- if (mode) {
- if (main_opts.remember_powered == FALSE)
- *mode = main_opts.mode;
- else if (read_device_mode(address, str, sizeof(str)) == 0)
- *mode = get_mode(&adapter->bdaddr, str);
- else
- *mode = main_opts.mode;
- }
+ if (mode)
+ *mode = adapter->config.mode;
if (on_mode)
- *on_mode = get_mode(&adapter->bdaddr, "on");
+ *on_mode = adapter->config.on_mode;
if (discoverable_timeout)
*discoverable_timeout = adapter->discov_timeout;
@@ -2490,6 +2482,10 @@ static void set_mode_complete(struct btd_adapter *adapter)
const char *modestr;
int err;
+ adapter->config.mode = adapter->mode;
+ if (adapter->mode != MODE_OFF)
+ adapter->config.on_mode = adapter->mode;
+
modestr = mode2str(adapter->mode);
write_device_mode(&adapter->bdaddr, modestr);
@@ -2664,6 +2660,7 @@ static void load_config(struct btd_adapter *adapter)
{
char name[MAX_NAME_LENGTH + 1];
char address[18];
+ char mode[14];
int timeout;
ba2str(&adapter->bdaddr, address);
@@ -2695,6 +2692,20 @@ static void load_config(struct btd_adapter *adapter)
adapter->discov_timeout = main_opts.discovto;
else
adapter->discov_timeout = timeout;
+
+ /* Get mode */
+ if (main_opts.remember_powered == FALSE)
+ adapter->config.mode = main_opts.mode;
+ else if (read_device_mode(address, mode, sizeof(mode)) == 0)
+ adapter->config.mode = get_mode(mode);
+ else
+ adapter->config.mode = main_opts.mode;
+
+ /* Get on mode */
+ if (read_on_mode(address, mode, sizeof(mode)) == 0)
+ adapter->config.on_mode = get_mode(mode);
+ else
+ adapter->config.on_mode = MODE_CONNECTABLE;
}
gboolean adapter_init(struct btd_adapter *adapter, gboolean up)
@@ -3601,17 +3612,13 @@ gboolean adapter_powering_down(struct btd_adapter *adapter)
int btd_adapter_restore_powered(struct btd_adapter *adapter)
{
- char mode[14], address[18];
-
if (!main_opts.remember_powered)
return -EINVAL;
if (adapter->up)
return 0;
- ba2str(&adapter->bdaddr, address);
- if (read_device_mode(address, mode, sizeof(mode)) == 0 &&
- g_str_equal(mode, "off"))
+ if (adapter->config.mode == MODE_OFF)
return 0;
return mgmt_set_powered(adapter->dev_id, TRUE);
--
1.7.9.5
^ permalink raw reply related
* [PATCH v2 5/7] adapter: Read discoverable timeout in storage at init
From: Frédéric Danis @ 2012-10-10 8:58 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1349859520-8824-1-git-send-email-frederic.danis@linux.intel.com>
---
src/adapter.c | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/src/adapter.c b/src/adapter.c
index b869d81..40df4a1 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -2268,16 +2268,6 @@ static void load_connections(struct btd_adapter *adapter)
g_slist_free_full(conns, g_free);
}
-static int get_discoverable_timeout(const char *src)
-{
- int timeout;
-
- if (read_discoverable_timeout(src, &timeout) == 0)
- return timeout;
-
- return main_opts.discovto;
-}
-
static void set_auto_connect(gpointer data, gpointer user_data)
{
struct btd_device *device = data;
@@ -2339,7 +2329,7 @@ void btd_adapter_get_mode(struct btd_adapter *adapter, uint8_t *mode,
*on_mode = get_mode(&adapter->bdaddr, "on");
if (discoverable_timeout)
- *discoverable_timeout = get_discoverable_timeout(address);
+ *discoverable_timeout = adapter->discov_timeout;
if (pairable)
*pairable = adapter->pairable;
@@ -2421,7 +2411,6 @@ void btd_adapter_start(struct btd_adapter *adapter)
adapter->dev_class = 0;
adapter->off_requested = FALSE;
adapter->up = TRUE;
- adapter->discov_timeout = get_discoverable_timeout(address);
adapter->off_timer = 0;
if (adapter->scan_mode & SCAN_INQUIRY)
@@ -2700,6 +2689,12 @@ static void load_config(struct btd_adapter *adapter)
adapter->pairable_timeout = main_opts.pairto;
else
adapter->pairable_timeout = timeout;
+
+ /* Get discoverable timeout */
+ if (read_discoverable_timeout(address, &timeout) < 0)
+ adapter->discov_timeout = main_opts.discovto;
+ else
+ adapter->discov_timeout = timeout;
}
gboolean adapter_init(struct btd_adapter *adapter, gboolean up)
--
1.7.9.5
^ permalink raw reply related
* [PATCH v2 4/7] adapter: Read pairable timeout in storage at init
From: Frédéric Danis @ 2012-10-10 8:58 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1349859520-8824-1-git-send-email-frederic.danis@linux.intel.com>
---
src/adapter.c | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/src/adapter.c b/src/adapter.c
index 357b717..b869d81 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -2278,16 +2278,6 @@ static int get_discoverable_timeout(const char *src)
return main_opts.discovto;
}
-static int get_pairable_timeout(const char *src)
-{
- int timeout;
-
- if (read_pairable_timeout(src, &timeout) == 0)
- return timeout;
-
- return main_opts.pairto;
-}
-
static void set_auto_connect(gpointer data, gpointer user_data)
{
struct btd_device *device = data;
@@ -2432,7 +2422,6 @@ void btd_adapter_start(struct btd_adapter *adapter)
adapter->off_requested = FALSE;
adapter->up = TRUE;
adapter->discov_timeout = get_discoverable_timeout(address);
- adapter->pairable_timeout = get_pairable_timeout(address);
adapter->off_timer = 0;
if (adapter->scan_mode & SCAN_INQUIRY)
@@ -2685,6 +2674,10 @@ void btd_adapter_unref(struct btd_adapter *adapter)
static void load_config(struct btd_adapter *adapter)
{
char name[MAX_NAME_LENGTH + 1];
+ char address[18];
+ int timeout;
+
+ ba2str(&adapter->bdaddr, address);
/* Get name */
if (read_local_name(&adapter->bdaddr, name) < 0)
@@ -2701,6 +2694,12 @@ static void load_config(struct btd_adapter *adapter)
/* Get pairable mode */
if (read_device_pairable(&adapter->bdaddr, &adapter->pairable) < 0)
adapter->pairable = TRUE;
+
+ /* Get pairable timeout */
+ if (read_pairable_timeout(address, &timeout) < 0)
+ adapter->pairable_timeout = main_opts.pairto;
+ else
+ adapter->pairable_timeout = timeout;
}
gboolean adapter_init(struct btd_adapter *adapter, gboolean up)
--
1.7.9.5
^ permalink raw reply related
* [PATCH v2 3/7] adapter: Move pairable read to load_config()
From: Frédéric Danis @ 2012-10-10 8:58 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1349859520-8824-1-git-send-email-frederic.danis@linux.intel.com>
---
src/adapter.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/adapter.c b/src/adapter.c
index 93dc0fb..357b717 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -2697,6 +2697,10 @@ static void load_config(struct btd_adapter *adapter)
uint32_t class = htobl(main_opts.class);
memcpy(adapter->config.class, &class, 3);
}
+
+ /* Get pairable mode */
+ if (read_device_pairable(&adapter->bdaddr, &adapter->pairable) < 0)
+ adapter->pairable = TRUE;
}
gboolean adapter_init(struct btd_adapter *adapter, gboolean up)
@@ -2724,10 +2728,6 @@ gboolean adapter_init(struct btd_adapter *adapter, gboolean up)
clear_blocked(adapter);
load_devices(adapter);
- /* Set pairable mode */
- if (read_device_pairable(&adapter->bdaddr, &adapter->pairable) < 0)
- adapter->pairable = TRUE;
-
/* retrieve the active connections: address the scenario where
* the are active connections before the daemon've started */
load_connections(adapter);
--
1.7.9.5
^ permalink raw reply related
* [PATCH v2 2/7] adapter: Read device class in storage at init
From: Frédéric Danis @ 2012-10-10 8:58 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1349859520-8824-1-git-send-email-frederic.danis@linux.intel.com>
---
src/adapter.c | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/adapter.c b/src/adapter.c
index 8b9af28..93dc0fb 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -117,6 +117,7 @@ struct service_auth {
struct btd_adapter_config {
char *name;
+ uint8_t class[3];
};
struct btd_adapter {
@@ -729,6 +730,10 @@ void btd_adapter_class_changed(struct btd_adapter *adapter, uint8_t *new_class)
if (class == adapter->dev_class)
return;
+ adapter->config.class[0] = new_class[0];
+ adapter->config.class[1] = new_class[1];
+ adapter->config.class[2] = new_class[2];
+
write_local_class(&adapter->bdaddr, new_class);
adapter->dev_class = class;
@@ -2353,15 +2358,8 @@ void btd_adapter_get_mode(struct btd_adapter *adapter, uint8_t *mode,
void btd_adapter_read_class(struct btd_adapter *adapter, uint8_t *major,
uint8_t *minor)
{
- uint8_t cls[3];
-
- if (read_local_class(&adapter->bdaddr, cls) < 0) {
- uint32_t class = htobl(main_opts.class);
- memcpy(cls, &class, 3);
- }
-
- *major = cls[1];
- *minor = cls[0];
+ *major = adapter->config.class[1];
+ *minor = adapter->config.class[0];
}
uint32_t btd_adapter_get_class(struct btd_adapter *adapter)
@@ -2694,6 +2692,11 @@ static void load_config(struct btd_adapter *adapter)
else
adapter->config.name = g_strdup(name);
+ /* Get class */
+ if (read_local_class(&adapter->bdaddr, adapter->config.class) < 0) {
+ uint32_t class = htobl(main_opts.class);
+ memcpy(adapter->config.class, &class, 3);
+ }
}
gboolean adapter_init(struct btd_adapter *adapter, gboolean up)
--
1.7.9.5
^ permalink raw reply related
* [PATCH v2 1/7] adapter: Read name in storage at init
From: Frédéric Danis @ 2012-10-10 8:58 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1349859520-8824-1-git-send-email-frederic.danis@linux.intel.com>
---
plugins/adaptername.c | 9 ++++++---
src/adapter.c | 34 ++++++++++++++++++++++++++++++++++
src/adapter.h | 1 +
3 files changed, 41 insertions(+), 3 deletions(-)
diff --git a/plugins/adaptername.c b/plugins/adaptername.c
index f58fb0f..46dbbe8 100644
--- a/plugins/adaptername.c
+++ b/plugins/adaptername.c
@@ -198,7 +198,8 @@ static void set_pretty_name(struct btd_adapter *adapter,
static int adaptername_probe(struct btd_adapter *adapter)
{
int current_id;
- char name[MAX_NAME_LENGTH + 1];
+ char *name;
+ char str[MAX_NAME_LENGTH + 1];
char *pretty_hostname;
pretty_hostname = read_pretty_host_name();
@@ -211,8 +212,10 @@ static int adaptername_probe(struct btd_adapter *adapter)
adapter_set_allow_name_changes(adapter, TRUE);
current_id = adapter_get_dev_id(adapter);
- if (read_local_name(adapter_get_address(adapter), name) < 0)
- expand_name(name, MAX_NAME_LENGTH, main_opts.name, current_id);
+ if (adapter_get_config_name(adapter, &name) < 0) {
+ expand_name(str, MAX_NAME_LENGTH, main_opts.name, current_id);
+ name = str;
+ }
DBG("Setting name '%s' for device 'hci%d'", name, current_id);
adapter_set_name(adapter, name);
diff --git a/src/adapter.c b/src/adapter.c
index ad8ee06..8b9af28 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -115,6 +115,10 @@ struct service_auth {
struct agent *agent; /* NULL for queued auths */
};
+struct btd_adapter_config {
+ char *name;
+};
+
struct btd_adapter {
uint16_t dev_id;
gboolean up;
@@ -155,6 +159,8 @@ struct btd_adapter {
gboolean pairable; /* pairable state */
gboolean initialized;
+ struct btd_adapter_config config;
+
gboolean off_requested; /* DEVDOWN ioctl was called */
gint ref;
@@ -780,11 +786,24 @@ int adapter_set_name(struct btd_adapter *adapter, const char *name)
adapter->name = g_strdup(maxname);
}
+ g_free(adapter->config.name);
+ adapter->config.name = g_strdup(maxname);
+
write_local_name(&adapter->bdaddr, maxname);
return 0;
}
+int adapter_get_config_name(struct btd_adapter *adapter, char **name)
+{
+ if (adapter->config.name == NULL)
+ return -EINVAL;
+
+ *name = adapter->config.name;
+
+ return 0;
+}
+
static void set_name(struct btd_adapter *adapter, const char *name,
GDBusPendingPropertySet id)
{
@@ -2665,6 +2684,18 @@ void btd_adapter_unref(struct btd_adapter *adapter)
g_free(path);
}
+static void load_config(struct btd_adapter *adapter)
+{
+ char name[MAX_NAME_LENGTH + 1];
+
+ /* Get name */
+ if (read_local_name(&adapter->bdaddr, name) < 0)
+ adapter->config.name = NULL;
+ else
+ adapter->config.name = g_strdup(name);
+
+}
+
gboolean adapter_init(struct btd_adapter *adapter, gboolean up)
{
adapter->up = up;
@@ -2684,6 +2715,7 @@ gboolean adapter_init(struct btd_adapter *adapter, gboolean up)
if (main_opts.gatt_enabled)
btd_adapter_gatt_server_start(adapter);
+ load_config(adapter);
load_drivers(adapter);
btd_profile_foreach(probe_profile, adapter);
clear_blocked(adapter);
@@ -2752,6 +2784,8 @@ void adapter_remove(struct btd_adapter *adapter)
/* Return adapter to down state if it was not up on init */
if (!adapter->already_up && adapter->up)
mgmt_set_powered(adapter->dev_id, FALSE);
+
+ g_free(adapter->config.name);
}
uint16_t adapter_get_dev_id(struct btd_adapter *adapter)
diff --git a/src/adapter.h b/src/adapter.h
index b5bff10..b575c1b 100644
--- a/src/adapter.h
+++ b/src/adapter.h
@@ -133,6 +133,7 @@ void adapter_update_found_devices(struct btd_adapter *adapter,
void adapter_emit_device_found(struct btd_adapter *adapter,
struct remote_dev_info *dev);
void adapter_mode_changed(struct btd_adapter *adapter, uint8_t scan_mode);
+int adapter_get_config_name(struct btd_adapter *adapter, char **name);
int adapter_set_name(struct btd_adapter *adapter, const char *name);
void adapter_name_changed(struct btd_adapter *adapter, const char *name);
void adapter_service_insert(struct btd_adapter *adapter, void *rec);
--
1.7.9.5
^ permalink raw reply related
* [PATCH v2 0/7] Move adapter config file to ini-file format
From: Frédéric Danis @ 2012-10-10 8:58 UTC (permalink / raw)
To: linux-bluetooth
Adapter saved configuration will be saved to /var/lib/bluetooth/<adapter address>/settings
in ini-file format for BlueZ 5.
If this file does not exist, we try to convert legacy config file to it.
Access to variables during run-time is performed in adapter structure which is populated by loading saved configuration during initialization.
First 6 patches remove access to config file from run-time.
Last patch move to ini-file format style (load, save and convert).
Frédéric Danis (7):
adapter: Read name in storage at init
adapter: Read device class in storage at init
adapter: Move pairable read to load_config()
adapter: Read pairable timeout in storage at init
adapter: Read discoverable timeout in storage at init
adapter: Read mode in storage at init
adapter: Move saved config to ini-file format
TODO | 6 +
plugins/adaptername.c | 9 +-
src/adapter.c | 330 ++++++++++++++++++++++++++++++++++++++-----------
src/adapter.h | 1 +
4 files changed, 268 insertions(+), 78 deletions(-)
--
1.7.9.5
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox