mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-12-22 17:51:53 +00:00
Code Releases Activity

RPKI: improved rpki_get_status()

Browse Source
This commit is contained in:
Pavel Tvrdík 2015-10-27 17:42:13 +01:00
parent 50791a41bf
commit e189e2f55d
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
proto/rpki/rpki.c
View File

@ -824,7 +824,9 @@ rpki_get_status(struct proto *P, byte *buf)
uint established_connections = 0; uint established_connections = 0;
uint cache_servers = 0; uint cache_servers = 0;
uint synchronizing = 0;
pthread_mutex_lock(&p->rtr_conf->mutex);
for (i = 0; i < p->rtr_conf->len; i++) for (i = 0; i < p->rtr_conf->len; i++)
{ {
for (j = 0; j < p->rtr_conf->groups[i].sockets_len; j++) for (j = 0; j < p->rtr_conf->groups[i].sockets_len; j++)
@ -833,22 +835,27 @@ rpki_get_status(struct proto *P, byte *buf)
switch (p->rtr_conf->groups[i].sockets[j]->state) switch (p->rtr_conf->groups[i].sockets[j]->state)
{ {
case RTR_ESTABLISHED: case RTR_ESTABLISHED:
established_connections++;
break;
case RTR_RESET: case RTR_RESET:
case RTR_SYNC: case RTR_SYNC:
established_connections++; case RTR_FAST_RECONNECT:
case RTR_CONNECTING:
synchronizing++;
break; break;
} }
} }
} }
pthread_mutex_unlock(&p->rtr_conf->mutex);
if (established_connections == 1) if (established_connections > 0)
bsprintf(buf, "Keep synchronized with 1 cache server"); bsprintf(buf, "Keep synchronized with %u cache server%s", established_connections, (established_connections > 1) ? "s" : "");
else if (established_connections > 1) else if (synchronizing > 0)
bsprintf(buf, "Keep synchronized with %u cache servers", established_connections); bsprintf(buf, "Synchronizing with %u cache server%s", synchronizing, (synchronizing > 1) ? "s" : "");
else if (cache_servers == 0) else if (cache_servers == 0)
bsprintf(buf, "No cache server is configured"); bsprintf(buf, "No cache server is configured");
else if (cache_servers == 1) else if (cache_servers == 1)
bsprintf(buf, "Cannot connect to cache server"); bsprintf(buf, "Cannot connect to a cache server");
else else
bsprintf(buf, "Cannot connect to any cache servers"); bsprintf(buf, "Cannot connect to any cache servers");
} }

5
proto/rpki/rtrlib-mockup.h
View File

@ -195,10 +195,11 @@ struct rtr_mgr_group {
struct rtr_mgr_config { struct rtr_mgr_config {
struct rtr_mgr_group *groups; struct rtr_mgr_group *groups;
unsigned int len; unsigned int len;
/* some items deleted for mockuping */ pthread_mutex_t mutex;
void *status_fp; /* voided for mockuping */
void *status_fp_data;
}; };
/** /**
* @brief Version of the IP protocol. * @brief Version of the IP protocol.
*/ */