mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-07-22 10:46:59 +00:00
trivial: whitespace fix
Signed-off-by: Thomas Haller <thaller@redhat.com>
This commit is contained in:
parent
10bd060076
commit
f059298896
|
@ -310,7 +310,7 @@ construct_ip6_items (GSList *items, GHashTable *ip6_config, const char *prefix)
|
|||
first = FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
items = g_slist_prepend (items, tmp->str);
|
||||
g_string_free (tmp, FALSE);
|
||||
}
|
||||
|
@ -448,7 +448,7 @@ nm_dispatcher_utils_construct_envp (const char *action,
|
|||
return NULL;
|
||||
}
|
||||
ip_iface = g_value_get_string (value);
|
||||
}
|
||||
}
|
||||
|
||||
/* Device type */
|
||||
value = g_hash_table_lookup (device_props, NMD_DEVICE_PROPS_TYPE);
|
||||
|
|
|
@ -345,7 +345,7 @@ _gvalues_compare_map (const GValue *value1, const GValue *value2)
|
|||
}
|
||||
|
||||
hash1 = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, _gvalue_destroy);
|
||||
dbus_g_type_map_value_iterate (value1, iterate_map, &hash1);
|
||||
dbus_g_type_map_value_iterate (value1, iterate_map, &hash1);
|
||||
len1 = g_hash_table_size (hash1);
|
||||
|
||||
hash2 = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, _gvalue_destroy);
|
||||
|
|
|
@ -878,7 +878,7 @@ set_property (GObject *object, guint prop_id,
|
|||
g_array_free (priv->dns, TRUE);
|
||||
priv->dns = g_value_dup_boxed (value);
|
||||
if (!priv->dns)
|
||||
priv->dns = g_array_sized_new (FALSE, TRUE, sizeof (guint32), 3);
|
||||
priv->dns = g_array_sized_new (FALSE, TRUE, sizeof (guint32), 3);
|
||||
break;
|
||||
case PROP_DNS_SEARCH:
|
||||
g_slist_free_full (priv->dns_search, g_free);
|
||||
|
|
|
@ -991,7 +991,7 @@ nm_utils_ip4_routes_from_gvalue (const GValue *value)
|
|||
g_warning ("Ignoring invalid IP4 route");
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
route = nm_ip4_route_new ();
|
||||
nm_ip4_route_set_dest (route, g_array_index (array, guint32, 0));
|
||||
nm_ip4_route_set_prefix (route, g_array_index (array, guint32, 1));
|
||||
|
|
|
@ -3177,8 +3177,8 @@ addrconf6_start (NMDevice *self)
|
|||
return FALSE;
|
||||
}
|
||||
|
||||
priv->rdisc_config_changed_sigid = g_signal_connect (
|
||||
priv->rdisc, NM_RDISC_CONFIG_CHANGED, G_CALLBACK (rdisc_config_changed), self);
|
||||
priv->rdisc_config_changed_sigid = g_signal_connect (priv->rdisc, NM_RDISC_CONFIG_CHANGED,
|
||||
G_CALLBACK (rdisc_config_changed), self);
|
||||
|
||||
/* FIXME: what if interface has no lladdr, like PPP? */
|
||||
if (priv->hw_addr_len)
|
||||
|
|
|
@ -183,7 +183,7 @@ dispose (GObject *object)
|
|||
|
||||
g_clear_object (&priv->client);
|
||||
|
||||
G_OBJECT_CLASS (nm_atm_manager_parent_class)->dispose (object);
|
||||
G_OBJECT_CLASS (nm_atm_manager_parent_class)->dispose (object);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
@ -279,9 +279,9 @@ typedef struct {
|
|||
GArray * (*ip4_address_get_all) (NMPlatform *, int ifindex);
|
||||
GArray * (*ip6_address_get_all) (NMPlatform *, int ifindex);
|
||||
gboolean (*ip4_address_add) (NMPlatform *, int ifindex, in_addr_t address, int plen,
|
||||
guint32 lifetime, guint32 preferred_lft);
|
||||
guint32 lifetime, guint32 preferred_lft);
|
||||
gboolean (*ip6_address_add) (NMPlatform *, int ifindex, struct in6_addr address, int plen,
|
||||
guint32 lifetime, guint32 preferred_lft);
|
||||
guint32 lifetime, guint32 preferred_lft);
|
||||
gboolean (*ip4_address_delete) (NMPlatform *, int ifindex, in_addr_t address, int plen);
|
||||
gboolean (*ip6_address_delete) (NMPlatform *, int ifindex, struct in6_addr address, int plen);
|
||||
gboolean (*ip4_address_exists) (NMPlatform *, int ifindex, in_addr_t address, int plen);
|
||||
|
@ -290,9 +290,9 @@ 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);
|
||||
|
@ -400,9 +400,9 @@ gboolean nm_platform_gre_get_properties (int ifindex, NMPlatformGreProperties *p
|
|||
GArray *nm_platform_ip4_address_get_all (int ifindex);
|
||||
GArray *nm_platform_ip6_address_get_all (int ifindex);
|
||||
gboolean nm_platform_ip4_address_add (int ifindex, in_addr_t address, int plen,
|
||||
guint32 lifetime, guint32 preferred_lft);
|
||||
guint32 lifetime, guint32 preferred_lft);
|
||||
gboolean nm_platform_ip6_address_add (int ifindex, struct in6_addr address, int plen,
|
||||
guint32 lifetime, guint32 preferred_lft);
|
||||
guint32 lifetime, guint32 preferred_lft);
|
||||
gboolean nm_platform_ip4_address_delete (int ifindex, in_addr_t address, int plen);
|
||||
gboolean nm_platform_ip6_address_delete (int ifindex, struct in6_addr address, int plen);
|
||||
gboolean nm_platform_ip4_address_exists (int ifindex, in_addr_t address, int plen);
|
||||
|
@ -415,9 +415,9 @@ 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);
|
||||
|
|
|
@ -218,7 +218,7 @@ test_ip6_address_external (void)
|
|||
g_assert (!nm_platform_ip6_address_exists (ifindex, addr, IP6_PLEN));
|
||||
|
||||
/* Add/delete conflict */
|
||||
run_command ("ip address add %s/%d dev %s valid_lft %d preferred_lft %d",
|
||||
run_command ("ip address add %s/%d dev %s valid_lft %d preferred_lft %d",
|
||||
IP6_ADDRESS, IP6_PLEN, DEVICE_NAME, lifetime, preferred);
|
||||
g_assert (nm_platform_ip6_address_add (ifindex, addr, IP6_PLEN, lifetime, preferred));
|
||||
no_error ();
|
||||
|
|
|
@ -85,12 +85,12 @@ typedef struct {
|
|||
} NMRDiscDNSDomain;
|
||||
|
||||
typedef enum {
|
||||
NM_RDISC_CONFIG_DHCP_LEVEL = 1 << 0,
|
||||
NM_RDISC_CONFIG_GATEWAYS = 1 << 1,
|
||||
NM_RDISC_CONFIG_ADDRESSES = 1 << 2,
|
||||
NM_RDISC_CONFIG_ROUTES = 1 << 3,
|
||||
NM_RDISC_CONFIG_DNS_SERVERS = 1 << 4,
|
||||
NM_RDISC_CONFIG_DNS_DOMAINS = 1 << 5
|
||||
NM_RDISC_CONFIG_DHCP_LEVEL = 1 << 0,
|
||||
NM_RDISC_CONFIG_GATEWAYS = 1 << 1,
|
||||
NM_RDISC_CONFIG_ADDRESSES = 1 << 2,
|
||||
NM_RDISC_CONFIG_ROUTES = 1 << 3,
|
||||
NM_RDISC_CONFIG_DNS_SERVERS = 1 << 4,
|
||||
NM_RDISC_CONFIG_DNS_DOMAINS = 1 << 5
|
||||
} NMRDiscConfigMap;
|
||||
|
||||
/**
|
||||
|
|
|
@ -499,7 +499,7 @@ plugin_state_changed (DBusGProxy *proxy,
|
|||
nm_log_info (LOGD_VPN, "VPN plugin state change reason: %d", priv->failure_reason);
|
||||
nm_vpn_connection_set_vpn_state (connection,
|
||||
NM_VPN_CONNECTION_STATE_FAILED,
|
||||
priv->failure_reason);
|
||||
priv->failure_reason);
|
||||
|
||||
/* Reset the failure reason */
|
||||
priv->failure_reason = NM_VPN_CONNECTION_STATE_REASON_UNKNOWN;
|
||||
|
@ -570,7 +570,7 @@ print_vpn_config (NMVPNConnection *connection)
|
|||
nm_log_info (LOGD_VPN, " Internal Address: %s", ip_address_to_string (address4->address));
|
||||
nm_log_info (LOGD_VPN, " Internal Prefix: %d", address4->plen);
|
||||
nm_log_info (LOGD_VPN, " Internal Point-to-Point Address: %s",
|
||||
ip_address_to_string (nm_ip4_config_get_ptp_address (priv->ip4_config)));
|
||||
ip_address_to_string (nm_ip4_config_get_ptp_address (priv->ip4_config)));
|
||||
nm_log_info (LOGD_VPN, " Maximum Segment Size (MSS): %d", nm_ip4_config_get_mss (priv->ip4_config));
|
||||
|
||||
num = nm_ip4_config_get_num_routes (priv->ip4_config);
|
||||
|
@ -584,12 +584,12 @@ print_vpn_config (NMVPNConnection *connection)
|
|||
}
|
||||
|
||||
nm_log_info (LOGD_VPN, " Forbid Default Route: %s",
|
||||
nm_ip4_config_get_never_default (priv->ip4_config) ? "yes" : "no");
|
||||
nm_ip4_config_get_never_default (priv->ip4_config) ? "yes" : "no");
|
||||
|
||||
num = nm_ip4_config_get_num_nameservers (priv->ip4_config);
|
||||
for (i = 0; i < num; i++) {
|
||||
nm_log_info (LOGD_VPN, " Internal DNS: %s",
|
||||
ip_address_to_string (nm_ip4_config_get_nameserver (priv->ip4_config, i)));
|
||||
ip_address_to_string (nm_ip4_config_get_nameserver (priv->ip4_config, i)));
|
||||
}
|
||||
|
||||
if (nm_ip4_config_get_num_domains (priv->ip4_config) > 0)
|
||||
|
@ -609,7 +609,7 @@ print_vpn_config (NMVPNConnection *connection)
|
|||
nm_log_info (LOGD_VPN, " Internal Address: %s", ip6_address_to_string (&address6->address));
|
||||
nm_log_info (LOGD_VPN, " Internal Prefix: %d", address6->plen);
|
||||
nm_log_info (LOGD_VPN, " Internal Point-to-Point Address: %s",
|
||||
ip6_address_to_string (nm_ip6_config_get_ptp_address (priv->ip6_config)));
|
||||
ip6_address_to_string (nm_ip6_config_get_ptp_address (priv->ip6_config)));
|
||||
nm_log_info (LOGD_VPN, " Maximum Segment Size (MSS): %d", nm_ip6_config_get_mss (priv->ip6_config));
|
||||
|
||||
num = nm_ip6_config_get_num_routes (priv->ip6_config);
|
||||
|
@ -623,12 +623,12 @@ print_vpn_config (NMVPNConnection *connection)
|
|||
}
|
||||
|
||||
nm_log_info (LOGD_VPN, " Forbid Default Route: %s",
|
||||
nm_ip6_config_get_never_default (priv->ip6_config) ? "yes" : "no");
|
||||
nm_ip6_config_get_never_default (priv->ip6_config) ? "yes" : "no");
|
||||
|
||||
num = nm_ip6_config_get_num_nameservers (priv->ip6_config);
|
||||
for (i = 0; i < num; i++) {
|
||||
nm_log_info (LOGD_VPN, " Internal DNS: %s",
|
||||
ip6_address_to_string (nm_ip6_config_get_nameserver (priv->ip6_config, i)));
|
||||
ip6_address_to_string (nm_ip6_config_get_nameserver (priv->ip6_config, i)));
|
||||
}
|
||||
|
||||
if (nm_ip6_config_get_num_domains (priv->ip6_config) > 0)
|
||||
|
|
Loading…
Reference in a new issue