staticd: Do not ready prefix for printing till it's decoded

[mirror_frr.git] / ldpd / ldp_zebra.c

diff --git a/ldpd/ldp_zebra.c b/ldpd/ldp_zebra.c
index a12a4b913ee45d5dc7d3ddf37fae73b487162de9..9dc56773584aae7fb8d59a8aa2b3d32e70cda066 100644 (file)
--- a/ldpd/ldp_zebra.c
+++ b/ldpd/ldp_zebra.c
@@ -142,9 +142,9 @@ zebra_send_mpls_labels(int cmd, struct kroute *kr)
                stream_put_in_addr(s, &kr->nexthop.v4);
                break;
        case AF_INET6:
-               stream_write(s, (u_char *)&kr->prefix.v6, 16);
+               stream_write(s, (uint8_t *)&kr->prefix.v6, 16);
                stream_putc(s, kr->prefixlen);
-               stream_write(s, (u_char *)&kr->nexthop.v6, 16);
+               stream_write(s, (uint8_t *)&kr->nexthop.v6, 16);
                break;
        default:
                fatalx("kr_change: unknown af");
@@ -533,7 +533,7 @@ void
 ldp_zebra_init(struct thread_master *master)
 {
        /* Set default values. */
-       zclient = zclient_new_notify(master, &zclient_options_default);
+       zclient = zclient_new(master, &zclient_options_default);
        zclient_init(zclient, ZEBRA_ROUTE_LDP, 0, &ldpd_privs);
 
        /* set callbacks */