diff options
| author | Jan Moskyto Matejka <mq@ucw.cz> | 2017-02-22 11:58:04 +0100 |
|---|---|---|
| committer | Jan Moskyto Matejka <mq@ucw.cz> | 2017-02-22 11:58:04 +0100 |
| commit | c609d039860f97f400d2cf0e9ca2b4e87b3fd1cc (patch) | |
| tree | 6141291f6d6fbc0a90320f39c01bde49a119eadf /proto/rpki/rpki.c | |
| parent | 62e64905b76b88da72c522eac9276a74f60c9592 (diff) | |
| parent | 2be9218a3b1dfcc8e42c8d118e95f2074d9f7a7c (diff) | |
Merge branch 'int-new' into nexthop-merged
Diffstat (limited to 'proto/rpki/rpki.c')
| -rw-r--r-- | proto/rpki/rpki.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/proto/rpki/rpki.c b/proto/rpki/rpki.c index 497edd3c..5459d9c3 100644 --- a/proto/rpki/rpki.c +++ b/proto/rpki/rpki.c @@ -357,7 +357,7 @@ rpki_stop_retry_timer_event(struct rpki_cache *cache) tm_stop(cache->retry_timer); } -static void +static void UNUSED rpki_stop_expire_timer_event(struct rpki_cache *cache) { CACHE_DBG(cache, "Stop"); @@ -636,7 +636,7 @@ rpki_shutdown(struct proto *P) */ static int -rpki_try_fast_reconnect(struct rpki_cache *cache, struct rpki_config *new, struct rpki_config *old) +rpki_try_fast_reconnect(struct rpki_cache *cache) { if (cache->state == RPKI_CS_ESTABLISHED) { @@ -660,11 +660,10 @@ rpki_try_fast_reconnect(struct rpki_cache *cache, struct rpki_config *new, struc * protocol. Returns |NEED_TO_RESTART| or |SUCCESSFUL_RECONF|. */ static int -rpki_reconfigure_cache(struct rpki_proto *p, struct rpki_cache *cache, struct rpki_config *new, struct rpki_config *old) +rpki_reconfigure_cache(struct rpki_proto *p UNUSED, struct rpki_cache *cache, struct rpki_config *new, struct rpki_config *old) { u8 try_fast_reconnect = 0; - if (strcmp(old->hostname, new->hostname) != 0) { CACHE_TRACE(D_EVENTS, cache, "Cache server address changed to %s", new->hostname); @@ -709,7 +708,7 @@ rpki_reconfigure_cache(struct rpki_proto *p, struct rpki_cache *cache, struct rp #undef TEST_INTERVAL if (try_fast_reconnect) - return rpki_try_fast_reconnect(cache, new, old); + return rpki_try_fast_reconnect(cache); return SUCCESSFUL_RECONF; } @@ -906,7 +905,7 @@ rpki_postconfig(struct proto_config *CF) static void rpki_copy_config(struct proto_config *dest, struct proto_config *src) { - /* Just a shallow copy */ + /* FIXME: Should copy transport */ } struct protocol proto_rpki = { |