dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-07-19 14:00:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

network/address: make Address object optionally take reference to IPv6Token

Browse Source 
Currently, the element is unused. Preparation for later commits.
This commit is contained in:
Yu Watanabe
2024-04-09 11:22:00 +09:00
parent ffafb56125
commit e39bb29100
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/network/networkd-address.c
View File

@@ -260,6 +260,7 @@ static Address* address_free(Address *address) {
config_section_free(address->section);
free(address->label);
free(address->netlabel);
ipv6_token_unref(address->token);
nft_set_context_clear(&address->nft_set_context);
return mfree(address);
}
@@ -608,6 +609,7 @@ int address_dup(const Address *src, Address **ret) {
dest->section = NULL;
dest->link = NULL;
dest->label = NULL;
dest->token = ipv6_token_ref(src->token);
dest->netlabel = NULL;
dest->nft_set_context.sets = NULL;
dest->nft_set_context.n_sets = 0;
@@ -1886,6 +1888,10 @@ int manager_rtnl_process_address(sd_netlink *rtnl, sd_netlink_message *message,
(void) nft_set_context_dup(&a->nft_set_context, &address->nft_set_context);
address->requested_as_null = a->requested_as_null;
address->callback = a->callback;
ipv6_token_ref(a->token);
ipv6_token_unref(address->token);
address->token = a->token;
}
/* Then, update miscellaneous info. */

4
src/network/networkd-address.h
View File

@@ -10,6 +10,7 @@
#include "hash-funcs.h"
#include "in-addr-util.h"
#include "network-util.h"
#include "networkd-address-generation.h"
#include "networkd-link.h"
#include "networkd-util.h"
#include "time-util.h"
@@ -63,6 +64,9 @@ struct Address {
* To control DAD for IPv6 dynamic addresses, set IFA_F_NODAD to flags. */
AddressFamily duplicate_address_detection;
/* Used by address generator. */
IPv6Token *token;
/* Called when address become ready */
address_ready_callback_t callback;