External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-05 22:05:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

IPv6 route check: list devices only once

Browse Source 
If several RA routes are found for the same device, only list that
device once in the error message.
This commit is contained in:
Cédric Bosdonnat 2017-04-26 11:45:42 +02:00
parent 8d704e6cf7
commit b63de148a4
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/util/virnetdevip.c
View File

@ -551,6 +551,8 @@ virNetDevIPCheckIPv6ForwardingCallback(const struct nlmsghdr *resp,
int ret = 0;
int len = RTM_PAYLOAD(resp);
int oif = -1;
size_t i;
bool hasDevice;
/* Ignore messages other than route ones */
if (resp->nlmsg_type != RTM_NEWROUTE)
@ -587,7 +589,13 @@ virNetDevIPCheckIPv6ForwardingCallback(const struct nlmsghdr *resp,
accept_ra = virNetDevIPGetAcceptRA(ifname);
VIR_DEBUG("Checking route for device %s, accept_ra: %d", ifname, accept_ra);
if (accept_ra != 2 && VIR_APPEND_ELEMENT(data->devices, data->ndevices, ifname) < 0)
hasDevice = false;
for (i = 0; i < data->ndevices && !hasDevice; i++) {
if (STREQ(data->devices[i], ifname))
hasDevice = true;
}
if (accept_ra != 2 && !hasDevice &&
VIR_APPEND_ELEMENT(data->devices, data->ndevices, ifname) < 0)
goto error;
cleanup: