Merge pull request #2309 from opensourcerouting/master-mpls_te_print_detail-fix

[mirror_frr.git] / bgpd / bgp_dump.c

diff --git a/bgpd/bgp_dump.c b/bgpd/bgp_dump.c
index 08313690624631ce9b47923e79663829a3414fe6..d69b1c46f268ec5531d67391e86703a4d78a14ca 100644 (file)
--- a/bgpd/bgp_dump.c
+++ b/bgpd/bgp_dump.c
@@ -277,7 +277,7 @@ static void bgp_dump_routes_index_table(struct bgp *bgp)
                if (sockunion_family(&peer->su) == AF_INET) {
                        stream_put_in_addr(obuf, &peer->su.sin.sin_addr);
                } else if (sockunion_family(&peer->su) == AF_INET6) {
-                       stream_write(obuf, (u_char *)&peer->su.sin6.sin6_addr,
+                       stream_write(obuf, (uint8_t *)&peer->su.sin6.sin6_addr,
                                     IPV6_MAX_BYTELEN);
                }
 
@@ -329,12 +329,12 @@ static struct bgp_info *bgp_dump_route_node_record(int afi, struct bgp_node *rn,
        if (afi == AFI_IP) {
                /* We'll dump only the useful bits (those not 0), but have to
                 * align on 8 bits */
-               stream_write(obuf, (u_char *)&rn->p.u.prefix4,
+               stream_write(obuf, (uint8_t *)&rn->p.u.prefix4,
                             (rn->p.prefixlen + 7) / 8);
        } else if (afi == AFI_IP6) {
                /* We'll dump only the useful bits (those not 0), but have to
                 * align on 8 bits */
-               stream_write(obuf, (u_char *)&rn->p.u.prefix6,
+               stream_write(obuf, (uint8_t *)&rn->p.u.prefix6,
                             (rn->p.prefixlen + 7) / 8);
        }
 
@@ -465,7 +465,7 @@ static void bgp_dump_common(struct stream *obuf, struct peer *peer,
        }
 
        if (peer->su.sa.sa_family == AF_INET) {
-               stream_putw(obuf, peer->ifindex);
+               stream_putw(obuf, peer->ifp ? peer->ifp->ifindex : 0);
                stream_putw(obuf, AFI_IP);
 
                stream_put(obuf, &peer->su.sin.sin_addr, IPV4_MAX_BYTELEN);
@@ -477,7 +477,7 @@ static void bgp_dump_common(struct stream *obuf, struct peer *peer,
                        stream_put(obuf, empty, IPV4_MAX_BYTELEN);
        } else if (peer->su.sa.sa_family == AF_INET6) {
                /* Interface Index and Address family. */
-               stream_putw(obuf, peer->ifindex);
+               stream_putw(obuf, peer->ifp ? peer->ifp->ifindex : 0);
                stream_putw(obuf, AFI_IP6);
 
                /* Source IP Address and Destination IP Address. */