79b3a063e4
- Fail to start network instead of losing routes if IPv6 forwarding
is required. bsc#1025252
Added patches:
00d28a78b-check-accept_ra-before-enabling-ipv6-forward.patch
3ee35d7d6-more-uses-of-SYSCTL_PATH.patch
5dd607059-add-virNetDevGetName.patch
754515b7d-add-virNetlinkDumpCommand.patch
d68cb4f55-extract-the-request-sending-code-from-virNetlin.patch
OBS-URL: https://build.opensuse.org/request/show/481947
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=593
126 lines
4.0 KiB
Diff
126 lines
4.0 KiB
Diff
From 754515b7db6258ab592265b743128353be0cb32b Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= <cbosdonnat@suse.com>
|
|
Date: Fri, 3 Mar 2017 12:22:50 +0100
|
|
Subject: [PATCH 2/5] util: add virNetlinkDumpCommand()
|
|
|
|
virNetlinkCommand() processes only one response message, while some
|
|
netlink commands, like route dumping, need to process several.
|
|
Add virNetlinkDumpCommand() as a virNetlinkCommand() sister.
|
|
---
|
|
src/libvirt_private.syms | 1 +
|
|
src/util/virnetlink.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++
|
|
src/util/virnetlink.h | 9 ++++++++
|
|
3 files changed, 68 insertions(+)
|
|
|
|
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
|
|
index b46e85f63..f03925bc1 100644
|
|
--- a/src/libvirt_private.syms
|
|
+++ b/src/libvirt_private.syms
|
|
@@ -2138,6 +2138,7 @@ virNetDevVPortProfileOpTypeToString;
|
|
# util/virnetlink.h
|
|
virNetlinkCommand;
|
|
virNetlinkDelLink;
|
|
+virNetlinkDumpCommand;
|
|
virNetlinkDumpLink;
|
|
virNetlinkEventAddClient;
|
|
virNetlinkEventRemoveClient;
|
|
diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c
|
|
index be00351db..9bc1f0f2b 100644
|
|
--- a/src/util/virnetlink.c
|
|
+++ b/src/util/virnetlink.c
|
|
@@ -335,6 +335,52 @@ int virNetlinkCommand(struct nl_msg *nl_msg,
|
|
return ret;
|
|
}
|
|
|
|
+int
|
|
+virNetlinkDumpCommand(struct nl_msg *nl_msg,
|
|
+ virNetlinkDumpCallback callback,
|
|
+ uint32_t src_pid, uint32_t dst_pid,
|
|
+ unsigned int protocol, unsigned int groups,
|
|
+ void *opaque)
|
|
+{
|
|
+ int ret = -1;
|
|
+ bool end = false;
|
|
+ int len = 0;
|
|
+ struct nlmsghdr *resp = NULL;
|
|
+ struct nlmsghdr *msg = NULL;
|
|
+
|
|
+ struct sockaddr_nl nladdr = {
|
|
+ .nl_family = AF_NETLINK,
|
|
+ .nl_pid = dst_pid,
|
|
+ .nl_groups = 0,
|
|
+ };
|
|
+ virNetlinkHandle *nlhandle = NULL;
|
|
+
|
|
+ if (!(nlhandle = virNetlinkSendRequest(nl_msg, src_pid, nladdr,
|
|
+ protocol, groups)))
|
|
+ goto cleanup;
|
|
+
|
|
+ while (!end) {
|
|
+ len = nl_recv(nlhandle, &nladdr, (unsigned char **)&resp, NULL);
|
|
+
|
|
+ for (msg = resp; NLMSG_OK(msg, len); msg = NLMSG_NEXT(msg, len)) {
|
|
+ if (msg->nlmsg_type == NLMSG_DONE)
|
|
+ end = true;
|
|
+
|
|
+ if (virNetlinkGetErrorCode(msg, len) < 0)
|
|
+ goto cleanup;
|
|
+
|
|
+ if (callback(msg, opaque) < 0)
|
|
+ goto cleanup;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ ret = 0;
|
|
+
|
|
+ cleanup:
|
|
+ virNetlinkFree(nlhandle);
|
|
+ return ret;
|
|
+}
|
|
+
|
|
/**
|
|
* virNetlinkDumpLink:
|
|
*
|
|
@@ -1061,6 +1107,18 @@ int virNetlinkCommand(struct nl_msg *nl_msg ATTRIBUTE_UNUSED,
|
|
return -1;
|
|
}
|
|
|
|
+int
|
|
+virNetlinkDumpCommand(struct nl_msg *nl_msg ATTRIBUTE_UNUSED,
|
|
+ virNetlinkDumpCallback callback ATTRIBUTE_UNUSED,
|
|
+ uint32_t src_pid ATTRIBUTE_UNUSED,
|
|
+ uint32_t dst_pid ATTRIBUTE_UNUSED,
|
|
+ unsigned int protocol ATTRIBUTE_UNUSED,
|
|
+ unsigned int groups ATTRIBUTE_UNUSED,
|
|
+ void *opaque ATTRIBUTE_UNUSED)
|
|
+{
|
|
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported));
|
|
+ return -1;
|
|
+}
|
|
|
|
int
|
|
virNetlinkDumpLink(const char *ifname ATTRIBUTE_UNUSED,
|
|
diff --git a/src/util/virnetlink.h b/src/util/virnetlink.h
|
|
index 11e817c82..088b01343 100644
|
|
--- a/src/util/virnetlink.h
|
|
+++ b/src/util/virnetlink.h
|
|
@@ -52,6 +52,15 @@ int virNetlinkCommand(struct nl_msg *nl_msg,
|
|
uint32_t src_pid, uint32_t dst_pid,
|
|
unsigned int protocol, unsigned int groups);
|
|
|
|
+typedef int (*virNetlinkDumpCallback)(const struct nlmsghdr *resp,
|
|
+ void *data);
|
|
+
|
|
+int virNetlinkDumpCommand(struct nl_msg *nl_msg,
|
|
+ virNetlinkDumpCallback callback,
|
|
+ uint32_t src_pid, uint32_t dst_pid,
|
|
+ unsigned int protocol, unsigned int groups,
|
|
+ void *opaque);
|
|
+
|
|
typedef int (*virNetlinkDelLinkFallback)(const char *ifname);
|
|
|
|
int virNetlinkDelLink(const char *ifname, virNetlinkDelLinkFallback fallback);
|
|
--
|
|
2.12.0
|
|
|