mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2025-01-03 15:41:54 +00:00
Code Releases Activity

RPKI: improve reconfiguration

Browse Source
This commit is contained in:
Pavel Tvrdík 2016-01-18 08:13:52 +01:00
parent c727c28404
commit 4c1e54d4a6
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
proto/rpki/rpki.c
View File

@ -474,13 +474,27 @@ rpki_relax_groups(struct rpki_proto *p)
return; return;
} }
static struct rpki_cache *
rpki_replace_cache(struct rpki_cache *cache, struct rpki_cache_cfg *old, struct rpki_cache_cfg *new)
{
struct rpki_proto *p = cache->p;
cache->cfg = old;
rpki_free_cache(cache);
struct rpki_cache *new_cache = rpki_new_cache(p, new);
rpki_insert_cache_into_group(new_cache);
return new_cache;
}
static int static int
rpki_reconfigure_proto(struct rpki_proto *p, struct rpki_config *new_cf, struct rpki_config *old_cf) rpki_reconfigure_proto(struct rpki_proto *p, struct rpki_config *new_cf, struct rpki_config *old_cf)
{ {
if (old_cf->c.table && new_cf->c.table && old_cf->c.table->table != new_cf->c.table->table) if (old_cf->c.table && new_cf->c.table && old_cf->c.table->table != new_cf->c.table->table)
{ {
RPKI_TRACE(D_EVENTS, p, "Table changed"); RPKI_TRACE(D_EVENTS, p, "Table changed");
return 0; /* Need to restart the protocol */ return 0; /* Have to restart the protocol */
} }
struct rpki_cache_cfg *old; struct rpki_cache_cfg *old;
@ -509,21 +523,17 @@ rpki_reconfigure_proto(struct rpki_proto *p, struct rpki_config *new_cf, struct
if (!!old->ssh != !!new->ssh) if (!!old->ssh != !!new->ssh)
{ {
/* toggled SSH enable/disable */ /* toggled SSH enable/disable */
return 0; /* Need to restart the protocol */ rpki_replace_cache(cache, old, new);
continue;
} }
else if (old->ssh && new->ssh)
if (old->ssh && new->ssh)
{ {
/* TODO: RTR_FAST_RECONNECT will be probably enough */ if ((strcmp(old->ssh->bird_private_key, new->ssh->bird_private_key) != 0) ||
(strcmp(old->ssh->cache_public_key, new->ssh->cache_public_key) != 0) ||
if (strcmp(old->ssh->bird_private_key, new->ssh->bird_private_key) != 0) (strcmp(old->ssh->username, new->ssh->username) != 0))
return 0; /* Need to restart the protocol */ {
rtr_change_socket_state(cache->rtr_socket, RTR_FAST_RECONNECT);
if (strcmp(old->ssh->cache_public_key, new->ssh->cache_public_key) != 0) }
return 0; /* Need to restart the protocol */
if (strcmp(old->ssh->username, new->ssh->username) != 0)
return 0; /* Need to restart the protocol */
} }
} }