[PATCH v2 1/3] P2P: allow persistent group join retry limit to be configured via D-Bus

[Matthew Wang]

Ahh shoot sorry, there were some weird things going on when porting
things over from the Android checkout, thanks for fixing it up. I'll
reupload the second patch with fixes.

On Sun, Dec 18, 2022 at 9:54 AM Jouni Malinen <j at w1.fi> wrote:
>
> On Fri, Dec 16, 2022 at 11:10:00AM -0800, Matthew Wang wrote:
> > Android and ChromeOS use this to limit retries for auto GO join
> > operation.
>
> Thanks, I applied patches 1/3 and 3/3 with some cleanup and fixes.
> There was something strange with all these three patches actually
> breaking the build with separate problems.. Maybe some kind of merging
> between branches or snapshots went wrong somewhere(?).
>
> For example:
>
> > diff --git a/wpa_supplicant/dbus/dbus_new_handlers_p2p.c b/wpa_supplicant/dbus/dbus_new_handlers_p2p.c
> > @@ -355,6 +355,7 @@ DBusMessage * wpas_dbus_handler_p2p_group_add(DBusMessage *message,
> > +     int retry_limit = 0;
>
> Adding retry_limit..
>
> > +             } else if (os_strcmp(entry.key, "retry_limit") == 0 &&
> > +                        entry.type == DBUS_TYPE_INT32) {
> > +                     timeout = entry.int32_value;
> > +                     if (timeout <= 0)
> > +                             goto inv_args_clear;
>
> But parsing to timeout?!
>
> >               if (wpas_p2p_group_add_persistent(wpa_s, ssid, 0, freq, 0, 0, 0,
> >                                                 0, 0, 0, 0, NULL, 0, 0,
> > -                                               false)) {
> > +                                               false, retry_limit)) {
>
> While still using retry_limit here..
>
> --
> Jouni Malinen                                            PGP id EFC895FA