Age | Commit message (Collapse) | Author | Files | Lines |
|
If the client which originated the request exits (e.g. HUP received in its
socket) before the actual response from the QmiDevice arrives, we'll end up
trying to access the Client info (as kept in request->client) even if it has
already been freed.
Fix that, by making the Client a ref-counted object, and passing around full
references of the Client where needed, e.g.:
* In the async callbacks where Client is passed as data.
* Inside each Request.
Doing this we make sure each operation has a totally valid Client until the
operation finishes, even if the client gets disconnected in between.
==311== Invalid read of size 8
==311== at 0x4E9381C: track_cid (qmi-proxy.c:443)
==311== by 0x4E93A45: device_command_ready (qmi-proxy.c:492)
==311== by 0x52BEC18: g_simple_async_result_complete (gsimpleasyncresult.c:777)
==311== by 0x52BEC4E: complete_in_idle_cb (gsimpleasyncresult.c:789)
==311== by 0x583FA6D: g_idle_dispatch (gmain.c:5250)
==311== by 0x583D47A: g_main_dispatch (gmain.c:3065)
==311== by 0x583E237: g_main_context_dispatch (gmain.c:3641)
==311== by 0x583E463: g_main_context_iterate (gmain.c:3712)
==311== by 0x583E79C: g_main_loop_run (gmain.c:3906)
==311== by 0x401411: main (qmi-proxy.c:220)
==311== Address 0x87c7450 is 48 bytes inside a block of size 64 free'd
==311== at 0x4C2A0C0: free (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
==311== by 0x584519E: g_free (gmem.c:197)
==311== by 0x585BBF6: g_slice_free1 (gslice.c:1124)
==311== by 0x4E92CC5: client_free (qmi-proxy.c:149)
==311== by 0x4E92DD4: connection_close (qmi-proxy.c:177)
==311== by 0x4E93CFF: connection_readable_cb (qmi-proxy.c:586)
==311== by 0x52C2A4D: socket_source_dispatch (gsocket.c:3264)
==311== by 0x583D47A: g_main_dispatch (gmain.c:3065)
==311== by 0x583E237: g_main_context_dispatch (gmain.c:3641)
==311== by 0x583E463: g_main_context_iterate (gmain.c:3712)
==311== by 0x583E79C: g_main_loop_run (gmain.c:3906)
==311== by 0x401411: main (qmi-proxy.c:220)
==311== Block was alloc'd at
==311== at 0x4C2B3D0: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
==311== by 0x584502D: g_malloc (gmem.c:104)
==311== by 0x585B990: g_slice_alloc (gslice.c:1016)
==311== by 0x585B9D4: g_slice_alloc0 (gslice.c:1042)
==311== by 0x4E93FC5: incoming_cb (qmi-proxy.c:655)
==311== by 0x60F2A4B: ffi_call_unix64 (unix64.S:75)
==311== by 0x60F24B8: ffi_call (ffi64.c:492)
==311== by 0x55BB773: g_cclosure_marshal_generic (gclosure.c:1454)
==311== by 0x55BA093: g_closure_invoke (gclosure.c:777)
==311== by 0x55D1B45: signal_emit_unlocked_R (gsignal.c:3586)
==311== by 0x55D0F00: g_signal_emit_valist (gsignal.c:3340)
==311== by 0x55D1383: g_signal_emit (gsignal.c:3386)
and:
==9308== Invalid read of size 8
==9308== at 0x4E93641: device_new_ready (qmi-proxy.c:348)
==9308== by 0x52BEC18: g_simple_async_result_complete (gsimpleasyncresult.c:777)
==9308== by 0x52BEC4E: complete_in_idle_cb (gsimpleasyncresult.c:789)
==9308== by 0x583FA6D: g_idle_dispatch (gmain.c:5250)
==9308== by 0x583D47A: g_main_dispatch (gmain.c:3065)
==9308== by 0x583E237: g_main_context_dispatch (gmain.c:3641)
==9308== by 0x583E463: g_main_context_iterate (gmain.c:3712)
==9308== by 0x583E79C: g_main_loop_run (gmain.c:3906)
==9308== by 0x401411: main (qmi-proxy.c:220)
==9308== Address 0x8d04930 is 32 bytes inside a block of size 72 free'd
==9308== at 0x4C2A0C0: free (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
==9308== by 0x584519E: g_free (gmem.c:197)
==9308== by 0x585BBF6: g_slice_free1 (gslice.c:1124)
==9308== by 0x4E92EAB: client_free (qmi-proxy.c:159)
==9308== by 0x4E92FBA: connection_close (qmi-proxy.c:187)
==9308== by 0x4E93FC1: connection_readable_cb (qmi-proxy.c:626)
==9308== by 0x52C2A4D: socket_source_dispatch (gsocket.c:3264)
==9308== by 0x583D47A: g_main_dispatch (gmain.c:3065)
==9308== by 0x583E237: g_main_context_dispatch (gmain.c:3641)
==9308== by 0x583E463: g_main_context_iterate (gmain.c:3712)
==9308== by 0x583E79C: g_main_loop_run (gmain.c:3906)
==9308== by 0x401411: main (qmi-proxy.c:220)
==9308== Block was alloc'd at
==9308== at 0x4C2B3D0: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
==9308== by 0x584502D: g_malloc (gmem.c:104)
==9308== by 0x585B990: g_slice_alloc (gslice.c:1016)
==9308== by 0x585B9D4: g_slice_alloc0 (gslice.c:1042)
==9308== by 0x4E94287: incoming_cb (qmi-proxy.c:695)
==9308== by 0x60F2A4B: ffi_call_unix64 (unix64.S:75)
==9308== by 0x60F24B8: ffi_call (ffi64.c:492)
==9308== by 0x55BB773: g_cclosure_marshal_generic (gclosure.c:1454)
==9308== by 0x55BA093: g_closure_invoke (gclosure.c:777)
==9308== by 0x55D1B45: signal_emit_unlocked_R (gsignal.c:3586)
==9308== by 0x55D0F00: g_signal_emit_valist (gsignal.c:3340)
==9308== by 0x55D1383: g_signal_emit (gsignal.c:3386)
|
|
|
|
plug memleak
|
|
plug memleak
|
|
|
|
https://bugs.freedesktop.org/show_bug.cgi?id=98459
|
|
|
|
changed logic a bit to support situation when there is no config activated. In
this case indication generated with error NOT_PROVISIONED.
|
|
There won't be any indication if no configs are available.
Based on a patch from Aliaksandr Barouski <alex.borovsky@gmail.com>.
|
|
|
|
Mostly coding style fixes, although the patch also fixes several allocation
issues when freeing GSlices.
|
|
|
|
The original implementation actually had some bugs when freeing the output
array in error conditions. Also, use g_ascii_xdigit_value() instead of
custom conversions.
|
|
Added calls for configure hp4120 LTE modem
|
|
Based on a patch from Aliaksandr Barouski <alex.borovsky@gmail.com>
https://bugs.freedesktop.org/show_bug.cgi?id=96465
|
|
|
|
|
|
|
|
|
|
|
|
QMI_WDS_IP_FAMILY_UNSPECIFIED = 8 but ip_type gets initialized to
0, so the "IP Family Preference" was always being sent with an
unrecognized value.
Fixes: 81c21379 qmicli: add support for IP type to --wds-start-networ
|
|
Some devices (Quectel EC21) lie about their supported DMS version,
so assume a reasonable DMS version if the WDS version is high enough.
|
|
If the device cannot exit low-power mode it sometimes reports a reason,
like pri-image-misconfiguration.
|
|
|
|
'--dms-set-firmware-pref'
|
|
Signed-off-by: Bjørn Mork <bjorn@mork.no>
|
|
The firmware preference must be set to the new firmware version
before a firmware download can take place. Add support for setting
the firmware preference independently of the currently installed
images.
Signed-off-by: Bjørn Mork <bjorn@mork.no>
|
|
|
|
Don't know what I was thinking here, but the referenced channels
are of course *RX* channels. None of my modems can do TX CA. Yet :)
Signed-off-by: Bjørn Mork <bjorn@mork.no>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
The lifecycle for transactions going through the MBIM backend is a bit different
w.r.t. the default one:
* Given that libmbim has its own timeout management for the commands sent, we
will rely on it instead of having our own. This means that we always assume
that mbim_command() finishes, as it should be.
* Instead of using the response QMI message to match a transaction, when using
MBIM we use the transaction key given in the context passed to mbim_command()
and by doing this we make sure that the transaction is always removed from
the tracking table, regardless of whether the QMI message inside matched or
not.
|
|
|
|
|
|
|
|
If libmbim 1.14.0 found, enable QMI over MBIM support.
|
|
Signed-off-by: Bjørn Mork <bjorn@mork.no>
|
|
Signed-off-by: Bjørn Mork <bjorn@mork.no>
|
|
Reported-by: Jing Chen <jing.chen@spirent.com>
|
|
|
|
cc1: warnings being treated as errors
test-generated.c: In function 'dms_get_time_ready':
test-generated.c:292: error: integer constant is too large for 'long' type
test-generated.c:298: error: integer constant is too large for 'long' type
|
|
qmicli-nas.c: In function 'get_lte_cphy_ca_info_ready':
qmicli-nas.c:2780:12: error: declaration of 'index' shadows a global declaration [-Werror=shadow]
cc1: all warnings being treated as errors
make[7]: *** [qmicli-qmicli-nas.o] Error 1
|
|
We provide a compatibility symbol to try to provide a better backwards
compatibility.
|
|
Commit 7ca279e9a42 introduced a couple of method renames that we now try to
recover in order to provide a better backwards API compatibility.
|
|
Carrier aggregation is much more fun when you can watch it being
activated :)
$ qmicli -p -d /dev/cdc-wdm0 --nas-get-lte-cphy-ca-info
[/dev/cdc-wdm0] Successfully got carrier aggregation info
DL Bandwidth: '20'
Secondary Cell Info
Physical Cell ID: '101'
TX Channel: '3050'
DL Bandwidth: '20'
LTE Band: 'eutran-7'
State: 'activated'
Primary Cell Info
Physical Cell ID: '299'
TX Channel: '1450'
DL Bandwidth: '20'
LTE Band: 'eutran-3'
Secondary Cell index: '1'
I have absolutely no clue about the required NAS version, so I just put
the current version I have there...
Signed-off-by: Bjørn Mork <bjorn@mork.no>
|
|
The current definition of QMI_*_BAND_CAPABILITY_BC_15 gets converted to a
negative value (0xffffffff80000000) which causes false positives for BC15
to be returned from dms_add_qmi_bands() and nas_add_qmi_bands() in
ModemManager/src/mm-modem-helpers-qmi.c when a matching QMI band (e.g.
WCDMA900) is present in qmi_bands like in this example
https://lists.freedesktop.org/archives/libqmi-devel/2016-March/001572.html .
Replace 1 << 31 with ((guint64) 1) << 31 for QMI_*_BAND_CAPABILITY_BC_15
to avoid incorrect mmcli "Bands | supported: 'cdma-bc15-aws, ...'" output.
Signed-off-by: Reinhard Speyerer <rspmn@arcor.de>
|