summaryrefslogtreecommitdiff
path: root/src/network
diff options
context:
space:
mode:
Diffstat (limited to 'src/network')
-rw-r--r--src/network/networkctl.c8
-rw-r--r--src/network/networkd-address.c18
-rw-r--r--src/network/networkd-dhcp4.c14
-rw-r--r--src/network/networkd-dhcp6.c2
-rw-r--r--src/network/networkd-ipv4ll.c4
-rw-r--r--src/network/networkd-link.c10
-rw-r--r--src/network/networkd-link.h4
-rw-r--r--src/network/networkd-lldp-rx.c2
-rw-r--r--src/network/networkd-lldp-tx.c2
-rw-r--r--src/network/networkd-ndisc.c6
-rw-r--r--src/network/networkd-radv.c4
11 files changed, 37 insertions, 37 deletions
diff --git a/src/network/networkctl.c b/src/network/networkctl.c
index 619ef91288..4423847eaf 100644
--- a/src/network/networkctl.c
+++ b/src/network/networkctl.c
@@ -272,7 +272,7 @@ typedef struct LinkInfo {
sd_device *sd_device;
int ifindex;
unsigned short iftype;
- hw_addr_data hw_address;
+ struct hw_addr_data hw_address;
struct ether_addr permanent_mac_address;
uint32_t master;
uint32_t mtu;
@@ -554,13 +554,13 @@ static int decode_link(sd_netlink_message *m, LinkInfo *info, char **patterns, b
info->has_mac_address =
netlink_message_read_hw_addr(m, IFLA_ADDRESS, &info->hw_address) >= 0 &&
- memcmp(&info->hw_address, &HW_ADDR_NULL, sizeof(hw_addr_data)) != 0;
+ memcmp(&info->hw_address, &HW_ADDR_NULL, sizeof(struct hw_addr_data)) != 0;
info->has_permanent_mac_address =
ethtool_get_permanent_macaddr(NULL, info->name, &info->permanent_mac_address) >= 0 &&
memcmp(&info->permanent_mac_address, &ETHER_ADDR_NULL, sizeof(struct ether_addr)) != 0 &&
(info->hw_address.length != sizeof(struct ether_addr) ||
- memcmp(&info->permanent_mac_address, info->hw_address.addr.bytes, sizeof(struct ether_addr)) != 0);
+ memcmp(&info->permanent_mac_address, info->hw_address.bytes, sizeof(struct ether_addr)) != 0);
(void) sd_netlink_message_read_u32(m, IFLA_MTU, &info->mtu);
(void) sd_netlink_message_read_u32(m, IFLA_MIN_MTU, &info->min_mtu);
@@ -1684,7 +1684,7 @@ static int link_status_one(
_cleanup_free_ char *description = NULL;
if (info->hw_address.length == ETH_ALEN)
- (void) ieee_oui(hwdb, &info->hw_address.addr.ether, &description);
+ (void) ieee_oui(hwdb, &info->hw_address.ether, &description);
r = table_add_many(table,
TABLE_EMPTY,
diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c
index ad7ef85d8a..b84181892e 100644
--- a/src/network/networkd-address.c
+++ b/src/network/networkd-address.c
@@ -59,22 +59,22 @@ int generate_ipv6_eui_64_address(const Link *link, struct in6_addr *ret) {
if (link->iftype == ARPHRD_INFINIBAND) {
/* see RFC4391 section 8 */
- memcpy(&ret->s6_addr[8], &link->hw_addr.addr.infiniband[12], 8);
+ memcpy(&ret->s6_addr[8], &link->hw_addr.infiniband[12], 8);
ret->s6_addr[8] ^= 1 << 1;
return 0;
}
/* see RFC4291 section 2.5.1 */
- ret->s6_addr[8] = link->hw_addr.addr.ether.ether_addr_octet[0];
+ ret->s6_addr[8] = link->hw_addr.ether.ether_addr_octet[0];
ret->s6_addr[8] ^= 1 << 1;
- ret->s6_addr[9] = link->hw_addr.addr.ether.ether_addr_octet[1];
- ret->s6_addr[10] = link->hw_addr.addr.ether.ether_addr_octet[2];
+ ret->s6_addr[9] = link->hw_addr.ether.ether_addr_octet[1];
+ ret->s6_addr[10] = link->hw_addr.ether.ether_addr_octet[2];
ret->s6_addr[11] = 0xff;
ret->s6_addr[12] = 0xfe;
- ret->s6_addr[13] = link->hw_addr.addr.ether.ether_addr_octet[3];
- ret->s6_addr[14] = link->hw_addr.addr.ether.ether_addr_octet[4];
- ret->s6_addr[15] = link->hw_addr.addr.ether.ether_addr_octet[5];
+ ret->s6_addr[13] = link->hw_addr.ether.ether_addr_octet[3];
+ ret->s6_addr[14] = link->hw_addr.ether.ether_addr_octet[4];
+ ret->s6_addr[15] = link->hw_addr.ether.ether_addr_octet[5];
return 0;
}
@@ -1531,7 +1531,7 @@ static int ipv4_dad_configure(Address *address) {
if (r < 0)
return r;
- r = sd_ipv4acd_set_mac(address->acd, &address->link->hw_addr.addr.ether);
+ r = sd_ipv4acd_set_mac(address->acd, &address->link->hw_addr.ether);
if (r < 0)
return r;
@@ -1561,7 +1561,7 @@ static int ipv4_dad_update_mac_one(Address *address) {
if (r < 0)
return r;
- r = sd_ipv4acd_set_mac(address->acd, &address->link->hw_addr.addr.ether);
+ r = sd_ipv4acd_set_mac(address->acd, &address->link->hw_addr.ether);
if (r < 0)
return r;
diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c
index 4a11b91677..878b306c1f 100644
--- a/src/network/networkd-dhcp4.c
+++ b/src/network/networkd-dhcp4.c
@@ -852,7 +852,7 @@ static int dhcp4_configure_dad(Link *link) {
if (r < 0)
return r;
- r = sd_ipv4acd_set_mac(link->dhcp_acd, &link->hw_addr.addr.ether);
+ r = sd_ipv4acd_set_mac(link->dhcp_acd, &link->hw_addr.ether);
if (r < 0)
return r;
@@ -874,7 +874,7 @@ static int dhcp4_dad_update_mac(Link *link) {
if (r < 0)
return r;
- r = sd_ipv4acd_set_mac(link->dhcp_acd, &link->hw_addr.addr.ether);
+ r = sd_ipv4acd_set_mac(link->dhcp_acd, &link->hw_addr.ether);
if (r < 0)
return r;
@@ -1437,7 +1437,7 @@ static int dhcp4_set_client_identifier(Link *link) {
break;
}
case DHCP_CLIENT_ID_MAC: {
- const uint8_t *hw_addr = link->hw_addr.addr.bytes;
+ const uint8_t *hw_addr = link->hw_addr.bytes;
size_t hw_addr_len = link->hw_addr.length;
if (link->iftype == ARPHRD_INFINIBAND && hw_addr_len == INFINIBAND_ALEN) {
@@ -1546,8 +1546,8 @@ int dhcp4_configure(Link *link) {
return log_link_warning_errno(link, r, "DHCP4 CLIENT: Failed to attach event to DHCP4 client: %m");
r = sd_dhcp_client_set_mac(link->dhcp_client,
- link->hw_addr.addr.bytes,
- link->bcast_addr.length > 0 ? link->bcast_addr.addr.bytes : NULL,
+ link->hw_addr.bytes,
+ link->bcast_addr.length > 0 ? link->bcast_addr.bytes : NULL,
link->hw_addr.length, link->iftype);
if (r < 0)
return log_link_warning_errno(link, r, "DHCP4 CLIENT: Failed to set MAC address: %m");
@@ -1702,8 +1702,8 @@ int dhcp4_update_mac(Link *link) {
if (!link->dhcp_client)
return 0;
- r = sd_dhcp_client_set_mac(link->dhcp_client, link->hw_addr.addr.bytes,
- link->bcast_addr.length > 0 ? link->bcast_addr.addr.bytes : NULL,
+ r = sd_dhcp_client_set_mac(link->dhcp_client, link->hw_addr.bytes,
+ link->bcast_addr.length > 0 ? link->bcast_addr.bytes : NULL,
link->hw_addr.length, link->iftype);
if (r < 0)
return r;
diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c
index 488f903329..e2c314514b 100644
--- a/src/network/networkd-dhcp6.c
+++ b/src/network/networkd-dhcp6.c
@@ -1569,7 +1569,7 @@ static int dhcp6_set_identifier(Link *link, sd_dhcp6_client *client) {
assert(link->network);
assert(client);
- r = sd_dhcp6_client_set_mac(client, link->hw_addr.addr.bytes, link->hw_addr.length, link->iftype);
+ r = sd_dhcp6_client_set_mac(client, link->hw_addr.bytes, link->hw_addr.length, link->iftype);
if (r < 0)
return r;
diff --git a/src/network/networkd-ipv4ll.c b/src/network/networkd-ipv4ll.c
index 2ad7f2c5dc..a2a76d848c 100644
--- a/src/network/networkd-ipv4ll.c
+++ b/src/network/networkd-ipv4ll.c
@@ -166,7 +166,7 @@ int ipv4ll_configure(Link *link) {
return r;
}
- r = sd_ipv4ll_set_mac(link->ipv4ll, &link->hw_addr.addr.ether);
+ r = sd_ipv4ll_set_mac(link->ipv4ll, &link->hw_addr.ether);
if (r < 0)
return r;
@@ -196,7 +196,7 @@ int ipv4ll_update_mac(Link *link) {
if (r < 0)
return r;
- r = sd_ipv4ll_set_mac(link->ipv4ll, &link->hw_addr.addr.ether);
+ r = sd_ipv4ll_set_mac(link->ipv4ll, &link->hw_addr.ether);
if (r < 0)
return r;
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 6933c8890f..1ec346ff53 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -1157,7 +1157,7 @@ static int link_get_network(Link *link, Network **ret) {
r = net_match_config(
&network->match,
link->sd_device,
- &link->hw_addr.addr.ether,
+ &link->hw_addr.ether,
&link->permanent_mac,
link->driver,
link->iftype,
@@ -1968,7 +1968,7 @@ static int link_update_master(Link *link, sd_netlink_message *message) {
}
static int link_update_hardware_address(Link *link, sd_netlink_message *message) {
- hw_addr_data hw_addr;
+ struct hw_addr_data hw_addr;
int r;
assert(link);
@@ -1985,7 +1985,7 @@ static int link_update_hardware_address(Link *link, sd_netlink_message *message)
return log_link_warning_errno(link, r, "rtnl: failed to read hardware address: %m");
if (link->hw_addr.length == hw_addr.length &&
- memcmp(link->hw_addr.addr.bytes, hw_addr.addr.bytes, hw_addr.length) == 0)
+ memcmp(link->hw_addr.bytes, hw_addr.bytes, hw_addr.length) == 0)
return 0;
link->hw_addr = hw_addr;
@@ -2009,13 +2009,13 @@ static int link_update_hardware_address(Link *link, sd_netlink_message *message)
return log_link_debug_errno(link, r, "Could not update MAC address for Router Advertisement: %m");
if (link->ndisc) {
- r = sd_ndisc_set_mac(link->ndisc, &link->hw_addr.addr.ether);
+ r = sd_ndisc_set_mac(link->ndisc, &link->hw_addr.ether);
if (r < 0)
return log_link_debug_errno(link, r, "Could not update MAC for NDisc: %m");
}
if (link->lldp) {
- r = sd_lldp_set_filter_address(link->lldp, &link->hw_addr.addr.ether);
+ r = sd_lldp_set_filter_address(link->lldp, &link->hw_addr.ether);
if (r < 0)
return log_link_debug_errno(link, r, "Could not update MAC address for LLDP: %m");
}
diff --git a/src/network/networkd-link.h b/src/network/networkd-link.h
index 780bdee185..f5a2fc802b 100644
--- a/src/network/networkd-link.h
+++ b/src/network/networkd-link.h
@@ -53,8 +53,8 @@ typedef struct Link {
char *kind;
unsigned short iftype;
char *state_file;
- hw_addr_data hw_addr;
- hw_addr_data bcast_addr;
+ struct hw_addr_data hw_addr;
+ struct hw_addr_data bcast_addr;
struct ether_addr permanent_mac;
struct in6_addr ipv6ll_address;
uint32_t mtu;
diff --git a/src/network/networkd-lldp-rx.c b/src/network/networkd-lldp-rx.c
index d781f443d6..56e4244f41 100644
--- a/src/network/networkd-lldp-rx.c
+++ b/src/network/networkd-lldp-rx.c
@@ -95,7 +95,7 @@ int link_lldp_rx_configure(Link *link) {
if (r < 0)
return r;
- r = sd_lldp_set_filter_address(link->lldp, &link->hw_addr.addr.ether);
+ r = sd_lldp_set_filter_address(link->lldp, &link->hw_addr.ether);
if (r < 0)
return r;
diff --git a/src/network/networkd-lldp-tx.c b/src/network/networkd-lldp-tx.c
index bd77b78852..45a087b301 100644
--- a/src/network/networkd-lldp-tx.c
+++ b/src/network/networkd-lldp-tx.c
@@ -314,7 +314,7 @@ static int link_send_lldp(Link *link) {
SD_LLDP_SYSTEM_CAPABILITIES_STATION;
r = lldp_make_packet(link->network->lldp_emit,
- &link->hw_addr.addr.ether,
+ &link->hw_addr.ether,
sd_id128_to_string(machine_id, machine_id_string),
link->ifname,
(uint16_t) ttl,
diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c
index 80cb80247a..444147c305 100644
--- a/src/network/networkd-ndisc.c
+++ b/src/network/networkd-ndisc.c
@@ -657,9 +657,9 @@ static int make_stableprivate_address(Link *link, const struct in6_addr *prefix,
siphash24_compress_string(link->ifname, &state);
/* Only last 8 bytes of IB MAC are stable */
if (link->iftype == ARPHRD_INFINIBAND)
- siphash24_compress(&link->hw_addr.addr.infiniband[12], 8, &state);
+ siphash24_compress(&link->hw_addr.infiniband[12], 8, &state);
else
- siphash24_compress(link->hw_addr.addr.bytes, link->hw_addr.length, &state);
+ siphash24_compress(link->hw_addr.bytes, link->hw_addr.length, &state);
siphash24_compress(&dad_counter, sizeof(uint8_t), &state);
rid = htole64(siphash24_finalize(&state));
@@ -1370,7 +1370,7 @@ int ndisc_configure(Link *link) {
if (r < 0)
return r;
- r = sd_ndisc_set_mac(link->ndisc, &link->hw_addr.addr.ether);
+ r = sd_ndisc_set_mac(link->ndisc, &link->hw_addr.ether);
if (r < 0)
return r;
diff --git a/src/network/networkd-radv.c b/src/network/networkd-radv.c
index 45cfd7a9a7..805d3fff6c 100644
--- a/src/network/networkd-radv.c
+++ b/src/network/networkd-radv.c
@@ -694,7 +694,7 @@ int radv_configure(Link *link) {
if (r < 0)
return r;
- r = sd_radv_set_mac(link->radv, &link->hw_addr.addr.ether);
+ r = sd_radv_set_mac(link->radv, &link->hw_addr.ether);
if (r < 0)
return r;
@@ -766,7 +766,7 @@ int radv_update_mac(Link *link) {
if (r < 0)
return r;
- r = sd_radv_set_mac(link->radv, &link->hw_addr.addr.ether);
+ r = sd_radv_set_mac(link->radv, &link->hw_addr.ether);
if (r < 0)
return r;
View Lorry Controller Status