ospfd: fix symbol collision

debug_init() was recently added in libfrr, which is now causing a build
error with static linking.

Signed-off-by: David Lamparter <equinox@diac24.net>

diff --git a/ospfd/ospf_dump.c b/ospfd/ospf_dump.c
index d8742943c0043022494ac545da87104a1926715b..48d210d2790270db639984fc3ec37a9c5c3c3fd8 100644 (file)
--- a/ospfd/ospf_dump.c
+++ b/ospfd/ospf_dump.c
@@ -1799,7 +1799,7 @@ static int config_write_debug(struct vty *vty)
 }
 
 /* Initialize debug commands. */
-void debug_init()
+void ospf_debug_init(void)
 {
        install_node(&debug_node, config_write_debug);
 

diff --git a/ospfd/ospf_dump.h b/ospfd/ospf_dump.h
index 99d7512f16f19c30a44d6171d43085d230eb4930..397f666f6907e845bc7548a22dce88608cb92118 100644 (file)
--- a/ospfd/ospf_dump.h
+++ b/ospfd/ospf_dump.h
@@ -140,7 +140,7 @@ extern const char *ospf_timer_dump(struct thread *, char *, size_t);
 extern const char *ospf_timeval_dump(struct timeval *, char *, size_t);
 extern void ospf_ip_header_dump(struct ip *);
 extern void ospf_packet_dump(struct stream *);
-extern void debug_init(void);
+extern void ospf_debug_init(void);
 
 /* Appropriate buffer size to use with ospf_timer_dump and ospf_timeval_dump: */
 #define OSPF_TIME_DUMP_SIZE    16

diff --git a/ospfd/ospf_main.c b/ospfd/ospf_main.c
index 9fb0e0ad133ef00092676ba75b8bf1299a01d52c..20632f2840ca44d16ed378431a51b5a7559a7138 100644 (file)
--- a/ospfd/ospf_main.c
+++ b/ospfd/ospf_main.c
@@ -187,7 +187,7 @@ int main(int argc, char **argv)
        master = om->master;
 
        /* Library inits. */
-       debug_init();
+       ospf_debug_init();
        ospf_vrf_init();
 
        access_list_init();