[PATCH v2 02/13] ublox: fallback to router mode if networking mode unknown

[Aleksander Morgado]

On 14/09/17 22:00, Aleksander Morgado wrote:
> The TOBY-L4 doesn't support querying the current networking mode in
> use via the AT+UBMCONF command, so we will just fallback to
> MM_UBLOX_NETWORKING_MODE_ROUTER if that happens, as this is the mode
> which requires less configuration commands from our side.
> ---

Merged to git master.

>  plugins/ublox/mm-broadband-modem-ublox.c | 20 ++++++++++++++++----
>  1 file changed, 16 insertions(+), 4 deletions(-)
> 
> diff --git a/plugins/ublox/mm-broadband-modem-ublox.c b/plugins/ublox/mm-broadband-modem-ublox.c
> index 3bd7307c..8d9da206 100644
> --- a/plugins/ublox/mm-broadband-modem-ublox.c
> +++ b/plugins/ublox/mm-broadband-modem-ublox.c
> @@ -669,6 +669,7 @@ typedef struct {
>      CreateBearerStep       step;
>      MMBearerProperties    *properties;
>      MMBaseBearer          *bearer;
> +    gboolean               has_net;
>  } CreateBearerContext;
> 
>  static void
> @@ -760,7 +761,15 @@ mode_check_ready (MMBaseModem  *self,
>          mm_dbg ("u-blox: networking mode loaded: %s", mm_ublox_networking_mode_get_string (ctx->self->priv->mode));
>      }
> 
> -    /* Assume the operation has been performed, even if it may have failed */
> +    /* If checking networking mode isn't supported, we'll fallback to
> +     * assume the device is in router mode, which is the mode asking for
> +     * less connection setup rules from our side (just request DHCP).
> +     */
> +    if (ctx->self->priv->mode == MM_UBLOX_NETWORKING_MODE_UNKNOWN && ctx->has_net) {
> +        mm_dbg ("u-blox: fallback to default networking mode: router");
> +        ctx->self->priv->mode = MM_UBLOX_NETWORKING_MODE_ROUTER;
> +    }
> +
>      ctx->self->priv->mode_checked = TRUE;
> 
>      ctx->step++;
> @@ -841,9 +850,9 @@ create_bearer_step (GTask *task)
>      case CREATE_BEARER_STEP_CREATE_BEARER:
>          /* If we have a net interface, we'll create a u-blox bearer, unless for
>           * any reason we have the back-compatible profile selected. */
> -        if ((ctx->self->priv->profile != MM_UBLOX_USB_PROFILE_BACK_COMPATIBLE) &&
> -            (ctx->self->priv->mode == MM_UBLOX_NETWORKING_MODE_BRIDGE || ctx->self->priv->mode == MM_UBLOX_NETWORKING_MODE_ROUTER) &&
> -            mm_base_modem_peek_best_data_port (MM_BASE_MODEM (ctx->self), MM_PORT_TYPE_NET)) {
> +        if ((ctx->self->priv->profile != MM_UBLOX_USB_PROFILE_BACK_COMPATIBLE) && ctx->has_net) {
> +            /* whenever there is a net port, we should have loaded a valid networking mode */
> +            g_assert (ctx->self->priv->mode != MM_UBLOX_NETWORKING_MODE_UNKNOWN);
>              mm_dbg ("u-blox: creating u-blox broadband bearer (%s profile, %s mode)...",
>                      mm_ublox_usb_profile_get_string (ctx->self->priv->profile),
>                      mm_ublox_networking_mode_get_string (ctx->self->priv->mode));
> @@ -892,6 +901,9 @@ modem_create_bearer (MMIfaceModem        *self,
>      ctx->self = g_object_ref (self);
>      ctx->properties = g_object_ref (properties);
> 
> +    /* Flag whether this modem has exposed a network interface */
> +    ctx->has_net = !!mm_base_modem_peek_best_data_port (MM_BASE_MODEM (self), MM_PORT_TYPE_NET);
> +
>      task = g_task_new (self, NULL, callback, user_data);
>      g_task_set_task_data (task, ctx, (GDestroyNotify) create_bearer_context_free);
>      create_bearer_step (task);
> --
> 2.14.1
> 


-- 
Aleksander
https://aleksander.es