[isisd] Fix compiler warnings and allow v4-only compilation
2006-12-08 Hannes Gredler <hannes@gredler.at>
* isis_adjacency.c: (isis_new_adj) Allow NULL snpa argument.
* isis_pdu.c: (various) Update calls to isis_new_adj() to pass
NULL and use default.
* (general) Add forward declarations where required.
Fix up const char *'s.
Allow V4-only compilation.
diff --git a/isisd/isisd.c b/isisd/isisd.c
index c5c2153..48ea47a 100644
--- a/isisd/isisd.c
+++ b/isisd/isisd.c
@@ -61,6 +61,21 @@
struct isis *isis = NULL;
extern struct thread_master *master;
+/*
+ * Prototypes.
+ */
+void isis_new(unsigned long);
+struct isis_area *isis_area_create(void);
+int isis_area_get(struct vty *, const char *);
+int isis_area_destroy(struct vty *, const char *);
+int area_net_title(struct vty *, const u_char *);
+int area_clear_net_title(struct vty *, const u_char *);
+int show_clns_neigh(struct vty *, char);
+void print_debug(struct vty *, int, int);
+int isis_config_write(struct vty *);
+
+
+
void
isis_new (unsigned long process_id)
{
@@ -217,7 +232,7 @@
}
int
-area_net_title (struct vty *vty, u_char *net_title)
+area_net_title (struct vty *vty, const u_char *net_title)
{
struct isis_area *area;
struct area_addr *addr;
@@ -311,7 +326,7 @@
}
int
-area_clear_net_title (struct vty *vty, u_char *net_title)
+area_clear_net_title (struct vty *vty, const u_char *net_title)
{
struct isis_area *area;
struct area_addr addr, *addrp = NULL;
@@ -997,7 +1012,7 @@
"A Network Entity Title for this process (OSI only)\n"
"XX.XXXX. ... .XXX.XX Network entity title (NET)\n")
{
- return area_net_title (vty, (u_char *)argv[0]);
+ return area_net_title (vty, argv[0]);
}
/*
@@ -1010,7 +1025,7 @@
"A Network Entity Title for this process (OSI only)\n"
"XX.XXXX. ... .XXX.XX Network entity title (NET)\n")
{
- return area_clear_net_title (vty, (u_char *)argv[0]);
+ return area_clear_net_title (vty, argv[0]);
}
DEFUN (area_passwd,
@@ -1182,7 +1197,7 @@
return CMD_WARNING;
}
- type = string2circuit_t ((u_char *)argv[0]);
+ type = string2circuit_t (argv[0]);
if (!type)
{
vty_out (vty, "Unknown IS level %s", VTY_NEWLINE);