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

simtech: handle 'MISSED_CALL' URCs

Browse Source 
https://source.puri.sm/Librem5/ModemManager/issues/6
This commit is contained in:
Aleksander Morgado
2019-10-16 18:04:47 +02:00
parent eb66e8ae68
commit 5316e9e4e5
4 changed files with 103 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/simtech/mm-modem-helpers-simtech.c
+30
View File
@@ -151,6 +151,36 @@ out:
/*****************************************************************************/
/*
* <CR><LF>MISSED_CALL: 11:01AM 07712345678<CR><LF>
*/
GRegex *
mm_simtech_get_missed_call_urc_regex (void)
{
return g_regex_new ("\\r\\nMISSED_CALL:\\s*(.+)\\r\\n",
G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, NULL);
}
gboolean
mm_simtech_parse_missed_call_urc (GMatchInfo *match_info,
gchar **details,
GError **error)
{
gchar *str;
str = mm_get_string_unquoted_from_match_info (match_info, 1);
if (!str) {
g_set_error (error, MM_CORE_ERROR, MM_CORE_ERROR_FAILED,
"Couldn't read missed call URC details");
return FALSE;
}
*details = str;
return TRUE;
}
/*****************************************************************************/
/*
* Using TWO <CR> instead of one...
* <CR><CR><LF>+CRING: VOICE<CR><CR><LF>
plugins/simtech/mm-modem-helpers-simtech.h
+8
View File
@@ -45,6 +45,14 @@ gboolean mm_simtech_parse_voice_call_urc (GMatchInfo *match_info,
guint *duration,
GError **error);
/*****************************************************************************/
/* MISSED_CALL URC helpers */
GRegex *mm_simtech_get_missed_call_urc_regex (void);
gboolean mm_simtech_parse_missed_call_urc (GMatchInfo *match_info,
gchar **details,
GError **error);
/*****************************************************************************/
/* Non-standard CRING URC helpers */
plugins/simtech/mm-shared-simtech.c
+27
View File
@@ -54,6 +54,7 @@ typedef struct {
FeatureSupport clcc_urc_support;
GRegex *clcc_urc_regex;
GRegex *voice_call_regex;
GRegex *missed_call_regex;
GRegex *cring_regex;
GRegex *rxdtmf_regex;
} Private;
@@ -63,6 +64,7 @@ private_free (Private *ctx)
{
g_regex_unref (ctx->rxdtmf_regex);
g_regex_unref (ctx->cring_regex);
g_regex_unref (ctx->missed_call_regex);
g_regex_unref (ctx->voice_call_regex);
g_regex_unref (ctx->clcc_urc_regex);
g_slice_free (Private, ctx);
@@ -86,6 +88,7 @@ get_private (MMSharedSimtech *self)
priv->clcc_urc_support = FEATURE_SUPPORT_UNKNOWN;
priv->clcc_urc_regex = mm_simtech_get_clcc_urc_regex ();
priv->voice_call_regex = mm_simtech_get_voice_call_urc_regex ();
priv->missed_call_regex = mm_simtech_get_missed_call_urc_regex ();
priv->cring_regex = mm_simtech_get_cring_urc_regex ();
priv->rxdtmf_regex = mm_simtech_get_rxdtmf_urc_regex ();
@@ -809,6 +812,24 @@ clcc_urc_received (MMPortSerialAt *port,
g_free (full);
}
static void
missed_call_urc_received (MMPortSerialAt *port,
GMatchInfo *match_info,
MMSharedSimtech *self)
{
GError *error = NULL;
gchar *details = NULL;
if (!mm_simtech_parse_missed_call_urc (match_info, &details, &error)) {
mm_warn ("couldn't parse missed call URC: %s", error->message);
g_error_free (error);
return;
}
mm_dbg ("missed call reported: %s", details);
g_free (details);
}
static void
voice_call_urc_received (MMPortSerialAt *port,
GMatchInfo *match_info,
@@ -902,6 +923,12 @@ common_voice_setup_cleanup_unsolicited_events (MMSharedSimtech *self,
enable ? self : NULL,
NULL);
mm_port_serial_at_add_unsolicited_msg_handler (ports[i],
priv->missed_call_regex,
enable ? (MMPortSerialAtUnsolicitedMsgFn)missed_call_urc_received : NULL,
enable ? self : NULL,
NULL);
mm_port_serial_at_add_unsolicited_msg_handler (ports[i],
priv->cring_regex,
enable ? (MMPortSerialAtUnsolicitedMsgFn)cring_urc_received : NULL,
plugins/simtech/tests/test-modem-helpers-simtech.c
+38
View File
@@ -193,6 +193,42 @@ test_voice_call_end_duration_urc (void)
/*****************************************************************************/
static void
common_test_missed_call_urc (const gchar *urc,
const gchar *expected_details)
{
GError *error = NULL;
gchar *details = NULL;
GRegex *missed_call_regex = NULL;
gboolean result;
GMatchInfo *match_info = NULL;
missed_call_regex = mm_simtech_get_missed_call_urc_regex ();
/* Same matching logic as done in MMSerialPortAt when processing URCs! */
result = g_regex_match_full (missed_call_regex, urc, -1, 0, 0, &match_info, &error);
g_assert_no_error (error);
g_assert (result);
result = mm_simtech_parse_missed_call_urc (match_info, &details, &error);
g_assert_no_error (error);
g_assert (result);
g_assert_cmpstr (expected_details, ==, details);
g_free (details);
g_match_info_free (match_info);
g_regex_unref (missed_call_regex);
}
static void
test_missed_call_urc (void)
{
common_test_missed_call_urc ("\r\nMISSED_CALL: 11:01AM 07712345678\r\n", "11:01AM 07712345678");
}
/*****************************************************************************/
static void
common_test_cring_urc (const gchar *urc,
const gchar *expected_type)
@@ -315,6 +351,8 @@ int main (int argc, char **argv)
g_test_add_func ("/MM/simtech/voicecall/urc/end", test_voice_call_end_urc);
g_test_add_func ("/MM/simtech/voicecall/urc/end-duration", test_voice_call_end_duration_urc);
g_test_add_func ("/MM/simtech/missedcall/urc", test_missed_call_urc);
g_test_add_func ("/MM/simtech/cring/urc/two-crs", test_cring_urc_two_crs);
g_test_add_func ("/MM/simtech/cring/urc/one-cr", test_cring_urc_one_cr);