diff options
| author | paul <paul> | 2005-04-28 17:35:14 +0000 |
|---|---|---|
| committer | paul <paul> | 2005-04-28 17:35:14 +0000 |
| commit | 4d38fdb421ee04430ac2f4d4e8ef4a4e27c1020b (patch) | |
| tree | a7bdb41cd18be9f612c54531efef5a5ccaab36f1 /zebra/zserv.c | |
| parent | 8b70d0b04f6bba2f30827d71084dd74fd00808b3 (diff) | |
2005-04-28 Paul Jakma <paul.jakma@sun.com>
* rib.h: (struct rib) Add lock field for refcounting.
* zserv.h: (struct zebra_t) Add a ribq workqueue to the zebra
'master' struct.
* zserv.c: (zread_ipv4_add) XMALLOC then memset should be XCALLOC.
* zebra_rib.c: Clean up refcounting of route_node, make struct rib
refcounted and convert rib_process to work-queue. In general,
rib's should be rib_addnode'd and delnode'd to route_nodes, and
these symmetrical functions will manage the locking of referenced
route_node and freeing of struct rib - rather than having users
manage each seperately - with much scope for bugs..
(newrib_free) removed and replaced with rib_lock
(rib_lock) new function, check state of lock and increment.
(rib_unlock) new function, check lock state and decrement. Free
struct rib if refcount hits 0, freeing struct nexthop's, as
newrib_free did.
(rib_addnode) Add RIB to route_node, locking both.
(rib_delnode) Delete RIB from route_node, unlocking each.
(rib_process) Converted to a work-queue work function.
Functional changes are minimal, just arguments, comments and
whitespace.
(rib_queue_add_qnode) Helper function to setup a ribq item.
(rib_queue_add) Helper function, same arguments as old
rib_process, to replace in callers of rib_process.
(rib_queue_qnode_del) ribq deconstructor.
(rib_queue_init) Create the ribq.
(rib_init) call rib_queue_init.
(remainder) Sanitise refcounting of route_node's. Convert to
rib_queue_add, rib_addnode and rib_delnode. Change XMALLOC/memset
to XCALLOC. Remove calls to nexthop_delete and nexthop_free.
Diffstat (limited to 'zebra/zserv.c')
| -rw-r--r-- | zebra/zserv.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/zebra/zserv.c b/zebra/zserv.c index e90fe019..c02eac89 100644 --- a/zebra/zserv.c +++ b/zebra/zserv.c @@ -780,9 +780,8 @@ zread_ipv4_add (struct zserv *client, u_short length) s = client->ibuf; /* Allocate new rib. */ - rib = XMALLOC (MTYPE_RIB, sizeof (struct rib)); - memset (rib, 0, sizeof (struct rib)); - + rib = XCALLOC (MTYPE_RIB, sizeof (struct rib)); + /* Type, flags, message. */ rib->type = stream_getc (s); rib->flags = stream_getc (s); |