fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-06 05:38:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

device,default-route-manager: merge branch 'th/default-route-resync'

Browse source 
(cherry picked from commit 6197c27f24)
This commit is contained in:
Beniamino Galvani 2017-04-03 13:33:11 +02:00
commit 369b323b2d
1 changed files with 33 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
src/nm-default-route-manager.c
View file

@ -110,7 +110,7 @@ NM_DEFINE_SINGLETON_GETTER (NMDefaultRouteManager, nm_default_route_manager_get,
const Entry *const __entry = (entry); \ const Entry *const __entry = (entry); \
\ \
_nm_log (__level, __domain, 0, \ _nm_log (__level, __domain, 0, \
"%s: entry[%u/%s:%p:%s:%c:%csync]: "_NM_UTILS_MACRO_FIRST(__VA_ARGS__), \ "%s: entry[%u/%s:%p:%s:%chas:%csync]: "_NM_UTILS_MACRO_FIRST(__VA_ARGS__), \
self != singleton_instance \ self != singleton_instance \
? nm_sprintf_buf (__prefix_buf, "%s%c[%p]", \ ? nm_sprintf_buf (__prefix_buf, "%s%c[%p]", \
_NMLOG2_PREFIX_NAME, \ _NMLOG2_PREFIX_NAME, \
@ -121,7 +121,7 @@ NM_DEFINE_SINGLETON_GETTER (NMDefaultRouteManager, nm_default_route_manager_get,
NM_IS_DEVICE (__entry->source.pointer) ? "dev" : "vpn", \ NM_IS_DEVICE (__entry->source.pointer) ? "dev" : "vpn", \
__entry->source.pointer, \ __entry->source.pointer, \
NM_IS_DEVICE (__entry->source.pointer) ? nm_device_get_iface (__entry->source.device) : nm_active_connection_get_settings_connection_id (NM_ACTIVE_CONNECTION (__entry->source.vpn)), \ NM_IS_DEVICE (__entry->source.pointer) ? nm_device_get_iface (__entry->source.device) : nm_active_connection_get_settings_connection_id (NM_ACTIVE_CONNECTION (__entry->source.vpn)), \
(__entry->never_default ? '0' : '1'), \ (__entry->never_default ? '-' : '+'), \
(__entry->synced ? '+' : '-') \ (__entry->synced ? '+' : '-') \
_NM_UTILS_MACRO_REST(__VA_ARGS__)); \ _NM_UTILS_MACRO_REST(__VA_ARGS__)); \
} \ } \
@ -522,8 +522,6 @@ _resync_all (const VTableIP *vtable, NMDefaultRouteManager *self, const Entry *c
for (i = 0; i < entries->len; i++) { for (i = 0; i < entries->len; i++) {
entry = g_ptr_array_index (entries, i); entry = g_ptr_array_index (entries, i);
g_assert (entry != old_entry);
if (entry->never_default) if (entry->never_default)
continue; continue;
@ -578,12 +576,15 @@ _resync_all (const VTableIP *vtable, NMDefaultRouteManager *self, const Entry *c
/* for the changed entry, the previous metric was either old_entry->effective_metric, /* for the changed entry, the previous metric was either old_entry->effective_metric,
* or none. Hence, we only have to remember what is going to change. */ * or none. Hence, we only have to remember what is going to change. */
g_array_append_val (changed_metrics, expected_metric); g_array_append_val (changed_metrics, expected_metric);
if (old_entry) { if (!old_entry) {
_LOG2D (vtable, i, entry, "sync:add %s (%u)",
vtable->vt->route_to_string (&entry->route, NULL, 0), (guint) expected_metric);
} else if (old_entry != changed_entry) {
_LOG2D (vtable, i, entry, "sync:update %s (%u -> %u)", _LOG2D (vtable, i, entry, "sync:update %s (%u -> %u)",
vtable->vt->route_to_string (&entry->route, NULL, 0), (guint) old_entry->effective_metric, vtable->vt->route_to_string (&entry->route, NULL, 0), (guint) old_entry->effective_metric,
(guint) expected_metric); (guint) expected_metric);
} else { } else {
_LOG2D (vtable, i, entry, "sync:add %s (%u)", _LOG2D (vtable, i, entry, "sync:resync %s (%u)",
vtable->vt->route_to_string (&entry->route, NULL, 0), (guint) expected_metric); vtable->vt->route_to_string (&entry->route, NULL, 0), (guint) expected_metric);
} }
} else if (entry->effective_metric != expected_metric) { } else if (entry->effective_metric != expected_metric) {
@ -661,7 +662,11 @@ _entry_at_idx_update (const VTableIP *vtable, NMDefaultRouteManager *self, guint
entry->effective_metric = entry->route.rx.metric; entry->effective_metric = entry->route.rx.metric;
_LOG2D (vtable, entry_idx, entry, "%s %s (%"G_GUINT32_FORMAT")", _LOG2D (vtable, entry_idx, entry, "%s %s (%"G_GUINT32_FORMAT")",
old_entry ? "record:update" : "record:add ", old_entry
? (entry != old_entry
? "record:update"
: "record:resync")
: "record:add ",
vtable->vt->route_to_string (&entry->route, NULL, 0), vtable->vt->route_to_string (&entry->route, NULL, 0),
entry->effective_metric); entry->effective_metric);
@ -698,7 +703,9 @@ _entry_at_idx_remove (const VTableIP *vtable, NMDefaultRouteManager *self, guint
/***********************************************************************************/ /***********************************************************************************/
static void static void
_ipx_update_default_route (const VTableIP *vtable, NMDefaultRouteManager *self, gpointer source) _ipx_update_default_route (const VTableIP *vtable,
NMDefaultRouteManager *self,
gpointer source)
{ {
NMDefaultRouteManagerPrivate *priv; NMDefaultRouteManagerPrivate *priv;
Entry *entry; Entry *entry;
@ -770,9 +777,8 @@ _ipx_update_default_route (const VTableIP *vtable, NMDefaultRouteManager *self,
default_route = &rt.rx; default_route = &rt.rx;
never_default = TRUE; never_default = TRUE;
synced = TRUE; }
} else synced = !is_assumed;
synced = default_route && !is_assumed;
} else { } else {
NMConnection *connection = nm_active_connection_get_applied_connection ((NMActiveConnection *) vpn); NMConnection *connection = nm_active_connection_get_applied_connection ((NMActiveConnection *) vpn);
@ -864,12 +870,18 @@ _ipx_update_default_route (const VTableIP *vtable, NMDefaultRouteManager *self,
new_entry.never_default = never_default; new_entry.never_default = never_default;
new_entry.synced = synced; new_entry.synced = synced;
if (memcmp (entry, &new_entry, sizeof (new_entry)) == 0) if (memcmp (entry, &new_entry, sizeof (new_entry)) == 0) {
return; if (!synced) {
/* the internal book-keeping doesn't change, so don't do a full
old_entry = *entry; * sync of the configured routes. */
*entry = new_entry; return;
_entry_at_idx_update (vtable, self, entry_idx, &old_entry); }
_entry_at_idx_update (vtable, self, entry_idx, entry);
} else {
old_entry = *entry;
*entry = new_entry;
_entry_at_idx_update (vtable, self, entry_idx, &old_entry);
}
} else { } else {
/* delete */ /* delete */
_entry_at_idx_remove (vtable, self, entry_idx); _entry_at_idx_remove (vtable, self, entry_idx);
@ -877,13 +889,15 @@ _ipx_update_default_route (const VTableIP *vtable, NMDefaultRouteManager *self,
} }
void void
nm_default_route_manager_ip4_update_default_route (NMDefaultRouteManager *self, gpointer source) nm_default_route_manager_ip4_update_default_route (NMDefaultRouteManager *self,
gpointer source)
{ {
_ipx_update_default_route (&vtable_ip4, self, source); _ipx_update_default_route (&vtable_ip4, self, source);
} }
void void
nm_default_route_manager_ip6_update_default_route (NMDefaultRouteManager *self, gpointer source) nm_default_route_manager_ip6_update_default_route (NMDefaultRouteManager *self,
gpointer source)
{ {
_ipx_update_default_route (&vtable_ip6, self, source); _ipx_update_default_route (&vtable_ip6, self, source);
} }