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

trivial: route-related whitespace/indentation fixes

Browse Source
This commit is contained in:
Dan Winship
2014-05-15 15:19:59 -04:00
parent 722c90343b
commit e644745d85
6 changed files with 96 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/nm-policy.c
View File

@@ -658,9 +658,15 @@ update_ip4_routing (NMPolicy *policy, gboolean force_update)
if (ip_ifindex <= 0) if (ip_ifindex <= 0)
ip_ifindex = parent_ifindex; ip_ifindex = parent_ifindex;
if (!nm_platform_ip4_route_add (ip_ifindex, 0, 0, int_gw, NM_PLATFORM_ROUTE_METRIC_DEFAULT, mss)) { if (!nm_platform_ip4_route_add (ip_ifindex,
(void) nm_platform_ip4_route_add (parent_ifindex, gw_addr, 32, 0, NM_PLATFORM_ROUTE_METRIC_DEFAULT, parent_mss); 0, 0, int_gw,
if (!nm_platform_ip4_route_add (ip_ifindex, 0, 0, int_gw, NM_PLATFORM_ROUTE_METRIC_DEFAULT, mss)) NM_PLATFORM_ROUTE_METRIC_DEFAULT, mss)) {
(void) nm_platform_ip4_route_add (parent_ifindex,
gw_addr, 32, 0,
NM_PLATFORM_ROUTE_METRIC_DEFAULT, parent_mss);
if (!nm_platform_ip4_route_add (ip_ifindex,
0, 0, int_gw,
NM_PLATFORM_ROUTE_METRIC_DEFAULT, mss))
nm_log_err (LOGD_IP4 | LOGD_VPN, "Failed to set default route."); nm_log_err (LOGD_IP4 | LOGD_VPN, "Failed to set default route.");
} }
@@ -669,9 +675,15 @@ update_ip4_routing (NMPolicy *policy, gboolean force_update)
int mss = nm_ip4_config_get_mss (ip4_config); int mss = nm_ip4_config_get_mss (ip4_config);
g_assert (ip_iface); g_assert (ip_iface);
if (!nm_platform_ip4_route_add (ip_ifindex, 0, 0, gw_addr, NM_PLATFORM_ROUTE_METRIC_DEFAULT, mss)) { if (!nm_platform_ip4_route_add (ip_ifindex,
(void) nm_platform_ip4_route_add (ip_ifindex, gw_addr, 32, 0, NM_PLATFORM_ROUTE_METRIC_DEFAULT, mss); 0, 0, gw_addr,
if (!nm_platform_ip4_route_add (ip_ifindex, 0, 0, gw_addr, NM_PLATFORM_ROUTE_METRIC_DEFAULT, mss)) { NM_PLATFORM_ROUTE_METRIC_DEFAULT, mss)) {
(void) nm_platform_ip4_route_add (ip_ifindex,
gw_addr, 32, 0,
NM_PLATFORM_ROUTE_METRIC_DEFAULT, mss);
if (!nm_platform_ip4_route_add (ip_ifindex,
0, 0, gw_addr,
NM_PLATFORM_ROUTE_METRIC_DEFAULT, mss)) {
nm_log_err (LOGD_IP4, "Failed to set default route."); nm_log_err (LOGD_IP4, "Failed to set default route.");
} }
} }
@@ -852,9 +864,15 @@ update_ip6_routing (NMPolicy *policy, gboolean force_update)
if (ip_ifindex <= 0) if (ip_ifindex <= 0)
ip_ifindex = parent_ifindex; ip_ifindex = parent_ifindex;
if (!nm_platform_ip6_route_add (ip_ifindex, in6addr_any, 0, *int_gw, NM_PLATFORM_ROUTE_METRIC_DEFAULT, mss)) { if (!nm_platform_ip6_route_add (ip_ifindex,
(void) nm_platform_ip6_route_add (parent_ifindex, *gw_addr, 128, in6addr_any, NM_PLATFORM_ROUTE_METRIC_DEFAULT, parent_mss); in6addr_any, 0, *int_gw,
if (!nm_platform_ip6_route_add (ip_ifindex, in6addr_any, 0, *int_gw, NM_PLATFORM_ROUTE_METRIC_DEFAULT, mss)) { NM_PLATFORM_ROUTE_METRIC_DEFAULT, mss)) {
(void) nm_platform_ip6_route_add (parent_ifindex,
*gw_addr, 128, in6addr_any,
NM_PLATFORM_ROUTE_METRIC_DEFAULT, parent_mss);
if (!nm_platform_ip6_route_add (ip_ifindex,
in6addr_any, 0, *int_gw,
NM_PLATFORM_ROUTE_METRIC_DEFAULT, mss)) {
nm_log_err (LOGD_IP6 | LOGD_VPN, "Failed to set default route."); nm_log_err (LOGD_IP6 | LOGD_VPN, "Failed to set default route.");
} }
} }
@@ -863,9 +881,15 @@ update_ip6_routing (NMPolicy *policy, gboolean force_update)
} else { } else {
int mss = nm_ip6_config_get_mss (ip6_config); int mss = nm_ip6_config_get_mss (ip6_config);
if (!nm_platform_ip6_route_add (ip_ifindex, in6addr_any, 0, *gw_addr, NM_PLATFORM_ROUTE_METRIC_DEFAULT, mss)) { if (!nm_platform_ip6_route_add (ip_ifindex,
(void) nm_platform_ip6_route_add (ip_ifindex, *gw_addr, 128, in6addr_any, NM_PLATFORM_ROUTE_METRIC_DEFAULT, mss); in6addr_any, 0, *gw_addr,
if (!nm_platform_ip6_route_add (ip_ifindex, in6addr_any, 0, *gw_addr, NM_PLATFORM_ROUTE_METRIC_DEFAULT, mss)) NM_PLATFORM_ROUTE_METRIC_DEFAULT, mss)) {
(void) nm_platform_ip6_route_add (ip_ifindex,
*gw_addr, 128, in6addr_any,
NM_PLATFORM_ROUTE_METRIC_DEFAULT, mss);
if (!nm_platform_ip6_route_add (ip_ifindex,
in6addr_any, 0, *gw_addr,
NM_PLATFORM_ROUTE_METRIC_DEFAULT, mss))
nm_log_err (LOGD_IP6, "Failed to set default route."); nm_log_err (LOGD_IP6, "Failed to set default route.");
} }

10
src/platform/nm-fake-platform.c
View File

@@ -1039,8 +1039,9 @@ ip6_route_get_all (NMPlatform *platform, int ifindex, gboolean include_default)
} }
static gboolean static gboolean
ip4_route_add (NMPlatform *platform, int ifindex, in_addr_t network, int plen, ip4_route_add (NMPlatform *platform, int ifindex,
in_addr_t gateway, int metric, int mss) in_addr_t network, int plen, in_addr_t gateway,
int metric, int mss)
{ {
NMFakePlatformPrivate *priv = NM_FAKE_PLATFORM_GET_PRIVATE (platform); NMFakePlatformPrivate *priv = NM_FAKE_PLATFORM_GET_PRIVATE (platform);
NMPlatformIP4Route route; NMPlatformIP4Route route;
@@ -1077,8 +1078,9 @@ ip4_route_add (NMPlatform *platform, int ifindex, in_addr_t network, int plen,
} }
static gboolean static gboolean
ip6_route_add (NMPlatform *platform, int ifindex, struct in6_addr network, int plen, ip6_route_add (NMPlatform *platform, int ifindex,
struct in6_addr gateway, int metric, int mss) struct in6_addr network, int plen, struct in6_addr gateway,
int metric, int mss)
{ {
NMFakePlatformPrivate *priv = NM_FAKE_PLATFORM_GET_PRIVATE (platform); NMFakePlatformPrivate *priv = NM_FAKE_PLATFORM_GET_PRIVATE (platform);
NMPlatformIP6Route route; NMPlatformIP6Route route;

12
src/platform/nm-linux-platform.c
View File

@@ -3315,7 +3315,9 @@ clear_host_address (int family, const void *network, int plen, void *dst)
} }
static struct nl_object * static struct nl_object *
build_rtnl_route (int family, int ifindex, gconstpointer network, int plen, gconstpointer gateway, int metric, int mss) build_rtnl_route (int family, int ifindex,
gconstpointer network, int plen, gconstpointer gateway,
int metric, int mss)
{ {
guint32 network_clean[4]; guint32 network_clean[4];
struct rtnl_route *rtnlroute; struct rtnl_route *rtnlroute;
@@ -3353,13 +3355,17 @@ build_rtnl_route (int family, int ifindex, gconstpointer network, int plen, gcon
} }
static gboolean static gboolean
ip4_route_add (NMPlatform *platform, int ifindex, in_addr_t network, int plen, in_addr_t gateway, int metric, int mss) ip4_route_add (NMPlatform *platform, int ifindex,
in_addr_t network, int plen, in_addr_t gateway,
int metric, int mss)
{ {
return add_object (platform, build_rtnl_route (AF_INET, ifindex, &network, plen, &gateway, metric, mss)); return add_object (platform, build_rtnl_route (AF_INET, ifindex, &network, plen, &gateway, metric, mss));
} }
static gboolean static gboolean
ip6_route_add (NMPlatform *platform, int ifindex, struct in6_addr network, int plen, struct in6_addr gateway, int metric, int mss) ip6_route_add (NMPlatform *platform, int ifindex,
struct in6_addr network, int plen, struct in6_addr gateway,
int metric, int mss)
{ {
return add_object (platform, build_rtnl_route (AF_INET6, ifindex, &network, plen, &gateway, metric, mss)); return add_object (platform, build_rtnl_route (AF_INET6, ifindex, &network, plen, &gateway, metric, mss));
} }

10
src/platform/nm-platform.c
View File

@@ -1712,8 +1712,8 @@ nm_platform_ip6_route_get_all (int ifindex, gboolean include_default)
gboolean gboolean
nm_platform_ip4_route_add (int ifindex, nm_platform_ip4_route_add (int ifindex,
in_addr_t network, int plen, in_addr_t network, int plen,
in_addr_t gateway, int metric, int mss) in_addr_t gateway, int metric, int mss)
{ {
reset_error (); reset_error ();
@@ -1740,7 +1740,8 @@ nm_platform_ip4_route_add (int ifindex,
gboolean gboolean
nm_platform_ip6_route_add (int ifindex, nm_platform_ip6_route_add (int ifindex,
struct in6_addr network, int plen, struct in6_addr gateway, int metric, int mss) struct in6_addr network, int plen, struct in6_addr gateway,
int metric, int mss)
{ {
g_return_val_if_fail (platform, FALSE); g_return_val_if_fail (platform, FALSE);
g_return_val_if_fail (0 <= plen && plen <= 128, FALSE); g_return_val_if_fail (0 <= plen && plen <= 128, FALSE);
@@ -1776,8 +1777,7 @@ nm_platform_ip4_route_delete (int ifindex, in_addr_t network, int plen, int metr
} }
gboolean gboolean
nm_platform_ip6_route_delete (int ifindex, nm_platform_ip6_route_delete (int ifindex, struct in6_addr network, int plen, int metric)
struct in6_addr network, int plen, int metric)
{ {
reset_error (); reset_error ();

12
src/platform/nm-platform.h
View File

@@ -429,9 +429,11 @@ typedef struct {
GArray * (*ip4_route_get_all) (NMPlatform *, int ifindex, gboolean include_default); GArray * (*ip4_route_get_all) (NMPlatform *, int ifindex, gboolean include_default);
GArray * (*ip6_route_get_all) (NMPlatform *, int ifindex, gboolean include_default); GArray * (*ip6_route_get_all) (NMPlatform *, int ifindex, gboolean include_default);
gboolean (*ip4_route_add) (NMPlatform *, int ifindex, gboolean (*ip4_route_add) (NMPlatform *, int ifindex,
in_addr_t network, int plen, in_addr_t gateway, int prio, int mss); in_addr_t network, int plen, in_addr_t gateway,
int prio, int mss);
gboolean (*ip6_route_add) (NMPlatform *, int ifindex, gboolean (*ip6_route_add) (NMPlatform *, int ifindex,
struct in6_addr network, int plen, struct in6_addr gateway, int prio, int mss); struct in6_addr network, int plen, struct in6_addr gateway,
int prio, int mss);
gboolean (*ip4_route_delete) (NMPlatform *, int ifindex, in_addr_t network, int plen, int metric); gboolean (*ip4_route_delete) (NMPlatform *, int ifindex, in_addr_t network, int plen, int metric);
gboolean (*ip6_route_delete) (NMPlatform *, int ifindex, struct in6_addr network, int plen, int metric); gboolean (*ip6_route_delete) (NMPlatform *, int ifindex, struct in6_addr network, int plen, int metric);
gboolean (*ip4_route_exists) (NMPlatform *, int ifindex, in_addr_t network, int plen, int metric); gboolean (*ip4_route_exists) (NMPlatform *, int ifindex, in_addr_t network, int plen, int metric);
@@ -571,9 +573,11 @@ GArray *nm_platform_ip4_route_get_all (int ifindex, gboolean include_default);
GArray *nm_platform_ip6_route_get_all (int ifindex, gboolean include_default); GArray *nm_platform_ip6_route_get_all (int ifindex, gboolean include_default);
gboolean nm_platform_route_set_metric (int ifindex, int metric); gboolean nm_platform_route_set_metric (int ifindex, int metric);
gboolean nm_platform_ip4_route_add (int ifindex, gboolean nm_platform_ip4_route_add (int ifindex,
in_addr_t network, int plen, in_addr_t gateway, int metric, int mss); in_addr_t network, int plen, in_addr_t gateway,
int metric, int mss);
gboolean nm_platform_ip6_route_add (int ifindex, gboolean nm_platform_ip6_route_add (int ifindex,
struct in6_addr network, int plen, struct in6_addr gateway, int metric, int mss); struct in6_addr network, int plen, struct in6_addr gateway,
int metric, int mss);
gboolean nm_platform_ip4_route_delete (int ifindex, in_addr_t network, int plen, int metric); gboolean nm_platform_ip4_route_delete (int ifindex, in_addr_t network, int plen, int metric);
gboolean nm_platform_ip6_route_delete (int ifindex, struct in6_addr network, int plen, int metric); gboolean nm_platform_ip6_route_delete (int ifindex, struct in6_addr network, int plen, int metric);
gboolean nm_platform_ip4_route_exists (int ifindex, in_addr_t network, int plen, int metric); gboolean nm_platform_ip4_route_exists (int ifindex, in_addr_t network, int plen, int metric);

48
src/platform/tests/test-route.c
View File

@@ -66,13 +66,17 @@ test_ip4_route ()
inet_pton (AF_INET, "198.51.100.1", &gateway); inet_pton (AF_INET, "198.51.100.1", &gateway);
/* Add route to gateway */ /* Add route to gateway */
g_assert (nm_platform_ip4_route_add (ifindex, gateway, 32, INADDR_ANY, metric, mss)); no_error (); g_assert (nm_platform_ip4_route_add (ifindex, gateway, 32, INADDR_ANY, metric, mss));
no_error ();
accept_signal (route_added); accept_signal (route_added);
/* Add route */ /* Add route */
g_assert (!nm_platform_ip4_route_exists (ifindex, network, plen, metric)); no_error (); g_assert (!nm_platform_ip4_route_exists (ifindex, network, plen, metric));
g_assert (nm_platform_ip4_route_add (ifindex, network, plen, gateway, metric, mss)); no_error (); no_error ();
g_assert (nm_platform_ip4_route_exists (ifindex, network, plen, metric)); no_error (); g_assert (nm_platform_ip4_route_add (ifindex, network, plen, gateway, metric, mss));
no_error ();
g_assert (nm_platform_ip4_route_exists (ifindex, network, plen, metric));
no_error ();
accept_signal (route_added); accept_signal (route_added);
/* Add route again */ /* Add route again */
@@ -81,9 +85,12 @@ test_ip4_route ()
accept_signal (route_changed); accept_signal (route_changed);
/* Add default route */ /* Add default route */
g_assert (!nm_platform_ip4_route_exists (ifindex, 0, 0, metric)); no_error (); g_assert (!nm_platform_ip4_route_exists (ifindex, 0, 0, metric));
g_assert (nm_platform_ip4_route_add (ifindex, 0, 0, gateway, metric, mss)); no_error (); no_error ();
g_assert (nm_platform_ip4_route_exists (ifindex, 0, 0, metric)); no_error (); g_assert (nm_platform_ip4_route_add (ifindex, 0, 0, gateway, metric, mss));
no_error ();
g_assert (nm_platform_ip4_route_exists (ifindex, 0, 0, metric));
no_error ();
accept_signal (route_added); accept_signal (route_added);
/* Add default route again */ /* Add default route again */
@@ -121,7 +128,8 @@ test_ip4_route ()
g_array_unref (routes); g_array_unref (routes);
/* Remove route */ /* Remove route */
g_assert (nm_platform_ip4_route_delete (ifindex, network, plen, metric)); no_error (); g_assert (nm_platform_ip4_route_delete (ifindex, network, plen, metric));
no_error ();
g_assert (!nm_platform_ip4_route_exists (ifindex, network, plen, metric)); g_assert (!nm_platform_ip4_route_exists (ifindex, network, plen, metric));
accept_signal (route_removed); accept_signal (route_removed);
@@ -153,13 +161,17 @@ test_ip6_route ()
inet_pton (AF_INET6, "2001:db8:c:d:1:2:3:4", &gateway); inet_pton (AF_INET6, "2001:db8:c:d:1:2:3:4", &gateway);
/* Add route to gateway */ /* Add route to gateway */
g_assert (nm_platform_ip6_route_add (ifindex, gateway, 128, in6addr_any, metric, mss)); no_error (); g_assert (nm_platform_ip6_route_add (ifindex, gateway, 128, in6addr_any, metric, mss));
no_error ();
accept_signal (route_added); accept_signal (route_added);
/* Add route */ /* Add route */
g_assert (!nm_platform_ip6_route_exists (ifindex, network, plen, metric)); no_error (); g_assert (!nm_platform_ip6_route_exists (ifindex, network, plen, metric));
g_assert (nm_platform_ip6_route_add (ifindex, network, plen, gateway, metric, mss)); no_error (); no_error ();
g_assert (nm_platform_ip6_route_exists (ifindex, network, plen, metric)); no_error (); g_assert (nm_platform_ip6_route_add (ifindex, network, plen, gateway, metric, mss));
no_error ();
g_assert (nm_platform_ip6_route_exists (ifindex, network, plen, metric));
no_error ();
accept_signal (route_added); accept_signal (route_added);
/* Add route again */ /* Add route again */
@@ -168,9 +180,12 @@ test_ip6_route ()
accept_signal (route_changed); accept_signal (route_changed);
/* Add default route */ /* Add default route */
g_assert (!nm_platform_ip6_route_exists (ifindex, in6addr_any, 0, metric)); no_error (); g_assert (!nm_platform_ip6_route_exists (ifindex, in6addr_any, 0, metric));
g_assert (nm_platform_ip6_route_add (ifindex, in6addr_any, 0, gateway, metric, mss)); no_error (); no_error ();
g_assert (nm_platform_ip6_route_exists (ifindex, in6addr_any, 0, metric)); no_error (); g_assert (nm_platform_ip6_route_add (ifindex, in6addr_any, 0, gateway, metric, mss));
no_error ();
g_assert (nm_platform_ip6_route_exists (ifindex, in6addr_any, 0, metric));
no_error ();
accept_signal (route_added); accept_signal (route_added);
/* Add default route again */ /* Add default route again */
@@ -208,7 +223,8 @@ test_ip6_route ()
g_array_unref (routes); g_array_unref (routes);
/* Remove route */ /* Remove route */
g_assert (nm_platform_ip6_route_delete (ifindex, network, plen, metric)); no_error (); g_assert (nm_platform_ip6_route_delete (ifindex, network, plen, metric));
no_error ();
g_assert (!nm_platform_ip6_route_exists (ifindex, network, plen, metric)); g_assert (!nm_platform_ip6_route_exists (ifindex, network, plen, metric));
accept_signal (route_removed); accept_signal (route_removed);