From b3a89dc1538febffe354ad77fe1054aea9785ee0 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Sun, 15 Jan 2017 12:57:50 +0100
Subject: [PATCH] ip4-config: cleanup MTU handling

It is wrong that nm_ip4_config_set_mtu() tries to ~merge~ the new MTU
with the existing. All callers of nm_ip4_config_set_mtu() want that the
new value prevails.
That is also already the case because the DHCP clients and PPP manager set
the MTU on a newly created NMIP4Config instance, thus their value is taken.
Similarly, the final merge with NM_IP_CONFIG_SOURCE_USER also prevails as the
source has the highest priority.

The setter should just set. The only place where we want the merge behavior
is in nm_ip4_config_merge(), where it is now implemented in-place.

For example, nm_ip4_config_replace() very much wants that the new value
wins, regardless of the previous setting. Using nm_ip4_config_set_mtu()
with the merge behavior was wrong because it means that the MTU of NMDevice's
composite can never be raised again (for example with a new DHCP event).
---
 src/nm-ip4-config.c | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/nm-ip4-config.c b/src/nm-ip4-config.c
index ea6468bbb3..1486edccc7 100644
--- a/src/nm-ip4-config.c
+++ b/src/nm-ip4-config.c
@@ -702,9 +702,11 @@ nm_ip4_config_merge (NMIP4Config *dst, const NMIP4Config *src, NMIPConfigMergeFl
 		nm_ip4_config_set_mss (dst, nm_ip4_config_get_mss (src));
 
 	/* MTU */
-	if (nm_ip4_config_get_mtu (src))
-		nm_ip4_config_set_mtu (dst, nm_ip4_config_get_mtu (src),
-		                       nm_ip4_config_get_mtu_source (src));
+	if (   src_priv->mtu_source > dst_priv->mtu_source
+	    || (   src_priv->mtu_source == dst_priv->mtu_source
+	        && (   (!dst_priv->mtu && src_priv->mtu)
+	            || (dst_priv->mtu && src_priv->mtu < dst_priv->mtu))))
+		nm_ip4_config_set_mtu (dst, src_priv->mtu, src_priv->mtu_source);
 
 	/* NIS */
 	if (!NM_FLAGS_HAS (merge_flags, NM_IP_CONFIG_MERGE_NO_DNS)) {
@@ -932,7 +934,8 @@ nm_ip4_config_subtract (NMIP4Config *dst, const NMIP4Config *src)
 		nm_ip4_config_set_mss (dst, 0);
 
 	/* MTU */
-	if (nm_ip4_config_get_mtu (src) == nm_ip4_config_get_mtu (dst))
+	if (   nm_ip4_config_get_mtu (src) == nm_ip4_config_get_mtu (dst)
+	    && nm_ip4_config_get_mtu_source (src) == nm_ip4_config_get_mtu_source (dst))
 		nm_ip4_config_set_mtu (dst, 0, NM_IP_CONFIG_SOURCE_UNKNOWN);
 
 	/* NIS */
@@ -1252,7 +1255,8 @@ nm_ip4_config_replace (NMIP4Config *dst, const NMIP4Config *src, gboolean *relev
 	}
 
 	/* mtu */
-	if (src_priv->mtu != dst_priv->mtu) {
+	if (   src_priv->mtu != dst_priv->mtu
+	    || src_priv->mtu_source != dst_priv->mtu_source) {
 		nm_ip4_config_set_mtu (dst, src_priv->mtu, src_priv->mtu_source);
 		has_minor_changes = TRUE;
 	}
@@ -1329,7 +1333,7 @@ nm_ip4_config_dump (const NMIP4Config *config, const char *detail)
 	g_message (" dnspri: %d", nm_ip4_config_get_dns_priority (config));
 
 	g_message ("    mss: %"G_GUINT32_FORMAT, nm_ip4_config_get_mss (config));
-	g_message ("    mtu: %"G_GUINT32_FORMAT, nm_ip4_config_get_mtu (config));
+	g_message ("    mtu: %"G_GUINT32_FORMAT" (source: %d)", nm_ip4_config_get_mtu (config), (int) nm_ip4_config_get_mtu_source (config));
 
 	/* NIS */
 	for (i = 0; i < nm_ip4_config_get_num_nis_servers (config); i++) {
@@ -2080,11 +2084,11 @@ nm_ip4_config_set_mtu (NMIP4Config *config, guint32 mtu, NMIPConfigSource source
 {
 	NMIP4ConfigPrivate *priv = NM_IP4_CONFIG_GET_PRIVATE (config);
 
-	if (source > priv->mtu_source) {
-		priv->mtu = mtu;
-		priv->mtu_source = source;
-	} else if (source == priv->mtu_source && (!priv->mtu || priv->mtu > mtu))
-		priv->mtu = mtu;
+	if (!mtu)
+		source = NM_IP_CONFIG_SOURCE_UNKNOWN;
+
+	priv->mtu = mtu;
+	priv->mtu_source = source;
 }
 
 guint32