core: implement nm_ip[46]_config_update_setting()

src/nm-ip4-config.c

@@ -256,6 +256,70 @@ nm_ip4_config_merge_setting (NMIP4Config *config, NMSettingIP4Config *setting)
 		nm_ip4_config_add_search (config, nm_setting_ip4_config_get_dns_search (setting, i));
 }
 
+void
+nm_ip4_config_update_setting (NMIP4Config *config, NMSettingIP4Config *setting)
+{
+	guint32 gateway;
+	guint naddresses, nroutes, nnameservers, nsearches;
+	const char *method = NULL;
+	int i;
+
+	if (!config)
+		return;
+
+	gateway = nm_ip4_config_get_gateway (config);
+	naddresses = nm_ip4_config_get_num_addresses (config);
+	nroutes = nm_ip4_config_get_num_routes (config);
+	nnameservers = nm_ip4_config_get_num_nameservers (config);
+	nsearches = nm_ip4_config_get_num_searches (config);
+
+	/* Addresses */
+	for (i = 0; i < naddresses; i++) {
+		const NMPlatformIP4Address *address = nm_ip4_config_get_address (config, i);
+		gs_unref_object NMIP4Address *s_addr = nm_ip4_address_new ();
+
+		/* Static address found. */
+		if (!method)
+			method = NM_SETTING_IP4_CONFIG_METHOD_MANUAL;
+
+		nm_ip4_address_set_address (s_addr, address->address);
+		nm_ip4_address_set_prefix (s_addr, address->plen);
+		/* For backwards compatibility, attach the gateway to an address if it's
+		 * in the same subnet.
+		 */
+		if (same_prefix (address->address, gateway, address->plen))
+			nm_ip4_address_set_gateway (s_addr, gateway);
+
+		nm_setting_ip4_config_add_address (setting, s_addr);
+	}
+	if (!method)
+		method = NM_SETTING_IP4_CONFIG_METHOD_DISABLED;
+	g_object_set (setting, NM_SETTING_IP4_CONFIG_METHOD, method, NULL);
+
+	/* Routes */
+	for (i = 0; i < nroutes; i++) {
+		NMIP4Route *route = nm_ip4_config_get_route (config, i);
+
+		/* Ignore default route. */
+		if (!nm_ip4_route_get_prefix (route))
+			continue;
+
+		nm_setting_ip4_config_add_route (setting, route);
+	}
+
+	/* DNS */
+	for (i = 0; i < nnameservers; i++) {
+		guint32 nameserver = nm_ip4_config_get_nameserver (config, i);
+
+		nm_setting_ip4_config_add_dns (setting, nameserver);
+	}
+	for (i = 0; i < nsearches; i++) {
+		const char *search = nm_ip4_config_get_search (config, i);
+
+		nm_setting_ip4_config_add_dns_search (setting, search);
+	}
+}
+
 /******************************************************************/
 
 gboolean

src/nm-ip4-config.h

@@ -61,6 +61,7 @@ const char * nm_ip4_config_get_dbus_path (NMIP4Config *config);
 NMIP4Config *nm_ip4_config_capture (int ifindex);
 gboolean nm_ip4_config_commit (NMIP4Config *config, int ifindex, int priority);
 void nm_ip4_config_merge_setting (NMIP4Config *config, NMSettingIP4Config *setting);
+void nm_ip4_config_update_setting (NMIP4Config *config, NMSettingIP4Config *setting);
 
 /* Utility functions */
 gboolean nm_ip4_config_destination_is_direct (NMIP4Config *config, guint32 dest, int plen);

src/nm-ip6-config.c

@@ -259,6 +259,75 @@ nm_ip6_config_merge_setting (NMIP6Config *config, NMSettingIP6Config *setting)
 		nm_ip6_config_add_search (config, nm_setting_ip6_config_get_dns_search (setting, i));
 }
 
+void
+nm_ip6_config_update_setting (NMIP6Config *config, NMSettingIP6Config *setting)
+{
+	const struct in6_addr *gateway;
+	guint naddresses, nroutes, nnameservers, nsearches;
+	const char *method = NULL;
+	int i;
+
+	if (!config)
+		return;
+
+	gateway = nm_ip6_config_get_gateway (config);
+	naddresses = nm_ip6_config_get_num_addresses (config);
+	nroutes = nm_ip6_config_get_num_routes (config);
+	nnameservers = nm_ip6_config_get_num_nameservers (config);
+	nsearches = nm_ip6_config_get_num_searches (config);
+
+	/* Addresses */
+	for (i = 0; i < naddresses; i++) {
+		NMPlatformIP6Address *address = nm_ip6_config_get_address (config, i);
+		gs_unref_object NMIP6Address *s_addr = nm_ip6_address_new ();
+
+		/* Ignore link-local address. */
+		if (IN6_IS_ADDR_LINKLOCAL (&address->address))
+			continue;
+
+		/* Static address found. */
+		if (!method)
+			method = NM_SETTING_IP6_CONFIG_METHOD_MANUAL;
+
+		nm_ip6_address_set_address (s_addr, &address->address);
+		nm_ip6_address_set_prefix (s_addr, address->plen);
+		if (gateway)
+			nm_ip6_address_set_gateway (s_addr, gateway);
+
+		nm_setting_ip6_config_add_address (setting, s_addr);
+	}
+	if (!method)
+		method = NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL;
+	g_object_set (setting, NM_SETTING_IP6_CONFIG_METHOD, method, NULL);
+
+	/* Routes */
+	for (i = 0; i < nroutes; i++) {
+		NMIP6Route *route = nm_ip6_config_get_route (config, i);
+
+		/* Ignore link-local route. */
+		if (IN6_IS_ADDR_LINKLOCAL (nm_ip6_route_get_dest (route)))
+			continue;
+
+		/* Ignore default route. */
+		if (!nm_ip6_route_get_prefix (route))
+			continue;
+
+		nm_setting_ip6_config_add_route (setting, route);
+	}
+
+	/* DNS */
+	for (i = 0; i < nnameservers; i++) {
+		const struct in6_addr *nameserver = nm_ip6_config_get_nameserver (config, i);
+
+		nm_setting_ip6_config_add_dns (setting, nameserver);
+	}
+	for (i = 0; i < nsearches; i++) {
+		const char *search = nm_ip6_config_get_search (config, i);
+
+		nm_setting_ip6_config_add_dns_search (setting, search);
+	}
+}
+
 /******************************************************************/
 
 void

src/nm-ip6-config.h

@@ -61,6 +61,7 @@ const char * nm_ip6_config_get_dbus_path (NMIP6Config *config);
 NMIP6Config *nm_ip6_config_capture (int ifindex);
 gboolean nm_ip6_config_commit (NMIP6Config *config, int ifindex, int priority);
 void nm_ip6_config_merge_setting (NMIP6Config *config, NMSettingIP6Config *setting);
+void nm_ip6_config_update_setting (NMIP6Config *config, NMSettingIP6Config *setting);
 
 /* Utility functions */
 void nm_ip6_config_merge (NMIP6Config *dst, NMIP6Config *src);