mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-11-04 01:43:38 +00:00
228da42898
I've spent the last several weeks working on stability fixes to bgpd. These patches fix all of the numerous crashes, assertion failures, memory leaks and memory stomping I could find. Valgrind was used extensively. Added new function bgp_exit() to help catch problems. If "debug bgp" is configured and bgpd exits with status of 0, statistics on remaining lib/memory.c allocations are printed to stderr. It is my hope that other developers will use this to stay on top of memory issues. Example questionable exit: bgpd: memstats: Current memory utilization in module LIB: bgpd: memstats: Link List : 6 bgpd: memstats: Link Node : 5 bgpd: memstats: Hash : 8 bgpd: memstats: Hash Bucket : 2 bgpd: memstats: Hash Index : 8 bgpd: memstats: Work queue : 3 bgpd: memstats: Work queue item : 2 bgpd: memstats: Work queue name string : 3 bgpd: memstats: Current memory utilization in module BGP: bgpd: memstats: BGP instance : 1 bgpd: memstats: BGP peer : 1 bgpd: memstats: BGP peer hostname : 1 bgpd: memstats: BGP attribute : 1 bgpd: memstats: BGP extra attributes : 1 bgpd: memstats: BGP aspath : 1 bgpd: memstats: BGP aspath str : 1 bgpd: memstats: BGP table : 24 bgpd: memstats: BGP node : 1 bgpd: memstats: BGP route : 1 bgpd: memstats: BGP synchronise : 8 bgpd: memstats: BGP Process queue : 1 bgpd: memstats: BGP node clear queue : 1 bgpd: memstats: NOTE: If configuration exists, utilization may be expected. Example clean exit: bgpd: memstats: No remaining tracked memory utilization. This patch fixes bug #397: "Invalid free in bgp_announce_check()". This patch fixes bug #492: "SIGBUS in bgpd/bgp_route.c: bgp_clear_route_node()". My apologies for not separating out these changes into individual patches. The complexity of doing so boggled what is left of my brain. I hope this is all still useful to the community. This code has been production tested, in non-route-server-client mode, on a linux 32-bit box and a 64-bit box. Release/reset functions, used by bgp_exit(), added to: bgpd/bgp_attr.c,h bgpd/bgp_community.c,h bgpd/bgp_dump.c,h bgpd/bgp_ecommunity.c,h bgpd/bgp_filter.c,h bgpd/bgp_nexthop.c,h bgpd/bgp_route.c,h lib/routemap.c,h File by file analysis: * bgpd/bgp_aspath.c: Prevent re-use of ashash after it is released. * bgpd/bgp_attr.c: #if removed uncalled cluster_dup(). * bgpd/bgp_clist.c,h: Allow community_list_terminate() to be called from bgp_exit(). * bgpd/bgp_filter.c: Fix aslist->name use without allocation check, and also fix memory leak. * bgpd/bgp_main.c: Created bgp_exit() exit routine. This function frees allocations made as part of bgpd initialization and, to some extent, configuration. If "debug bgp" is configured, memory stats are printed as described above. * bgpd/bgp_nexthop.c: zclient_new() already allocates stream for ibuf/obuf, so bgp_scan_init() shouldn't do it too. Also, made it so zlookup is global so bgp_exit() can use it. * bgpd/bgp_packet.c: bgp_capability_msg_parse() call to bgp_clear_route() adjusted to use new BGP_CLEAR_ROUTE_NORMAL flag. * bgpd/bgp_route.h: Correct reference counter "lock" to be signed. bgp_clear_route() now accepts a bgp_clear_route_type of either BGP_CLEAR_ROUTE_NORMAL or BGP_CLEAR_ROUTE_MY_RSCLIENT. * bgpd/bgp_route.c: - bgp_process_rsclient(): attr was being zero'ed and then bgp_attr_extra_free() was being called with it, even though it was never filled with valid data. - bgp_process_rsclient(): Make sure rsclient->group is not NULL before use. - bgp_processq_del(): Add call to bgp_table_unlock(). - bgp_process(): Add call to bgp_table_lock(). - bgp_update_rsclient(): memset clearing of new_attr not needed since declarationw with "= { 0 }" does it. memset was already commented out. - bgp_update_rsclient(): Fix screwed up misleading indentation. - bgp_withdraw_rsclient(): Fix screwed up misleading indentation. - bgp_clear_route_node(): Support BGP_CLEAR_ROUTE_MY_RSCLIENT. - bgp_clear_node_queue_del(): Add call to bgp_table_unlock() and also free struct bgp_clear_node_queue used for work item. - bgp_clear_node_complete(): Do peer_unlock() after BGP_EVENT_ADD() in case peer is released by peer_unlock() call. - bgp_clear_route_table(): Support BGP_CLEAR_ROUTE_MY_RSCLIENT. Use struct bgp_clear_node_queue to supply data to worker. Add call to bgp_table_lock(). - bgp_clear_route(): Add support for BGP_CLEAR_ROUTE_NORMAL or BGP_CLEAR_ROUTE_MY_RSCLIENT. - bgp_clear_route_all(): Use BGP_CLEAR_ROUTE_NORMAL. Bug 397 fixes: - bgp_default_originate() - bgp_announce_table() * bgpd/bgp_table.h: - struct bgp_table: Added reference count. Changed type of owner to be "struct peer *" rather than "void *". - struct bgp_node: Correct reference counter "lock" to be signed. * bgpd/bgp_table.c: - Added bgp_table reference counting. - bgp_table_free(): Fixed cleanup code. Call peer_unlock() on owner if set. - bgp_unlock_node(): Added assertion. - bgp_node_get(): Added call to bgp_lock_node() to code path that it was missing from. * bgpd/bgp_vty.c: - peer_rsclient_set_vty(): Call peer_lock() as part of peer assignment to owner. Handle failure gracefully. - peer_rsclient_unset_vty(): Add call to bgp_clear_route() with BGP_CLEAR_ROUTE_MY_RSCLIENT purpose. * bgpd/bgp_zebra.c: Made it so zclient is global so bgp_exit() can use it. * bgpd/bgpd.c: - peer_lock(): Allow to be called when status is "Deleted". - peer_deactivate(): Supply BGP_CLEAR_ROUTE_NORMAL purpose to bgp_clear_route() call. - peer_delete(): Common variable listnode pn. Fix bug in which rsclient was only dealt with if not part of a peer group. Call bgp_clear_route() for rsclient, if appropriate, and do so with BGP_CLEAR_ROUTE_MY_RSCLIENT purpose. - peer_group_get(): Use XSTRDUP() instead of strdup() for conf->host. - peer_group_bind(): Call bgp_clear_route() for rsclient, and do so with BGP_CLEAR_ROUTE_MY_RSCLIENT purpose. - bgp_create(): Use XSTRDUP() instead of strdup() for peer_self->host. - bgp_delete(): Delete peers before groups, rather than after. And then rather than deleting rsclients, verify that there are none at this point. - bgp_unlock(): Add assertion. - bgp_free(): Call bgp_table_finish() rather than doing XFREE() itself. * lib/command.c,h: Compiler warning fixes. Add cmd_terminate(). Fixed massive leak in install_element() in which cmd_make_descvec() was being called more than once for the same cmd->strvec/string/doc. * lib/log.c: Make closezlog() check fp before calling fclose(). * lib/memory.c: Catch when alloc count goes negative by using signed counts. Correct #endif comment. Add log_memstats_stderr(). * lib/memory.h: Add log_memstats_stderr(). * lib/thread.c: thread->funcname was being accessed in thread_call() after it had been freed. Rearranged things so that thread_call() frees funcname. Also made it so thread_master_free() cleans up cpu_record. * lib/vty.c,h: Use global command_cr. Add vty_terminate(). * lib/zclient.c,h: Re-enable zclient_free().
187 lines
5.5 KiB
C
187 lines
5.5 KiB
C
/* Zebra's client header.
|
|
* Copyright (C) 1999 Kunihiro Ishiguro
|
|
*
|
|
* This file is part of GNU Zebra.
|
|
*
|
|
* GNU Zebra is free software; you can redistribute it and/or modify it
|
|
* under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2, or (at your option)
|
|
* any later version.
|
|
*
|
|
* GNU Zebra is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* 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.
|
|
*/
|
|
|
|
#ifndef _ZEBRA_ZCLIENT_H
|
|
#define _ZEBRA_ZCLIENT_H
|
|
|
|
/* For struct interface and struct connected. */
|
|
#include "if.h"
|
|
|
|
/* For input/output buffer to zebra. */
|
|
#define ZEBRA_MAX_PACKET_SIZ 4096
|
|
|
|
/* Zebra header size. */
|
|
#define ZEBRA_HEADER_SIZE 6
|
|
|
|
/* Structure for the zebra client. */
|
|
struct zclient
|
|
{
|
|
/* Socket to zebra daemon. */
|
|
int sock;
|
|
|
|
/* Flag of communication to zebra is enabled or not. Default is on.
|
|
This flag is disabled by `no router zebra' statement. */
|
|
int enable;
|
|
|
|
/* Connection failure count. */
|
|
int fail;
|
|
|
|
/* Input buffer for zebra message. */
|
|
struct stream *ibuf;
|
|
|
|
/* Output buffer for zebra message. */
|
|
struct stream *obuf;
|
|
|
|
/* Buffer of data waiting to be written to zebra. */
|
|
struct buffer *wb;
|
|
|
|
/* Read and connect thread. */
|
|
struct thread *t_read;
|
|
struct thread *t_connect;
|
|
|
|
/* Thread to write buffered data to zebra. */
|
|
struct thread *t_write;
|
|
|
|
/* Redistribute information. */
|
|
u_char redist_default;
|
|
u_char redist[ZEBRA_ROUTE_MAX];
|
|
|
|
/* Redistribute defauilt. */
|
|
u_char default_information;
|
|
|
|
/* Pointer to the callback functions. */
|
|
int (*router_id_update) (int, struct zclient *, uint16_t);
|
|
int (*interface_add) (int, struct zclient *, uint16_t);
|
|
int (*interface_delete) (int, struct zclient *, uint16_t);
|
|
int (*interface_up) (int, struct zclient *, uint16_t);
|
|
int (*interface_down) (int, struct zclient *, uint16_t);
|
|
int (*interface_address_add) (int, struct zclient *, uint16_t);
|
|
int (*interface_address_delete) (int, struct zclient *, uint16_t);
|
|
int (*ipv4_route_add) (int, struct zclient *, uint16_t);
|
|
int (*ipv4_route_delete) (int, struct zclient *, uint16_t);
|
|
int (*ipv6_route_add) (int, struct zclient *, uint16_t);
|
|
int (*ipv6_route_delete) (int, struct zclient *, uint16_t);
|
|
};
|
|
|
|
/* Zebra API message flag. */
|
|
#define ZAPI_MESSAGE_NEXTHOP 0x01
|
|
#define ZAPI_MESSAGE_IFINDEX 0x02
|
|
#define ZAPI_MESSAGE_DISTANCE 0x04
|
|
#define ZAPI_MESSAGE_METRIC 0x08
|
|
|
|
/* Zserv protocol message header */
|
|
struct zserv_header
|
|
{
|
|
uint16_t length;
|
|
uint8_t marker; /* corresponds to command field in old zserv
|
|
* always set to 255 in new zserv.
|
|
*/
|
|
uint8_t version;
|
|
#define ZSERV_VERSION 1
|
|
uint16_t command;
|
|
};
|
|
|
|
/* Zebra IPv4 route message API. */
|
|
struct zapi_ipv4
|
|
{
|
|
u_char type;
|
|
|
|
u_char flags;
|
|
|
|
u_char message;
|
|
|
|
u_char nexthop_num;
|
|
struct in_addr **nexthop;
|
|
|
|
u_char ifindex_num;
|
|
unsigned int *ifindex;
|
|
|
|
u_char distance;
|
|
|
|
u_int32_t metric;
|
|
};
|
|
|
|
/* Prototypes of zebra client service functions. */
|
|
extern struct zclient *zclient_new (void);
|
|
extern void zclient_init (struct zclient *, int);
|
|
extern int zclient_start (struct zclient *);
|
|
extern void zclient_stop (struct zclient *);
|
|
extern void zclient_reset (struct zclient *);
|
|
extern void zclient_free (struct zclient *);
|
|
|
|
/* Get TCP socket connection to zebra daemon at loopback address. */
|
|
extern int zclient_socket (void);
|
|
|
|
/* Get unix stream socket connection to zebra daemon at given path. */
|
|
extern int zclient_socket_un (const char *);
|
|
|
|
/* Send redistribute command to zebra daemon. Do not update zclient state. */
|
|
extern int zebra_redistribute_send (int command, struct zclient *, int type);
|
|
|
|
/* If state has changed, update state and call zebra_redistribute_send. */
|
|
extern void zclient_redistribute (int command, struct zclient *, int type);
|
|
|
|
/* If state has changed, update state and send the command to zebra. */
|
|
extern void zclient_redistribute_default (int command, struct zclient *);
|
|
|
|
/* Send the message in zclient->obuf to the zebra daemon (or enqueue it).
|
|
Returns 0 for success or -1 on an I/O error. */
|
|
extern int zclient_send_message(struct zclient *);
|
|
|
|
/* create header for command, length to be filled in by user later */
|
|
extern void zclient_create_header (struct stream *, uint16_t);
|
|
|
|
extern struct interface *zebra_interface_add_read (struct stream *);
|
|
extern struct interface *zebra_interface_state_read (struct stream *s);
|
|
extern struct connected *zebra_interface_address_read (int, struct stream *);
|
|
extern void zebra_interface_if_set_value (struct stream *, struct interface *);
|
|
extern void zebra_router_id_update_read (struct stream *s, struct prefix *rid);
|
|
extern int zapi_ipv4_route (u_char, struct zclient *, struct prefix_ipv4 *,
|
|
struct zapi_ipv4 *);
|
|
|
|
#ifdef HAVE_IPV6
|
|
/* IPv6 prefix add and delete function prototype. */
|
|
|
|
struct zapi_ipv6
|
|
{
|
|
u_char type;
|
|
|
|
u_char flags;
|
|
|
|
u_char message;
|
|
|
|
u_char nexthop_num;
|
|
struct in6_addr **nexthop;
|
|
|
|
u_char ifindex_num;
|
|
unsigned int *ifindex;
|
|
|
|
u_char distance;
|
|
|
|
u_int32_t metric;
|
|
};
|
|
|
|
extern int zapi_ipv6_route (u_char cmd, struct zclient *zclient,
|
|
struct prefix_ipv6 *p, struct zapi_ipv6 *api);
|
|
#endif /* HAVE_IPV6 */
|
|
|
|
#endif /* _ZEBRA_ZCLIENT_H */
|