shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-22 17:35:35 +03:00
Code

network/l2tp: downgrade log level of several messages

Browse Source 
Also, use log_section_warning_errno() where applicable.
This commit is contained in:
Yu Watanabe 2024-09-10 03:05:18 +09:00
parent 909acd37b8
commit c480e4cd66
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/network/netdev/l2tp-tunnel.c
View File

@ -752,28 +752,28 @@ static void l2tp_tunnel_init(NetDev *netdev) {
t->udp6_csum_tx = true; t->udp6_csum_tx = true;
} }
static int l2tp_session_verify(L2tpSession *session) { #define log_session(session, fmt, ...) \
NetDev *netdev; ({ \
const L2tpSession *_session = (session); \
log_section_warning_errno( \
_session ? _session->section : NULL, \
SYNTHETIC_ERRNO(EINVAL), \
fmt " Ignoring [L2TPSession] section.", \
##__VA_ARGS__); \
})
static int l2tp_session_verify(L2tpSession *session) {
assert(session); assert(session);
assert(session->tunnel); assert(session->tunnel);
netdev = NETDEV(session->tunnel);
if (section_is_invalid(session->section)) if (section_is_invalid(session->section))
return -EINVAL; return -EINVAL;
if (!session->name) if (!session->name)
return log_netdev_error_errno(netdev, SYNTHETIC_ERRNO(EINVAL), return log_session(session, "L2TP session without name configured.");
"%s: L2TP session without name configured. "
"Ignoring [L2TPSession] section from line %u",
session->section->filename, session->section->line);
if (session->session_id == 0 || session->peer_session_id == 0) if (session->session_id == 0 || session->peer_session_id == 0)
return log_netdev_error_errno(netdev, SYNTHETIC_ERRNO(EINVAL), return log_session(session, "L2TP session without session IDs configured.");
"%s: L2TP session without session IDs configured. "
"Ignoring [L2TPSession] section from line %u",
session->section->filename, session->section->line);
return 0; return 0;
} }
@ -785,19 +785,19 @@ static int netdev_l2tp_tunnel_verify(NetDev *netdev, const char *filename) {
L2tpSession *session; L2tpSession *session;
if (!IN_SET(t->family, AF_INET, AF_INET6)) if (!IN_SET(t->family, AF_INET, AF_INET6))
return log_netdev_error_errno(netdev, SYNTHETIC_ERRNO(EINVAL), return log_netdev_warning_errno(netdev, SYNTHETIC_ERRNO(EINVAL),
"%s: L2TP tunnel with invalid address family configured. Ignoring", "%s: L2TP tunnel with invalid address family configured. Ignoring",
filename); filename);
if (!in_addr_is_set(t->family, &t->remote)) if (!in_addr_is_set(t->family, &t->remote))
return log_netdev_error_errno(netdev, SYNTHETIC_ERRNO(EINVAL), return log_netdev_warning_errno(netdev, SYNTHETIC_ERRNO(EINVAL),
"%s: L2TP tunnel without a remote address configured. Ignoring", "%s: L2TP tunnel without a remote address configured. Ignoring",
filename); filename);
if (t->tunnel_id == 0 || t->peer_tunnel_id == 0) if (t->tunnel_id == 0 || t->peer_tunnel_id == 0)
return log_netdev_error_errno(netdev, SYNTHETIC_ERRNO(EINVAL), return log_netdev_warning_errno(netdev, SYNTHETIC_ERRNO(EINVAL),
"%s: L2TP tunnel without tunnel IDs configured. Ignoring", "%s: L2TP tunnel without tunnel IDs configured. Ignoring",
filename); filename);
ORDERED_HASHMAP_FOREACH(session, t->sessions_by_section) ORDERED_HASHMAP_FOREACH(session, t->sessions_by_section)
if (l2tp_session_verify(session) < 0) if (l2tp_session_verify(session) < 0)