From a1ffe805affb058e49692b6e473d296a72a39f1b Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 9 Dec 2013 11:15:15 -0600 Subject: [PATCH] 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 ^RSSILVL:60 --- plugins/huawei/mm-broadband-modem-huawei.c | 4 ++-- 1 file 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: ^MODE:5