Re: [PATCH] qmimodem: return all serial numbers
by Denis Kenzior
Hi Tom,
On 04/05/2019 03:13 PM, Nguyen, Tom wrote:
> Hi Denis,
>
> Thank you for the quick response. By the way, I'm not able to post to ofono(a)ofono.org, so this reply probably won't show up there. I've not figured out what the problem is, but suspect it's blocking "garmin.com".
Please contact ofono-owner address again and see if someone can help. I
don't really have any idea why we would be blocking any domain and you
are the first to complain in 10 or so years.
>
> The issue is that Quectel has a single mode LTE modem that populates all 3 fields. They do this because they also have the same modem that only supports CDMA. So, the current oFono code returns the ESN even though my modem is LTE only. Your info below is very informative, thanks! The CDMA info also confirms my observation about its level of support.
>
> I have an alternative idea. What if I query QMI_DMS_GET_CAPS, figure out which radio_if is supported, then return IMEI if GSM/UMTS/LTE is supported, else ESN or MEID? This way Modem.Serial property will still behave as it does now.
That sounds workable.
Regards,
-Denis
1 year, 1 month
[PATCH] qmimodem: return all serial numbers
by Joshua Watt
From: Tom Nguyen <tom.nguyen(a)garmin.com>
ESN and MEID are used for CDMA devices. IMEI is used for GSM devices.
Some modems, eg. Quectel EC25E, have variants that support each network
for in various regions. So, the modems may return the ESN, MEID, and
IMEI regardless of the variant. To support this case, the ESN, MEID,
and IMEI should all be reported. Then the user application can decide
which to use.
---
drivers/qmimodem/devinfo.c | 33 +++++++++++++++++++--------------
1 file changed, 19 insertions(+), 14 deletions(-)
diff --git a/drivers/qmimodem/devinfo.c b/drivers/qmimodem/devinfo.c
index af976b77..08e71fdf 100644
--- a/drivers/qmimodem/devinfo.c
+++ b/drivers/qmimodem/devinfo.c
@@ -117,7 +117,10 @@ static void get_ids_cb(struct qmi_result *result, void *user_data)
{
struct cb_data *cbd = user_data;
ofono_devinfo_query_cb_t cb = cbd->cb;
- char *str;
+ char *esn;
+ char *imei;
+ char *meid;
+ char buf[64];
DBG("");
@@ -126,20 +129,22 @@ static void get_ids_cb(struct qmi_result *result, void *user_data)
return;
}
- str = qmi_result_get_string(result, QMI_DMS_RESULT_ESN);
- /* Telit qmi modems return a "0" string when ESN is not available. */
- if (!str || strcmp(str, "0") == 0) {
- qmi_free(str);
- str = qmi_result_get_string(result, QMI_DMS_RESULT_IMEI);
- if (!str) {
- CALLBACK_WITH_FAILURE(cb, NULL, cbd->data);
- return;
- }
- }
-
- CALLBACK_WITH_SUCCESS(cb, str, cbd->data);
+ esn = qmi_result_get_string(result, QMI_DMS_RESULT_ESN);
+ imei = qmi_result_get_string(result, QMI_DMS_RESULT_IMEI);
+ meid = qmi_result_get_string(result, QMI_DMS_RESULT_MEID);
+
+ if (esn || imei || meid) {
+ sprintf(buf, "ESN:%s,IMEI:%s,MEID:%s",
+ (esn) ? esn : "unknown",
+ (imei) ? imei : "unknown",
+ (meid) ? meid : "unknown");
+ CALLBACK_WITH_SUCCESS(cb, buf, cbd->data);
+ } else
+ CALLBACK_WITH_FAILURE(cb, NULL, cbd->data);
- qmi_free(str);
+ qmi_free(esn);
+ qmi_free(imei);
+ qmi_free(meid);
}
static void qmi_query_serial(struct ofono_devinfo *devinfo,
--
2.20.1
1 year, 1 month
[PATCH] xmm7modem: handling of IPv6 address for activated context
by Antara Borwankar
Handled IPv6 address after activating PDP context
---
drivers/ifxmodem/gprs-context.c | 38 ++++++++++++++++++++++++++++----------
1 file changed, 28 insertions(+), 10 deletions(-)
diff --git a/drivers/ifxmodem/gprs-context.c b/drivers/ifxmodem/gprs-context.c
index 6042004..2c5456b 100644
--- a/drivers/ifxmodem/gprs-context.c
+++ b/drivers/ifxmodem/gprs-context.c
@@ -352,10 +352,17 @@ static void cgcontrdp_cb(gboolean ok, GAtResult *result, gpointer user_data)
DBG("DNS: %s, %s\n", gcd->dns1, gcd->dns2);
- if (!laddrnetmask || at_util_get_ipv4_address_and_netmask(laddrnetmask,
- gcd->address, gcd->netmask) < 0) {
- failed_setup(gc, NULL, TRUE);
- return;
+ if (gcd->proto == OFONO_GPRS_PROTO_IP) {
+ if (!laddrnetmask || at_util_get_ipv4_address_and_netmask(laddrnetmask,
+ gcd->address, gcd->netmask) < 0) {
+ failed_setup(gc, NULL, TRUE);
+ return;
+ }
+ }
+
+ if (gcd->proto == OFONO_GPRS_PROTO_IPV6) {
+ if (laddrnetmask)
+ strncpy(gcd->address, laddrnetmask, sizeof(gcd->address));
}
if (gw)
@@ -373,15 +380,26 @@ static void cgcontrdp_cb(gboolean ok, GAtResult *result, gpointer user_data)
interface = ofono_gprs_context_get_interface(gc);
datapath = get_datapath(modem, interface);
- ofono_gprs_context_set_ipv4_address(gc, gcd->address, TRUE);
+ if (gcd->proto == OFONO_GPRS_PROTO_IP) {
+ ofono_gprs_context_set_ipv4_address(gc, gcd->address, TRUE);
- if (gcd->netmask[0])
- ofono_gprs_context_set_ipv4_netmask(gc, gcd->netmask);
+ if (gcd->netmask[0])
+ ofono_gprs_context_set_ipv4_netmask(gc, gcd->netmask);
- if (gcd->gateway[0])
- ofono_gprs_context_set_ipv4_gateway(gc, gcd->gateway);
+ if (gcd->gateway[0])
+ ofono_gprs_context_set_ipv4_gateway(gc, gcd->gateway);
- ofono_gprs_context_set_ipv4_dns_servers(gc, dns);
+ ofono_gprs_context_set_ipv4_dns_servers(gc, dns);
+ }
+
+ if (gcd->proto == OFONO_GPRS_PROTO_IPV6) {
+ ofono_gprs_context_set_ipv6_address(gc, gcd->address);
+
+ if (gcd->gateway[0])
+ ofono_gprs_context_set_ipv6_gateway(gc, gcd->gateway);
+
+ ofono_gprs_context_set_ipv6_dns_servers(gc, dns);
+ }
snprintf(buf, sizeof(buf), "AT+XDATACHANNEL=1,1,\"%s\",\"%s\",2,%u",
ctrlpath, datapath, gcd->active_context);
--
1.9.1
1 year, 1 month
[PATCH] ublox: gprs-context: Fix router mode IP settings.
by richard.rojfors＠gmail.com
From: Richard Röjfors <richard(a)puffinpack.se>
The ublox modems always run DHCP when in router mode.
Unfortunately the code overwrote the IP settings with
static IP settings while activating.
Now we respect the networking_mode regardless if
we read settings during activation or read settings
phase.
---
drivers/ubloxmodem/gprs-context.c | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/drivers/ubloxmodem/gprs-context.c b/drivers/ubloxmodem/gprs-context.c
index 35abae02..489f31e8 100644
--- a/drivers/ubloxmodem/gprs-context.c
+++ b/drivers/ubloxmodem/gprs-context.c
@@ -235,6 +235,14 @@ static void ublox_read_settings(struct ofono_gprs_context *gc)
{
struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
+ if (gcd->networking_mode == NETWORKING_MODE_ROUTER) {
+ /* Use DHCP */
+ set_gprs_context_interface(gc);
+ ofono_gprs_context_set_ipv4_address(gc, NULL, 0);
+ CALLBACK_WITH_SUCCESS(gcd->cb, gcd->cb_data);
+ return;
+ }
+
if (ublox_send_cgcontrdp(gc) < 0)
CALLBACK_WITH_FAILURE(gcd->cb, gcd->cb_data);
}
@@ -247,15 +255,6 @@ static void ublox_gprs_read_settings(struct ofono_gprs_context *gc,
DBG("cid %u", cid);
- if (gcd->networking_mode == NETWORKING_MODE_ROUTER) {
- /* 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
1 year, 1 month
[PATCH 1/2] udevng: Track udev devices through devpath and not syspath
by Pau Espin Pedrol
syspath is not really needed in there, and catching devpath instead
allows us to easily match against DEVPATH_OLD in follow-up patches.
Furthermore, previous code was misleading retrieving syspath in
remove_device() and then passing it as devpath param of check_remove().
---
plugins/udevng.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/plugins/udevng.c b/plugins/udevng.c
index f689b756..c518553a 100644
--- a/plugins/udevng.c
+++ b/plugins/udevng.c
@@ -1427,16 +1427,16 @@ static gboolean check_remove(gpointer key, gpointer value, gpointer user_data)
static void remove_device(struct udev_device *device)
{
- const char *syspath;
+ const char *devpath;
- syspath = udev_device_get_syspath(device);
- if (syspath == NULL)
+ devpath = udev_device_get_devpath(device);
+ if (devpath == NULL)
return;
- DBG("%s", syspath);
+ DBG("%s", devpath);
g_hash_table_foreach_remove(modem_list, check_remove,
- (char *) syspath);
+ (char *) devpath);
}
static gint compare_device(gconstpointer a, gconstpointer b)
@@ -1550,7 +1550,7 @@ static void add_device(const char *syspath, const char *devname,
struct device_info *info;
struct udev_device *parent;
- devpath = udev_device_get_syspath(device);
+ devpath = udev_device_get_devpath(device);
if (devpath == NULL)
return;
--
2.21.0
1 year, 1 month
[PATCH] gprs: Fix allocation of context id read from settings
by richard.rojfors＠gmail.com
From: Richard Röjfors <richard(a)puffinpack.se>
This fix is similar to the one in the following commit,
but fixes allocation for context ids after ap's are
read from settings.
commit c3fdf6a7c567a7507c3558a27006b6f9559493d6
Author: Denis Kenzior <denkenz(a)gmail.com>
Date: Thu Jan 3 17:17:21 2019 -0600
gprs: Fix allocation of context id
---
src/gprs.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/gprs.c b/src/gprs.c
index b0d56e1e..d432c9fd 100644
--- a/src/gprs.c
+++ b/src/gprs.c
@@ -2340,7 +2340,11 @@ static void provision_context(const struct ofono_gprs_provision_data *ap,
strlen(ap->message_center) > MAX_MESSAGE_CENTER_LENGTH)
return;
- id = l_uintset_find_unused(gprs->used_pids, gprs->last_context_id);
+ if (gprs->last_context_id)
+ id = l_uintset_find_unused(gprs->used_pids,
+ gprs->last_context_id);
+ else
+ id = l_uintset_find_unused_min(gprs->used_pids);
if (id > l_uintset_get_max(gprs->used_pids))
return;
--
2.19.1
1 year, 1 month
[PATCH 2/3] xmm7modem: Changes in plugin for DSSA functionality
by Antara Borwankar
Changed the sim driver vendor for xmm7modem from
OFONO_VENDOR_IFX to OFONO_VENDOR_XMM to handle DSSA functionality.
---
plugins/xmm7xxx.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/plugins/xmm7xxx.c b/plugins/xmm7xxx.c
index 90e52fb..23a7d4e 100644
--- a/plugins/xmm7xxx.c
+++ b/plugins/xmm7xxx.c
@@ -1223,7 +1223,7 @@ static void xmm7xxx_pre_sim(struct ofono_modem *modem)
DBG("%p", modem);
ofono_devinfo_create(modem, OFONO_VENDOR_IFX, "atmodem", data->chat);
- data->sim = ofono_sim_create(modem, OFONO_VENDOR_IFX, "atmodem",
+ data->sim = ofono_sim_create(modem, OFONO_VENDOR_XMM, "atmodem",
data->chat);
}
--
1.9.1
1 year, 1 month
[PATCH 1/3] xmm7modem: handling of dual sim single active feature
by Antara Borwankar
Handled DSSA use case for xmm7modem. Added driver function
to switch between available card slots for SIM.
Only one SIM will be active at a given time. On calling this
function the active SIM will be removed and the card slot made
inactive and SIM in the other card slot will be made active.
Use case is similar to a SIM swap/change where one SIM is replaced
another SIM in the same slot.
---
drivers/atmodem/sim.c | 124 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 123 insertions(+), 1 deletion(-)
diff --git a/drivers/atmodem/sim.c b/drivers/atmodem/sim.c
index 5f66a09..9c80f2e 100644
--- a/drivers/atmodem/sim.c
+++ b/drivers/atmodem/sim.c
@@ -75,6 +75,7 @@ static const char *cuad_prefix[] = { "+CUAD:", NULL };
static const char *ccho_prefix[] = { "+CCHO:", NULL };
static const char *crla_prefix[] = { "+CRLA:", NULL };
static const char *cgla_prefix[] = { "+CGLA:", NULL };
+static const char *xcmscsc_prefix[] = { "+XCMSCSC:", NULL};
static const char *none_prefix[] = { NULL };
static void append_file_path(char *buf, const unsigned char *path,
@@ -1160,6 +1161,7 @@ static void at_pin_retries_query(struct ofono_sim *sim,
DBG("");
switch (sd->vendor) {
+ case OFONO_VENDOR_XMM:
case OFONO_VENDOR_IFX:
if (g_at_chat_send(sd->chat, "AT+XPINCNT", xpincnt_prefix,
xpincnt_cb, cbd, g_free) > 0)
@@ -1920,6 +1922,80 @@ static void at_logical_access(struct ofono_sim *sim, int session_id,
CALLBACK_WITH_FAILURE(cb, NULL, 0, data);
}
+static void xcmscsc_query_cb(gboolean ok, GAtResult *result, gpointer user)
+{
+ struct ofono_sim *sim = user;
+ struct sim_data *sd = ofono_sim_get_data(sim);
+ GAtResultIter iter;
+ int active_slot;
+
+ if (!ok)
+ goto done;
+
+ g_at_result_iter_init(&iter, result);
+
+ if (!g_at_result_iter_next(&iter, "+XCMSCSC:"))
+ goto done;
+
+ g_at_result_iter_skip_next(&iter);
+ g_at_result_iter_skip_next(&iter);
+
+ g_at_result_iter_next_number(&iter, &active_slot);
+
+ /* set active SIM slot */
+ ofono_sim_set_active_card_slot(sim, active_slot+1);
+
+done:
+ /* Query supported <fac>s */
+ g_at_chat_send(sd->chat, "AT+CLCK=?", clck_prefix,
+ at_clck_query_cb, sim, NULL);
+}
+
+static void at_xcmscsc_test_cb(gboolean ok, GAtResult *result, gpointer user)
+{
+ struct ofono_sim *sim = user;
+ struct sim_data *sd = ofono_sim_get_data(sim);
+ GAtResultIter iter;
+ int card_slot_count;
+
+ if (!ok)
+ goto done;
+
+ g_at_result_iter_init(&iter, result);
+
+ if (!g_at_result_iter_next(&iter, "+XCMSCSC:"))
+ goto done;
+
+ g_at_result_iter_skip_next(&iter);
+ g_at_result_iter_skip_next(&iter);
+
+ if (!g_at_result_iter_open_list(&iter))
+ goto done;
+
+ g_at_result_iter_skip_next(&iter);
+
+ if (!g_at_result_iter_next_number(&iter, &card_slot_count))
+ goto done;
+
+ /* Set num slots */
+ ofono_sim_set_card_slot_count(sim, card_slot_count+1);
+
+ /* enable reporting of MSIM remap status information
+ and enable automatic acceptance of MSIM Remap
+ acknowledgement. */
+ g_at_chat_send(sd->chat, "AT+XCMSRS=2", none_prefix,
+ NULL, NULL, NULL);
+
+ /* Query active card slot */
+ g_at_chat_send(sd->chat, "AT+XCMSCSC?", xcmscsc_prefix,
+ xcmscsc_query_cb, sim, NULL);
+
+done:
+ /* Query supported <fac>s */
+ g_at_chat_send(sd->chat, "AT+CLCK=?", clck_prefix,
+ at_clck_query_cb, sim, NULL);
+}
+
static int at_sim_probe(struct ofono_sim *sim, unsigned int vendor,
void *data)
{
@@ -1938,6 +2014,10 @@ static int at_sim_probe(struct ofono_sim *sim, unsigned int vendor,
if (at_clck_cpwd_fac[i])
sd->passwd_type_mask |= (1 << i);
+ if (sd->vendor == OFONO_VENDOR_XMM)
+ return g_at_chat_send(sd->chat, "AT+XCMSCSC=?", xcmscsc_prefix,
+ at_xcmscsc_test_cb, sim, NULL) ? 0 : -1;
+
/* Query supported <fac>s */
return g_at_chat_send(sd->chat, "AT+CLCK=?", clck_prefix,
at_clck_query_cb, sim, NULL) ? 0 : -1;
@@ -1957,6 +2037,47 @@ static void at_sim_remove(struct ofono_sim *sim)
g_free(sd);
}
+static void xcmscsc_cb(gboolean ok, GAtResult *result,
+ gpointer user_data)
+{
+ struct cb_data *cbd = user_data;
+ ofono_sim_set_active_card_slot_cb_t cb = cbd->cb;
+ struct ofono_error error;
+
+ decode_at_error(&error, g_at_result_final_response(result));
+
+ if (cb)
+ cb(&error, cbd->data);
+}
+
+static void at_set_active_card_slot(struct ofono_sim *sim, unsigned int index,
+ ofono_sim_set_active_card_slot_cb_t cb, void *data)
+{
+ struct sim_data *sd = ofono_sim_get_data(sim);
+ struct cb_data *cbd = cb_data_new(cb, data);
+ char cmd[43];
+
+ if (sd->vendor != OFONO_VENDOR_XMM) {
+ struct ofono_error error;
+ error.type = OFONO_ERROR_TYPE_CME;
+ error.error = 4;
+
+ cb(&error, data);
+ return;
+ }
+
+ /* Enable single SIM mode for indicated card slot id */
+ snprintf(cmd, sizeof(cmd), "AT+XCMSCSC=1,0,%u,1", index);
+
+ if (g_at_chat_send(sd->chat, cmd, none_prefix, xcmscsc_cb,
+ cbd, g_free) > 0)
+ return;
+
+ g_free(cbd);
+
+ CALLBACK_WITH_FAILURE(cb, data);
+}
+
static const struct ofono_sim_driver driver = {
.name = "atmodem",
.probe = at_sim_probe,
@@ -1982,7 +2103,8 @@ static const struct ofono_sim_driver driver = {
.session_read_binary = at_session_read_binary,
.session_read_record = at_session_read_record,
.session_read_info = at_session_read_info,
- .logical_access = at_logical_access
+ .logical_access = at_logical_access,
+ .set_active_card_slot = at_set_active_card_slot
};
static const struct ofono_sim_driver driver_noef = {
--
1.9.1
1 year, 1 month
[PATCH 3/3] sim: added error handling in set slot callback
by Antara Borwankar
Adding the handling of error when the driver returns
CME ERROR:4.
This error will be returned for non xmm vendor modems
using ifxmodem driver for sim.
---
src/sim.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/sim.c b/src/sim.c
index 9f0183f..a178cb8 100644
--- a/src/sim.c
+++ b/src/sim.c
@@ -680,7 +680,7 @@ static void sim_set_slot_callback(const struct ofono_error *error, void *data)
sim->pending_active_card_slot = sim->active_card_slot;
- reply = __ofono_error_failed(sim->pending);
+ reply = __ofono_error_from_error(error, sim->pending);
__ofono_dbus_pending_reply(&sim->pending, reply);
return;
--
1.9.1
1 year, 1 month
