[PATCH] sim: fix crash in case of invalid sim password type
by Christophe Ronco
Hi,
I have an old Swedish SIM card here that I tried to put in my MC7304 modem.
My ofono version is 1.20 (with some additional patches).
It sometimes return an invalid SIM password type.
After that, ofono crashes. Here is an extract of debug traces when this happens.
Ofono is just starting, modem was here before ofono starts.
Jun 27 15:28:41 klk-lpbs-0504B4 daemon.debug ofonod[1120]: ../git/drivers/qmimodem/sim.c:qmi_read_attributes() file id 0x6fb7 path len 0
Jun 27 15:28:41 klk-lpbs-0504B4 daemon.debug ofonod[1120]: ../git/drivers/qmimodem/devinfo.c:string_cb()
Jun 27 15:28:41 klk-lpbs-0504B4 daemon.debug ofonod[1120]: ../git/drivers/qmimodem/devinfo.c:qmi_query_serial()
Jun 27 15:28:41 klk-lpbs-0504B4 daemon.debug ofonod[1120]: ../git/drivers/qmimodem/sim.c:get_file_attributes_cb()
Jun 27 15:28:41 klk-lpbs-0504B4 daemon.err ofonod[1120]: Requested file structure differs from SIM: 6fb7
Jun 27 15:28:41 klk-lpbs-0504B4 daemon.debug ofonod[1120]: ../git/src/voicecall.c:ecc_g2_read_cb() 0
Jun 27 15:28:41 klk-lpbs-0504B4 daemon.debug ofonod[1120]: ../git/drivers/qmimodem/sim.c:qmi_read_attributes() file id 0x6fb7 path len 0
Jun 27 15:28:41 klk-lpbs-0504B4 daemon.debug ofonod[1120]: ../git/drivers/qmimodem/devinfo.c:get_ids_cb()
Jun 27 15:28:41 klk-lpbs-0504B4 daemon.debug ofonod[1120]: ../git/drivers/qmimodem/sim.c:get_file_attributes_cb()
Jun 27 15:28:41 klk-lpbs-0504B4 daemon.debug ofonod[1120]: ../git/drivers/qmimodem/sim.c:qmi_read_record() file id 0x6fb7 path len 0
Jun 27 15:28:41 klk-lpbs-0504B4 daemon.debug ofonod[1120]: ../git/drivers/qmimodem/sim.c:read_generic_cb()
Jun 27 15:28:41 klk-lpbs-0504B4 daemon.debug ofonod[1120]: ../git/src/voicecall.c:ecc_g3_read_cb() 1
Jun 27 15:28:41 klk-lpbs-0504B4 daemon.debug ofonod[1120]: ../git/drivers/qmimodem/sim.c:qmi_read_record() file id 0x6fb7 path len 0
Jun 27 15:28:41 klk-lpbs-0504B4 daemon.debug ofonod[1120]: ../git/drivers/qmimodem/sim.c:read_generic_cb()
Jun 27 15:28:41 klk-lpbs-0504B4 daemon.debug ofonod[1120]: ../git/src/voicecall.c:ecc_g3_read_cb() 1
Jun 27 15:28:41 klk-lpbs-0504B4 daemon.debug ofonod[1120]: ../git/drivers/qmimodem/sim.c:qmi_read_record() file id 0x6fb7 path len 0
Jun 27 15:28:41 klk-lpbs-0504B4 daemon.debug ofonod[1120]: ../git/drivers/qmimodem/sim.c:read_generic_cb()
Jun 27 15:28:41 klk-lpbs-0504B4 daemon.debug ofonod[1120]: ../git/src/voicecall.c:ecc_g3_read_cb() 1
Jun 27 15:28:41 klk-lpbs-0504B4 daemon.debug ofonod[1120]: ../git/drivers/qmimodem/sim.c:qmi_read_record() file id 0x6fb7 path len 0
Jun 27 15:28:41 klk-lpbs-0504B4 daemon.debug ofonod[1120]: ../git/drivers/qmimodem/sim.c:read_generic_cb()
Jun 27 15:28:41 klk-lpbs-0504B4 daemon.debug ofonod[1120]: ../git/src/voicecall.c:ecc_g3_read_cb() 1
Jun 27 15:28:41 klk-lpbs-0504B4 daemon.debug ofonod[1120]: ../git/drivers/qmimodem/sim.c:qmi_read_record() file id 0x6fb7 path len 0
Jun 27 15:28:41 klk-lpbs-0504B4 daemon.debug ofonod[1120]: ../git/drivers/qmimodem/sim.c:read_generic_cb()
Jun 27 15:28:41 klk-lpbs-0504B4 daemon.debug ofonod[1120]: ../git/src/voicecall.c:ecc_g3_read_cb() 1
Jun 27 15:28:41 klk-lpbs-0504B4 daemon.debug ofonod[1120]: ../git/drivers/qmimodem/sim.c:qmi_read_attributes() file id 0x2fe2 path len 0
Jun 27 15:28:41 klk-lpbs-0504B4 daemon.debug ofonod[1120]: ../git/drivers/qmimodem/sim.c:get_file_attributes_cb()
Jun 27 15:28:41 klk-lpbs-0504B4 daemon.debug ofonod[1120]: ../git/drivers/qmimodem/sim.c:qmi_read_transparent() file id 0x2fe2 path len 0
Jun 27 15:28:41 klk-lpbs-0504B4 daemon.debug ofonod[1120]: ../git/drivers/qmimodem/sim.c:read_generic_cb()
Jun 27 15:28:41 klk-lpbs-0504B4 daemon.debug ofonod[1120]: ../git/src/simfs.c:sim_fs_op_read_block_cb() bufoff: 0, dataoff: 0, tocopy: 10
Jun 27 15:28:41 klk-lpbs-0504B4 daemon.debug ofonod[1120]: ../git/drivers/qmimodem/sim.c:qmi_read_attributes() file id 0x6f05 path len 0
Jun 27 15:28:41 klk-lpbs-0504B4 daemon.debug ofonod[1120]: ../git/drivers/qmimodem/sim.c:get_file_attributes_cb()
Jun 27 15:28:41 klk-lpbs-0504B4 daemon.debug ofonod[1120]: ../git/drivers/qmimodem/sim.c:qmi_read_transparent() file id 0x6f05 path len 0
Jun 27 15:28:41 klk-lpbs-0504B4 daemon.debug ofonod[1120]: ../git/drivers/qmimodem/sim.c:read_generic_cb()
Jun 27 15:28:41 klk-lpbs-0504B4 daemon.debug ofonod[1120]: ../git/src/simfs.c:sim_fs_op_read_block_cb() bufoff: 0, dataoff: 0, tocopy: 6
Jun 27 15:28:41 klk-lpbs-0504B4 daemon.debug ofonod[1120]: ../git/drivers/qmimodem/sim.c:qmi_read_attributes() file id 0x2f05 path len 0
Jun 27 15:28:41 klk-lpbs-0504B4 daemon.debug ofonod[1120]: ../git/drivers/qmimodem/sim.c:get_file_attributes_cb()
Jun 27 15:28:41 klk-lpbs-0504B4 daemon.debug ofonod[1120]: ../git/drivers/qmimodem/sim.c:qmi_read_transparent() file id 0x2f05 path len 0
Jun 27 15:28:41 klk-lpbs-0504B4 daemon.debug ofonod[1120]: ../git/drivers/qmimodem/sim.c:read_generic_cb()
Jun 27 15:28:41 klk-lpbs-0504B4 daemon.debug ofonod[1120]: ../git/src/simfs.c:sim_fs_op_read_block_cb() bufoff: 0, dataoff: 0, tocopy: 6
Jun 27 15:28:41 klk-lpbs-0504B4 daemon.debug ofonod[1120]: ../git/drivers/qmimodem/sim.c:qmi_query_passwd_state()
Jun 27 15:28:42 klk-lpbs-0504B4 daemon.debug ofonod[1120]: ../git/drivers/qmimodem/sim.c:get_card_status() info1->app_state:0x6: OFONO_SIM_PASSWORD_INVALID
Jun 27 15:28:42 klk-lpbs-0504B4 daemon.debug ofonod[1120]: ../git/drivers/qmimodem/sim.c:query_passwd_state_cb() passwd state 16
Jun 27 15:28:42 klk-lpbs-0504B4 daemon.debug ofonod[1120]: ../git/src/sim.c:sim_pin_query_cb() sim->pin_type: 0, pin_type: 16
Jun 27 15:28:42 klk-lpbs-0504B4 daemon.err ofonod[1120]: Aborting (signal 11) [/usr/sbin/ofonod]
Problem is just that we don't have a string corresponding to this password type.
Christophe Ronco (1):
sim: fix crash in case of invalid sim password type
src/sim.c | 1 +
1 file changed, 1 insertion(+)
--
2.7.4
2 years, 10 months
ofono with sim5320 module
by David Ashley
Hello, I'm at my wits' end trying to get ofono working with the
sim5320 module. I'm using the plugins/sim900.c module as a starting
point. I think the issue has something to do with the difference
between the MUX functionality between the 900 and the 5320. The sim900
supports the elaborate parameters sent on the
AT+CMUX=0,x,x,x,x, etc.
but the SIM5320 only supports
AT+CMUX=0
There's that... but also the way the sim900 plugin creates a
SETUP_DLC, initiates muxing, then deletes the setup DLC and creates 4
new DLC's... it didn't work for the sim5320 until I remapped the DLC's
somewhat like this:
#define NUM_DLC 4
#define VOICE_DLC 2
#define NETREG_DLC 1
//#define SMS_DLC 2
#define GPRS_DLC 3
#define SETUP_DLC 0
static char *dlc_prefixes[NUM_DLC] = {
[VOICE_DLC]="Voice: ",
[NETREG_DLC]="Net: ",
// [SMS_DLC]= "SMS: ",
[GPRS_DLC]= "GPRS: " ,
[SETUP_DLC]= "Setup: ",
};
Note I have to eliminate the SMS_DLC usage later in sim5320_post_sim:
// ofono_sms_create(modem, OFONO_VENDOR_SIMCOM, "atmodem",
// data->dlcs[SMS_DLC]);
OK everything is *ALMOST* working. ofonod interacts fine with
connmand, connmand tells ofonod to activate the sim5320, which
actually establishes a ppp connection and sets up a ppp device:
ppp0 Link encap:UNSPEC HWaddr 00-00-00-00-00-00-00-00-00-00-00-00-00-00-0
inet addr:30.97.132.47 P-t-P:30.97.132.47 Mask:255.255.255.255
UP POINTOPOINT RUNNING NOARP MULTICAST MTU:1500 Metric:1
RX packets:0 errors:0 dropped:0 overruns:0 frame:0
TX packets:2 errors:0 dropped:0 overruns:0 carrier:0
collisions:0 txqueuelen:500
RX bytes:0 (0.0 B) TX bytes:124 (124.0 B)
Here's the rub: No matter what I do, I never get any RX packets from
that ppp device, and even when it appears to TX packets (I'm trying to
ping out) the machine on the internet isn't actually receiving them.
I'm running on a beaglebone with a custom board with a sim5320 module on it.
I have no idea what to try... Any advice would be appreciated...
Thanks very much!!!!
-Dave
3 years, 2 months
APN provisioning with connman (and duplicate profiles in MBPI)
by Matthijs Kooijman
Hey folks,
I just tried Connman and oFono on a Debian stretch system for the first
time, hoping to get a more robust solution for keeping a cellular and/or
ethernet connection up. It seems the duo is quite capable of doing what
I need, but there were a few bumps in setting this up, where I think
things could be improved.
Some of these issues might be more connman issues, but they're mostly on
the cross-over area between the two, so I'll post them here for now.
In somewhat chronological order:
- I could not find any documentation on how to get a cellular
connection up. Plugging in a dongle made the "cellular" technology
appear in connman, but no services, with no indication of what needed
to happen next.
- When provisioning in oFono fails, a single gprs context is created
without an APN. Setting the APN manually made the profile show up in
connman and (eventually) work.
It might be better to cange connman to create a service for a context
without an APN, and show an error when trying to connect it, instead
of completely hiding the context.
- There does not seem to be any official commandline interface to ofono
to figure out what is happening. There are "test" python scripts in
the source repo, but these are not shipped in the Debian package
(reported here: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=868377)
- When mobile-broadband-provider-info provision finds multiple matches
for the operator (that is, multiple apns all with the same usage
type), provisioning fails, disregarding *all* apns found. I believe
this even happens when there is just one type duplicate (e.g. if
multiple mms profiles are available and just one internet profile,
the internet one is not used). Not entirely sure, though.
- When multiple profiles match, it would not make sense for oFono to
just pick an arbitrary one to use. Ideally, it would just create
a context for each, and let the user select the right context. For
this to actually work, the user must be able to distinguish them, and
see all the relevant details for profile/context to allow choosing
the right one.
I tried simply passing "allow_duplicates=TRUE" to ..., which does
indeed create all contexts, but seems to show only the first two as
aservices in connman (not sure why just these two), and there is no
way to really distinguish them (the service name is just the
currently connected network name).
- When actually connecting from connman (or activating a context using
the ofono test/activate-context script), the reported errors are very
unclear. I only got a "Not implemented" error, which is very
non-descriptive and, looking at the code, is returned in quite some
different places. There's also nothing in the log to indicate what
went wrong.
The activation error in my case was due to a missing tun kernel
module, I submitted a separate patch for that.
- I also ran into an issue where my modem was not properly detected at
startup, debug output showed it couldn't detect the USB vidpid for
some subdevices. I suspect there might be a race condition involved
there, but I'm still investigating.
Gr.
Matthijs
3 years, 6 months
Re: AW: AW: connmand[186]: Online check failed but running dhclient manually fixes this issue
by Daniel Wagner
[added ofono mailing list]
Summery: The qmi modem returns since 475b789f3de9 ("qmi: retrieve GPRS
context parameters") the IP configuration which is sometimes incorrect.
If ConnMan gets the IP configuration it doesn't do any DHCP and applies
the not working IP configuration.
On 07/26/2017 10:11 AM, Eswaran Vinothkumar (BEG/PJ-IOT-EL) wrote:
> On 07/21/2017 09:31 AM, Daniel Wagner wrote:
>> The first thing I noticed, is that we do not extract the DNS settings
>> correctly. oFono sends 10.105.16.254 and 10.105.144.254. I starred at
>> the oFono code base and also at ConnMan and I don't see what's going
>> wrong.
>>
>> Jul 21 05:47:02 alen-iot-gateway ofonod[176]:
>> ../ofono-1.20/drivers/qmimodem/gprs-context.c:get_settings_cb()
>> Jul 21 05:47:02 alen-iot-gateway ofonod[176]:
>> ../ofono-1.20/drivers/qmimodem/gprs-context.c:get_settings_cb() APN:
>> internetd.gdsp Jul 21 05:47:02 alen-iot-gateway ofonod[176]:
>> ../ofono-1.20/drivers/qmimodem/gprs-context.c:get_settings_cb() PDP
>> type 0 Jul 21 05:47:02 alen-iot-gateway ofonod[176]:
>> ../ofono-1.20/drivers/qmimodem/gprs-context.c:get_settings_cb() IP
>> addr: 10.249.97.226 Jul 21 05:47:02 alen-iot-gateway ofonod[176]:
>> ../ofono-1.20/drivers/qmimodem/gprs-context.c:get_settings_cb()
>> Gateway: 10.249.97.225 Jul 21 05:47:02 alen-iot-gateway ofonod[176]:
>> ../ofono-1.20/drivers/qmimodem/gprs-context.c:get_settings_cb()
>> Gateway netmask: 255.255.255.252 Jul 21 05:47:02 alen-iot-gateway
>> ofonod[176]:
>> ../ofono-1.20/drivers/qmimodem/gprs-context.c:get_settings_cb()
>> Primary DNS: 10.105.16.254 Jul 21 05:47:02 alen-iot-gateway
>> ofonod[176]:
>> ../ofono-1.20/drivers/qmimodem/gprs-context.c:get_settings_cb()
>> Secondary DNS: 10.105.144.254
>>
>>
>> Jul 21 05:47:02 alen-iot-gateway connmand[175]:
>> ../connman-1.34/plugins/ofono.c:extract_ipv4_settings() Interface
>> wwan0 Jul 21 05:47:02 alen-iot-gateway connmand[175]:
>> ../connman-1.34/plugins/ofono.c:extract_ipv4_settings() index 6 Jul 21
>> 05:47:02 alen-iot-gateway connmand[175]:
>> ../connman-1.34/plugins/ofono.c:extract_ipv4_settings() Method static
>> Jul 21 05:47:02 alen-iot-gateway connmand[175]:
>> ../connman-1.34/plugins/ofono.c:extract_ipv4_settings() Address
>> 10.249.97.226 Jul 21 05:47:02 alen-iot-gateway connmand[175]:
>> ../connman-1.34/plugins/ofono.c:extract_ipv4_settings() Netmask
>> 255.255.255.252 Jul 21 05:47:02 alen-iot-gateway connmand[175]:
>> ../connman-1.34/plugins/ofono.c:extract_ipv4_settings() Gateway
>> 10.249.97.225 Jul 21 05:47:02 alen-iot-gateway connmand[175]:
>> ../connman-1.34/plugins/ofono.c:extract_ipv4_settings() Nameservers
>> 10.105.144.254 10.105.144.254
>>
>> Could you add some printfs to the extract_nameservers() in
>> plugins/ofono.c? And you might also want to run
>> ofono/test/monitor-ofono so that you can see what oFono sends to
>> ConnMan.
>>
>>
>> Address: 10.249.97.226 00001010.11111001.01100001.111000 10
>> Netmask: 255.255.255.252 = 30 11111111.11111111.11111111.111111 00
>> Wildcard: 0.0.0.3 00000000.00000000.00000000.000000 11
>> =>
>> Network: 10.249.97.224/30 00001010.11111001.01100001.111000 00 (Class A)
>> Broadcast: 10.249.97.227 00001010.11111001.01100001.111000 11
>> HostMin: 10.249.97.225 00001010.11111001.01100001.111000 01
>> HostMax: 10.249.97.226 00001010.11111001.01100001.111000 10
>> Hosts/Net: 2 (Private Internet)
>>
>> Looking through the log, it looks like ConnMan does all the math
>> correctly.
>>
>> One thing which looks inconsistent in your first report is:
>>
>> ofono_start_gsm.sh[192]: Interface is wwan0
>> ofono_start_gsm.sh[192]: IP address is 10.249.29.20
>> ofono_start_gsm.sh[192]: Gateway is 10.249.29.21
>> ofono_start_gsm.sh[192]: Nameserver is 10.105.144.254
>>
>>
>> Destination Gateway Genmask Flags Metric Ref Use Iface
>> 0.0.0.0 10.166.199.10 0.0.0.0 UG 0 0 0 wwan0
>> 10.105.144.254 10.166.199.10 255.255.255.255 UGH 0 0 0 wwan0
>> 10.166.199.8 0.0.0.0 255.255.255.252 U 0 0 0 wwan0
>> 10.166.199.10 0.0.0.0 255.255.255.255 UH 0 0 0 wwan0
>>
>> The gateway should be 10.249.29.21 and not 10.166.199.10.
>> The next three lines are adding a host routing for the DNS server and
>> maybe timeserver. At least the first line is the DNS server but again
>> the gateway is wrong.
>>
>> dhclient gets set a complete different gateway:
>>
>> Destination Gateway Genmask Flags Metric Ref Use Iface
>> 0.0.0.0 10.166.250.1 0.0.0.0 UG 0 0 0 wwan0
>> 10.166.250.0 0.0.0.0 255.255.255.240 U 0 0 0 wwan0
>> 192.168.1.0 0.0.0.0 255.255.255.0 U 0 0 0 eth0
>> 192.168.1.255 0.0.0.0 255.255.255.255 UH 0 0 0 eth0
>>
>> 10.166.250.1 with a different netmask!
>>
>> First thing I would do is to verify what the oFono modem is doing. If
>> that one extracts the wrong information and passes that to ConnMan it
>> would explain your problem. The code in oFono is pretty new
>>
>> 475b789f3de9 ("qmi: retrieve GPRS context parameters")
> Just my 2 cents on this topic.
> On my setup, I use another QMI modem: MC7304 with ofono 1.20 + a bunch of patches done internally and connman 1.34.
>
> I also had problem with this patch (475b789f3de9 ("qmi: retrieve GPRS context parameters")).
> I have reverted it or to be more precise I commented all calls to functions ofono_gprs_context_set_ipv4* functions.
> I have done that 3 months ago so I am not completely sure about the why:
> Here is what I wrote in my patch:
>
> The goal is to force connman to use DHCP.
> When connman don't do that, MC7304 fails to ping.
> This behavior has been seen by libqmi guys:
> https://lists.freedesktop.org/archives/libqmi-devel/2016-June/001617.html
>
> Maybe you have the same problem with your TELIT modem.
> I can send my patch if you want but it is not the best way to handle the problem.
Thanks for your report. So we have at least two independent reports for
this problem.
Just for the record which ISP are you using? The above is Vodafone.
> Christophe Ronco
>
> I have also fixed the issue by creating a patch for Connman to run DHCP even when network returns static/fixed IP. Its'a not the way to do, but it’s a quick fix like yours.
If we could find some sort of rule when to ignore the returned values
from oFono than we can fallback to DHCP.
Thanks,
Daniel
3 years, 6 months
[PATCH 1/5] common: create GList helper ofono_call_compare
by Alexander Couzens
replaces at_util_call_compare (atmodem) and
call_compare (rild).
---
drivers/atmodem/atutil.c | 17 ++---------------
drivers/atmodem/atutil.h | 1 -
drivers/atmodem/voicecall.c | 2 +-
drivers/hfpmodem/voicecall.c | 2 +-
drivers/huaweimodem/voicecall.c | 2 +-
drivers/ifxmodem/voicecall.c | 2 +-
drivers/rilmodem/voicecall.c | 16 +---------------
drivers/stemodem/voicecall.c | 2 +-
src/common.c | 14 ++++++++++++++
src/common.h | 2 ++
10 files changed, 24 insertions(+), 36 deletions(-)
diff --git a/drivers/atmodem/atutil.c b/drivers/atmodem/atutil.c
index 14873483..1a48b606 100644
--- a/drivers/atmodem/atutil.c
+++ b/drivers/atmodem/atutil.c
@@ -31,6 +31,7 @@
#define OFONO_API_SUBJECT_TO_CHANGE
#include <ofono/log.h>
#include <ofono/types.h>
+#include "../src/common.h"
#include "atutil.h"
#include "vendor.h"
@@ -101,20 +102,6 @@ gint at_util_call_compare_by_id(gconstpointer a, gconstpointer b)
return 0;
}
-gint at_util_call_compare(gconstpointer a, gconstpointer b)
-{
- const struct ofono_call *ca = a;
- const struct ofono_call *cb = b;
-
- if (ca->id < cb->id)
- return -1;
-
- if (ca->id > cb->id)
- return 1;
-
- return 0;
-}
-
GSList *at_util_parse_clcc(GAtResult *result, unsigned int *ret_mpty_ids)
{
GAtResultIter iter;
@@ -173,7 +160,7 @@ GSList *at_util_parse_clcc(GAtResult *result, unsigned int *ret_mpty_ids)
else
call->clip_validity = 2;
- l = g_slist_insert_sorted(l, call, at_util_call_compare);
+ l = g_slist_insert_sorted(l, call, ofono_call_compare);
if (mpty)
mpty_ids |= 1 << id;
diff --git a/drivers/atmodem/atutil.h b/drivers/atmodem/atutil.h
index 5cb88b78..95e09900 100644
--- a/drivers/atmodem/atutil.h
+++ b/drivers/atmodem/atutil.h
@@ -54,7 +54,6 @@ void decode_at_error(struct ofono_error *error, const char *final);
gint at_util_call_compare_by_status(gconstpointer a, gconstpointer b);
gint at_util_call_compare_by_phone_number(gconstpointer a, gconstpointer b);
gint at_util_call_compare_by_id(gconstpointer a, gconstpointer b);
-gint at_util_call_compare(gconstpointer a, gconstpointer b);
GSList *at_util_parse_clcc(GAtResult *result, unsigned int *mpty_ids);
gboolean at_util_parse_reg(GAtResult *result, const char *prefix,
int *mode, int *status,
diff --git a/drivers/atmodem/voicecall.c b/drivers/atmodem/voicecall.c
index e4c59c26..6fee39bc 100644
--- a/drivers/atmodem/voicecall.c
+++ b/drivers/atmodem/voicecall.c
@@ -132,7 +132,7 @@ static struct ofono_call *create_call(struct ofono_voicecall *vc, int type,
call->clip_validity = clip;
call->cnap_validity = CNAP_VALIDITY_NOT_AVAILABLE;
- d->calls = g_slist_insert_sorted(d->calls, call, at_util_call_compare);
+ d->calls = g_slist_insert_sorted(d->calls, call, ofono_call_compare);
return call;
}
diff --git a/drivers/hfpmodem/voicecall.c b/drivers/hfpmodem/voicecall.c
index ffdf4b7b..1a282903 100644
--- a/drivers/hfpmodem/voicecall.c
+++ b/drivers/hfpmodem/voicecall.c
@@ -128,7 +128,7 @@ static struct ofono_call *create_call(struct ofono_voicecall *vc, int type,
call->phone_number.type = num_type;
}
- d->calls = g_slist_insert_sorted(d->calls, call, at_util_call_compare);
+ d->calls = g_slist_insert_sorted(d->calls, call, ofono_call_compare);
call->clip_validity = clip;
diff --git a/drivers/huaweimodem/voicecall.c b/drivers/huaweimodem/voicecall.c
index f55568d3..0887f652 100644
--- a/drivers/huaweimodem/voicecall.c
+++ b/drivers/huaweimodem/voicecall.c
@@ -76,7 +76,7 @@ static struct ofono_call *create_call(struct ofono_voicecall *vc, int type,
call->clip_validity = clip;
- d->calls = g_slist_insert_sorted(d->calls, call, at_util_call_compare);
+ d->calls = g_slist_insert_sorted(d->calls, call, ofono_call_compare);
return call;
}
diff --git a/drivers/ifxmodem/voicecall.c b/drivers/ifxmodem/voicecall.c
index 45b5ca42..581a7906 100644
--- a/drivers/ifxmodem/voicecall.c
+++ b/drivers/ifxmodem/voicecall.c
@@ -107,7 +107,7 @@ static struct ofono_call *create_call(struct ofono_voicecall *vc, int type,
call->clip_validity = clip;
- d->calls = g_slist_insert_sorted(d->calls, call, at_util_call_compare);
+ d->calls = g_slist_insert_sorted(d->calls, call, ofono_call_compare);
return call;
}
diff --git a/drivers/rilmodem/voicecall.c b/drivers/rilmodem/voicecall.c
index b7180b90..f248d871 100644
--- a/drivers/rilmodem/voicecall.c
+++ b/drivers/rilmodem/voicecall.c
@@ -117,20 +117,6 @@ done:
ofono_voicecall_disconnected(vc, reqdata->id, reason, NULL);
}
-static int call_compare(gconstpointer a, gconstpointer b)
-{
- const struct ofono_call *ca = a;
- const struct ofono_call *cb = b;
-
- if (ca->id < cb->id)
- return -1;
-
- if (ca->id > cb->id)
- return 1;
-
- return 0;
-}
-
static void clcc_poll_cb(struct ril_msg *message, gpointer user_data)
{
struct ofono_voicecall *vc = user_data;
@@ -209,7 +195,7 @@ static void clcc_poll_cb(struct ril_msg *message, gpointer user_data)
call->id, call->status, call->type,
call->phone_number.number, call->name);
- calls = g_slist_insert_sorted(calls, call, call_compare);
+ calls = g_slist_insert_sorted(calls, call, ofono_call_compare);
}
no_calls:
diff --git a/drivers/stemodem/voicecall.c b/drivers/stemodem/voicecall.c
index 356ab7c6..19276111 100644
--- a/drivers/stemodem/voicecall.c
+++ b/drivers/stemodem/voicecall.c
@@ -128,7 +128,7 @@ static struct ofono_call *create_call(struct ofono_voicecall *vc, int type,
call->clip_validity = clip;
- d->calls = g_slist_insert_sorted(d->calls, call, at_util_call_compare);
+ d->calls = g_slist_insert_sorted(d->calls, call, ofono_call_compare);
return call;
}
diff --git a/src/common.c b/src/common.c
index 17d1d58a..75bb94dc 100644
--- a/src/common.c
+++ b/src/common.c
@@ -736,3 +736,17 @@ void ofono_call_init(struct ofono_call *call)
call->cnap_validity = CNAP_VALIDITY_NOT_AVAILABLE;
call->clip_validity = CLIP_VALIDITY_NOT_AVAILABLE;
}
+
+gint ofono_call_compare(gconstpointer a, gconstpointer b)
+{
+ const struct ofono_call *ca = a;
+ const struct ofono_call *cb = b;
+
+ if (ca->id < cb->id)
+ return -1;
+
+ if (ca->id > cb->id)
+ return 1;
+
+ return 0;
+}
diff --git a/src/common.h b/src/common.h
index 05f2a851..46bae577 100644
--- a/src/common.h
+++ b/src/common.h
@@ -184,3 +184,5 @@ const char *registration_tech_to_string(int tech);
const char *packet_bearer_to_string(int bearer);
gboolean is_valid_apn(const char *apn);
+
+gint ofono_call_compare(gconstpointer a, gconstpointer b);
--
2.13.3
3 years, 6 months
[PATCH] radio-settings: Fix typo in radio_band_umts_from_string
by John Ernberg
From: John Ernberg <john.ernberg(a)actia.se>
---
src/radio-settings.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/radio-settings.c b/src/radio-settings.c
index b988e3e..c551b04 100644
--- a/src/radio-settings.c
+++ b/src/radio-settings.c
@@ -167,7 +167,7 @@ static gboolean radio_band_umts_from_string(const char *str,
enum ofono_radio_band_umts *band)
{
if (g_str_equal(str, "any")) {
- *band = OFONO_RADIO_BAND_GSM_ANY;
+ *band = OFONO_RADIO_BAND_UMTS_ANY;
return TRUE;
} else if (g_str_equal(str, "850")) {
*band = OFONO_RADIO_BAND_UMTS_850;
--
2.7.4
3 years, 6 months
gemalto: AGPS functionality
by Vincent CESSON
Hi,
I am trying to add AGPS functionality to Gemalto modems. I took a look
at interface AssistedSatelliteNavigation and implementation in
drivers/atmodem/gnss.c. Unfortunately, Gemalto does not support AT+CPOS
command but it uses a custom command: AT^SBNW. Moreover, the positioning
file expected is not XML but binary format.
The process of loading the binary is:
- Download binary file from Gemalto server to local memory
- Initiate binary write command: AT^SBNW="agps",<binary_file_length>
- Copy binary file from local memory to modem over its application (or
modem) interface
AT^SBNW immediately returns "CONNECT". Then "AGPS READY: SEND FILE..."
After the modem receives the exact amount of bytes specified in the
command, it verifies the data and returns one of the following: "AGPS
END OK", "TIME INFO ERROR", "BAD CRC" or "OK".
So I am facing several issues:
- How to send binary data from local memory to oFono? DBus message
with array of bytes?
- How to send binary data from oFono to modem interface? Does gatchat
only support strings?
- How to handle custom result codes? I already tried some hacks, and I
had to blacklist the response "CONNECT" for instance.
Or maybe it isn't worth the effort implementing it in oFono?
Regards,
Vincent
3 years, 6 months
[PATCH] ussd: Switch the state from USER_ACTION to IDLE
by Slava Monich
... when a USSD notification is received. Some networks
send 0 (no further user action required) after the response
timeout expires. That should result in the user input form
getting removed from the ME screen.
---
src/ussd.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/src/ussd.c b/src/ussd.c
index 99fa753..84f64c6 100644
--- a/src/ussd.c
+++ b/src/ussd.c
@@ -512,6 +512,20 @@ void ofono_ussd_notify(struct ofono_ussd *ussd, int status, int dcs,
ussd_change_state(ussd, new_state);
goto free;
+ } else if (ussd->state == USSD_STATE_USER_ACTION &&
+ status != OFONO_USSD_STATUS_ACTION_REQUIRED) {
+ ussd_change_state(ussd, USSD_STATE_IDLE);
+
+ if (status == OFONO_USSD_STATUS_NOTIFY && str && str[0]) {
+ const char *path = __ofono_atom_get_path(ussd->atom);
+
+ g_dbus_emit_signal(conn, path,
+ OFONO_SUPPLEMENTARY_SERVICES_INTERFACE,
+ "NotificationReceived", DBUS_TYPE_STRING,
+ &str, DBUS_TYPE_INVALID);
+ }
+
+ goto free;
} else {
ofono_error("Received an unsolicited USSD but can't handle.");
DBG("USSD is: status: %d, %s", status, str);
--
1.9.1
3 years, 6 months
[PATCH] drivers/qmimodem: don't change the RAT when registering to an operator
by Alexander Couzens
When registering to an operator ofono uses the old RAT.
In the case the modem is not connected to any network, this would use
QMI_NAS_NETWORK_RAT_NONE which results in the error OP_DEVICE_UNSUPPORTED.
Use QMI_NAS_NETWORK_RAT_NO_CHANGE instead to not define any preference.
---
drivers/qmimodem/nas.h | 1 +
drivers/qmimodem/network-registration.c | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/qmimodem/nas.h b/drivers/qmimodem/nas.h
index 09807f83..d2feb464 100644
--- a/drivers/qmimodem/nas.h
+++ b/drivers/qmimodem/nas.h
@@ -97,6 +97,7 @@ struct qmi_nas_network_rat {
} __attribute__((__packed__)) info[0];
} __attribute__((__packed__));
+#define QMI_NAS_NETWORK_RAT_NONE 0x00
#define QMI_NAS_NETWORK_RAT_GSM 0x04
#define QMI_NAS_NETWORK_RAT_UMTS 0x05
#define QMI_NAS_NETWORK_RAT_LTE 0x08
diff --git a/drivers/qmimodem/network-registration.c b/drivers/qmimodem/network-registration.c
index 52ad69a6..04de5a5b 100644
--- a/drivers/qmimodem/network-registration.c
+++ b/drivers/qmimodem/network-registration.c
@@ -356,7 +356,7 @@ static void qmi_register_manual(struct ofono_netreg *netreg,
info.mcc = atoi(mcc);
info.mnc = atoi(mnc);
- info.rat = data->current_rat;
+ info.rat = QMI_NAS_NETWORK_RAT_NO_CHANGE;
qmi_param_append(param, QMI_NAS_PARAM_REGISTER_MANUAL_INFO,
sizeof(info), &info);
--
2.13.3
3 years, 6 months
[PATCH] plugins/allowed-apns: remove dbus interface when modem disappear
by Alexander Couzens
Previous a disappeared modem still shows the following methods:
org.ofono.AllowedAccessPoints.GetAllowedAccessPoints
---
plugins/allowed-apns.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/plugins/allowed-apns.c b/plugins/allowed-apns.c
index 532d17af..b222b91c 100644
--- a/plugins/allowed-apns.c
+++ b/plugins/allowed-apns.c
@@ -195,6 +195,7 @@ static void sim_watch(struct ofono_atom *atom,
if (cond == OFONO_ATOM_WATCH_CONDITION_UNREGISTERED) {
if (ctx->simwatch_id) {
+ sim_state_watch(OFONO_SIM_STATE_NOT_PRESENT, data);
ofono_sim_remove_state_watch(ctx->sim, ctx->simwatch_id);
ctx->simwatch_id = 0;
}
--
2.13.3
3 years, 6 months
