diff options
author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2018-08-06 17:28:27 +0900 |
---|---|---|
committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2018-08-08 10:15:00 +0900 |
commit | f24648a66c54a78a6e6b6490d3e7390ccbc85b92 (patch) | |
tree | 6c4cdb8d507471e7e2c313b1467c0dc2be1b390f | |
parent | 27eba50e76819c447f7bea8c33ba062c5fb996c6 (diff) | |
download | systemd-f24648a66c54a78a6e6b6490d3e7390ccbc85b92.tar.gz |
network: move and rename link_duid()
-rw-r--r-- | src/network/networkd-dhcp4.c | 4 | ||||
-rw-r--r-- | src/network/networkd-dhcp6.c | 2 | ||||
-rw-r--r-- | src/network/networkd-link.c | 13 | ||||
-rw-r--r-- | src/network/networkd-link.h | 3 | ||||
-rw-r--r-- | src/network/networkd-manager.h | 7 |
5 files changed, 16 insertions, 13 deletions
diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c index 7798844e03..c49d8a0939 100644 --- a/src/network/networkd-dhcp4.c +++ b/src/network/networkd-dhcp4.c @@ -766,7 +766,7 @@ int dhcp4_configure(Link *link) { switch (link->network->dhcp_client_identifier) { case DHCP_CLIENT_ID_DUID: { /* If configured, apply user specified DUID and/or IAID */ - const DUID *duid = link_duid(link); + const DUID *duid = link_get_duid(link); r = sd_dhcp_client_set_iaid_duid(link->dhcp_client, link->network->iaid, @@ -779,7 +779,7 @@ int dhcp4_configure(Link *link) { } case DHCP_CLIENT_ID_DUID_ONLY: { /* If configured, apply user specified DUID */ - const DUID *duid = link_duid(link); + const DUID *duid = link_get_duid(link); r = sd_dhcp_client_set_duid(link->dhcp_client, duid->type, diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c index 0ec4deb716..aa400bc35b 100644 --- a/src/network/networkd-dhcp6.c +++ b/src/network/networkd-dhcp6.c @@ -494,7 +494,7 @@ int dhcp6_configure(Link *link) { if (r < 0) return log_link_error_errno(link, r, "DHCP6 CLIENT: Failed to set IAID: %m"); - duid = link_duid(link); + duid = link_get_duid(link); r = sd_dhcp6_client_set_duid(client, duid->type, duid->raw_data_len > 0 ? duid->raw_data : NULL, diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index 4c534e685d..6b870c5bd5 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -27,6 +27,13 @@ #include "util.h" #include "virt.h" +DUID* link_get_duid(Link *link) { + if (link->network->duid.type != _DUID_TYPE_INVALID) + return &link->network->duid; + else + return &link->manager->duid; +} + static bool link_dhcp6_enabled(Link *link) { assert(link); @@ -3430,7 +3437,7 @@ int link_update(Link *link, sd_netlink_message *m) { switch (link->network->dhcp_client_identifier) { case DHCP_CLIENT_ID_DUID: { - const DUID *duid = link_duid(link); + const DUID *duid = link_get_duid(link); r = sd_dhcp_client_set_iaid_duid(link->dhcp_client, link->network->iaid, @@ -3442,7 +3449,7 @@ int link_update(Link *link, sd_netlink_message *m) { break; } case DHCP_CLIENT_ID_DUID_ONLY: { - const DUID *duid = link_duid(link); + const DUID *duid = link_get_duid(link); r = sd_dhcp_client_set_duid(link->dhcp_client, duid->type, @@ -3466,7 +3473,7 @@ int link_update(Link *link, sd_netlink_message *m) { } if (link->dhcp6_client) { - const DUID* duid = link_duid(link); + const DUID* duid = link_get_duid(link); r = sd_dhcp6_client_set_mac(link->dhcp6_client, (const uint8_t *) &link->mac, diff --git a/src/network/networkd-link.h b/src/network/networkd-link.h index d3028bae50..35e44cd09f 100644 --- a/src/network/networkd-link.h +++ b/src/network/networkd-link.h @@ -43,6 +43,7 @@ typedef enum LinkOperationalState { typedef struct Manager Manager; typedef struct Network Network; typedef struct Address Address; +typedef struct DUID DUID; typedef struct Link { Manager *manager; @@ -123,6 +124,8 @@ typedef struct Link { Hashmap *bound_to_links; } Link; +DUID *link_get_duid(Link *link); + Link *link_unref(Link *link); Link *link_ref(Link *link); int link_get(Manager *m, int ifindex, Link **ret); diff --git a/src/network/networkd-manager.h b/src/network/networkd-manager.h index a6cb1e2d44..d6e3fe5478 100644 --- a/src/network/networkd-manager.h +++ b/src/network/networkd-manager.h @@ -56,13 +56,6 @@ struct Manager { Set *rules_saved; }; -static inline const DUID* link_duid(const Link *link) { - if (link->network->duid.type != _DUID_TYPE_INVALID) - return &link->network->duid; - else - return &link->manager->duid; -} - extern const sd_bus_vtable manager_vtable[]; int manager_new(Manager **ret); |