diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-05-24 17:22:35 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-05-24 17:22:35 +0200 |
| commit | 9e962de4b619a00a139f8982c9e6528553927f14 (patch) | |
| tree | 7df0f155c27bc9b5993df17d21a22314be2fb413 /ospfd/ospf_vty.h | |
| parent | Merge pull request #612 from LabNConsulting/working/master/patch-set/deprecat... (diff) | |
| parent | Merge pull request #611 from LabNConsulting/working/3.0/patch-set/deprecateEncap (diff) | |
| download | frr-9e962de4b619a00a139f8982c9e6528553927f14.tar.xz frr-9e962de4b619a00a139f8982c9e6528553927f14.zip | |
Merge remote-tracking branch 'origin/stable/3.0'
Diffstat (limited to 'ospfd/ospf_vty.h')
| -rw-r--r-- | ospfd/ospf_vty.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ospfd/ospf_vty.h b/ospfd/ospf_vty.h index 57090e9b1..6a34e99de 100644 --- 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 */ |