Got it, then let's simply leave this patch out.
Cheers,
Archie
On Thu, 2 Sept 2021 at 17:29, Marcel Holtmann <marcel@xxxxxxxxxxxx> wrote:
>
> Hi Archie,
>
> > BT core spec 5.3 promotes the usage of inclusive languages.
> > This CL replaces some terms with the more appropriate counterparts,
> > such as "central" and "peripheral"
> > ---
> >
> > (no changes since v1)
> >
> > doc/settings-storage.txt | 4 ++--
> > src/adapter.c | 10 +++++-----
> > 2 files changed, 7 insertions(+), 7 deletions(-)
> >
> > diff --git a/doc/settings-storage.txt b/doc/settings-storage.txt
> > index 1d96cd66d9..3c637c3521 100644
> > --- a/doc/settings-storage.txt
> > +++ b/doc/settings-storage.txt
> > @@ -314,9 +314,9 @@ Long term key) related to a remote device.
> > Rand Integer Randomizer
> >
> >
> > -[SlaveLongTermKey] group contains:
> > +[PeripheralLongTermKey] group contains:
> >
> > - Same as the [LongTermKey] group, except for slave keys.
> > + Same as the [LongTermKey] group, except for peripheral keys.
> >
> >
> > [ConnectionParameters] group contains:
> > diff --git a/src/adapter.c b/src/adapter.c
> > index 4ad53a3a24..8528e2b6e0 100644
> > --- a/src/adapter.c
> > +++ b/src/adapter.c
> > @@ -3745,7 +3745,7 @@ static struct smp_ltk_info *get_ltk(GKeyFile *key_file, const char *peer,
> > NULL);
> > ltk->ediv = g_key_file_get_integer(key_file, group, "EDiv", NULL);
> >
> > - central = g_key_file_get_boolean(key_file, group, "Master", &gerr);
> > + central = g_key_file_get_boolean(key_file, group, "Central", &gerr);
> > if (gerr)
> > g_error_free(gerr);
> > else
> > @@ -3777,7 +3777,7 @@ static struct smp_ltk_info *get_peripheral_ltk_info(GKeyFile *key_file,
> >
> > DBG("%s", peer);
> >
> > - ltk = get_ltk(key_file, peer, bdaddr_type, "SlaveLongTermKey");
> > + ltk = get_ltk(key_file, peer, bdaddr_type, "PeripheralLongTermKey");
> > if (ltk)
> > ltk->central = false;
> >
> > @@ -5780,7 +5780,7 @@ static void convert_ltk_entry(GKeyFile *key_file, void *value)
> > g_free(str);
> >
> > g_key_file_set_integer(key_file, "LongTermKey", "Authenticated", auth);
> > - g_key_file_set_integer(key_file, "LongTermKey", "Master", central);
> > + g_key_file_set_integer(key_file, "LongTermKey", "Central", central);
> > g_key_file_set_integer(key_file, "LongTermKey", "EncSize", enc_size);
> > g_key_file_set_integer(key_file, "LongTermKey", "EDiv", ediv);
>
> this is just not going to work. You are going to break existing installations that upgrade to a new version. The storage format, D-Bus API and libbluetooth API are something that you can not search+replace.
>
> Regards
>
> Marcel
>
