chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
networkd: use structured logging for links and bridges
[elogind.git]
/
src
/
network
/
networkd-link.c
diff --git
a/src/network/networkd-link.c
b/src/network/networkd-link.c
index bc8ca21c82afd97ec12f27c06a753a9ee8da1562..2ed5e6b63f21a438fddf3f72a77cb861edde07eb 100644
(file)
--- a/
src/network/networkd-link.c
+++ b/
src/network/networkd-link.c
@@
-134,7
+134,7
@@
static int link_enter_configured(Link *link) {
assert(link);
assert(link->state == LINK_STATE_SETTING_ROUTES);
assert(link);
assert(link->state == LINK_STATE_SETTING_ROUTES);
- log_
info("%s: link configured", link->ifname
);
+ log_
link_info(link, "link configured"
);
link->state = LINK_STATE_CONFIGURED;
link->state = LINK_STATE_CONFIGURED;
@@
-144,7
+144,7
@@
static int link_enter_configured(Link *link) {
static void link_enter_failed(Link *link) {
assert(link);
static void link_enter_failed(Link *link) {
assert(link);
- log_
warning("%s: failed", link->ifname
);
+ log_
link_warning(link, "failed"
);
link->state = LINK_STATE_FAILED;
}
link->state = LINK_STATE_FAILED;
}
@@
-165,13
+165,12
@@
static int route_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
r = sd_rtnl_message_get_errno(m);
if (r < 0 && r != -EEXIST)
r = sd_rtnl_message_get_errno(m);
if (r < 0 && r != -EEXIST)
- log_warning("%s: could not set route: %s",
- link->ifname, strerror(-r));
+ log_warning_link(link, "could not set route: %s", strerror(-r));
/* we might have received an old reply after moving back to SETTING_ADDRESSES,
* ignore it */
if (link->route_messages == 0 && link->state == LINK_STATE_SETTING_ROUTES) {
/* we might have received an old reply after moving back to SETTING_ADDRESSES,
* ignore it */
if (link->route_messages == 0 && link->state == LINK_STATE_SETTING_ROUTES) {
- log_
debug("%s: routes set", link->ifname
);
+ log_
link_debug(link, "routes set"
);
link_enter_configured(link);
}
link_enter_configured(link);
}
@@
-191,12
+190,13
@@
static int link_enter_set_routes(Link *link) {
if (!link->network->static_routes && !link->dhcp_route)
return link_enter_configured(link);
if (!link->network->static_routes && !link->dhcp_route)
return link_enter_configured(link);
- log_
debug("%s: setting routes", link->ifname
);
+ log_
link_debug(link, "setting routes"
);
LIST_FOREACH(static_routes, route, link->network->static_routes) {
r = route_configure(route, link, &route_handler);
if (r < 0) {
LIST_FOREACH(static_routes, route, link->network->static_routes) {
r = route_configure(route, link, &route_handler);
if (r < 0) {
- log_warning("%s: could not set routes", link->ifname);
+ log_warning_link(link,
+ "could not set routes: %s", strerror(-r));
link_enter_failed(link);
return r;
}
link_enter_failed(link);
return r;
}
@@
-207,7
+207,8
@@
static int link_enter_set_routes(Link *link) {
if (link->dhcp_route) {
r = route_configure(link->dhcp_route, link, &route_handler);
if (r < 0) {
if (link->dhcp_route) {
r = route_configure(link->dhcp_route, link, &route_handler);
if (r < 0) {
- log_warning("%s: could not set routes", link->ifname);
+ log_warning_link(link,
+ "could not set routes: %s", strerror(-r));
link_enter_failed(link);
return r;
}
link_enter_failed(link);
return r;
}
@@
-235,11
+236,14
@@
static int address_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
r = sd_rtnl_message_get_errno(m);
if (r < 0 && r != -EEXIST)
r = sd_rtnl_message_get_errno(m);
if (r < 0 && r != -EEXIST)
- log_warning("%s: could not set address: %s",
- link->ifname, strerror(-r));
+ log_struct_link(LOG_ERR, link,
+ "MESSAGE=%s: could not set address: %s",
+ link->ifname, strerror(-r),
+ "ERRNO=%d", -r,
+ NULL);
if (link->addr_messages == 0) {
if (link->addr_messages == 0) {
- log_
debug("%s: addresses set", link->ifname
);
+ log_
link_debug(link, "addresses set"
);
link_enter_set_routes(link);
}
link_enter_set_routes(link);
}
@@
-259,12
+263,13
@@
static int link_enter_set_addresses(Link *link) {
if (!link->network->static_addresses && !link->dhcp_address)
return link_enter_set_routes(link);
if (!link->network->static_addresses && !link->dhcp_address)
return link_enter_set_routes(link);
- log_
debug("%s: setting addresses", link->ifname
);
+ log_
link_debug(link, "setting addresses"
);
LIST_FOREACH(static_addresses, address, link->network->static_addresses) {
r = address_configure(address, link, &address_handler);
if (r < 0) {
LIST_FOREACH(static_addresses, address, link->network->static_addresses) {
r = address_configure(address, link, &address_handler);
if (r < 0) {
- log_warning("%s: could not set addresses", link->ifname);
+ log_warning_link(link,
+ "could not set addresses: %s", strerror(-r));
link_enter_failed(link);
return r;
}
link_enter_failed(link);
return r;
}
@@
-275,7
+280,8
@@
static int link_enter_set_addresses(Link *link) {
if (link->dhcp_address) {
r = address_configure(link->dhcp_address, link, &address_handler);
if (r < 0) {
if (link->dhcp_address) {
r = address_configure(link->dhcp_address, link, &address_handler);
if (r < 0) {
- log_warning("%s: could not set addresses", link->ifname);
+ log_warning_link(link,
+ "could not set addresses: %s", strerror(-r));
link_enter_failed(link);
return r;
}
link_enter_failed(link);
return r;
}
@@
-299,8
+305,7
@@
static int address_drop_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdat
r = sd_rtnl_message_get_errno(m);
if (r < 0 && r != -EEXIST)
r = sd_rtnl_message_get_errno(m);
if (r < 0 && r != -EEXIST)
- log_warning("%s: could not drop address: %s",
- link->ifname, strerror(-r));
+ log_warning_link(link, "could not drop address: %s", strerror(-r));
return 1;
}
return 1;
}
@@
-319,13
+324,13
@@
static void dhcp_handler(sd_dhcp_client *client, int event, void *userdata) {
return;
if (event < 0) {
return;
if (event < 0) {
- log_warning
("%s: DHCP error: %s", link->ifname
, strerror(-event));
+ log_warning
_link(link, "DHCP error: %s"
, strerror(-event));
link_enter_failed(link);
return;
}
if (event == DHCP_EVENT_NO_LEASE)
link_enter_failed(link);
return;
}
if (event == DHCP_EVENT_NO_LEASE)
- log_
debug("%s: IP address in use.", link->ifname
);
+ log_
link_debug(link, "IP address in use."
);
if (event == DHCP_EVENT_IP_CHANGE || event == DHCP_EVENT_EXPIRED ||
event == DHCP_EVENT_STOP) {
if (event == DHCP_EVENT_IP_CHANGE || event == DHCP_EVENT_EXPIRED ||
event == DHCP_EVENT_STOP) {
@@
-344,28
+349,28
@@
static void dhcp_handler(sd_dhcp_client *client, int event, void *userdata) {
r = sd_dhcp_client_get_address(client, &address);
if (r < 0) {
r = sd_dhcp_client_get_address(client, &address);
if (r < 0) {
- log_
warning("%s: DHCP error: no address", link->ifname
);
+ log_
link_warning(link, "DHCP error: no address"
);
link_enter_failed(link);
return;
}
r = sd_dhcp_client_get_netmask(client, &netmask);
if (r < 0) {
link_enter_failed(link);
return;
}
r = sd_dhcp_client_get_netmask(client, &netmask);
if (r < 0) {
- log_
warning("%s: DHCP error: no netmask", link->ifname
);
+ log_
link_warning(link, "DHCP error: no netmask"
);
link_enter_failed(link);
return;
}
prefixlen = sd_dhcp_client_prefixlen(&netmask);
if (prefixlen < 0) {
link_enter_failed(link);
return;
}
prefixlen = sd_dhcp_client_prefixlen(&netmask);
if (prefixlen < 0) {
- log_
warning("%s: DHCP error: no prefixlen", link->ifname
);
+ log_
link_warning(link, "DHCP error: no prefixlen"
);
link_enter_failed(link);
return;
}
r = sd_dhcp_client_get_router(client, &gateway);
if (r < 0) {
link_enter_failed(link);
return;
}
r = sd_dhcp_client_get_router(client, &gateway);
if (r < 0) {
- log_
warning("%s: DHCP error: no router", link->ifname
);
+ log_
link_warning(link, "DHCP error: no router"
);
link_enter_failed(link);
return;
}
link_enter_failed(link);
return;
}
@@
-374,11
+379,11
@@
static void dhcp_handler(sd_dhcp_client *client, int event, void *userdata) {
_cleanup_address_free_ Address *addr = NULL;
_cleanup_route_free_ Route *rt = NULL;
_cleanup_address_free_ Address *addr = NULL;
_cleanup_route_free_ Route *rt = NULL;
- log_
info("%s: received config over DHCPv4", link->ifname
);
+ log_
link_info(link, "received config over DHCPv4"
);
r = address_new_dynamic(&addr);
if (r < 0) {
r = address_new_dynamic(&addr);
if (r < 0) {
- log_
error(
"Could not allocate address");
+ log_
link_error(link,
"Could not allocate address");
link_enter_failed(link);
return;
}
link_enter_failed(link);
return;
}
@@
-390,7
+395,7
@@
static void dhcp_handler(sd_dhcp_client *client, int event, void *userdata) {
r = route_new_dynamic(&rt);
if (r < 0) {
r = route_new_dynamic(&rt);
if (r < 0) {
- log_
error(
"Could not allocate route");
+ log_
link_error(link,
"Could not allocate route");
link_enter_failed(link);
return;
}
link_enter_failed(link);
return;
}
@@
-453,20
+458,17
@@
static int link_update_flags(Link *link, unsigned flags) {
return 0;
if (link->flags == flags) {
return 0;
if (link->flags == flags) {
- log_debug
("%s: link status unchanged: %#x", link->ifname
, flags);
+ log_debug
_link(link, "link status unchanged: %#x"
, flags);
return 0;
}
return 0;
}
- if ((link->flags & IFF_UP) != (flags & IFF_UP)) {
- if (flags & IFF_UP)
- log_info("%s: power on", link->ifname);
- else
- log_info("%s: power off", link->ifname);
- }
+ if ((link->flags & IFF_UP) != (flags & IFF_UP))
+ log_info_link(link,
+ "power %s", flags & IFF_UP ? "on": "off");
if ((link->flags & IFF_LOWER_UP) != (flags & IFF_LOWER_UP)) {
if (flags & IFF_LOWER_UP) {
if ((link->flags & IFF_LOWER_UP) != (flags & IFF_LOWER_UP)) {
if (flags & IFF_LOWER_UP) {
- log_
info("%s: carrier on", link->ifname
);
+ log_
link_info(link, "carrier on"
);
if (link->network->dhcp) {
r = link_acquire_conf(link);
if (link->network->dhcp) {
r = link_acquire_conf(link);
@@
-476,7
+478,7
@@
static int link_update_flags(Link *link, unsigned flags) {
}
}
} else {
}
}
} else {
- log_
info("%s: carrier off", link->ifname
);
+ log_
link_info(link, "carrier off"
);
if (link->network->dhcp) {
r = sd_dhcp_client_stop(link->dhcp);
if (link->network->dhcp) {
r = sd_dhcp_client_stop(link->dhcp);
@@
-488,7
+490,8
@@
static int link_update_flags(Link *link, unsigned flags) {
}
}
}
}
- log_debug("%s: link status updated: %#x -> %#x", link->ifname, link->flags, flags);
+ log_debug_link(link,
+ "link status updated: %#x -> %#x", link->flags, flags);
link->flags = flags;
link->flags = flags;
@@
-506,8
+509,8
@@
static int link_up_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
r = sd_rtnl_message_get_errno(m);
if (r < 0) {
r = sd_rtnl_message_get_errno(m);
if (r < 0) {
- log_warning
("%s: could not bring up interface: %s"
,
-
link->ifname
, strerror(-r));
+ log_warning
_link(link
,
+
"could not bring up interface: %s"
, strerror(-r));
link_enter_failed(link);
}
link_enter_failed(link);
}
@@
-524,23
+527,24
@@
static int link_up(Link *link) {
assert(link->manager);
assert(link->manager->rtnl);
assert(link->manager);
assert(link->manager->rtnl);
- log_
debug("%s: bringing up link", link->ifname
);
+ log_
link_debug(link, "bringing link up"
);
r = sd_rtnl_message_link_new(RTM_SETLINK, link->ifindex, &req);
if (r < 0) {
r = sd_rtnl_message_link_new(RTM_SETLINK, link->ifindex, &req);
if (r < 0) {
- log_
error(
"Could not allocate RTM_SETLINK message");
+ log_
link_error(link,
"Could not allocate RTM_SETLINK message");
return r;
}
r = sd_rtnl_message_link_set_flags(req, IFF_UP);
if (r < 0) {
return r;
}
r = sd_rtnl_message_link_set_flags(req, IFF_UP);
if (r < 0) {
- log_error
("Could not set link flags"
);
+ log_error
_link(link, "Could not set link flags: %s", strerror(-r)
);
return r;
}
r = sd_rtnl_call_async(link->manager->rtnl, req, link_up_handler, link, 0, NULL);
if (r < 0) {
return r;
}
r = sd_rtnl_call_async(link->manager->rtnl, req, link_up_handler, link, 0, NULL);
if (r < 0) {
- log_error("Could not send rtnetlink message: %s", strerror(-r));
+ log_error_link(link,
+ "Could not send rtnetlink message: %s", strerror(-r));
return r;
}
return r;
}
@@
-579,14
+583,20
@@
static int bridge_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
r = sd_rtnl_message_get_errno(m);
if (r < 0) {
r = sd_rtnl_message_get_errno(m);
if (r < 0) {
- log_warning("%s: could not join bridge '%s': %s",
- link->ifname, link->network->bridge->name, strerror(-r));
+ log_struct_link(LOG_ERR, link,
+ "MESSAGE=%s: could not join bridge '%s': %s",
+ link->ifname, link->network->bridge->name, strerror(-r),
+ BRIDGE(link->network->bridge),
+ NULL);
link_enter_failed(link);
return 1;
link_enter_failed(link);
return 1;
- } else
- log_debug("%s: joined bridge '%s'",
- link->ifname, link->network->bridge->name);
+ }
+ log_struct_link(LOG_DEBUG, link,
+ "MESSAGE=%s: joined bridge '%s'",
+ link->network->bridge->name,
+ BRIDGE(link->network->bridge),
+ NULL);
link_bridge_joined(link);
return 1;
link_bridge_joined(link);
return 1;
@@
-604,12
+614,20
@@
static int link_enter_join_bridge(Link *link) {
if (!link->network->bridge)
return link_bridge_joined(link);
if (!link->network->bridge)
return link_bridge_joined(link);
- log_debug("%s: joining bridge", link->ifname);
+ log_struct_link(LOG_DEBUG, link,
+ "MESSAGE=%s: joining bridge '%s'",
+ link->network->bridge->name,
+ BRIDGE(link->network->bridge),
+ NULL);
+ log_link_debug(link, "joining bridge");
r = bridge_join(link->network->bridge, link, &bridge_handler);
if (r < 0) {
r = bridge_join(link->network->bridge, link, &bridge_handler);
if (r < 0) {
- log_warning("%s: could not join bridge '%s'", link->ifname,
- link->network->bridge->name);
+ log_struct_link(LOG_WARNING, link,
+ "MESSAGE=%s: could not join bridge '%s': %s",
+ link->network->bridge->name, strerror(-r),
+ BRIDGE(link->network->bridge),
+ NULL);
link_enter_failed(link);
return r;
}
link_enter_failed(link);
return r;
}
@@
-628,12
+646,11
@@
static int link_get_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
r = sd_rtnl_message_get_errno(m);
if (r < 0) {
r = sd_rtnl_message_get_errno(m);
if (r < 0) {
- log_warning("%s: could not get state: %s",
- link->ifname, strerror(-r));
+ log_warning_link(link, "could not get state: %s", strerror(-r));
link_enter_failed(link);
}
link_enter_failed(link);
}
- log_
debug("%s: got link state", link->ifname
);
+ log_
link_debug(link, "got link state"
);
link_update(link, m);
link_update(link, m);
@@
-648,17
+665,18
@@
static int link_get(Link *link) {
assert(link->manager);
assert(link->manager->rtnl);
assert(link->manager);
assert(link->manager->rtnl);
- log_
debug("%s: requesting link status", link->ifname
);
+ log_
link_debug(link, "requesting link status"
);
r = sd_rtnl_message_link_new(RTM_GETLINK, link->ifindex, &req);
if (r < 0) {
r = sd_rtnl_message_link_new(RTM_GETLINK, link->ifindex, &req);
if (r < 0) {
- log_
error(
"Could not allocate RTM_GETLINK message");
+ log_
link_error(link,
"Could not allocate RTM_GETLINK message");
return r;
}
r = sd_rtnl_call_async(link->manager->rtnl, req, link_get_handler, link, 0, NULL);
if (r < 0) {
return r;
}
r = sd_rtnl_call_async(link->manager->rtnl, req, link_get_handler, link, 0, NULL);
if (r < 0) {
- log_error("Could not send rtnetlink message: %s", strerror(-r));
+ log_error_link(link,
+ "Could not send rtnetlink message: %s", strerror(-r));
return r;
}
return r;
}
@@
-693,7
+711,7
@@
int link_update(Link *link, sd_rtnl_message *m) {
r = sd_rtnl_message_link_get_flags(m, &flags);
if (r < 0) {
r = sd_rtnl_message_link_get_flags(m, &flags);
if (r < 0) {
- log_
warning("%s: could not get link flags", link->ifname
);
+ log_
link_warning(link, "could not get link flags"
);
return r;
}
return r;
}