Merge pull request #5549 from donaldsharp/automated

[mirror_frr.git] / ospfd / ospf_vty.h

diff --git a/ospfd/ospf_vty.h b/ospfd/ospf_vty.h
index 9f30e204ff1d62caf9199e6cc0f4e7bdcf2060a4..79aabe7b4ea4397b718b9e6240dbcba276ce779f 100644 (file)
--- a/ospfd/ospf_vty.h
+++ b/ospfd/ospf_vty.h
@@ -13,73 +13,45 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with GNU Zebra; see the file COPYING.  If not, write to the Free
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.  
+ * You should have received a copy of the GNU General Public License along
+ * with this program; see the file COPYING; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-/* Macros. */
-#define VTY_GET_UINT32(NAME,V,STR)                                            \
-{                                                                             \
-  char *endptr = NULL;                                                        \
-  (V) = strtoul ((STR), &endptr, 10);                                         \
-  if (*endptr != '\0' || ((V) == ULONG_MAX && errno == ERANGE))               \
-    {                                                                         \
-      vty_out (vty, "%% Invalid %s value%s", NAME, VTY_NEWLINE);              \
-      return CMD_WARNING;                                                     \
-    }                                                                         \
-}
-
-#define VTY_GET_IPV4_ADDRESS(NAME,V,STR)                                      \
-{                                                                             \
-  int retv;                                                                   \
-  retv = inet_aton ((STR), &(V));                                             \
-  if (!retv)                                                                  \
-    {                                                                         \
-      vty_out (vty, "%% Invalid %s value%s", NAME, VTY_NEWLINE);              \
-      return CMD_WARNING;                                                     \
-    }                                                                         \
-}
-
-#define VTY_GET_IPV4_PREFIX(NAME,V,STR)                                       \
-{                                                                             \
-  int retv;                                                                   \
-  retv = str2prefix_ipv4 ((STR), &(V));                                       \
-  if (retv <= 0)                                                              \
-    {                                                                         \
-      vty_out (vty, "%% Invalid %s value%s", NAME, VTY_NEWLINE);              \
-      return CMD_WARNING;                                                     \
-    }                                                                         \
-}
+#ifndef _QUAGGA_OSPF_VTY_H
+#define _QUAGGA_OSPF_VTY_H
 
-#define VTY_GET_OSPF_AREA_ID(V,F,STR)                                         \
-{                                                                             \
-  int retv;                                                                   \
-  retv = ospf_str2area_id ((STR), &(V), &(F));                                \
-  if (retv < 0)                                                               \
-    {                                                                         \
-      vty_out (vty, "%% Invalid OSPF area ID%s", VTY_NEWLINE);                \
-      return CMD_WARNING;                                                     \
-    }                                                                         \
-}
+/* Macros. */
+#define VTY_GET_OSPF_AREA_ID(V, F, STR)                                        \
+       {                                                                      \
+               int retv;                                                      \
+               retv = str2area_id((STR), &(V), &(F));                         \
+               if (retv < 0) {                                                \
+                       vty_out(vty, "%% Invalid OSPF area ID\n");             \
+                       return CMD_WARNING;                                    \
+               }                                                              \
+       }
 
-#define VTY_GET_OSPF_AREA_ID_NO_BB(NAME,V,F,STR)                              \
-{                                                                             \
-  int retv;                                                                   \
-  retv = ospf_str2area_id ((STR), &(V), &(F));                                \
-  if (retv < 0)                                                               \
-    {                                                                         \
-      vty_out (vty, "%% Invalid OSPF area ID%s", VTY_NEWLINE);                \
-      return CMD_WARNING;                                                     \
-    }                                                                         \
-  if (OSPF_IS_AREA_ID_BACKBONE ((V)))                                         \
-    {                                                                         \
-      vty_out (vty, "%% You can't configure %s to backbone%s",                \
-               NAME, VTY_NEWLINE);                                            \
-    }                                                                         \
-}
+#define VTY_GET_OSPF_AREA_ID_NO_BB(NAME, V, F, STR)                            \
+       {                                                                      \
+               int retv;                                                      \
+               retv = str2area_id((STR), &(V), &(F));                         \
+               if (retv < 0) {                                                \
+                       vty_out(vty, "%% Invalid OSPF area ID\n");             \
+                       return CMD_WARNING;                                    \
+               }                                                              \
+               if (OSPF_IS_AREA_ID_BACKBONE((V))) {                           \
+                       vty_out(vty,                                           \
+                               "%% You can't configure %s to backbone\n",     \
+                               NAME);                                         \
+                       return CMD_WARNING;                                    \
+               }                                                              \
+       }
 
 /* Prototypes. */
-void ospf_vty_init ();
-void ospf_vty_show_init ();
+extern void ospf_vty_init(void);
+extern void ospf_vty_show_init(void);
+extern void ospf_vty_clear_init(void);
+extern int str2area_id(const char *, struct in_addr *, int *);
+
+#endif /* _QUAGGA_OSPF_VTY_H */