diff options
| author | Paul Jakma <paul.jakma@sun.com> | 2006-12-08 01:09:50 +0000 |
|---|---|---|
| committer | Paul Jakma <paul.jakma@sun.com> | 2006-12-08 01:09:50 +0000 |
| commit | 41b36e9013111a6da812ca000e3b978282bd27a9 (patch) | |
| tree | 11805d66de677613be7fe5e31626cfbbbbec78a6 /isisd/isisd.c | |
| parent | 3c0755dc9772deccff2ba6e9dc0511a9af2b9d1b (diff) | |
[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.
Diffstat (limited to 'isisd/isisd.c')
| -rw-r--r-- | isisd/isisd.c | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/isisd/isisd.c b/isisd/isisd.c index c5c2153f..48ea47af 100644 --- a/isisd/isisd.c +++ b/isisd/isisd.c @@ -61,6 +61,21 @@ u_char DEFAULT_TOPOLOGY_BASEIS[6] = { 0xFE, 0xED, 0xFE, 0xED, 0x00, 0x00 }; 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 @@ isis_area_destroy (struct vty *vty, const char *area_tag) } 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 @@ area_net_title (struct vty *vty, u_char *net_title) } 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 @@ DEFUN (net, "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 @@ DEFUN (no_net, "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 @@ DEFUN (is_type, 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); |