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

huawei: handle disconnection via ^NDISSTAT unsolicited message

Browse Source 
This patch changes MMBroadbandModemHuawei to use ^NDISSTAT unsolicited
messages to handle network-initiated disconnection. As a ^NDISSTAT
unsolicited message is similar to a ^NDISSTATQRY response, the patch
extends the ^NDISSTATQRY parser code to handle both ^NDISSTAT and
^NDISSTATQRY responses.
This commit is contained in:
Ben Chan
2013-09-18 01:46:20 -07:00
committed by Aleksander Morgado
parent aa74ea1aa6
commit 2b20264215
6 changed files with 143 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/huawei/mm-broadband-bearer-huawei.c
View File

@@ -639,6 +639,26 @@ disconnect_3gpp (MMBroadbandBearer *self,
/*****************************************************************************/ /*****************************************************************************/
void
mm_broadband_bearer_huawei_report_connection_status (MMBroadbandBearerHuawei *self,
gboolean connected)
{
/* When a pending connection / disconnection attempt is in progress, we use
* ^NDISSTATQRY? to check the connection status and thus temporarily ignore
* ^NDISSTAT unsolicited messages */
if (self->priv->connect_pending || self->priv->disconnect_pending)
return;
/* We already use ^NDISSTATQRY? to poll the connection status, so only
* handle network-initiated disconnection here. */
if (!connected) {
mm_dbg ("Disconnect bearer '%s'", mm_bearer_get_path (MM_BEARER (self)));
mm_bearer_report_disconnection (MM_BEARER (self));
}
}
/*****************************************************************************/
MMBearer * MMBearer *
mm_broadband_bearer_huawei_new_finish (GAsyncResult *res, mm_broadband_bearer_huawei_new_finish (GAsyncResult *res,
GError **error) GError **error)

3
plugins/huawei/mm-broadband-bearer-huawei.h
View File

@@ -56,4 +56,7 @@ void mm_broadband_bearer_huawei_new (MMBroadbandModemHuawei *modem,
MMBearer *mm_broadband_bearer_huawei_new_finish (GAsyncResult *res, MMBearer *mm_broadband_bearer_huawei_new_finish (GAsyncResult *res,
GError **error); GError **error);
void mm_broadband_bearer_huawei_report_connection_status (MMBroadbandBearerHuawei *self,
gboolean connected);
#endif /* MM_BROADBAND_BEARER_HUAWEI_H */ #endif /* MM_BROADBAND_BEARER_HUAWEI_H */

83
plugins/huawei/mm-broadband-modem-huawei.c
View File

@@ -34,6 +34,7 @@
#include "mm-log.h" #include "mm-log.h"
#include "mm-errors-types.h" #include "mm-errors-types.h"
#include "mm-modem-helpers.h" #include "mm-modem-helpers.h"
#include "mm-modem-helpers-huawei.h"
#include "mm-base-modem-at.h" #include "mm-base-modem-at.h"
#include "mm-iface-modem.h" #include "mm-iface-modem.h"
#include "mm-iface-modem-3gpp.h" #include "mm-iface-modem-3gpp.h"
@@ -43,6 +44,7 @@
#include "mm-broadband-modem-huawei.h" #include "mm-broadband-modem-huawei.h"
#include "mm-broadband-bearer-huawei.h" #include "mm-broadband-bearer-huawei.h"
#include "mm-broadband-bearer.h" #include "mm-broadband-bearer.h"
#include "mm-bearer-list.h"
#include "mm-sim-huawei.h" #include "mm-sim-huawei.h"
static void iface_modem_init (MMIfaceModem *iface); static void iface_modem_init (MMIfaceModem *iface);
@@ -85,6 +87,7 @@ struct _MMBroadbandModemHuaweiPrivate {
/* Regex for connection status related notifications */ /* Regex for connection status related notifications */
GRegex *dsflowrpt_regex; GRegex *dsflowrpt_regex;
GRegex *ndisstat_regex;
/* Regex to ignore */ /* Regex to ignore */
GRegex *boot_regex; GRegex *boot_regex;
@@ -97,7 +100,6 @@ struct _MMBroadbandModemHuaweiPrivate {
GRegex *srvst_regex; GRegex *srvst_regex;
GRegex *stin_regex; GRegex *stin_regex;
GRegex *hcsq_regex; GRegex *hcsq_regex;
GRegex *ndisstat_regex;
GRegex *pdpdeact_regex; GRegex *pdpdeact_regex;
GRegex *ndisend_regex; GRegex *ndisend_regex;
GRegex *rfswitch_regex; GRegex *rfswitch_regex;
@@ -1510,6 +1512,68 @@ huawei_status_changed (MMAtSerialPort *port,
g_free (str); g_free (str);
} }
typedef struct {
gboolean ipv4_available;
gboolean ipv4_connected;
gboolean ipv6_available;
gboolean ipv6_connected;
} NdisstatResult;
static void
bearer_report_connection_status (MMBearer *bearer,
NdisstatResult *ndisstat_result)
{
if (ndisstat_result->ipv4_available) {
/* TODO: MMBroadbandBearerHuawei does not currently support IPv6.
* When it does, we should check the IP family associated with each bearer. */
mm_broadband_bearer_huawei_report_connection_status (MM_BROADBAND_BEARER_HUAWEI (bearer),
ndisstat_result->ipv4_connected);
}
}
static void
huawei_ndisstat_changed (MMAtSerialPort *port,
GMatchInfo *match_info,
MMBroadbandModemHuawei *self)
{
gchar *str;
NdisstatResult ndisstat_result;
GError *error = NULL;
MMBearerList *list = NULL;
str = g_match_info_fetch (match_info, 1);
if (!mm_huawei_parse_ndisstatqry_response (str,
&ndisstat_result.ipv4_available,
&ndisstat_result.ipv4_connected,
&ndisstat_result.ipv6_available,
&ndisstat_result.ipv6_connected,
&error)) {
mm_dbg ("Ignore invalid ^NDISSTAT unsolicited message: '%s' (error %s)",
str, error->message);
g_error_free (error);
return;
}
mm_dbg ("NDIS status: IPv4 %s, IPv6 %s",
ndisstat_result.ipv4_available ?
(ndisstat_result.ipv4_connected ? "connected" : "disconnected") : "not available",
ndisstat_result.ipv6_available ?
(ndisstat_result.ipv6_connected ? "connected" : "disconnected") : "not available");
/* If empty bearer list, nothing else to do */
g_object_get (self,
MM_IFACE_MODEM_BEARER_LIST, &list,
NULL);
if (!list)
return;
mm_bearer_list_foreach (list,
(MMBearerListForeachFunc)bearer_report_connection_status,
&ndisstat_result);
g_object_unref (list);
}
static void static void
set_3gpp_unsolicited_events_handlers (MMBroadbandModemHuawei *self, set_3gpp_unsolicited_events_handlers (MMBroadbandModemHuawei *self,
gboolean enable) gboolean enable)
@@ -1548,6 +1612,13 @@ set_3gpp_unsolicited_events_handlers (MMBroadbandModemHuawei *self,
enable ? (MMAtSerialUnsolicitedMsgFn)huawei_status_changed : NULL, enable ? (MMAtSerialUnsolicitedMsgFn)huawei_status_changed : NULL,
enable ? self : NULL, enable ? self : NULL,
NULL); NULL);
mm_at_serial_port_add_unsolicited_msg_handler (
ports[i],
self->priv->ndisstat_regex,
enable ? (MMAtSerialUnsolicitedMsgFn)huawei_ndisstat_changed : NULL,
enable ? self : NULL,
NULL);
} }
} }
@@ -2990,10 +3061,6 @@ set_ignored_unsolicited_events_handlers (MMBroadbandModemHuawei *self)
ports[i], ports[i],
self->priv->hcsq_regex, self->priv->hcsq_regex,
NULL, NULL, NULL); NULL, NULL, NULL);
mm_at_serial_port_add_unsolicited_msg_handler (
ports[i],
self->priv->ndisstat_regex,
NULL, NULL, NULL);
mm_at_serial_port_add_unsolicited_msg_handler ( mm_at_serial_port_add_unsolicited_msg_handler (
ports[i], ports[i],
self->priv->pdpdeact_regex, self->priv->pdpdeact_regex,
@@ -3063,6 +3130,8 @@ mm_broadband_modem_huawei_init (MMBroadbandModemHuawei *self)
G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, NULL); G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, NULL);
self->priv->dsflowrpt_regex = g_regex_new ("\\r\\n\\^DSFLOWRPT:(.+)\\r\\n", self->priv->dsflowrpt_regex = g_regex_new ("\\r\\n\\^DSFLOWRPT:(.+)\\r\\n",
G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, NULL); G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, NULL);
self->priv->ndisstat_regex = g_regex_new ("\\r\\n(\\^NDISSTAT:.+)\\r+\\n",
G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, NULL);
self->priv->boot_regex = g_regex_new ("\\r\\n\\^BOOT:.+\\r\\n", self->priv->boot_regex = g_regex_new ("\\r\\n\\^BOOT:.+\\r\\n",
G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, NULL); G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, NULL);
self->priv->connect_regex = g_regex_new ("\\r\\n\\^CONNECT .+\\r\\n", self->priv->connect_regex = g_regex_new ("\\r\\n\\^CONNECT .+\\r\\n",
@@ -3083,8 +3152,6 @@ mm_broadband_modem_huawei_init (MMBroadbandModemHuawei *self)
G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, NULL); G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, NULL);
self->priv->hcsq_regex = g_regex_new ("\\r\\n\\^HCSQ:.+\\r+\\n", self->priv->hcsq_regex = g_regex_new ("\\r\\n\\^HCSQ:.+\\r+\\n",
G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, NULL); G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, NULL);
self->priv->ndisstat_regex = g_regex_new ("\\r\\n\\^NDISSTAT:.+\\r+\\n",
G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, NULL);
self->priv->pdpdeact_regex = g_regex_new ("\\r\\n\\^PDPDEACT:.+\\r+\\n", self->priv->pdpdeact_regex = g_regex_new ("\\r\\n\\^PDPDEACT:.+\\r+\\n",
G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, NULL); G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, NULL);
self->priv->ndisend_regex = g_regex_new ("\\r\\n\\^NDISEND:.+\\r+\\n", self->priv->ndisend_regex = g_regex_new ("\\r\\n\\^NDISEND:.+\\r+\\n",
@@ -3109,6 +3176,7 @@ finalize (GObject *object)
g_regex_unref (self->priv->hrssilvl_regex); g_regex_unref (self->priv->hrssilvl_regex);
g_regex_unref (self->priv->mode_regex); g_regex_unref (self->priv->mode_regex);
g_regex_unref (self->priv->dsflowrpt_regex); g_regex_unref (self->priv->dsflowrpt_regex);
g_regex_unref (self->priv->ndisstat_regex);
g_regex_unref (self->priv->boot_regex); g_regex_unref (self->priv->boot_regex);
g_regex_unref (self->priv->connect_regex); g_regex_unref (self->priv->connect_regex);
g_regex_unref (self->priv->csnr_regex); g_regex_unref (self->priv->csnr_regex);
@@ -3119,7 +3187,6 @@ finalize (GObject *object)
g_regex_unref (self->priv->srvst_regex); g_regex_unref (self->priv->srvst_regex);
g_regex_unref (self->priv->stin_regex); g_regex_unref (self->priv->stin_regex);
g_regex_unref (self->priv->hcsq_regex); g_regex_unref (self->priv->hcsq_regex);
g_regex_unref (self->priv->ndisstat_regex);
g_regex_unref (self->priv->pdpdeact_regex); g_regex_unref (self->priv->pdpdeact_regex);
g_regex_unref (self->priv->ndisend_regex); g_regex_unref (self->priv->ndisend_regex);
g_regex_unref (self->priv->rfswitch_regex); g_regex_unref (self->priv->rfswitch_regex);

18
plugins/huawei/mm-modem-helpers-huawei.c
View File

@@ -23,7 +23,7 @@
#include "mm-modem-helpers-huawei.h" #include "mm-modem-helpers-huawei.h"
/*****************************************************************************/ /*****************************************************************************/
/* ^NDISSTATQRY response parser */ /* ^NDISSTAT / ^NDISSTATQRY response parser */
gboolean gboolean
mm_huawei_parse_ndisstatqry_response (const gchar *response, mm_huawei_parse_ndisstatqry_response (const gchar *response,
@@ -37,8 +37,10 @@ mm_huawei_parse_ndisstatqry_response (const gchar *response,
GMatchInfo *match_info; GMatchInfo *match_info;
GError *inner_error = NULL; GError *inner_error = NULL;
if (!response || !g_str_has_prefix (response, "^NDISSTATQRY:")) { if (!response ||
g_set_error (error, MM_CORE_ERROR, MM_CORE_ERROR_FAILED, "Missing ^NDISSTATQRY prefix"); !(g_str_has_prefix (response, "^NDISSTAT:") ||
g_str_has_prefix (response, "^NDISSTATQRY:"))) {
g_set_error (error, MM_CORE_ERROR, MM_CORE_ERROR_FAILED, "Missing ^NDISSTAT / ^NDISSTATQRY prefix");
return FALSE; return FALSE;
} }
@@ -46,6 +48,8 @@ mm_huawei_parse_ndisstatqry_response (const gchar *response,
*ipv6_available = FALSE; *ipv6_available = FALSE;
/* The response maybe as: /* The response maybe as:
* ^NDISSTAT: 1,,,IPV4
* ^NDISSTAT: 0,33,,IPV6
* ^NDISSTATQRY: 1,,,IPV4 * ^NDISSTATQRY: 1,,,IPV4
* ^NDISSTATQRY: 0,33,,IPV6 * ^NDISSTATQRY: 0,33,,IPV6
* OK * OK
@@ -54,8 +58,8 @@ mm_huawei_parse_ndisstatqry_response (const gchar *response,
* ^NDISSTATQRY:0,,,"IPV4",0,,,"IPV6" * ^NDISSTATQRY:0,,,"IPV4",0,,,"IPV6"
* OK * OK
*/ */
r = g_regex_new ("\\^NDISSTATQRY:\\s*(\\d),([^,]*),([^,]*),([^,\\r\\n]*)(?:\\r\\n)?" r = g_regex_new ("\\^NDISSTAT(?:QRY)?:\\s*(\\d),([^,]*),([^,]*),([^,\\r\\n]*)(?:\\r\\n)?"
"(?:\\^NDISSTATQRY:)?\\s*,?(\\d)?,?([^,]*)?,?([^,]*)?,?([^,\\r\\n]*)?(?:\\r\\n)?", "(?:\\^NDISSTAT:|\\^NDISSTATQRY:)?\\s*,?(\\d)?,?([^,]*)?,?([^,]*)?,?([^,\\r\\n]*)?(?:\\r\\n)?",
G_REGEX_DOLLAR_ENDONLY | G_REGEX_RAW, G_REGEX_DOLLAR_ENDONLY | G_REGEX_RAW,
0, NULL); 0, NULL);
g_assert (r != NULL); g_assert (r != NULL);
@@ -78,7 +82,7 @@ mm_huawei_parse_ndisstatqry_response (const gchar *response,
(connected != 0 && connected != 1)) { (connected != 0 && connected != 1)) {
inner_error = g_error_new (MM_CORE_ERROR, inner_error = g_error_new (MM_CORE_ERROR,
MM_CORE_ERROR_FAILED, MM_CORE_ERROR_FAILED,
"Couldn't parse ^NDISSTATQRY fields"); "Couldn't parse ^NDISSTAT / ^NDISSTATQRY fields");
} else if (g_ascii_strcasecmp (ip_type_str, "IPV4") == 0) { } else if (g_ascii_strcasecmp (ip_type_str, "IPV4") == 0) {
*ipv4_available = TRUE; *ipv4_available = TRUE;
*ipv4_connected = (gboolean)connected; *ipv4_connected = (gboolean)connected;
@@ -98,7 +102,7 @@ mm_huawei_parse_ndisstatqry_response (const gchar *response,
if (!ipv4_available && !ipv6_available) { if (!ipv4_available && !ipv6_available) {
inner_error = g_error_new (MM_CORE_ERROR, inner_error = g_error_new (MM_CORE_ERROR,
MM_CORE_ERROR_FAILED, MM_CORE_ERROR_FAILED,
"Couldn't find IPv4 or IPv6 info in ^NDISSTATQRY response"); "Couldn't find IPv4 or IPv6 info in ^NDISSTAT / ^NDISSTATQRY response");
} }
if (inner_error) { if (inner_error) {

2
plugins/huawei/mm-modem-helpers-huawei.h
View File

@@ -19,7 +19,7 @@
#include "glib.h" #include "glib.h"
/* ^NDISSTATQRY response parser */ /* ^NDISSTAT / ^NDISSTATQRY response parser */
gboolean mm_huawei_parse_ndisstatqry_response (const gchar *response, gboolean mm_huawei_parse_ndisstatqry_response (const gchar *response,
gboolean *ipv4_available, gboolean *ipv4_available,
gboolean *ipv4_connected, gboolean *ipv4_connected,

34
plugins/huawei/tests/test-modem-helpers-huawei.c
View File

@@ -20,7 +20,7 @@
#include "mm-modem-helpers-huawei.h" #include "mm-modem-helpers-huawei.h"
/*****************************************************************************/ /*****************************************************************************/
/* Test ^NDISSTATQRY responses */ /* Test ^NDISSTAT / ^NDISSTATQRY responses */
typedef struct { typedef struct {
const gchar *str; const gchar *str;
@@ -31,6 +31,38 @@ typedef struct {
} NdisstatqryTest; } NdisstatqryTest;
static const NdisstatqryTest ndisstatqry_tests[] = { static const NdisstatqryTest ndisstatqry_tests[] = {
{ "^NDISSTAT: 1,,,IPV4\r\n", TRUE, TRUE, FALSE, FALSE },
{ "^NDISSTAT: 0,,,IPV4\r\n", TRUE, FALSE, FALSE, FALSE },
{ "^NDISSTAT: 1,,,IPV6\r\n", FALSE, FALSE, TRUE, TRUE },
{ "^NDISSTAT: 0,,,IPV6\r\n", FALSE, FALSE, TRUE, FALSE },
{ "^NDISSTAT: 1,,,IPV4\r\n"
"^NDISSTAT: 1,,,IPV6\r\n", TRUE, TRUE, TRUE, TRUE },
{ "^NDISSTAT: 1,,,IPV4\r\n"
"^NDISSTAT: 0,,,IPV6\r\n", TRUE, TRUE, TRUE, FALSE },
{ "^NDISSTAT: 0,,,IPV4\r\n"
"^NDISSTAT: 1,,,IPV6\r\n", TRUE, FALSE, TRUE, TRUE },
{ "^NDISSTAT: 0,,,IPV4\r\n"
"^NDISSTAT: 0,,,IPV6\r\n", TRUE, FALSE, TRUE, FALSE },
{ "^NDISSTAT: 1,,,IPV4", TRUE, TRUE, FALSE, FALSE },
{ "^NDISSTAT: 0,,,IPV4", TRUE, FALSE, FALSE, FALSE },
{ "^NDISSTAT: 1,,,IPV6", FALSE, FALSE, TRUE, TRUE },
{ "^NDISSTAT: 0,,,IPV6", FALSE, FALSE, TRUE, FALSE },
{ "^NDISSTAT: 1,,,IPV4\r\n"
"^NDISSTAT: 1,,,IPV6", TRUE, TRUE, TRUE, TRUE },
{ "^NDISSTAT: 1,,,IPV4\r\n"
"^NDISSTAT: 0,,,IPV6", TRUE, TRUE, TRUE, FALSE },
{ "^NDISSTAT: 0,,,IPV4\r\n"
"^NDISSTAT: 1,,,IPV6", TRUE, FALSE, TRUE, TRUE },
{ "^NDISSTAT: 0,,,IPV4\r\n"
"^NDISSTAT: 0,,,IPV6", TRUE, FALSE, TRUE, FALSE },
{ "^NDISSTAT: 1,,,\"IPV4\",1,,,\"IPV6\"", TRUE, TRUE, TRUE, TRUE },
{ "^NDISSTAT: 1,,,\"IPV4\",0,,,\"IPV6\"", TRUE, TRUE, TRUE, FALSE },
{ "^NDISSTAT: 0,,,\"IPV4\",1,,,\"IPV6\"", TRUE, FALSE, TRUE, TRUE },
{ "^NDISSTAT: 0,,,\"IPV4\",0,,,\"IPV6\"", TRUE, FALSE, TRUE, FALSE },
{ "^NDISSTAT: 1,,,\"IPV4\",1,,,\"IPV6\"\r\n", TRUE, TRUE, TRUE, TRUE },
{ "^NDISSTAT: 1,,,\"IPV4\",0,,,\"IPV6\"\r\n", TRUE, TRUE, TRUE, FALSE },
{ "^NDISSTAT: 0,,,\"IPV4\",1,,,\"IPV6\"\r\n", TRUE, FALSE, TRUE, TRUE },
{ "^NDISSTAT: 0,,,\"IPV4\",0,,,\"IPV6\"\r\n", TRUE, FALSE, TRUE, FALSE },
{ "^NDISSTATQRY: 1,,,IPV4\r\n", TRUE, TRUE, FALSE, FALSE }, { "^NDISSTATQRY: 1,,,IPV4\r\n", TRUE, TRUE, FALSE, FALSE },
{ "^NDISSTATQRY: 0,,,IPV4\r\n", TRUE, FALSE, FALSE, FALSE }, { "^NDISSTATQRY: 0,,,IPV4\r\n", TRUE, FALSE, FALSE, FALSE },
{ "^NDISSTATQRY: 1,,,IPV6\r\n", FALSE, FALSE, TRUE, TRUE }, { "^NDISSTATQRY: 1,,,IPV6\r\n", FALSE, FALSE, TRUE, TRUE },