NetworkManager r3449 - in trunk: . src
- From: dcbw svn gnome org
- To: svn-commits-list gnome org
- Subject: NetworkManager r3449 - in trunk: . src
- Date: Thu, 13 Mar 2008 20:25:06 +0000 (GMT)
Author: dcbw
Date: Thu Mar 13 20:25:06 2008
New Revision: 3449
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3449&view=rev
Log:
2008-03-13 Dan Williams <dcbw redhat com>
* src/NetworkManagerPolicy.c
- (update_routing_and_dns): never set the default route through an
IPv4LL addressed device
Modified:
trunk/ChangeLog
trunk/src/NetworkManagerPolicy.c
Modified: trunk/src/NetworkManagerPolicy.c
==============================================================================
--- trunk/src/NetworkManagerPolicy.c (original)
+++ trunk/src/NetworkManagerPolicy.c Thu Mar 13 20:25:06 2008
@@ -121,12 +121,25 @@
devices = nm_manager_get_devices (policy->manager);
for (iter = devices; iter; iter = g_slist_next (iter)) {
NMDevice *dev = NM_DEVICE (iter->data);
+ NMActRequest *req;
+ NMConnection *connection;
+ NMSettingIP4Config *s_ip4;
guint32 prio;
if ( (nm_device_get_state (dev) != NM_DEVICE_STATE_ACTIVATED)
|| !nm_device_get_ip4_config (dev))
continue;
+ req = nm_device_get_act_request (dev);
+ g_assert (req);
+ connection = nm_act_request_get_connection (req);
+ g_assert (connection);
+
+ /* Never set the default route through an IPv4LL-addressed device */
+ s_ip4 = (NMSettingIP4Config *) nm_connection_get_setting (connection, NM_TYPE_SETTING_IP4_CONFIG);
+ if (s_ip4 && !strcmp (s_ip4->method, NM_SETTING_IP4_CONFIG_METHOD_AUTOIP))
+ continue;
+
prio = get_device_priority (dev);
if (prio > best_prio) {
best = dev;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]