diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-10-03 11:30:35 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-10-09 22:06:25 +0200 |
| commit | 9003dae6cdc12fc4860d35b91d5799b1bf8d5638 (patch) | |
| tree | 7c545600cebfd75f1f1f0d1a0ab829705cc3de51 /src/nm-ip6-config.c | |
| parent | 2e146148702615f31209f6ccc07ca02663eddb7b (diff) | |
| download | NetworkManager-9003dae6cdc12fc4860d35b91d5799b1bf8d5638.tar.gz | |
core: don't track route MSS in ip-config
The MSS is only set for VPN connections (by merging it in the respective
NMIP4Config/NMIP6Config).
It is also only used when setting the MSS of the default route.
Don't track that property in NMIP4Config/NMIP6Config, instead, set the
mss of the route directly in nm_vpn_connection_ip4_config_get() and
nm_vpn_connection_ip6_config_get().
There is a potential change in behavior here: NMDevice also consisdered
the MSS for the default route, but that would only be set if the MSS
gets merged from an vpn-ip-config. Which at most is the case for
iterface-less VPN types (libreswan). But even in that case, it doesn't
seem right to me to use the VPN's MSS for the device's default-route.
Diffstat (limited to 'src/nm-ip6-config.c')
| -rw-r--r-- | src/nm-ip6-config.c | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/src/nm-ip6-config.c b/src/nm-ip6-config.c index 480465e5b9..6516b8b840 100644 --- a/src/nm-ip6-config.c +++ b/src/nm-ip6-config.c @@ -59,7 +59,6 @@ _route_valid (const NMPlatformIP6Route *r) typedef struct { bool never_default:1; - guint32 mss; int ifindex; int dns_priority; NMSettingIP6ConfigPrivacy privacy; @@ -940,9 +939,6 @@ nm_ip6_config_merge (NMIP6Config *dst, const NMIP6Config *src, NMIPConfigMergeFl nm_ip6_config_add_dns_option (dst, nm_ip6_config_get_dns_option (src, i)); } - if (nm_ip6_config_get_mss (src)) - nm_ip6_config_set_mss (dst, nm_ip6_config_get_mss (src)); - /* DNS priority */ if (nm_ip6_config_get_dns_priority (src)) nm_ip6_config_set_dns_priority (dst, nm_ip6_config_get_dns_priority (src)); @@ -1135,9 +1131,6 @@ nm_ip6_config_subtract (NMIP6Config *dst, const NMIP6Config *src) nm_ip6_config_del_dns_option (dst, idx); } - if (nm_ip6_config_get_mss (src) == nm_ip6_config_get_mss (dst)) - nm_ip6_config_set_mss (dst, 0); - /* DNS priority */ if (nm_ip6_config_get_dns_priority (src) == nm_ip6_config_get_dns_priority (dst)) nm_ip6_config_set_dns_priority (dst, 0); @@ -1468,12 +1461,6 @@ nm_ip6_config_replace (NMIP6Config *dst, const NMIP6Config *src, gboolean *relev has_relevant_changes = TRUE; } - /* mss */ - if (src_priv->mss != dst_priv->mss) { - nm_ip6_config_set_mss (dst, src_priv->mss); - has_minor_changes = TRUE; - } - /* DNS priority */ if (src_priv->dns_priority != dst_priv->dns_priority) { nm_ip6_config_set_dns_priority (dst, src_priv->dns_priority); @@ -1550,7 +1537,6 @@ nm_ip6_config_dump (const NMIP6Config *self, const char *detail) g_message (" dnspri: %d", nm_ip6_config_get_dns_priority (self)); - g_message (" mss: %"G_GUINT32_FORMAT, nm_ip6_config_get_mss (self)); g_message (" n-dflt: %d", nm_ip6_config_get_never_default (self)); } @@ -2338,24 +2324,6 @@ nm_ip6_config_get_dns_priority (const NMIP6Config *self) /*****************************************************************************/ -void -nm_ip6_config_set_mss (NMIP6Config *self, guint32 mss) -{ - NMIP6ConfigPrivate *priv = NM_IP6_CONFIG_GET_PRIVATE (self); - - priv->mss = mss; -} - -guint32 -nm_ip6_config_get_mss (const NMIP6Config *self) -{ - const NMIP6ConfigPrivate *priv = NM_IP6_CONFIG_GET_PRIVATE (self); - - return priv->mss; -} - -/*****************************************************************************/ - const NMPObject * nm_ip6_config_nmpobj_lookup (const NMIP6Config *self, const NMPObject *needle) { |