fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-03 17:30:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

rdisc/trivial: rename @uuid field to @network_id

Browse source 
Next we will optionally use a stable-id instead of the UUID. Rename it.
Also, RFC 7217 calls this argument Network_ID.
This commit is contained in:
Thomas Haller 2016-06-21 18:07:00 +02:00
parent 3f3ea1df21
commit 0df5e9b736
6 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/nm-core-utils.c
View file

@ -2955,7 +2955,7 @@ nm_utils_inet6_interface_identifier_to_token (NMUtilsIPv6IfaceId iid, char *buf)
static gboolean
_set_stable_privacy (struct in6_addr *addr,
const char *ifname,
const char *uuid,
const char *network_id,
guint dad_counter,
guint8 *secret_key,
gsize key_len,
@ -2981,9 +2981,9 @@ _set_stable_privacy (struct in6_addr *addr,
g_checksum_update (sum, addr->s6_addr, 8);
g_checksum_update (sum, (const guchar *) ifname, strlen (ifname) + 1);
if (!uuid)
uuid = "";
g_checksum_update (sum, (const guchar *) uuid, strlen (uuid) + 1);
if (!network_id)
network_id = "";
g_checksum_update (sum, (const guchar *) network_id, strlen (network_id) + 1);
tmp[0] = htonl (dad_counter);
tmp[1] = htonl (key_len);
g_checksum_update (sum, (const guchar *) tmp, sizeof (tmp));
@ -3011,7 +3011,7 @@ _set_stable_privacy (struct in6_addr *addr,
gboolean
nm_utils_ipv6_addr_set_stable_privacy (struct in6_addr *addr,
const char *ifname,
const char *uuid,
const char *network_id,
guint dad_counter,
GError **error)
{
@ -3028,7 +3028,7 @@ nm_utils_ipv6_addr_set_stable_privacy (struct in6_addr *addr,
if (!secret_key)
return FALSE;
return _set_stable_privacy (addr, ifname, uuid, dad_counter,
return _set_stable_privacy (addr, ifname, network_id, dad_counter,
secret_key, key_len, error);
}

2
src/nm-core-utils.h
View file

@ -355,7 +355,7 @@ gboolean nm_utils_get_ipv6_interface_identifier (NMLinkType link_type,
gboolean nm_utils_ipv6_addr_set_stable_privacy (struct in6_addr *addr,
const char *ifname,
const char *uuid,
const char *network_id,
guint dad_counter,
GError **error);

4
src/rdisc/nm-lndp-rdisc.c
View file

@ -321,7 +321,7 @@ NMRDisc *
nm_lndp_rdisc_new (NMPlatform *platform,
int ifindex,
const char *ifname,
const char *uuid,
const char *network_id,
NMSettingIP6ConfigAddrGenMode addr_gen_mode,
GError **error)
{
@ -342,7 +342,7 @@ nm_lndp_rdisc_new (NMPlatform *platform,
rdisc->ifindex = ifindex;
rdisc->ifname = g_strdup (ifname);
rdisc->uuid = g_strdup (uuid);
rdisc->network_id = g_strdup (network_id);
rdisc->addr_gen_mode = addr_gen_mode;
rdisc->max_addresses = ipv6_sysctl_get (platform, ifname, "max_addresses",

2
src/rdisc/nm-lndp-rdisc.h
View file

@ -47,7 +47,7 @@ GType nm_lndp_rdisc_get_type (void);
NMRDisc *nm_lndp_rdisc_new (NMPlatform *platform,
int ifindex,
const char *ifname,
const char *uuid,
const char *network_id,
NMSettingIP6ConfigAddrGenMode addr_gen_mode,
GError **error);

4
src/rdisc/nm-rdisc.c
View file

@ -142,7 +142,7 @@ complete_address (NMRDisc *rdisc, NMRDiscAddress *addr)
if (rdisc->addr_gen_mode == NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_STABLE_PRIVACY) {
if (!nm_utils_ipv6_addr_set_stable_privacy (&addr->address,
rdisc->ifname,
rdisc->uuid,
rdisc->network_id,
addr->dad_counter++,
&error)) {
_LOGW ("complete-address: failed to generate an stable-privacy address: %s",
@ -777,7 +777,7 @@ finalize (GObject *object)
NMRDisc *rdisc = NM_RDISC (object);
g_free (rdisc->ifname);
g_free (rdisc->uuid);
g_free (rdisc->network_id);
g_array_unref (rdisc->gateways);
g_array_unref (rdisc->addresses);
g_array_unref (rdisc->routes);

2
src/rdisc/nm-rdisc.h
View file

@ -118,7 +118,7 @@ typedef struct {
int ifindex;
char *ifname;
char *uuid;
char *network_id;
NMSettingIP6ConfigAddrGenMode addr_gen_mode;
NMUtilsIPv6IfaceId iid;
gint32 max_addresses;