ospfd, vrrpd: fuzzing rebase fixes

Signed-off-by: Quentin Young <qlyoung@nvidia.com>

diff --git a/ospfd/ospf_main.c b/ospfd/ospf_main.c
index 24207ecb9d12de8161c9bb8f7a38e67df09643a6..752aca59d936da7f2c033d8b428c76497a40b269 100644 (file)
--- a/ospfd/ospf_main.c
+++ b/ospfd/ospf_main.c
@@ -176,7 +176,7 @@ static bool FuzzingInit(void)
        prefix_list_init();
        ospf_if_init();
        ospf_zebra_init(master, instance);
-       ospf_bfd_init();
+       ospf_bfd_init(master);
        ospf_route_map_init();
        ospf_opaque_init();
        ospf_error_init();
@@ -192,7 +192,7 @@ static struct ospf *FuzzingCreateOspf(void)
        str2prefix("11.0.2.0/24", &p);
 
        bool created;
-       struct ospf *o = ospf_get_instance(0, &created);
+       struct ospf *o = ospf_get(0, NULL, &created);
        o->fd = 69;
 
        struct in_addr in;

diff --git a/vrrpd/vrrp_zebra.c b/vrrpd/vrrp_zebra.c
index 11625c4d2b84f934a4000d6a5f3c083e7e4781cc..bf6a6a4b3d78b42dd34225038500034da24955d0 100644 (file)
--- a/vrrpd/vrrp_zebra.c
+++ b/vrrpd/vrrp_zebra.c
@@ -185,8 +185,10 @@ void vrrp_zebra_radv_set(struct vrrp_router *r, bool enable)
 
 void vrrp_zclient_send_interface_protodown(struct interface *ifp, bool down)
 {
+#ifdef FUZZING
        if (!ifp)
-               return 0;
+               return;
+#endif
 
        DEBUGD(&vrrp_dbg_zebra,
               VRRP_LOGPFX "Requesting Zebra to set %s protodown %s", ifp->name,