diff options
Diffstat (limited to 'isisd')
| -rw-r--r-- | isisd/ChangeLog | 11 | ||||
| -rw-r--r-- | isisd/isis_zebra.c | 12 | ||||
| -rw-r--r-- | isisd/isis_zebra.h | 1 |
3 files changed, 12 insertions, 12 deletions
diff --git a/isisd/ChangeLog b/isisd/ChangeLog index 38ab2fcb..e4792d89 100644 --- a/isisd/ChangeLog +++ b/isisd/ChangeLog @@ -1,3 +1,14 @@ +2005-04-11 Andrew J. Schorr <ajschorr@alumni.princeton.edu> + + * isis_zebra.h (isis_zebra_finish): Remove declaration of unused + function. + * isis_zebra.c (isis_zebra_route_add_ipv4): Call zclient_send_message + to send the message to zebra instead of calling writen directly, since + zclient_send_message understands non-blocking I/O and will manage + the buffer queue appropriately. + (isis_zebra_finish): Remove unused function, particularly since + the zclient_free function has been removed. + 2005-04-10 Paul Jakma <paul@dishone.st> * Makefile.am: topology should not be a conditional SUBDIR, diff --git a/isisd/isis_zebra.c b/isisd/isis_zebra.c index f45b9c13..889c5bfb 100644 --- a/isisd/isis_zebra.c +++ b/isisd/isis_zebra.c @@ -302,7 +302,7 @@ isis_zebra_route_add_ipv4 (struct prefix *prefix, stream_putl (stream, route_info->cost); stream_putw_at (stream, 0, stream_get_endp (stream)); - writen (zclient->sock, stream->data, stream_get_endp (stream)); + zclient_send_message(zclient); } } @@ -612,13 +612,3 @@ isis_zebra_init () return; } - -void -isis_zebra_finish () -{ - zclient_stop (zclient); - zclient_free (zclient); - zclient = (struct zclient *) NULL; - - return; -} diff --git a/isisd/isis_zebra.h b/isisd/isis_zebra.h index 0dce7995..889cd9b6 100644 --- a/isisd/isis_zebra.h +++ b/isisd/isis_zebra.h @@ -25,7 +25,6 @@ extern struct zclient *zclient; void isis_zebra_init (void); -void isis_zebra_finish (void); void isis_zebra_route_update (struct prefix *prefix, struct isis_route_info *route_info); int isis_distribute_list_update (int routetype); |