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

2008-09-30 Tambet Ingo <tambet@gmail.com>

Browse Source 
* src/nm-device.c (nm_device_get_priority): Implement.
	(nm_device_set_ip4_config): Send the device priority to system ip4
	config setter.

	* src/NetworkManagerSystem.c (nm_system_device_set_from_ip4_config):
	Add priority argument and if it's >= 0, set the priority of the network
	route added automatically by netlink (or kernel?).
	(nm_system_device_set_priority): Implement.

	* src/NetworkManagerPolicy.c (get_best_device): Use
	nm_device_get_priority() instead of home-grown version. Revert the
	meaning, best priority is the lowest one.

git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@4125 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Tambet Ingo
2008-09-30 15:04:10 +00:00
parent 11f71598b7
commit 50f3ec27a2
6 changed files with 123 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/NetworkManagerPolicy.c
View File

@@ -172,30 +172,12 @@ get_connection_id (NMConnection *connection)
return s_con->id;
}
static guint32
get_device_priority (NMDevice *dev)
{
if (NM_IS_CDMA_DEVICE (dev))
return 2;
if (NM_IS_GSM_DEVICE (dev))
return 3;
if (NM_IS_DEVICE_WIFI (dev))
return 4;
if (NM_IS_DEVICE_ETHERNET (dev))
return 5;
return 1;
}
static NMDevice *
get_best_device (NMManager *manager, NMActRequest **out_req)
{
GSList *devices, *iter;
NMDevice *best = NULL;
guint32 best_prio = 0;
int best_prio = G_MAXINT;
g_return_val_if_fail (manager != NULL, NULL);
g_return_val_if_fail (NM_IS_MANAGER (manager), NULL);
@@ -209,7 +191,7 @@ get_best_device (NMManager *manager, NMActRequest **out_req)
NMConnection *connection;
NMIP4Config *ip4_config;
NMSettingIP4Config *s_ip4;
guint32 prio;
int prio;
guint i;
gboolean can_default = FALSE;
@@ -245,8 +227,8 @@ get_best_device (NMManager *manager, NMActRequest **out_req)
if (!can_default && !NM_IS_HSO_GSM_DEVICE (dev))
continue;
prio = get_device_priority (dev);
if (prio > best_prio) {
prio = nm_device_get_priority (dev);
if (prio > 0 && prio < best_prio) {
best = dev;
best_prio = prio;
*out_req = req;