mirror of
https://gitlab.nic.cz/labs/bird.git
synced 2024-11-10 05:08:42 +00:00
There are now no internal tables at all.
This commit is contained in:
parent
9efaf6bafe
commit
4ef2262bd5
@ -2293,9 +2293,6 @@ rt_free(resource *_r)
|
|||||||
DBG("Deleting routing table %s\n", r->name);
|
DBG("Deleting routing table %s\n", r->name);
|
||||||
ASSERT_DIE(r->use_count == 0);
|
ASSERT_DIE(r->use_count == 0);
|
||||||
|
|
||||||
if (r->internal)
|
|
||||||
return;
|
|
||||||
|
|
||||||
r->config->table = NULL;
|
r->config->table = NULL;
|
||||||
rem_node(&r->n);
|
rem_node(&r->n);
|
||||||
|
|
||||||
@ -2362,8 +2359,6 @@ rt_setup(pool *pp, struct rtable_config *cf)
|
|||||||
};
|
};
|
||||||
init_list(&t->exporter.hooks);
|
init_list(&t->exporter.hooks);
|
||||||
|
|
||||||
if (!(t->internal = cf->internal))
|
|
||||||
{
|
|
||||||
init_list(&t->imports);
|
init_list(&t->imports);
|
||||||
|
|
||||||
hmap_init(&t->id_map, p, 1024);
|
hmap_init(&t->id_map, p, 1024);
|
||||||
@ -2381,7 +2376,6 @@ rt_setup(pool *pp, struct rtable_config *cf)
|
|||||||
t->flowspec_trie = f_new_trie(lp_new_default(p), 0);
|
t->flowspec_trie = f_new_trie(lp_new_default(p), 0);
|
||||||
t->flowspec_trie->ipv4 = (t->addr_type == NET_FLOW4);
|
t->flowspec_trie->ipv4 = (t->addr_type == NET_FLOW4);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
return t;
|
return t;
|
||||||
}
|
}
|
||||||
|
@ -50,7 +50,6 @@ struct rtable_config {
|
|||||||
int gc_max_ops; /* Maximum number of operations before GC is run */
|
int gc_max_ops; /* Maximum number of operations before GC is run */
|
||||||
int gc_min_time; /* Minimum time between two consecutive GC runs */
|
int gc_min_time; /* Minimum time between two consecutive GC runs */
|
||||||
byte sorted; /* Routes of network are sorted according to rte_better() */
|
byte sorted; /* Routes of network are sorted according to rte_better() */
|
||||||
byte internal; /* Internal table of a protocol */
|
|
||||||
byte trie_used; /* Rtable has attached trie */
|
byte trie_used; /* Rtable has attached trie */
|
||||||
btime min_settle_time; /* Minimum settle time for notifications */
|
btime min_settle_time; /* Minimum settle time for notifications */
|
||||||
btime max_settle_time; /* Maximum settle time for notifications */
|
btime max_settle_time; /* Maximum settle time for notifications */
|
||||||
@ -98,7 +97,6 @@ typedef struct rtable {
|
|||||||
byte prune_trie; /* Prune prefix trie during next table prune */
|
byte prune_trie; /* Prune prefix trie during next table prune */
|
||||||
byte hcu_scheduled; /* Hostcache update is scheduled */
|
byte hcu_scheduled; /* Hostcache update is scheduled */
|
||||||
byte nhu_state; /* Next Hop Update state */
|
byte nhu_state; /* Next Hop Update state */
|
||||||
byte internal; /* This table is internal for some other object */
|
|
||||||
struct fib_iterator prune_fit; /* Rtable prune FIB iterator */
|
struct fib_iterator prune_fit; /* Rtable prune FIB iterator */
|
||||||
struct fib_iterator nhu_fit; /* Next Hop Update FIB iterator */
|
struct fib_iterator nhu_fit; /* Next Hop Update FIB iterator */
|
||||||
struct f_trie *trie_new; /* New prefix trie defined during pruning */
|
struct f_trie *trie_new; /* New prefix trie defined during pruning */
|
||||||
|
Loading…
Reference in New Issue
Block a user