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

icera: report connected access technology when connected

Browse Source 
The NWSTATE field reports both available access technology and the
actual access technology in-use when a PS connection is active, so
report the actual access tech when it's available.
This commit is contained in:
Eric Shienbrood
2011-06-13 10:30:11 -05:00
committed by Dan Williams
parent 6657e45a1e
commit a35fc3a583
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/mm-modem-icera.c
View File

@@ -221,7 +221,15 @@ nwstate_changed (MMAtSerialPort *port,
g_free (str); g_free (str);
} }
str = g_match_info_fetch (info, 3); /* Check the <connection state> field first for the connected access
* technology, otherwise if not connected (ie, "-") use the available
* access technology from the <tech> field.
*/
str = g_match_info_fetch (info, 4);
if (!str || (strcmp (str, "-") == 0)) {
g_free (str);
str = g_match_info_fetch (info, 3);
}
if (str) { if (str) {
act = nwstate_to_act (str); act = nwstate_to_act (str);
g_free (str); g_free (str);
@@ -753,7 +761,11 @@ mm_modem_icera_register_unsolicted_handlers (MMModemIcera *self,
{ {
GRegex *regex; GRegex *regex;
/* %NWSTATE: <rssi>,<mccmnc>,<tech>,<connected>,<regulation> */ /* %NWSTATE: <rssi>,<mccmnc>,<tech>,<connection state>,<regulation>
*
* <connection state> shows the actual access technology in-use when a
* PS connection is active.
*/
regex = g_regex_new ("\\r\\n%NWSTATE:\\s*(-?\\d+),(\\d+),([^,]*),([^,]*),(\\d+)\\r\\n", G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, NULL); regex = g_regex_new ("\\r\\n%NWSTATE:\\s*(-?\\d+),(\\d+),([^,]*),([^,]*),(\\d+)\\r\\n", G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, NULL);
mm_at_serial_port_add_unsolicited_msg_handler (port, regex, nwstate_changed, self, NULL); mm_at_serial_port_add_unsolicited_msg_handler (port, regex, nwstate_changed, self, NULL);
g_regex_unref (regex); g_regex_unref (regex);