colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

port-qmi: fallback to raw-ip if WDA Get Data Format requests arguments

Browse Source 
New devices return a "Missing Argument" error in WDA Get Data Format,
requiring the use of the "Endpoint info" TLV. Given that all these new
devices are raw-ip only anyway, let's use this error to right away
fallback to require raw-ip in the interface.

Fixes https://gitlab.freedesktop.org/mobile-broadband/ModemManager/issues/177
This commit is contained in:
Aleksander Morgado
2020-01-24 12:27:07 +01:00
parent 280363e0d6
commit a8fd33ebaa
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/mm-port-qmi.c
View File

@@ -304,15 +304,26 @@ get_data_format_ready (QmiClientWda *client,
{ {
PortOpenContext *ctx; PortOpenContext *ctx;
QmiMessageWdaGetDataFormatOutput *output; QmiMessageWdaGetDataFormatOutput *output;
g_autoptr(GError) error = NULL;
ctx = g_task_get_task_data (task); ctx = g_task_get_task_data (task);
output = qmi_client_wda_get_data_format_finish (client, res, NULL); output = qmi_client_wda_get_data_format_finish (client, res, NULL);
if (!output || if (!output ||
!qmi_message_wda_get_data_format_output_get_result (output, NULL) || !qmi_message_wda_get_data_format_output_get_result (output, &error) ||
!qmi_message_wda_get_data_format_output_get_link_layer_protocol (output, &ctx->llp, NULL)) !qmi_message_wda_get_data_format_output_get_link_layer_protocol (output, &ctx->llp, NULL)) {
/* A 'missing argument' error when querying data format is seen in new
* devices like the Quectel RM500Q, requiring the 'endpoint info' TLV.
* When this happens, assume the device supports only raw-ip and be done
* with it. */
if (error && g_error_matches (error, QMI_PROTOCOL_ERROR, QMI_PROTOCOL_ERROR_MISSING_ARGUMENT)) {
mm_dbg ("Querying data format failed: '%s', assuming raw-ip is only supported", error->message);
ctx->llp = QMI_WDA_LINK_LAYER_PROTOCOL_RAW_IP;
ctx->step++;
} else {
/* If loading WDA data format fails, fallback to 802.3 requested via CTL */ /* If loading WDA data format fails, fallback to 802.3 requested via CTL */
ctx->step = PORT_OPEN_STEP_CLOSE_BEFORE_OPEN_WITH_DATA_FORMAT; ctx->step = PORT_OPEN_STEP_CLOSE_BEFORE_OPEN_WITH_DATA_FORMAT;
else }
} else
/* Go on to next step */ /* Go on to next step */
ctx->step++; ctx->step++;