diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-06-04 09:26:48 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-06-04 09:26:48 -0700 |
| commit | 216e7815481d575dc35961e488a544b654617794 (patch) | |
| tree | 99c8148eec07afcb61a81dc3b6c4b65be52cf4ef | |
| parent | f3781dba5ac9470e3d7412b8b2f08622b0af1ec0 (diff) | |
| parent | 985852c5d1330646d37b4c91669f05a146e7f140 (diff) | |
| download | quagga-216e7815481d575dc35961e488a544b654617794.tar.bz2 quagga-216e7815481d575dc35961e488a544b654617794.tar.xz | |
Merge branch 'jenner' of 192.168.100.1:git/vyatta-quagga into jenner
| -rw-r--r-- | lib/table.c | 18 | ||||
| -rw-r--r-- | lib/table.h | 20 |
2 files changed, 18 insertions, 20 deletions
diff --git a/lib/table.c b/lib/table.c index 2ade71b8..17f9607b 100644 --- a/lib/table.c +++ b/lib/table.c @@ -201,24 +201,6 @@ set_link (struct route_node *node, struct route_node *new) new->parent = node; } -/* Lock node. */ -struct route_node * -route_lock_node (struct route_node *node) -{ - node->lock++; - return node; -} - -/* Unlock node. */ -void -route_unlock_node (struct route_node *node) -{ - node->lock--; - - if (node->lock == 0) - route_node_delete (node); -} - /* Dump routing table. */ static void __attribute__ ((unused)) route_dump_node (struct route_table *t) diff --git a/lib/table.h b/lib/table.h index 45ec6067..320a0d96 100644 --- a/lib/table.h +++ b/lib/table.h @@ -52,10 +52,27 @@ struct route_node void *aggregate; }; + +/* Lock node. */ +static inline struct route_node * +route_lock_node (struct route_node *node) +{ + node->lock++; + return node; +} + +/* Unlock node. */ +static inline void +route_unlock_node (struct route_node *node) +{ + if (--node->lock == 0) + route_node_delete (node); +} + + /* Prototypes. */ extern struct route_table *route_table_init (void); extern void route_table_finish (struct route_table *); -extern void route_unlock_node (struct route_node *node); extern void route_node_delete (struct route_node *node); extern struct route_node *route_top (struct route_table *); extern struct route_node *route_next (struct route_node *); @@ -65,7 +82,6 @@ extern struct route_node *route_node_get (struct route_table *, struct prefix *); extern struct route_node *route_node_lookup (struct route_table *, struct prefix *); -extern struct route_node *route_lock_node (struct route_node *node); extern struct route_node *route_node_match (struct route_table *, struct prefix *); extern struct route_node *route_node_match_ipv4 (struct route_table *, |