5:28 p.m.
---
drivers/ubloxmodem/gprs-context.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/ubloxmodem/gprs-context.c b/drivers/ubloxmodem/gprs-context.c
index 1b4e17f5..bbf8627a 100644
--- a/drivers/ubloxmodem/gprs-context.c
+++ b/drivers/ubloxmodem/gprs-context.c
@@ -45,6 +45,7 @@ static const char *cgcontrdp_prefix[] = { "+CGCONTRDP:", NULL
};
static const char *uipaddr_prefix[] = { "+UIPADDR:", NULL };
struct gprs_context_data {
+ const struct ublox_model *model;
GAtChat *chat;
unsigned int active_context;
ofono_gprs_context_cb_t cb;
@@ -462,7 +463,7 @@ static void cgev_notify(GAtResult *result, gpointer user_data)
}
static int ublox_gprs_context_probe(struct ofono_gprs_context *gc,
- unsigned int vendor, void *data)
+ unsigned int model_id, void *data)
{
GAtChat *chat = data;
struct gprs_context_data *gcd;
@@ -473,6 +474,10 @@ static int ublox_gprs_context_probe(struct ofono_gprs_context *gc,
if (gcd == NULL)
return -ENOMEM;
+ gcd->model = ublox_model_from_id(model_id);
+ if (!gcd->model)
+ return -EINVAL;
+
gcd->chat = g_at_chat_clone(chat);
ofono_gprs_context_set_data(gc, gcd);
--
2.19.1
5:28 p.m.
New subject: [PATCH 2/5] ublox: pass model_id to gprs-context driver
Depending on the transport used on the data connection we want either
the "atmodem" (PPP) driver or the "ubloxmodem". For the
"ubloxmodem",
we want to pass the model data so this patch wrangles some parameters to
make sure that right driver and right variant data are passed.
---
plugins/ublox.c | 23 +++++++++++++++++++----
1 file changed, 19 insertions(+), 4 deletions(-)
diff --git a/plugins/ublox.c b/plugins/ublox.c
index 1c74fe09..8100dfba 100644
--- a/plugins/ublox.c
+++ b/plugins/ublox.c
@@ -388,19 +388,34 @@ static void ublox_post_sim(struct ofono_modem *modem)
struct ofono_gprs *gprs;
struct ofono_gprs_context *gc;
GAtChat *chat = data->modem ? data->modem : data->aux;
- const char *driver = data->flags & UBLOX_DEVICE_F_HIGH_THROUGHPUT_MODE ?
- "ubloxmodem" : "atmodem";
+ const char *driver;
/* Toby L2: Create same number of contexts as supported PDP contexts. */
int ncontexts = data->flags & UBLOX_DEVICE_F_HIGH_THROUGHPUT_MODE ? 8 : 1;
+ int variant;
DBG("%p", modem);
gprs = ofono_gprs_create(modem, data->vendor_family, "atmodem",
data->aux);
+ if (ublox_is_toby_l4(data->model)) {
+ driver = "ubloxmodem";
+ variant = ublox_model_to_id(data->model);
+ } else if (ublox_is_toby_l2(data->model)) {
+ if (data->flags & UBLOX_DEVICE_F_HIGH_THROUGHPUT_MODE) {
+ driver = "ubloxmodem";
+ variant = ublox_model_to_id(data->model);
+ } else {
+ driver = "atmodem";
+ variant = OFONO_VENDOR_UBLOX;
+ }
+ } else {
+ driver = "atmodem";
+ variant = OFONO_VENDOR_UBLOX;
+ }
+
while (ncontexts) {
- gc = ofono_gprs_context_create(modem, data->vendor_family,
- driver, chat);
+ gc = ofono_gprs_context_create(modem, variant, driver, chat);
if (gprs && gc)
ofono_gprs_add_context(gprs, gc);
--
2.19.1
5:28 p.m.
New subject: [PATCH 3/5] ublox: TOBY L4 supports only router mode
The TOBY L4 supports only "router mode" where the modem presents a
network interface that one can run a DHCP client against. Behind this
interface, the modem takes care of routing packets via NAT by:
i) selecting the relevant context based on destination IP
ii) using the first activated context as the default route
In order to have the connection manager, thus, do the right thing, the
context only needs to report itself as being active and with the IP
settings set to method "dhcp". There's no need for the connection manager
to know details like what IP address the context was assigned.
Tested with connman that does the right thing when it finds an active
"dhcp" context.
---
drivers/ubloxmodem/gprs-context.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/drivers/ubloxmodem/gprs-context.c b/drivers/ubloxmodem/gprs-context.c
index bbf8627a..389868c1 100644
--- a/drivers/ubloxmodem/gprs-context.c
+++ b/drivers/ubloxmodem/gprs-context.c
@@ -240,6 +240,15 @@ static void ublox_gprs_read_settings(struct ofono_gprs_context *gc,
DBG("cid %u", cid);
+ if (ublox_is_toby_l4(gcd->model)) {
+ /* Use DHCP */
+ gcd->active_context = cid;
+ set_gprs_context_interface(gc);
+ ofono_gprs_context_set_ipv4_address(gc, NULL, 0);
+ CALLBACK_WITH_SUCCESS(cb, data);
+ return;
+ }
+
gcd->active_context = cid;
gcd->cb = cb;
gcd->cb_data = data;
--
2.19.1
8:44 p.m.
New subject: [PATCH 3/5] ublox: TOBY L4 supports only router mode
Hi Jonas,
On 03/14/2019 05:28 PM, Jonas Bonn wrote:
The TOBY L4 supports only "router mode" where the modem
presents a
network interface that one can run a DHCP client against. Behind this
interface, the modem takes care of routing packets via NAT by:
i) selecting the relevant context based on destination IP
ii) using the first activated context as the default route
Ah right, and this is where the multiple active context on the Toby L2
stuff came from. This is a bit tricky to support since oFono expects
some context types (such as MMS contexts, for example) to not be
configured via DHCP. And I'm not sure how MMS proxying would work either.
In order to have the connection manager, thus, do the right thing, the
context only needs to report itself as being active and with the IP
settings set to method "dhcp". There's no need for the connection manager
to know details like what IP address the context was assigned.
Tested with connman that does the right thing when it finds an active
"dhcp" context.
Anyway, all 5 applied, thanks.
Regards,
-Denis
5:28 p.m.
New subject: [PATCH 4/5] ublox: gprs-context: query networking mode for TOBY L2
The TOBY L2 may run in either "bridge" mode or "router" mode. For
this
model, query the configured mode so that the appropriate settings are
communicated when the context is activated.
---
Only compile tested... I don't actually have a TOBY L2.
/Jonas
drivers/ubloxmodem/gprs-context.c | 54 ++++++++++++++++++++++++++++++-
1 file changed, 53 insertions(+), 1 deletion(-)
diff --git a/drivers/ubloxmodem/gprs-context.c b/drivers/ubloxmodem/gprs-context.c
index 389868c1..35abae02 100644
--- a/drivers/ubloxmodem/gprs-context.c
+++ b/drivers/ubloxmodem/gprs-context.c
@@ -43,6 +43,12 @@
static const char *none_prefix[] = { NULL };
static const char *cgcontrdp_prefix[] = { "+CGCONTRDP:", NULL };
static const char *uipaddr_prefix[] = { "+UIPADDR:", NULL };
+static const char *ubmconf_prefix[] = { "+UBMCONF:", NULL };
+
+enum netmode {
+ NETWORKING_MODE_ROUTER,
+ NETWORKING_MODE_BRIDGE,
+};
struct gprs_context_data {
const struct ublox_model *model;
@@ -50,6 +56,7 @@ struct gprs_context_data {
unsigned int active_context;
ofono_gprs_context_cb_t cb;
void *cb_data;
+ enum netmode networking_mode;
};
static void uipaddr_cb(gboolean ok, GAtResult *result, gpointer user_data)
@@ -240,7 +247,7 @@ static void ublox_gprs_read_settings(struct ofono_gprs_context *gc,
DBG("cid %u", cid);
- if (ublox_is_toby_l4(gcd->model)) {
+ if (gcd->networking_mode == NETWORKING_MODE_ROUTER) {
/* Use DHCP */
gcd->active_context = cid;
set_gprs_context_interface(gc);
@@ -471,6 +478,42 @@ static void cgev_notify(GAtResult *result, gpointer user_data)
gcd->active_context = 0;
}
+static void at_ubmconf_read_cb(gboolean ok, GAtResult *result,
+ gpointer user_data)
+{
+ struct ofono_gprs_context *gc = user_data;
+ struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
+ GAtResultIter iter;
+ int mode;
+
+ if (!ok)
+ goto error;
+
+ g_at_result_iter_init(&iter, result);
+ if (!g_at_result_iter_next(&iter, "+UBMCONF:"))
+ goto error;
+
+ if (!g_at_result_iter_next_number(&iter, &mode))
+ goto error;
+
+ switch (mode) {
+ case 1:
+ gcd->networking_mode = NETWORKING_MODE_ROUTER;
+ break;
+ case 2:
+ gcd->networking_mode = NETWORKING_MODE_BRIDGE;
+ break;
+ default:
+ goto error;
+ }
+
+ return;
+
+error:
+ ofono_error("AT+UBMCONF? failed; assuming router mode");
+ gcd->networking_mode = NETWORKING_MODE_ROUTER;
+}
+
static int ublox_gprs_context_probe(struct ofono_gprs_context *gc,
unsigned int model_id, void *data)
{
@@ -491,6 +534,15 @@ static int ublox_gprs_context_probe(struct ofono_gprs_context *gc,
ofono_gprs_context_set_data(gc, gcd);
+ if (ublox_is_toby_l2(gcd->model)) {
+ g_at_chat_send(chat, "AT+UBMCONF?", ubmconf_prefix,
+ at_ubmconf_read_cb, gc, NULL);
+ } else if (ublox_is_toby_l4(gcd->model)) {
+ gcd->networking_mode = NETWORKING_MODE_ROUTER;
+ } else {
+ gcd->networking_mode = NETWORKING_MODE_ROUTER;
+ }
+
g_at_chat_register(chat, "+CGEV:", cgev_notify, FALSE, gc, NULL);
return 0;
--
2.19.1
5:28 p.m.
New subject: [PATCH 5/5] ublox: do not set bridge mode for TOBY L2
Trying to set the networking mode to "bridge" mode in the plugin is bogus
because the setting does not apply until after the device has been
reset. Instead, the current setting should be queried.
If a user wants to set the modem networking mode, the setting should be
made outside of ofono.
The gprs-context driver has already been adjusted to query the
networking mode and to set things up accordingly.
---
plugins/ublox.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/plugins/ublox.c b/plugins/ublox.c
index 8100dfba..dc001765 100644
--- a/plugins/ublox.c
+++ b/plugins/ublox.c
@@ -145,11 +145,6 @@ static void cfun_enable(gboolean ok, GAtResult *result, gpointer
user_data)
return;
}
- if (data->flags & UBLOX_DEVICE_F_HIGH_THROUGHPUT_MODE)
- /* use bridged mode until routed mode support is added */
- g_at_chat_send(data->aux, "AT+UBMCONF=2", none_prefix,
- NULL, NULL, NULL);
-
ofono_modem_set_powered(modem, TRUE);
}
--
2.19.1
680
days inactive
681
days old
5 comments
2 participants
participants (2)
-
Denis Kenzior -
Jonas Bonn