mirror/labs-bird
1
0
Fork 0
mirror of https://gitlab.labs.nic.cz/labs/bird.git synced 2024-05-11 16:54:54 +00:00
Code Releases Activity

RPKI: Fix conflict in config grammar

Browse Source
This commit is contained in:
Ondrej Zajicek
2023-08-25 04:32:01 +02:00
parent 32427c9ce1
commit 116285f2b0
2 changed files with 35 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
proto/rpki/config.Y
View File

@ -89,20 +89,22 @@ rpki_keep_interval:
rpki_proto_item_port: PORT expr { check_u16($2); RPKI_CFG->port = $2; };
rpki_cache_addr:
text {
rpki_check_unused_hostname();
RPKI_CFG->hostname = $1;
}
| ipa {
rpki_check_unused_hostname();
RPKI_CFG->ip = $1;
/* Ensure hostname is filled */
char *hostname = cfg_allocz(INET6_ADDRSTRLEN + 1);
bsnprintf(hostname, INET6_ADDRSTRLEN+1, "%I", RPKI_CFG->ip);
RPKI_CFG->hostname = hostname;
}
;
rpki_cache_addr: text_or_ipa
{
rpki_check_unused_hostname();
if ($1.type == T_STRING)
RPKI_CFG->hostname = $1.val.s;
else if ($1.type == T_IP)
{
RPKI_CFG->ip = $1.val.ip;
/* Ensure hostname is filled */
char *hostname = cfg_allocz(INET6_ADDRSTRLEN + 1);
bsnprintf(hostname, INET6_ADDRSTRLEN+1, "%I", RPKI_CFG->ip);
RPKI_CFG->hostname = hostname;
}
else bug("Bad text_or_ipa");
};
rpki_transport:
TCP rpki_transport_tcp_init