fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-29 20:50:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gsm: only use the 'Control' interface on new Option modems

Browse source
This commit is contained in:
Dan Williams 2009-02-17 06:24:41 -05:00
parent 3a37aa6ae5
commit eea5a77db4
1 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/nm-hal-manager.c
View file

@ -525,6 +525,7 @@ modem_device_creator (NMHalManager *self,
{
NMHalManagerPrivate *priv = NM_HAL_MANAGER_GET_PRIVATE (self);
char *serial_device;
const char *ttyname;
char *sysfs_path;
char *driver = NULL;
GObject *device = NULL;
@ -554,17 +555,40 @@ modem_device_creator (NMHalManager *self,
if (!type_gsm && !type_cdma)
hal_get_modem_capabilities (priv->hal_ctx, udi, &type_gsm, &type_cdma);
ttyname = serial_device + strlen ("/dev/");
/* Special handling of 'hso' cards (until punted out to a modem manager) */
if (type_gsm && !strcmp (driver, "hso"))
if (type_gsm && !strcmp (driver, "hso")) {
char *hsotype_path;
char *contents = NULL;
gboolean success;
/* We only want the "Control" interface, since that's the only
* one that gives us the unsolicited OWANCALL responses. Ignore
* errors since we didn't care about them before.
*/
hsotype_path = g_strdup_printf ("/sys/class/tty/%s/hsotype", ttyname);
success = g_file_get_contents (hsotype_path, &contents, NULL, NULL);
g_free (hsotype_path);
if (success && contents) {
if ( !strstr (contents, "Control")
&& !strstr (contents, "control")) {
g_free (contents);
goto out;
}
g_free (contents);
}
netdev = get_hso_netdev (priv->hal_ctx, udi);
}
if (type_gsm) {
if (netdev)
device = (GObject *) nm_hso_gsm_device_new (udi, serial_device + strlen ("/dev/"), NULL, netdev, driver, managed);
device = (GObject *) nm_hso_gsm_device_new (udi, ttyname, NULL, netdev, driver, managed);
else
device = (GObject *) nm_gsm_device_new (udi, serial_device + strlen ("/dev/"), NULL, driver, managed);
device = (GObject *) nm_gsm_device_new (udi, ttyname, NULL, driver, managed);
} else if (type_cdma)
device = (GObject *) nm_cdma_device_new (udi, serial_device + strlen ("/dev/"), NULL, driver, managed);
device = (GObject *) nm_cdma_device_new (udi, ttyname, NULL, driver, managed);
out:
libhal_free_string (serial_device);