Merge remote-tracking branch 'origin/stable/3.0'

[mirror_frr.git] / ospfd / ospf_vty.h

diff --git a/ospfd/ospf_vty.h b/ospfd/ospf_vty.h
index 57090e9b1529b231609f9506c6b77055fc6b1aca..6a34e99de27dc46a46b37a2bfba83903508da45c 100644 (file)
--- a/ospfd/ospf_vty.h
+++ b/ospfd/ospf_vty.h
@@ -25,7 +25,7 @@
 #define VTY_GET_OSPF_AREA_ID(V,F,STR)                                         \
 {                                                                             \
   int retv;                                                                   \
-  retv = ospf_str2area_id ((STR), &(V), &(F));                                \
+  retv = str2area_id ((STR), &(V), &(F));                                     \
   if (retv < 0)                                                               \
     {                                                                         \
       vty_out (vty, "%% Invalid OSPF area ID%s", VTY_NEWLINE);                \
@@ -36,7 +36,7 @@
 #define VTY_GET_OSPF_AREA_ID_NO_BB(NAME,V,F,STR)                              \
 {                                                                             \
   int retv;                                                                   \
-  retv = ospf_str2area_id ((STR), &(V), &(F));                                \
+  retv = str2area_id ((STR), &(V), &(F));                                     \
   if (retv < 0)                                                               \
     {                                                                         \
       vty_out (vty, "%% Invalid OSPF area ID%s", VTY_NEWLINE);                \
@@ -53,6 +53,7 @@
 extern void ospf_vty_init (void);
 extern void ospf_vty_show_init (void);
 extern void ospf_vty_clear_init (void);
-extern int ospf_str2area_id (const char *, struct in_addr *, int *);
+extern int str2area_id (const char *, struct in_addr *, int *);
+extern void area_id2str (char *, int, struct in_addr *, int);
 
 #endif /* _QUAGGA_OSPF_VTY_H */