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

serial: handle arbitrary amounts of <CR><LF> padding in responses

Browse Source 
Firmware on some Option devices (iCON 505) likes to spray newlines
all over the place.  Some fixes and boundary checks by me (dcbw).
This commit is contained in:
Jeroen Elebaut
2009-11-24 15:36:32 -08:00
committed by Dan Williams
parent 50412ba3f9
commit 19e9c0cb48
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/mm-serial-parsers.c
View File

@@ -26,15 +26,19 @@ response_clean (GString *response)
{ {
char *s; char *s;
/* Ends with '<CR><LF>' */ /* Ends with one or more '<CR><LF>' */
s = response->str + response->len - 1; s = response->str + response->len - 1;
if (*s == '\n' && *(--s) == '\r') while ((s > response->str) && (*s == '\n') && (*(s - 1) == '\r')) {
g_string_truncate (response, response->len - 2); g_string_truncate (response, response->len - 2);
s -= 2;
}
/* Starts with '<CR><LF>' */ /* Starts with one or more '<CR><LF>' */
s = response->str; s = response->str;
if (*s == '\r' && *(++s) == '\n') while ((response->len >= 2) && (*s == '\r') && (*(s + 1) == '\n')) {
g_string_erase (response, 0, 2); g_string_erase (response, 0, 2);
s = response->str;
}
} }
@@ -199,7 +203,7 @@ mm_serial_parser_v1_new (void)
parser = g_slice_new (MMSerialParserV1); parser = g_slice_new (MMSerialParserV1);
parser->regex_ok = g_regex_new ("\\r\\nOK\\r\\n$", flags, 0, NULL); parser->regex_ok = g_regex_new ("\\r\\nOK(\\r\\n)+$", flags, 0, NULL);
parser->regex_connect = g_regex_new ("\\r\\nCONNECT.*\\r\\n", flags, 0, NULL); parser->regex_connect = g_regex_new ("\\r\\nCONNECT.*\\r\\n", flags, 0, NULL);
parser->regex_detailed_error = g_regex_new ("\\r\\n\\+CME ERROR: (\\d+)\\r\\n$", flags, 0, NULL); parser->regex_detailed_error = g_regex_new ("\\r\\n\\+CME ERROR: (\\d+)\\r\\n$", flags, 0, NULL);
parser->regex_unknown_error = g_regex_new ("\\r\\n(ERROR)|(COMMAND NOT SUPPORT)\\r\\n$", flags, 0, NULL); parser->regex_unknown_error = g_regex_new ("\\r\\n(ERROR)|(COMMAND NOT SUPPORT)\\r\\n$", flags, 0, NULL);