shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-02-08 09:57:41 +03:00
Code

Merge pull request #30422 from yuwata/network-tiny-fixes

Browse Source 
network: tiny fixes
This commit is contained in:
Yu Watanabe 2023-12-12 00:23:11 +09:00 committed by GitHub
commit a9235a9488
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1802,7 +1802,7 @@ int manager_rtnl_process_address(sd_netlink *rtnl, sd_netlink_message *message,
/* If we did not know the address, then save it. */
r = address_add(link, tmp);
if (r < 0) {
log_link_warning_errno(link, r, "Failed to remember foreign address %s, ignoring: %m",
log_link_warning_errno(link, r, "Failed to save received address %s, ignoring: %m",
IN_ADDR_PREFIX_TO_STRING(tmp->family, &tmp->in_addr, tmp->prefixlen));
return 0;
}

1
src/network/networkd-manager.c
View File

@ -647,7 +647,6 @@ Manager* manager_free(Manager *m) {
* by the upstream link. And the links may be referenced by netlink slots. Hence, two
* set_free() must be called after the above sd_netlink_unref(). */
m->routes = set_free(m->routes);
m->routes_foreign = set_free(m->routes_foreign);
m->nexthops = set_free(m->nexthops);
m->nexthops_by_id = hashmap_free(m->nexthops_by_id);

1
src/network/networkd-manager.h
View File

@ -79,7 +79,6 @@ struct Manager {
/* Manager stores routes without RTA_OIF attribute. */
unsigned route_remove_messages;
Set *routes;
Set *routes_foreign;
/* Route table name */
Hashmap *route_table_numbers_by_name;

4
src/network/networkd-neighbor.c
View File

@ -530,6 +530,8 @@ int manager_rtnl_process_neighbor(sd_netlink *rtnl, sd_netlink_message *message,
return 0;
tmp = new0(Neighbor, 1);
if (!tmp)
return log_oom();
/* First, retrieve the fundamental information about the neighbor. */
r = sd_rtnl_message_neigh_get_family(message, &tmp->family);
@ -572,7 +574,7 @@ int manager_rtnl_process_neighbor(sd_netlink *rtnl, sd_netlink_message *message,
if (!neighbor) {
r = neighbor_add(link, tmp);
if (r < 0) {
log_link_warning_errno(link, r, "Failed to remember foreign neighbor, ignoring: %m");
log_link_warning_errno(link, r, "Failed to save received neighbor, ignoring: %m");
return 0;
}
neighbor = TAKE_PTR(tmp);