From e644745d85a20529c6bbb0f6f479acfa45edca86 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Thu, 15 May 2014 15:19:59 -0400 Subject: [PATCH] trivial: route-related whitespace/indentation fixes --- src/nm-policy.c | 48 ++++++++++++++++++++++++-------- src/platform/nm-fake-platform.c | 10 ++++--- src/platform/nm-linux-platform.c | 12 ++++++-- src/platform/nm-platform.c | 10 +++---- src/platform/nm-platform.h | 12 +++++--- src/platform/tests/test-route.c | 48 +++++++++++++++++++++----------- 6 files changed, 96 insertions(+), 44 deletions(-) diff --git a/src/nm-policy.c b/src/nm-policy.c index c85f3217d..13099e369 100644 --- a/src/nm-policy.c +++ b/src/nm-policy.c @@ -658,9 +658,15 @@ update_ip4_routing (NMPolicy *policy, gboolean force_update) if (ip_ifindex <= 0) ip_ifindex = parent_ifindex; - if (!nm_platform_ip4_route_add (ip_ifindex, 0, 0, int_gw, 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)) + if (!nm_platform_ip4_route_add (ip_ifindex, + 0, 0, int_gw, + 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."); } @@ -669,9 +675,15 @@ update_ip4_routing (NMPolicy *policy, gboolean force_update) int mss = nm_ip4_config_get_mss (ip4_config); g_assert (ip_iface); - if (!nm_platform_ip4_route_add (ip_ifindex, 0, 0, gw_addr, 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)) { + if (!nm_platform_ip4_route_add (ip_ifindex, + 0, 0, gw_addr, + 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."); } } @@ -852,9 +864,15 @@ update_ip6_routing (NMPolicy *policy, gboolean force_update) if (ip_ifindex <= 0) ip_ifindex = parent_ifindex; - if (!nm_platform_ip6_route_add (ip_ifindex, in6addr_any, 0, *int_gw, 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)) { + if (!nm_platform_ip6_route_add (ip_ifindex, + in6addr_any, 0, *int_gw, + 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."); } } @@ -863,9 +881,15 @@ update_ip6_routing (NMPolicy *policy, gboolean force_update) } else { 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)) { - (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)) + if (!nm_platform_ip6_route_add (ip_ifindex, + in6addr_any, 0, *gw_addr, + 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."); } diff --git a/src/platform/nm-fake-platform.c b/src/platform/nm-fake-platform.c index 4f8f5b28a..1fe11bdd3 100644 --- a/src/platform/nm-fake-platform.c +++ b/src/platform/nm-fake-platform.c @@ -1039,8 +1039,9 @@ ip6_route_get_all (NMPlatform *platform, int ifindex, gboolean include_default) } 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) { NMFakePlatformPrivate *priv = NM_FAKE_PLATFORM_GET_PRIVATE (platform); NMPlatformIP4Route route; @@ -1077,8 +1078,9 @@ ip4_route_add (NMPlatform *platform, int ifindex, in_addr_t network, int plen, } 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) { NMFakePlatformPrivate *priv = NM_FAKE_PLATFORM_GET_PRIVATE (platform); NMPlatformIP6Route route; diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c index 6aa8b650e..5831a6ece 100644 --- a/src/platform/nm-linux-platform.c +++ b/src/platform/nm-linux-platform.c @@ -3315,7 +3315,9 @@ clear_host_address (int family, const void *network, int plen, void *dst) } 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]; struct rtnl_route *rtnlroute; @@ -3353,13 +3355,17 @@ build_rtnl_route (int family, int ifindex, gconstpointer network, int plen, gcon } 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)); } 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)); } diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c index 42b31453c..35525cf5d 100644 --- a/src/platform/nm-platform.c +++ b/src/platform/nm-platform.c @@ -1712,8 +1712,8 @@ nm_platform_ip6_route_get_all (int ifindex, gboolean include_default) 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) { reset_error (); @@ -1740,7 +1740,8 @@ nm_platform_ip4_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) { g_return_val_if_fail (platform, 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 -nm_platform_ip6_route_delete (int ifindex, - struct in6_addr network, int plen, int metric) +nm_platform_ip6_route_delete (int ifindex, struct in6_addr network, int plen, int metric) { reset_error (); diff --git a/src/platform/nm-platform.h b/src/platform/nm-platform.h index 9a2487125..d6f3fe0ba 100644 --- a/src/platform/nm-platform.h +++ b/src/platform/nm-platform.h @@ -429,9 +429,11 @@ typedef struct { GArray * (*ip4_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, - 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, - 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 (*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); @@ -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); gboolean nm_platform_route_set_metric (int ifindex, int metric); 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, - 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_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); diff --git a/src/platform/tests/test-route.c b/src/platform/tests/test-route.c index d07749d49..24bd089cf 100644 --- a/src/platform/tests/test-route.c +++ b/src/platform/tests/test-route.c @@ -66,13 +66,17 @@ test_ip4_route () inet_pton (AF_INET, "198.51.100.1", &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); /* Add route */ - 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 (); + 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); /* Add route again */ @@ -81,9 +85,12 @@ test_ip4_route () accept_signal (route_changed); /* Add default route */ - 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 (); + 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); /* Add default route again */ @@ -121,7 +128,8 @@ test_ip4_route () g_array_unref (routes); /* 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)); accept_signal (route_removed); @@ -153,13 +161,17 @@ test_ip6_route () inet_pton (AF_INET6, "2001:db8:c:d:1:2:3:4", &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); /* Add route */ - 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 (); + 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); /* Add route again */ @@ -168,9 +180,12 @@ test_ip6_route () accept_signal (route_changed); /* Add default route */ - 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 (); + 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); /* Add default route again */ @@ -208,7 +223,8 @@ test_ip6_route () g_array_unref (routes); /* 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)); accept_signal (route_removed);