Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

modemmanager: allow optional spaces after commas in ^SXRAT 

https://onedigi.atlassian.net/browse/DEL-9445

Signed-off-by: Francisco Gil <francisco.gilmartinez@digi.com>
This commit is contained in:
Francisco Gil 2025-01-28 11:14:52 +01:00
parent 637bb9dbbe
commit 2b71f2ce2b
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/0001-modemmanager-Allow-optional-spaces-after-commas.patch Normal file
View File

@ -0,0 +1,33 @@
Date: Tue, 28 Jan 2025 10:18:20 +0100
Subject: [PATCH] modemmanager: Allow optional spaces after commas in ^SXRAT
response parsing
Updated the regex in `mm_cinterion_parse_sxrat_test` to allow
optional spaces after commas when parsing the ^SXRAT response.
This improves robustness by handling both spaced and non-spaced formats.
Fixes potential mismatches in responses like:
- `^SXRAT: (0-6),(0,2,3),(0,2,3)`
- `^SXRAT: (0-6), (0,2,3), (0,2,3)`
Signed-off-by: Francisco Gil <francisco.gilmartinez@digi.com>
---
src/plugins/cinterion/mm-modem-helpers-cinterion.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/plugins/cinterion/mm-modem-helpers-cinterion.c b/src/plugins/cinterion/mm-modem-helpers-cinterion.c
index 8af032b1..55cdf8d6 100644
--- a/src/plugins/cinterion/mm-modem-helpers-cinterion.c
+++ b/src/plugins/cinterion/mm-modem-helpers-cinterion.c
@@ -778,7 +778,7 @@ mm_cinterion_parse_sxrat_test (const gchar *response,
return FALSE;
}
- r = g_regex_new ("\\^SXRAT:\\s*\\(([^\\)]*)\\),\\(([^\\)]*)\\)(,\\(([^\\)]*)\\))?(?:\\r\\n)?",
+ r = g_regex_new ("\\^SXRAT:\\s*\\(([^\\)]*)\\),\\s*\\(([^\\)]*)\\)(?:,\\s*\\(([^\\)]*)\\))?(?:\\r\\n)?",
G_REGEX_DOLLAR_ENDONLY | G_REGEX_RAW,
0, NULL);
--
2.34.1

3
meta-digi-dey/recipes-connectivity/modemmanager/modemmanager_%.bbappend
View File

@ -1,8 +1,9 @@
# Copyright (C) 2017, Digi International Inc. # Copyright (C) 2017-2025, Digi International Inc.
FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
SRC_URI += " \ SRC_URI += " \
file://0001-modemmanager-Allow-optional-spaces-after-commas.patch \
file://80-mm-net-device-blacklist.rules \ file://80-mm-net-device-blacklist.rules \
file://late-modems-scan.service \ file://late-modems-scan.service \
file://late-modems-scan.timer \ file://late-modems-scan.timer \