diff options
| author | Thomas Haller <thaller@redhat.com> | 2014-11-04 12:29:01 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2014-11-05 23:54:19 +0100 |
| commit | 1d6d9221db907820ea8f1954f127ac23d9e88023 (patch) | |
| tree | 24651c8617553ffd2ce3a634c7bc4f228f04cdb7 | |
| parent | f83b798cae47a2656adbf31c85ee1fb368dd5f71 (diff) | |
| download | NetworkManager-1d6d9221db907820ea8f1954f127ac23d9e88023.tar.gz | |
fixup! core: add explicit functions for the route priority/metric
| -rw-r--r-- | src/vpn-manager/nm-vpn-connection.c | 12 | ||||
| -rw-r--r-- | src/vpn-manager/nm-vpn-connection.h | 3 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/vpn-manager/nm-vpn-connection.c b/src/vpn-manager/nm-vpn-connection.c index b17e249257..913266c4af 100644 --- a/src/vpn-manager/nm-vpn-connection.c +++ b/src/vpn-manager/nm-vpn-connection.c @@ -1053,8 +1053,8 @@ nm_vpn_connection_config_get (DBusGProxy *proxy, g_clear_object (&priv->ip6_config); } -static guint32 -get_vpn_ip4_route_metric (NMVpnConnection *connection) +guint32 +nm_vpn_connection_get_ip4_route_metric (NMVpnConnection *connection) { NMVpnConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (connection); @@ -1067,8 +1067,8 @@ get_vpn_ip4_route_metric (NMVpnConnection *connection) } } -static guint32 -get_vpn_ip6_route_metric (NMVpnConnection *connection) +guint32 +nm_vpn_connection_get_ip6_route_metric (NMVpnConnection *connection) { NMVpnConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (connection); @@ -1190,7 +1190,7 @@ nm_vpn_connection_ip4_config_get (DBusGProxy *proxy, nm_ip4_config_add_domain (config, *domain); } - route_metric = get_vpn_ip4_route_metric (connection); + route_metric = nm_vpn_connection_get_ip4_route_metric (connection); val = (GValue *) g_hash_table_lookup (config_hash, NM_VPN_PLUGIN_IP4_CONFIG_ROUTES); if (val) { @@ -1339,7 +1339,7 @@ nm_vpn_connection_ip6_config_get (DBusGProxy *proxy, nm_ip6_config_add_domain (config, *domain); } - route_metric = get_vpn_ip6_route_metric (connection); + route_metric = nm_vpn_connection_get_ip6_route_metric (connection); val = (GValue *) g_hash_table_lookup (config_hash, NM_VPN_PLUGIN_IP6_CONFIG_ROUTES); if (val) { diff --git a/src/vpn-manager/nm-vpn-connection.h b/src/vpn-manager/nm-vpn-connection.h index 4b574bb1f0..6b57e3e14e 100644 --- a/src/vpn-manager/nm-vpn-connection.h +++ b/src/vpn-manager/nm-vpn-connection.h @@ -93,4 +93,7 @@ int nm_vpn_connection_get_ip_ifindex (NMVpnConnection *connect guint32 nm_vpn_connection_get_ip4_internal_gateway (NMVpnConnection *connection); struct in6_addr * nm_vpn_connection_get_ip6_internal_gateway (NMVpnConnection *connection); +guint32 nm_vpn_connection_get_ip4_route_metric (NMVpnConnection *connection); +guint32 nm_vpn_connection_get_ip6_route_metric (NMVpnConnection *connection); + #endif /* __NETWORKMANAGER_VPN_CONNECTION_H__ */ |