system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-23 19:24:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

2008-03-10 Dan Williams <dcbw@redhat.com>

Browse source 
* src/nm-serial-device.c
		- (config_fd): report error from TCSETA
		- (nm_serial_device_open): fail when config_fd() fails



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3410 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2008-03-10 13:10:17 +00:00
parent 6ed1b8454a
commit be4addd6ae
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2008-03-10 Dan Williams <dcbw@redhat.com>
* src/nm-serial-device.c
- (config_fd): report error from TCSETA
- (nm_serial_device_open): fail when config_fd() fails
2008-03-10 Dan Williams <dcbw@redhat.com>
* src/nm-ip4-config.c

14
src/nm-serial-device.c
View file

@ -241,7 +241,8 @@ config_fd (NMSerialDevice *device, NMSettingSerial *setting)
stbuf.c_cflag |= (speed | bits | CREAD | 0 | parity | stopbits);
if (ioctl (priv->fd, TCSETA, &stbuf) < 0) {
g_warning ("Can not control device");
nm_warning ("(%s) cannot control device (errno %d)",
nm_device_get_iface (NM_DEVICE (device)), errno);
return FALSE;
}
@ -262,24 +263,27 @@ nm_serial_device_open (NMSerialDevice *device,
priv = NM_SERIAL_DEVICE_GET_PRIVATE (device);
iface = nm_device_get_iface (NM_DEVICE (device));
nm_debug ("Opening device '%s'", iface);
nm_debug ("(%s) opening device...", iface);
path = g_build_filename ("/dev", iface, NULL);
priv->fd = open (path, O_RDWR | O_EXCL | O_NONBLOCK | O_NOCTTY);
g_free (path);
if (priv->fd < 0) {
nm_warning ("Can not open device '%s'", iface);
nm_warning ("(%s) cannot open device (errno %d)", iface, errno);
return FALSE;
}
if (ioctl (priv->fd, TCGETA, &priv->old_t) < 0) {
nm_warning ("Can not control device '%s'", iface);
nm_warning ("(%s) cannot control device (errno %d)", iface, errno);
close (priv->fd);
return FALSE;
}
config_fd (device, setting);
if (!config_fd (device, setting)) {
close (priv->fd);
return FALSE;
}
priv->channel = g_io_channel_unix_new (priv->fd);