colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

platform: extend netlink processing of messages for different protocols

Browse Source 
Later, the same loop should also handle genl.
This commit is contained in:
Thomas Haller
2022-06-17 10:40:37 +02:00
parent ddbcd668ec
commit 2f8d8bba8f
1 changed files with 106 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/libnm-platform/nm-linux-platform.c
View File

@@ -9241,11 +9241,11 @@ rtnl_event_handler(int fd, GIOCondition io_condition, gpointer user_data)
/*****************************************************************************/ /*****************************************************************************/
/* copied from libnl3's recvmsgs() */
static int static int
event_handler_recvmsgs(NMPlatform *platform, gboolean handle_events) _netlink_recv_handle(NMPlatform *platform, int netlink_protocol, gboolean handle_events)
{ {
NMLinuxPlatformPrivate *priv = NM_LINUX_PLATFORM_GET_PRIVATE(platform); NMLinuxPlatformPrivate *priv = NM_LINUX_PLATFORM_GET_PRIVATE(platform);
struct nl_sock *sk;
int n; int n;
int err = 0; int err = 0;
gboolean multipart = 0; gboolean multipart = 0;
@@ -9255,10 +9255,15 @@ event_handler_recvmsgs(NMPlatform *platform, gboolean handle_events)
struct sockaddr_nl nla; struct sockaddr_nl nla;
struct ucred creds; struct ucred creds;
gboolean creds_has; gboolean creds_has;
const char *log_prefix;
nm_assert(netlink_protocol == NETLINK_ROUTE);
sk = priv->sk_rtnl;
log_prefix = "rtnl";
continue_reading: continue_reading:
n = _netlink_recv(platform, priv->sk_rtnl, &nla, &creds, &creds_has); n = _netlink_recv(platform, sk, &nla, &creds, &creds_has);
if (n < 0) { if (n < 0) {
if (n == -NME_NL_MSG_TRUNC && !handle_events) if (n == -NME_NL_MSG_TRUNC && !handle_events)
goto continue_reading; goto continue_reading;
@@ -9267,9 +9272,9 @@ continue_reading:
if (!creds_has || creds.pid) { if (!creds_has || creds.pid) {
if (!creds_has) if (!creds_has)
_LOGT("netlink: recvmsg: received message without credentials"); _LOGT("%s: recvmsg: received message without credentials", log_prefix);
else else
_LOGT("netlink: recvmsg: received non-kernel message (pid %d)", creds.pid); _LOGT("%s: recvmsg: received non-kernel message (pid %d)", log_prefix, creds.pid);
err = 0; err = 0;
goto stop; goto stop;
} }
@@ -9284,13 +9289,13 @@ continue_reading:
const char *extack_msg = NULL; const char *extack_msg = NULL;
msg = nlmsg_alloc_convert(hdr); msg = nlmsg_alloc_convert(hdr);
nlmsg_set_proto(msg, netlink_protocol);
nlmsg_set_proto(msg, NETLINK_ROUTE);
nlmsg_set_src(msg, &nla); nlmsg_set_src(msg, &nla);
nlmsg_set_creds(msg, &creds); nlmsg_set_creds(msg, &creds);
_LOGt("netlink: recvmsg: new message %s", _LOGt("%s: recvmsg: new message %s",
nl_nlmsghdr_to_str(NETLINK_ROUTE, hdr, buf_nlmsghdr, sizeof(buf_nlmsghdr))); log_prefix,
nl_nlmsghdr_to_str(netlink_protocol, hdr, buf_nlmsghdr, sizeof(buf_nlmsghdr)));
if (hdr->nlmsg_flags & NLM_F_MULTI) if (hdr->nlmsg_flags & NLM_F_MULTI)
multipart = TRUE; multipart = TRUE;
@@ -9309,6 +9314,9 @@ continue_reading:
/* FIXME: implement */ /* FIXME: implement */
} }
switch (netlink_protocol) {
case NETLINK_ROUTE:
{
seq_result = WAIT_FOR_NL_RESPONSE_RESULT_RESPONSE_UNKNOWN; seq_result = WAIT_FOR_NL_RESPONSE_RESULT_RESPONSE_UNKNOWN;
if (hdr->nlmsg_type == NLMSG_DONE) { if (hdr->nlmsg_type == NLMSG_DONE) {
@@ -9365,7 +9373,8 @@ continue_reading:
} }
/* Error message reported back from kernel. */ /* Error message reported back from kernel. */
_LOGD("netlink: recvmsg: error message from kernel: %s (%d)%s%s%s for request %d", _LOGD(
"netlink: recvmsg: error message from kernel: %s (%d)%s%s%s for request %d",
nm_strerror_native(errsv), nm_strerror_native(errsv),
errsv, errsv,
NM_PRINT_FMT_QUOTED(extack_msg, " \"", extack_msg, "\"", ""), NM_PRINT_FMT_QUOTED(extack_msg, " \"", extack_msg, "\"", ""),
@@ -9398,6 +9407,11 @@ continue_reading:
} }
event_seq_check(platform, seq_number, seq_result, extack_msg); event_seq_check(platform, seq_number, seq_result, extack_msg);
break;
}
default:
nm_assert_not_reached();
}
if (abort_parsing) if (abort_parsing)
goto stop; goto stop;
@@ -9450,7 +9464,7 @@ event_handler_read_netlink(NMPlatform *platform, gboolean wait_for_acks)
for (;;) { for (;;) {
int nle; int nle;
nle = event_handler_recvmsgs(platform, TRUE); nle = _netlink_recv_handle(platform, NETLINK_ROUTE, TRUE);
if (nle < 0) { if (nle < 0) {
switch (nle) { switch (nle) {
@@ -9475,7 +9489,7 @@ event_handler_read_netlink(NMPlatform *platform, gboolean wait_for_acks)
} }
_reason; _reason;
})); }));
event_handler_recvmsgs(platform, FALSE); _netlink_recv_handle(platform, NETLINK_ROUTE, FALSE);
delayed_action_wait_for_nl_response_complete_all( delayed_action_wait_for_nl_response_complete_all(
platform, platform,
WAIT_FOR_NL_RESPONSE_RESULT_FAILED_RESYNC); WAIT_FOR_NL_RESPONSE_RESULT_FAILED_RESYNC);