system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-22 02:35:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

core: add GetDeviceByIpIface method

Browse source 
Allow clients to get a device by its IP interface name instead
of having to get the device list and iterate through each one,
and read the interface name to get what they want.
This commit is contained in:
Dan Williams 2011-04-22 12:27:55 -05:00
parent 4cae0bb0fa
commit 8cce42f2a5
2 changed files with 63 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
introspection/nm-manager.xml
View file

@ -21,6 +21,25 @@
</arg>
</method>
<method name="GetDeviceByIpIface">
<tp:docstring>
Return the object path of the network device referenced by its IP
interface name. Note that some devices (usually modems) only have an
IP interface name when they are connected.
</tp:docstring>
<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_get_device_by_ip_iface"/>
<arg name="iface" type="s" direction="in">
<tp:docstring>
Interface name of the device to find.
</tp:docstring>
</arg>
<arg name="device" type="o" direction="out">
<tp:docstring>
Object path of the network device.
</tp:docstring>
</arg>
</method>
<method name="ActivateConnection">
<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_activate_connection"/>
<annotation name="org.freedesktop.DBus.GLib.Async" value=""/>

55
src/nm-manager.c
View file

@ -65,7 +65,15 @@
#define UPOWER_DBUS_SERVICE "org.freedesktop.UPower"
static gboolean impl_manager_get_devices (NMManager *manager, GPtrArray **devices, GError **err);
static gboolean impl_manager_get_devices (NMManager *manager,
GPtrArray **devices,
GError **err);
static gboolean impl_manager_get_device_by_ip_iface (NMManager *self,
const char *iface,
char **out_object_path,
GError **error);
static void impl_manager_activate_connection (NMManager *manager,
const char *connection_path,
const char *device_path,
@ -140,7 +148,7 @@ static const char *internal_activate_device (NMManager *manager,
gboolean assumed,
GError **error);
static NMDevice *find_device_by_iface (NMManager *self, const gchar *iface);
static NMDevice *find_device_by_ip_iface (NMManager *self, const gchar *iface);
static GSList * remove_one_device (NMManager *manager,
GSList *list,
@ -405,7 +413,7 @@ modem_added (NMModemManager *modem_manager,
ip_iface = nm_modem_get_iface (modem);
replace_device = find_device_by_iface (NM_MANAGER (user_data), ip_iface);
replace_device = find_device_by_ip_iface (NM_MANAGER (user_data), ip_iface);
if (replace_device) {
priv->devices = remove_one_device (NM_MANAGER (user_data),
priv->devices,
@ -1398,7 +1406,7 @@ add_device (NMManager *self, NMDevice *device)
iface = nm_device_get_ip_iface (device);
g_assert (iface);
if (!NM_IS_DEVICE_MODEM (device) && find_device_by_iface (self, iface)) {
if (!NM_IS_DEVICE_MODEM (device) && find_device_by_ip_iface (self, iface)) {
g_object_unref (device);
return;
}
@ -1696,18 +1704,17 @@ bluez_manager_bdaddr_removed_cb (NMBluezManager *bluez_mgr,
}
static NMDevice *
find_device_by_iface (NMManager *self, const gchar *iface)
find_device_by_ip_iface (NMManager *self, const gchar *iface)
{
NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self);
GSList *iter;
for (iter = priv->devices; iter; iter = g_slist_next (iter)) {
NMDevice *device = NM_DEVICE (iter->data);
const gchar *d_iface = nm_device_get_ip_iface (device);
if (!strcmp (d_iface, iface))
return device;
}
NMDevice *candidate = iter->data;
if (g_strcmp0 (nm_device_get_ip_iface (candidate), iface) == 0)
return candidate;
}
return NULL;
}
@ -1762,7 +1769,7 @@ udev_device_removed_cb (NMUdevManager *manager,
* they may have already been removed from sysfs. Instead, we just
* have to fall back to the device's interface name.
*/
device = find_device_by_iface (self, g_udev_device_get_name (udev_device));
device = find_device_by_ip_iface (self, g_udev_device_get_name (udev_device));
}
if (device)
@ -1800,6 +1807,32 @@ impl_manager_get_devices (NMManager *manager, GPtrArray **devices, GError **err)
return TRUE;
}
static gboolean
impl_manager_get_device_by_ip_iface (NMManager *self,
const char *iface,
char **out_object_path,
GError **error)
{
NMDevice *device;
const char *path = NULL;
device = find_device_by_ip_iface (self, iface);
if (device) {
path = nm_device_get_path (device);
if (path)
*out_object_path = g_strdup (path);
}
if (path == NULL) {
g_set_error_literal (error,
NM_MANAGER_ERROR,
NM_MANAGER_ERROR_UNKNOWN_DEVICE,
"No device found for the requested iface.");
}
return path ? TRUE : FALSE;
}
static NMActRequest *
nm_manager_get_act_request_by_path (NMManager *manager,
const char *path,