aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2013-12-09 11:15:15 -0600
committerDan Williams <dcbw@redhat.com>2013-12-09 11:27:27 -0600
commita1ffe805affb058e49692b6e473d296a72a39f1b (patch)
tree82bfd0b58403e3f375348f55534bfafc281104e5
parentf721c650d2b37dc91301ed41e3ed10f28c8acd10 (diff)
broadband-modem-huawei: fix CDMA unsolicited response parsing
On at least the EC168C, various unsolicited responses like RSSILVL, HRSSILVL, and MODE can include an extra Carriage Return: ^MODE: 2<CR><CR><LF><CR><CR><LF> ^RSSILVL:60<CR><CR><LF><CR><CR><LF>
-rw-r--r--plugins/huawei/mm-broadband-modem-huawei.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/huawei/mm-broadband-modem-huawei.c b/plugins/huawei/mm-broadband-modem-huawei.c
index 762d7f16..02230371 100644
--- a/plugins/huawei/mm-broadband-modem-huawei.c
+++ b/plugins/huawei/mm-broadband-modem-huawei.c
@@ -2999,9 +2999,9 @@ mm_broadband_modem_huawei_init (MMBroadbandModemHuawei *self)
/* Prepare regular expressions to setup */
self->priv->rssi_regex = g_regex_new ("\\r\\n\\^RSSI:\\s*(\\d+)\\r\\n",
G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, NULL);
- self->priv->rssilvl_regex = g_regex_new ("\\r\\n\\^RSSILVL:\\s*(\\d+)\\r\\n",
+ self->priv->rssilvl_regex = g_regex_new ("\\r\\n\\^RSSILVL:\\s*(\\d+)\\r+\\n",
G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, NULL);
- self->priv->hrssilvl_regex = g_regex_new ("\\r\\n\\^HRSSILVL:\\s*(\\d+)\\r\\n",
+ self->priv->hrssilvl_regex = g_regex_new ("\\r\\n\\^HRSSILVL:\\s*(\\d+)\\r+\\n",
G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, NULL);
/* 3GPP: <cr><lf>^MODE:5<cr><lf>