Merge pull request #17000 from poettering/network-fixlets
network: a bunch of unimportant cleanups across the board
This commit is contained in:
commit
293772c27a
|
@ -76,7 +76,7 @@ int arp_network_bind_raw_socket(int ifindex, be32_t address, const struct ether_
|
||||||
|
|
||||||
assert(ifindex > 0);
|
assert(ifindex > 0);
|
||||||
|
|
||||||
s = socket(PF_PACKET, SOCK_DGRAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0);
|
s = socket(AF_PACKET, SOCK_DGRAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0);
|
||||||
if (s < 0)
|
if (s < 0)
|
||||||
return -errno;
|
return -errno;
|
||||||
|
|
||||||
|
|
|
@ -47,7 +47,7 @@ int lldp_network_bind_raw_socket(int ifindex) {
|
||||||
|
|
||||||
assert(ifindex > 0);
|
assert(ifindex > 0);
|
||||||
|
|
||||||
fd = socket(PF_PACKET, SOCK_RAW|SOCK_CLOEXEC|SOCK_NONBLOCK,
|
fd = socket(AF_PACKET, SOCK_RAW|SOCK_CLOEXEC|SOCK_NONBLOCK,
|
||||||
htobe16(ETHERTYPE_LLDP));
|
htobe16(ETHERTYPE_LLDP));
|
||||||
if (fd < 0)
|
if (fd < 0)
|
||||||
return -errno;
|
return -errno;
|
||||||
|
|
|
@ -436,7 +436,7 @@ int sd_rtnl_message_new_neigh(sd_netlink *rtnl, sd_netlink_message **ret, uint16
|
||||||
int r;
|
int r;
|
||||||
|
|
||||||
assert_return(rtnl_message_type_is_neigh(nlmsg_type), -EINVAL);
|
assert_return(rtnl_message_type_is_neigh(nlmsg_type), -EINVAL);
|
||||||
assert_return(IN_SET(ndm_family, AF_UNSPEC, AF_INET, AF_INET6, PF_BRIDGE), -EINVAL);
|
assert_return(IN_SET(ndm_family, AF_UNSPEC, AF_INET, AF_INET6, AF_BRIDGE), -EINVAL);
|
||||||
assert_return(ret, -EINVAL);
|
assert_return(ret, -EINVAL);
|
||||||
|
|
||||||
r = message_new(rtnl, ret, nlmsg_type);
|
r = message_new(rtnl, ret, nlmsg_type);
|
||||||
|
|
|
@ -21,7 +21,7 @@ static void test_message_link_bridge(sd_netlink *rtnl) {
|
||||||
uint32_t cost;
|
uint32_t cost;
|
||||||
|
|
||||||
assert_se(sd_rtnl_message_new_link(rtnl, &message, RTM_NEWLINK, 1) >= 0);
|
assert_se(sd_rtnl_message_new_link(rtnl, &message, RTM_NEWLINK, 1) >= 0);
|
||||||
assert_se(sd_rtnl_message_link_set_family(message, PF_BRIDGE) >= 0);
|
assert_se(sd_rtnl_message_link_set_family(message, AF_BRIDGE) >= 0);
|
||||||
assert_se(sd_netlink_message_open_container(message, IFLA_PROTINFO) >= 0);
|
assert_se(sd_netlink_message_open_container(message, IFLA_PROTINFO) >= 0);
|
||||||
assert_se(sd_netlink_message_append_u32(message, IFLA_BRPORT_COST, 10) >= 0);
|
assert_se(sd_netlink_message_append_u32(message, IFLA_BRPORT_COST, 10) >= 0);
|
||||||
assert_se(sd_netlink_message_close_container(message) >= 0);
|
assert_se(sd_netlink_message_close_container(message) >= 0);
|
||||||
|
|
|
@ -496,10 +496,10 @@ _public_ int sd_resolve_new(sd_resolve **ret) {
|
||||||
for (i = 0; i < _FD_MAX; i++)
|
for (i = 0; i < _FD_MAX; i++)
|
||||||
resolve->fds[i] = -1;
|
resolve->fds[i] = -1;
|
||||||
|
|
||||||
if (socketpair(PF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0, resolve->fds + REQUEST_RECV_FD) < 0)
|
if (socketpair(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0, resolve->fds + REQUEST_RECV_FD) < 0)
|
||||||
return -errno;
|
return -errno;
|
||||||
|
|
||||||
if (socketpair(PF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0, resolve->fds + RESPONSE_RECV_FD) < 0)
|
if (socketpair(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0, resolve->fds + RESPONSE_RECV_FD) < 0)
|
||||||
return -errno;
|
return -errno;
|
||||||
|
|
||||||
for (i = 0; i < _FD_MAX; i++)
|
for (i = 0; i < _FD_MAX; i++)
|
||||||
|
|
|
@ -56,7 +56,7 @@ int main(int argc, char *argv[]) {
|
||||||
int r;
|
int r;
|
||||||
|
|
||||||
struct addrinfo hints = {
|
struct addrinfo hints = {
|
||||||
.ai_family = PF_UNSPEC,
|
.ai_family = AF_UNSPEC,
|
||||||
.ai_socktype = SOCK_STREAM,
|
.ai_socktype = SOCK_STREAM,
|
||||||
.ai_flags = AI_CANONNAME
|
.ai_flags = AI_CANONNAME
|
||||||
};
|
};
|
||||||
|
|
|
@ -192,7 +192,7 @@ int link_set_bridge(Link *link) {
|
||||||
if (r < 0)
|
if (r < 0)
|
||||||
return log_link_error_errno(link, r, "Could not allocate RTM_SETLINK message: %m");
|
return log_link_error_errno(link, r, "Could not allocate RTM_SETLINK message: %m");
|
||||||
|
|
||||||
r = sd_rtnl_message_link_set_family(req, PF_BRIDGE);
|
r = sd_rtnl_message_link_set_family(req, AF_BRIDGE);
|
||||||
if (r < 0)
|
if (r < 0)
|
||||||
return log_link_error_errno(link, r, "Could not set message family: %m");
|
return log_link_error_errno(link, r, "Could not set message family: %m");
|
||||||
|
|
||||||
|
|
|
@ -851,10 +851,12 @@ int config_parse_macsec_key_id(
|
||||||
log_syntax(unit, LOG_WARNING, filename, line, r, "Failed to parse KeyId \"%s\": %m", rvalue);
|
log_syntax(unit, LOG_WARNING, filename, line, r, "Failed to parse KeyId \"%s\": %m", rvalue);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
if (l > MACSEC_KEYID_LEN)
|
if (l > MACSEC_KEYID_LEN) {
|
||||||
return log_syntax(unit, LOG_WARNING, filename, line, 0,
|
log_syntax(unit, LOG_WARNING, filename, line, 0,
|
||||||
"Specified KeyId is larger then the allowed maximum (%zu > %u), ignoring: %s",
|
"Specified KeyId is larger then the allowed maximum (%zu > %u), ignoring: %s",
|
||||||
l, MACSEC_KEYID_LEN, rvalue);
|
l, MACSEC_KEYID_LEN, rvalue);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
dest = a ? a->sa.key_id : b->sa.key_id;
|
dest = a ? a->sa.key_id : b->sa.key_id;
|
||||||
memcpy_safe(dest, p, l);
|
memcpy_safe(dest, p, l);
|
||||||
|
|
|
@ -492,13 +492,17 @@ static int wireguard_decode_key_and_warn(
|
||||||
(void) warn_file_is_world_accessible(filename, NULL, unit, line);
|
(void) warn_file_is_world_accessible(filename, NULL, unit, line);
|
||||||
|
|
||||||
r = unbase64mem_full(rvalue, strlen(rvalue), true, &key, &len);
|
r = unbase64mem_full(rvalue, strlen(rvalue), true, &key, &len);
|
||||||
if (r < 0)
|
if (r < 0) {
|
||||||
return log_syntax(unit, LOG_WARNING, filename, line, r,
|
log_syntax(unit, LOG_WARNING, filename, line, r,
|
||||||
"Failed to decode wireguard key provided by %s=, ignoring assignment: %m", lvalue);
|
"Failed to decode wireguard key provided by %s=, ignoring assignment: %m", lvalue);
|
||||||
if (len != WG_KEY_LEN)
|
return 0;
|
||||||
return log_syntax(unit, LOG_WARNING, filename, line, SYNTHETIC_ERRNO(EINVAL),
|
}
|
||||||
|
if (len != WG_KEY_LEN) {
|
||||||
|
log_syntax(unit, LOG_WARNING, filename, line, 0,
|
||||||
"Wireguard key provided by %s= has invalid length (%zu bytes), ignoring assignment.",
|
"Wireguard key provided by %s= has invalid length (%zu bytes), ignoring assignment.",
|
||||||
lvalue, len);
|
lvalue, len);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
memcpy(ret, key, WG_KEY_LEN);
|
memcpy(ret, key, WG_KEY_LEN);
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -169,7 +169,7 @@ int br_vlan_configure(Link *link, uint16_t pvid, uint32_t *br_vid_bitmap, uint32
|
||||||
if (r < 0)
|
if (r < 0)
|
||||||
return log_link_error_errno(link, r, "Could not allocate RTM_SETLINK message: %m");
|
return log_link_error_errno(link, r, "Could not allocate RTM_SETLINK message: %m");
|
||||||
|
|
||||||
r = sd_rtnl_message_link_set_family(req, PF_BRIDGE);
|
r = sd_rtnl_message_link_set_family(req, AF_BRIDGE);
|
||||||
if (r < 0)
|
if (r < 0)
|
||||||
return log_link_error_errno(link, r, "Could not set message family: %m");
|
return log_link_error_errno(link, r, "Could not set message family: %m");
|
||||||
|
|
||||||
|
|
|
@ -124,7 +124,7 @@ int fdb_entry_configure(Link *link, FdbEntry *fdb_entry) {
|
||||||
assert(fdb_entry);
|
assert(fdb_entry);
|
||||||
|
|
||||||
/* create new RTM message */
|
/* create new RTM message */
|
||||||
r = sd_rtnl_message_new_neigh(link->manager->rtnl, &req, RTM_NEWNEIGH, link->ifindex, PF_BRIDGE);
|
r = sd_rtnl_message_new_neigh(link->manager->rtnl, &req, RTM_NEWNEIGH, link->ifindex, AF_BRIDGE);
|
||||||
if (r < 0)
|
if (r < 0)
|
||||||
return log_link_error_errno(link, r, "Could not create RTM_NEWNEIGH message: %m");
|
return log_link_error_errno(link, r, "Could not create RTM_NEWNEIGH message: %m");
|
||||||
|
|
||||||
|
@ -292,10 +292,12 @@ int config_parse_fdb_destination(
|
||||||
return log_oom();
|
return log_oom();
|
||||||
|
|
||||||
r = in_addr_from_string_auto(rvalue, &fdb_entry->family, &fdb_entry->destination_addr);
|
r = in_addr_from_string_auto(rvalue, &fdb_entry->family, &fdb_entry->destination_addr);
|
||||||
if (r < 0)
|
if (r < 0) {
|
||||||
return log_syntax(unit, LOG_WARNING, filename, line, r,
|
log_syntax(unit, LOG_WARNING, filename, line, r,
|
||||||
"FDB destination IP address is invalid, ignoring assignment: %s",
|
"FDB destination IP address is invalid, ignoring assignment: %s",
|
||||||
rvalue);
|
rvalue);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
fdb_entry = NULL;
|
fdb_entry = NULL;
|
||||||
|
|
||||||
|
|
|
@ -267,7 +267,7 @@ static int lldp_send_packet(
|
||||||
|
|
||||||
memcpy(sa.ll.sll_addr, address, ETH_ALEN);
|
memcpy(sa.ll.sll_addr, address, ETH_ALEN);
|
||||||
|
|
||||||
fd = socket(PF_PACKET, SOCK_RAW|SOCK_CLOEXEC, IPPROTO_RAW);
|
fd = socket(AF_PACKET, SOCK_RAW|SOCK_CLOEXEC, IPPROTO_RAW);
|
||||||
if (fd < 0)
|
if (fd < 0)
|
||||||
return -errno;
|
return -errno;
|
||||||
|
|
||||||
|
|
|
@ -943,7 +943,7 @@ int config_parse_channel(const char *unit,
|
||||||
}
|
}
|
||||||
|
|
||||||
if (k < 1) {
|
if (k < 1) {
|
||||||
log_syntax(unit, LOG_ERR, filename, line, -EINVAL, "Invalid %s value, ignoring: %s", lvalue, rvalue);
|
log_syntax(unit, LOG_ERR, filename, line, 0, "Invalid %s value, ignoring: %s", lvalue, rvalue);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue