mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-09-16 18:35:19 +00:00
Code Releases Activity

Merge commit '44e351d1522f0099687aac9fd65dcea73a04af43'

Browse Source
This commit is contained in:
Ondrej Zajicek 2024-03-21 15:58:52 +01:00
commit 46a4932574
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
proto/rpki/rpki.c
View File

@ -295,6 +295,7 @@ rpki_cache_change_state(struct rpki_cache *cache, const enum rpki_cache_state ne
rpki_close_connection(cache); rpki_close_connection(cache);
rpki_schedule_next_retry(cache); rpki_schedule_next_retry(cache);
rpki_stop_refresh_timer_event(cache); rpki_stop_refresh_timer_event(cache);
cache->request_session_id = 1;
break; break;
case RPKI_CS_FAST_RECONNECT: case RPKI_CS_FAST_RECONNECT:
@ -365,12 +366,11 @@ rpki_stop_expire_timer_event(struct rpki_cache *cache)
} }
static int static int
rpki_do_we_recv_prefix_pdu_in_last_seconds(struct rpki_cache *cache) rpki_sync_is_stuck(struct rpki_cache *cache)
{ {
if (!cache->last_rx_prefix) return !sk_rx_ready(cache->tr_sock->sk) && (
return 0; !cache->last_rx_prefix || (current_time() - cache->last_rx_prefix > 10 S)
);
return ((current_time() - cache->last_rx_prefix) <= 2 S);
} }
/** /**
@ -402,7 +402,7 @@ rpki_refresh_hook(timer *tm)
/* We sent Serial/Reset Query in last refresh hook call /* We sent Serial/Reset Query in last refresh hook call
* and we got Cache Response but didn't get End-Of-Data yet. * and we got Cache Response but didn't get End-Of-Data yet.
* It could be a trouble with network or only too long synchronization. */ * It could be a trouble with network or only too long synchronization. */
if (!rpki_do_we_recv_prefix_pdu_in_last_seconds(cache)) if (rpki_sync_is_stuck(cache))
{ {
CACHE_TRACE(D_EVENTS, cache, "Sync takes more time than refresh interval %us, resetting connection", cache->refresh_interval); CACHE_TRACE(D_EVENTS, cache, "Sync takes more time than refresh interval %us, resetting connection", cache->refresh_interval);
rpki_cache_change_state(cache, RPKI_CS_ERROR_TRANSPORT); rpki_cache_change_state(cache, RPKI_CS_ERROR_TRANSPORT);
@ -443,7 +443,7 @@ rpki_retry_hook(timer *tm)
case RPKI_CS_CONNECTING: case RPKI_CS_CONNECTING:
case RPKI_CS_SYNC_START: case RPKI_CS_SYNC_START:
case RPKI_CS_SYNC_RUNNING: case RPKI_CS_SYNC_RUNNING:
if (!rpki_do_we_recv_prefix_pdu_in_last_seconds(cache)) if (rpki_sync_is_stuck(cache))
{ {
/* We tried to establish a connection in last retry hook call and haven't done /* We tried to establish a connection in last retry hook call and haven't done
* yet. It looks like troubles with network. We are aggressive here. */ * yet. It looks like troubles with network. We are aggressive here. */