proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-27 05:28:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #17263 from opensourcerouting/fix/backport_1fe1f8d87c4ab46ae18536a2418c05ae5fd95185_9.1

Browse Source 
lib, zebra: Keep `zebra on-rib-process script` in frr.conf (backport #17160)
This commit is contained in:
Jafar Al-Gharaibeh 2024-10-28 12:38:34 -05:00 committed by GitHub
commit 1c1f033f04
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/frrscript.c
View File

@ -25,6 +25,16 @@ DEFINE_MTYPE_STATIC(LIB, SCRIPT, "Scripting");
struct frrscript_names_head frrscript_names_hash; struct frrscript_names_head frrscript_names_hash;
void frrscript_names_config_write(struct vty *vty)
{
struct frrscript_names_entry *lua_script_entry;
frr_each (frrscript_names, &frrscript_names_hash, lua_script_entry)
if (lua_script_entry->script_name[0] != '\0')
vty_out(vty, "zebra on-rib-process script %s\n",
lua_script_entry->script_name);
}
/* /*
* Wrapper for frrscript_names_add * Wrapper for frrscript_names_add
* Use this to register hook calls when a daemon starts up * Use this to register hook calls when a daemon starts up

2
lib/frrscript.h
View File

@ -44,6 +44,8 @@ struct frrscript_names_entry {
extern struct frrscript_names_head frrscript_names_hash; extern struct frrscript_names_head frrscript_names_hash;
extern void frrscript_names_config_write(struct vty *vty);
int frrscript_names_hash_cmp(const struct frrscript_names_entry *snhe1, int frrscript_names_hash_cmp(const struct frrscript_names_entry *snhe1,
const struct frrscript_names_entry *snhe2); const struct frrscript_names_entry *snhe2);
uint32_t frrscript_names_hash_key(const struct frrscript_names_entry *snhe); uint32_t frrscript_names_hash_key(const struct frrscript_names_entry *snhe);

4
zebra/zebra_vty.c
View File

@ -4017,6 +4017,10 @@ static int config_write_protocol(struct vty *vty)
if (!zebra_nhg_recursive_use_backups()) if (!zebra_nhg_recursive_use_backups())
vty_out(vty, "no zebra nexthop resolve-via-backup\n"); vty_out(vty, "no zebra nexthop resolve-via-backup\n");
#ifdef HAVE_SCRIPTING
frrscript_names_config_write(vty);
#endif
if (rnh_get_hide_backups()) if (rnh_get_hide_backups())
vty_out(vty, "ip nht hide-backup-events\n"); vty_out(vty, "ip nht hide-backup-events\n");