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

serial: allow user to provide custom regex for successful and error replies

Browse Source 
New mm_serial_parser_v1_set_custom_regex() method.
This commit is contained in:
Aleksander Morgado
2011-03-30 18:29:15 +02:00
committed by Dan Williams
parent cc5fcd195a
commit 9435a937ce
2 changed files with 70 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -196,13 +196,17 @@ mm_serial_parser_v0_destroy (gpointer data)
}
typedef struct {
/* Regular expressions for successful replies */
GRegex *regex_ok;
GRegex *regex_connect;
GRegex *regex_custom_successful;
/* Regular expressions for error replies */
GRegex *regex_cme_error;
GRegex *regex_cme_error_str;
GRegex *regex_ezx_error;
GRegex *regex_unknown_error;
GRegex *regex_connect_failed;
GRegex *regex_custom_error;
} MMSerialParserV1;
gpointer
@@ -221,9 +225,30 @@ mm_serial_parser_v1_new (void)
parser->regex_unknown_error = g_regex_new ("\\r\\n(ERROR)|(COMMAND NOT SUPPORT)\\r\\n$", flags, 0, NULL);
parser->regex_connect_failed = g_regex_new ("\\r\\n(NO CARRIER)|(BUSY)|(NO ANSWER)|(NO DIALTONE)\\r\\n$", flags, 0, NULL);
parser->regex_custom_successful = NULL;
parser->regex_custom_error = NULL;
return parser;
}
void
mm_serial_parser_v1_set_custom_regex (gpointer data,
GRegex *successful,
GRegex *error)
{
MMSerialParserV1 *parser = (MMSerialParserV1 *) data;
g_return_if_fail (parser != NULL);
if (parser->regex_custom_successful)
g_regex_unref (parser->regex_custom_successful);
if (parser->regex_custom_error)
g_regex_unref (parser->regex_custom_error);
parser->regex_custom_successful = successful ? g_regex_ref (successful) : NULL;
parser->regex_custom_error = error ? g_regex_ref (error) : NULL;
}
gboolean
mm_serial_parser_v1_parse (gpointer data,
GString *response,
@@ -244,11 +269,23 @@ mm_serial_parser_v1_parse (gpointer data,
/* First, check for successful responses */
found = g_regex_match_full (parser->regex_ok, response->str, response->len, 0, 0, NULL, NULL);
/* Custom successful replies first, if any */
if (parser->regex_custom_successful)
found = g_regex_match_full (parser->regex_custom_successful,
response->str, response->len,
0, 0, NULL, NULL);
if (!found) {
found = g_regex_match_full (parser->regex_ok,
response->str, response->len,
0, 0, NULL, NULL);
if (found)
remove_matches (parser->regex_ok, response);
else
found = g_regex_match_full (parser->regex_connect, response->str, response->len, 0, 0, NULL, NULL);
found = g_regex_match_full (parser->regex_connect,
response->str, response->len,
0, 0, NULL, NULL);
}
if (found) {
response_clean (response);
@@ -257,6 +294,21 @@ mm_serial_parser_v1_parse (gpointer data,
/* Now failures */
/* Custom error matches first, if any */
if (parser->regex_custom_error) {
found = g_regex_match_full (parser->regex_custom_error,
response->str, response->len,
0, 0, &match_info, NULL);
if (found) {
str = g_match_info_fetch (match_info, 1);
g_assert (str);
local_error = mm_mobile_error_for_code (atoi (str));
g_free (str);
g_match_info_free (match_info);
goto done;
}
}
/* Numeric CME errors */
found = g_regex_match_full (parser->regex_cme_error,
response->str, response->len,
@@ -359,6 +411,11 @@ mm_serial_parser_v1_destroy (gpointer data)
g_regex_unref (parser->regex_unknown_error);
g_regex_unref (parser->regex_connect_failed);
if (parser->regex_custom_successful)
g_regex_unref (parser->regex_custom_successful);
if (parser->regex_custom_error)
g_regex_unref (parser->regex_custom_error);
g_slice_free (MMSerialParserV1, data);
}

6
src/mm-serial-parsers.h
View File

@@ -22,15 +22,16 @@ gpointer mm_serial_parser_v0_new (void);
gboolean mm_serial_parser_v0_parse (gpointer parser,
GString *response,
GError **error);
void mm_serial_parser_v0_destroy (gpointer parser);
gpointer mm_serial_parser_v1_new (void);
void mm_serial_parser_v1_set_custom_regex (gpointer data,
GRegex *successful,
GRegex *error);
gboolean mm_serial_parser_v1_parse (gpointer parser,
GString *response,
GError **error);
void mm_serial_parser_v1_destroy (gpointer parser);
@@ -38,7 +39,6 @@ gpointer mm_serial_parser_v1_e1_new (void);
gboolean mm_serial_parser_v1_e1_parse (gpointer parser,
GString *response,
GError **error);
void mm_serial_parser_v1_e1_destroy (gpointer parser);
#endif /* MM_SERIAL_PARSERS_H */