openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

virNetDevIPCheckIPv6ForwardingCallback fixes 

Add check for more than one RTA_OIF, even though this is rather
unlikely.

Get rid of the buggy switch / break as this code won't need to
handle more attributes.

Use VIR_WARNINGS_NO_CAST_ALIGN to fix impossible to fix
util/virnetdevip.c:560:17: error: cast increases required alignment of target type [-Werror=cast-align]
This commit is contained in:
Cédric Bosdonnat 2017-03-28 16:00:24 +02:00 committed by John Ferlan
parent deb38c4503
commit b202c39adc
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/util/virnetdevip.c
View File

@ -556,15 +556,24 @@ virNetDevIPCheckIPv6ForwardingCallback(const struct nlmsghdr *resp,
if (resp->nlmsg_type != RTM_NEWROUTE)
return ret;
/* Extract a few attributes */
/* Extract a device ID attribute */
VIR_WARNINGS_NO_CAST_ALIGN
for (rta = RTM_RTA(rtmsg); RTA_OK(rta, len); rta = RTA_NEXT(rta, len)) {
switch (rta->rta_type) {
case RTA_OIF:
VIR_WARNINGS_RESET
if (rta->rta_type == RTA_OIF) {
oif = *(int *)RTA_DATA(rta);
/* Should never happen: netlink message would be broken */
if (ifname) {
char *ifname2 = virNetDevGetName(oif);
VIR_WARN("Single route has unexpected 2nd interface "
"- '%s' and '%s'", ifname, ifname2);
VIR_FREE(ifname2);
break;
}
if (!(ifname = virNetDevGetName(oif)))
goto error;
break;
}
}