colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2008-06-02 Tambet Ingo <tambet@gmail.com>

Browse Source 
* libnm-util/nm-setting-ip4-config.[ch]: Add static routes property.

	* src/nm-ip4-config.[ch]: Store the static routes as a list of
	NMIP4Address, update the getters and setters.

	* src/dhcp-manager/nm-dhcp-manager.c (nm_dhcp_manager_get_ip4_config):
	Use the updated NMIP4Config routes api.

	* src/NetworkManagerUtils.c (nm_utils_merge_ip4_config): Merge
	static routes as well.

	* src/NetworkManagerSystem.c (netmask_to_prefix): Implement.
	(nm_system_device_set_from_ip4_config): Use the updated NMIP4Config
	routes api.


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3715 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Tambet Ingo
2008-06-02 08:44:48 +00:00
parent a53ebdbd37
commit 4874f758d8
8 changed files with 165 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/dhcp-manager/nm-dhcp-manager.c
View File

@@ -978,9 +978,14 @@ nm_dhcp_manager_get_ip4_config (NMDHCPManager *manager,
}
// FIXME: ensure the IP addresse and route are sane
nm_ip4_config_add_static_route (ip4_config,
(guint32) rt_addr.s_addr,
(guint32) rt_route.s_addr);
addr = g_malloc0 (sizeof (NMSettingIP4Address));
addr->address = (guint32) rt_addr.s_addr;
addr->netmask = 0xFFFFFFFF; /* 255.255.255.255 */
addr->gateway = (guint32) rt_route.s_addr;
nm_ip4_config_take_static_route (ip4_config, addr);
addr = NULL;
nm_info (" static route %s gw %s", *s, *(s + 1));
}
} else {