fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-09 10:38:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

ip6: rename defgw to gateway

Browse source 
This was suggested by Dan Winship but it didn't get to commit
8a059b1 by mistake.
This commit is contained in:
Pavel Šimerda 2012-06-07 21:51:19 +02:00 • committed by Dan Williams
parent 64bac49934
commit e88aa72e6a
5 changed files with 21 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/ip6-manager/nm-ip6-manager.c
View file

@ -1457,7 +1457,7 @@ nm_ip6_manager_get_ip6_config (NMIP6Manager *manager, int ifindex)
NMIP6Address *ip6addr; NMIP6Address *ip6addr;
struct rtnl_route *rtnlroute; struct rtnl_route *rtnlroute;
struct nl_addr *nldest, *nlgateway; struct nl_addr *nldest, *nlgateway;
struct in6_addr *dest, *gateway; const struct in6_addr *dest, *gateway;
uint32_t metric; uint32_t metric;
NMIP6Route *ip6route; NMIP6Route *ip6route;
int i; int i;
@ -1508,8 +1508,8 @@ nm_ip6_manager_get_ip6_config (NMIP6Manager *manager, int ifindex)
if (rtnl_route_get_dst_len (rtnlroute) == 0) { if (rtnl_route_get_dst_len (rtnlroute) == 0) {
/* Default gateway route; cache the router's address for later */ /* Default gateway route; cache the router's address for later */
if (!nm_ip6_config_get_defgw (config)) if (!nm_ip6_config_get_gateway (config))
nm_ip6_config_set_defgw (config, gateway); nm_ip6_config_set_gateway (config, gateway);
continue; continue;
} }
@ -1532,8 +1532,6 @@ nm_ip6_manager_get_ip6_config (NMIP6Manager *manager, int ifindex)
/* Add addresses */ /* Add addresses */
for (rtnladdr = FIRST_ADDR (priv->addr_cache); rtnladdr; rtnladdr = NEXT_ADDR (rtnladdr)) { for (rtnladdr = FIRST_ADDR (priv->addr_cache); rtnladdr; rtnladdr = NEXT_ADDR (rtnladdr)) {
const struct in6_addr *defgw;
if (rtnl_addr_get_ifindex (rtnladdr) != device->ifindex) if (rtnl_addr_get_ifindex (rtnladdr) != device->ifindex)
continue; continue;
@ -1546,9 +1544,9 @@ nm_ip6_manager_get_ip6_config (NMIP6Manager *manager, int ifindex)
nm_ip6_address_set_prefix (ip6addr, rtnl_addr_get_prefixlen (rtnladdr)); nm_ip6_address_set_prefix (ip6addr, rtnl_addr_get_prefixlen (rtnladdr));
nm_ip6_address_set_address (ip6addr, addr); nm_ip6_address_set_address (ip6addr, addr);
nm_ip6_config_take_address (config, ip6addr); nm_ip6_config_take_address (config, ip6addr);
defgw = nm_ip6_config_get_defgw (config); gateway = nm_ip6_config_get_gateway (config);
if (defgw) if (gateway)
nm_ip6_address_set_gateway (ip6addr, defgw); nm_ip6_address_set_gateway (ip6addr, gateway);
} }
/* Add DNS servers */ /* Add DNS servers */

4
src/nm-device.c
View file

@ -1851,8 +1851,8 @@ merge_ip6_configs (NMIP6Config *dst, NMIP6Config *src)
nm_ip6_config_add_nameserver (dst, nm_ip6_config_get_nameserver (src, i)); nm_ip6_config_add_nameserver (dst, nm_ip6_config_get_nameserver (src, i));
/* default gateway */ /* default gateway */
if (!nm_ip6_config_get_defgw (dst)) if (!nm_ip6_config_get_gateway (dst))
nm_ip6_config_set_defgw (dst, nm_ip6_config_get_defgw (src)); nm_ip6_config_set_gateway (dst, nm_ip6_config_get_gateway (src));
/* routes */ /* routes */
for (i = 0; i < nm_ip6_config_get_num_routes (src); i++) for (i = 0; i < nm_ip6_config_get_num_routes (src); i++)

18
src/nm-ip6-config.c
View file

