From f90a5f6f1a6c1c1a4199a87a6202fe3edc9f7520 Mon Sep 17 00:00:00 2001 From: hasso Date: Mon, 11 Oct 2004 13:11:56 +0000 Subject: Sync isisd with changes in lib. --- isisd/ChangeLog | 5 +++++ isisd/isis_routemap.c | 4 ++-- isisd/isisd.c | 6 +++--- isisd/isisd.h | 4 ++-- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/isisd/ChangeLog b/isisd/ChangeLog index 420d7cf3..8e4a09c0 100644 --- a/isisd/ChangeLog +++ b/isisd/ChangeLog @@ -1,3 +1,8 @@ +2004-10-11 Hasso Tepper + + * isis_routemap.c, isisd.c: Make more strings const. + * isisd.h: Make min_bcast_mtu unsigned. + 2004-10-07 Hasso Tepper * *.[c|h]: Fix warnings: make strings const, signed -> unsigned, diff --git a/isisd/isis_routemap.c b/isisd/isis_routemap.c index 688ca58b..db52f328 100644 --- a/isisd/isis_routemap.c +++ b/isisd/isis_routemap.c @@ -52,7 +52,7 @@ extern struct isis *isis; void -isis_route_map_upd (char *name) +isis_route_map_upd (const char *name) { int i = 0; @@ -71,7 +71,7 @@ isis_route_map_upd (char *name) } void -isis_route_map_event (route_map_event_t event, char *name) +isis_route_map_event (route_map_event_t event, const char *name) { int type; diff --git a/isisd/isisd.c b/isisd/isisd.c index 8656d22b..a74dce62 100644 --- a/isisd/isisd.c +++ b/isisd/isisd.c @@ -141,7 +141,7 @@ isis_area_create () } struct isis_area * -isis_area_lookup (char *area_tag) +isis_area_lookup (const char *area_tag) { struct isis_area *area; struct listnode *node; @@ -156,7 +156,7 @@ isis_area_lookup (char *area_tag) } int -isis_area_get (struct vty *vty, char *area_tag) +isis_area_get (struct vty *vty, const char *area_tag) { struct isis_area *area; @@ -182,7 +182,7 @@ isis_area_get (struct vty *vty, char *area_tag) } int -isis_area_destroy (struct vty *vty, char *area_tag) +isis_area_destroy (struct vty *vty, const char *area_tag) { struct isis_area *area; struct listnode *node; diff --git a/isisd/isisd.h b/isisd/isisd.h index f1093cc2..c347bf0c 100644 --- a/isisd/isisd.h +++ b/isisd/isisd.h @@ -90,7 +90,7 @@ struct isis_area struct isis_spftree *spftree6[ISIS_LEVELS]; /* The v4 SPTs */ struct route_table *route_table6; /* IPv6 routes */ #endif - int min_bcast_mtu; + unsigned int min_bcast_mtu; struct list *circuit_list; /* IS-IS circuits */ struct flags flags; struct thread *t_tick; /* LSP walker */ @@ -134,7 +134,7 @@ struct isis_area }; void isis_init (void); -struct isis_area *isis_area_lookup (char *); +struct isis_area *isis_area_lookup (const char *); #define DEBUG_ADJ_PACKETS (1<<0) #define DEBUG_CHECKSUM_ERRORS (1<<1) -- cgit v1.2.1