sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

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.
This commit is contained in:
Jonas Bonn 2019-03-14 23:28:42 +01:00 committed by Denis Kenzior
parent efe1306ec2
commit a55e797ba2
1 changed files with 53 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
drivers/ubloxmodem/gprs-context.c
View File

@ -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;