@ -53,8 +53,8 @@ typedef struct {
GPtrArray *domains; GPtrArray *domains;
GPtrArray *searches; GPtrArray *searches;
gboolean defgw_set; gboolean gateway_set;
struct in6_addr defgw; struct in6_addr gateway;
GSList *routes; GSList *routes;
gboolean never_default; gboolean never_default;
@ -247,27 +247,27 @@ void nm_ip6_config_reset_nameservers (NMIP6Config *config)
} }
void void
nm_ip6_config_set_defgw (NMIP6Config *config, const struct in6_addr *defgw) nm_ip6_config_set_gateway (NMIP6Config *config, const struct in6_addr *gateway)
{ {
NMIP6ConfigPrivate *priv; NMIP6ConfigPrivate *priv;
g_return_if_fail (NM_IS_IP6_CONFIG (config)); g_return_if_fail (NM_IS_IP6_CONFIG (config));
priv = NM_IP6_CONFIG_GET_PRIVATE (config); priv = NM_IP6_CONFIG_GET_PRIVATE (config);
if (defgw) if (gateway)
memcpy (&priv->defgw, defgw, sizeof (priv->defgw)); memcpy (&priv->gateway, gateway, sizeof (priv->gateway));
priv->defgw_set = !!defgw; priv->gateway_set = !!gateway;
} }
const struct in6_addr * const struct in6_addr *
nm_ip6_config_get_defgw (NMIP6Config *config) nm_ip6_config_get_gateway (NMIP6Config *config)
{ {
NMIP6ConfigPrivate *priv; NMIP6ConfigPrivate *priv;
g_return_val_if_fail (NM_IS_IP6_CONFIG (config), NULL); g_return_val_if_fail (NM_IS_IP6_CONFIG (config), NULL);
priv = NM_IP6_CONFIG_GET_PRIVATE (config); priv = NM_IP6_CONFIG_GET_PRIVATE (config);
return priv->defgw_set ? &priv->defgw : NULL; return priv->gateway_set ? &priv->gateway : NULL;
} }
void void
@ -744,7 +744,7 @@ nm_ip6_config_init (NMIP6Config *config)
priv->nameservers = g_array_new (FALSE, TRUE, sizeof (struct in6_addr)); priv->nameservers = g_array_new (FALSE, TRUE, sizeof (struct in6_addr));
priv->domains = g_ptr_array_sized_new (3); priv->domains = g_ptr_array_sized_new (3);
priv->searches = g_ptr_array_sized_new (3); priv->searches = g_ptr_array_sized_new (3);
priv->defgw_set = FALSE; priv->gateway_set = FALSE;
} }
static void static void

4
src/nm-ip6-config.h
View file

@ -67,8 +67,8 @@ const struct in6_addr *nm_ip6_config_get_nameserver (NMIP6Config *config, g
guint32 nm_ip6_config_get_num_nameservers (NMIP6Config *config); guint32 nm_ip6_config_get_num_nameservers (NMIP6Config *config);
void nm_ip6_config_reset_nameservers (NMIP6Config *config); void nm_ip6_config_reset_nameservers (NMIP6Config *config);
void nm_ip6_config_set_defgw (NMIP6Config *config, const struct in6_addr *defgw); void nm_ip6_config_set_gateway (NMIP6Config *config, const struct in6_addr *gateway);
const struct in6_addr *nm_ip6_config_get_defgw (NMIP6Config *config); const struct in6_addr *nm_ip6_config_get_gateway (NMIP6Config *config);
void nm_ip6_config_take_route (NMIP6Config *config, NMIP6Route *route); void nm_ip6_config_take_route (NMIP6Config *config, NMIP6Route *route);
void nm_ip6_config_add_route (NMIP6Config *config, NMIP6Route *route); void nm_ip6_config_add_route (NMIP6Config *config, NMIP6Route *route);

4
src/nm-policy.c
View file

@ -756,8 +756,8 @@ update_ip6_routing (NMPolicy *policy, gboolean force_update)
} else { } else {
if (memcmp (nm_ip6_address_get_gateway (addr)->s6_addr, in6addr_any.s6_addr, sizeof (in6addr_any.s6_addr)) != 0) if (memcmp (nm_ip6_address_get_gateway (addr)->s6_addr, in6addr_any.s6_addr, sizeof (in6addr_any.s6_addr)) != 0)
nm_system_replace_default_ip6_route (ip_ifindex, nm_ip6_address_get_gateway (addr)); nm_system_replace_default_ip6_route (ip_ifindex, nm_ip6_address_get_gateway (addr));
else if (nm_ip6_config_get_defgw (ip6_config)) else if (nm_ip6_config_get_gateway (ip6_config))
nm_system_replace_default_ip6_route (ip_ifindex, nm_ip6_config_get_defgw (ip6_config)); nm_system_replace_default_ip6_route (ip_ifindex, nm_ip6_config_get_gateway (ip6_config));
else else
nm_log_dbg (LOGD_IP6, "missing default IPv6 route"); nm_log_dbg (LOGD_IP6, "missing default IPv6 route");
} }