matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

quagga: Additional centos 6 -enable-werror fixes

Browse source 
This commit fixes these warnings:

1) bgpd/bgp_nexthop.c - dereferencing pointer 'X' does break strict-aliasing rules
3) ripd/ripd.c - 'ifaddr.prefixlen' may be used uninitialized in this function

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2015-09-29 09:19:30 -04:00
parent bed578b8b9
commit 4608cb43b1
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bgpd/bgp_nexthop.c
View file

@ -211,9 +211,9 @@ bgp_connected_add (struct connected *ifc)
addr = ifc->address; addr = ifc->address;
p = *(CONNECTED_PREFIX(ifc));
if (addr->family == AF_INET) if (addr->family == AF_INET)
{ {
PREFIX_COPY_IPV4(&p, CONNECTED_PREFIX(ifc));
apply_mask_ipv4 ((struct prefix_ipv4 *) &p); apply_mask_ipv4 ((struct prefix_ipv4 *) &p);
if (prefix_ipv4_any ((struct prefix_ipv4 *) &p)) if (prefix_ipv4_any ((struct prefix_ipv4 *) &p))
@ -251,7 +251,6 @@ bgp_connected_add (struct connected *ifc)
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
else if (addr->family == AF_INET6) else if (addr->family == AF_INET6)
{ {
PREFIX_COPY_IPV6(&p, CONNECTED_PREFIX(ifc));
apply_mask_ipv6 ((struct prefix_ipv6 *) &p); apply_mask_ipv6 ((struct prefix_ipv6 *) &p);
if (IN6_IS_ADDR_UNSPECIFIED (&p.u.prefix6)) if (IN6_IS_ADDR_UNSPECIFIED (&p.u.prefix6))
@ -286,9 +285,9 @@ bgp_connected_delete (struct connected *ifc)
addr = ifc->address; addr = ifc->address;
p = *(CONNECTED_PREFIX(ifc));
if (addr->family == AF_INET) if (addr->family == AF_INET)
{ {
PREFIX_COPY_IPV4(&p, CONNECTED_PREFIX(ifc));
apply_mask_ipv4 ((struct prefix_ipv4 *) &p); apply_mask_ipv4 ((struct prefix_ipv4 *) &p);
if (prefix_ipv4_any ((struct prefix_ipv4 *) &p)) if (prefix_ipv4_any ((struct prefix_ipv4 *) &p))
@ -313,7 +312,6 @@ bgp_connected_delete (struct connected *ifc)
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
else if (addr->family == AF_INET6) else if (addr->family == AF_INET6)
{ {
PREFIX_COPY_IPV6(&p, CONNECTED_PREFIX(ifc));
apply_mask_ipv6 ((struct prefix_ipv6 *) &p); apply_mask_ipv6 ((struct prefix_ipv6 *) &p);
if (IN6_IS_ADDR_UNSPECIFIED (&p.u.prefix6)) if (IN6_IS_ADDR_UNSPECIFIED (&p.u.prefix6))

1
ripd/ripd.c
View file

@ -1109,6 +1109,7 @@ rip_response_process (struct rip_packet *packet, int size,
struct prefix_ipv4 ifaddrclass; struct prefix_ipv4 ifaddrclass;
int subnetted; int subnetted;
memset(&ifaddr, 0, sizeof(ifaddr));
/* We don't know yet. */ /* We don't know yet. */
subnetted = -1; subnetted = -1;