proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-16 08:32:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ripd: move "rip_enable_interface" to the rip structure

Browse Source 
Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
This commit is contained in:
Renato Westphal 2019-01-04 19:08:10 -02:00
parent 2d2eaa1366
commit ca04690261
3 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ripd/rip_interface.c
View File

@ -60,9 +60,6 @@ const struct message ri_version_msg[] = {{RI_RIP_VERSION_1, "1"},
{RI_RIP_VERSION_NONE, "none"}, {RI_RIP_VERSION_NONE, "none"},
{0}}; {0}};
/* RIP enabled network vector. */
vector rip_enable_interface;
/* RIP enabled interface table. */ /* RIP enabled interface table. */
struct route_table *rip_enable_network; struct route_table *rip_enable_network;
@ -794,8 +791,11 @@ static int rip_enable_if_lookup(const char *ifname)
unsigned int i; unsigned int i;
char *str; char *str;
for (i = 0; i < vector_active(rip_enable_interface); i++) if (!rip)
if ((str = vector_slot(rip_enable_interface, i)) != NULL) return -1;
for (i = 0; i < vector_active(rip->enable_interface); i++)
if ((str = vector_slot(rip->enable_interface, i)) != NULL)
if (strcmp(str, ifname) == 0) if (strcmp(str, ifname) == 0)
return i; return i;
return -1; return -1;
@ -810,7 +810,7 @@ int rip_enable_if_add(const char *ifname)
if (ret >= 0) if (ret >= 0)
return NB_ERR_INCONSISTENCY; return NB_ERR_INCONSISTENCY;
vector_set(rip_enable_interface, vector_set(rip->enable_interface,
XSTRDUP(MTYPE_RIP_INTERFACE_STRING, ifname)); XSTRDUP(MTYPE_RIP_INTERFACE_STRING, ifname));
rip_enable_apply_all(); /* TODOVJ */ rip_enable_apply_all(); /* TODOVJ */
@ -828,9 +828,9 @@ int rip_enable_if_delete(const char *ifname)
if (index < 0) if (index < 0)
return NB_ERR_INCONSISTENCY; return NB_ERR_INCONSISTENCY;
str = vector_slot(rip_enable_interface, index); str = vector_slot(rip->enable_interface, index);
XFREE(MTYPE_RIP_INTERFACE_STRING, str); XFREE(MTYPE_RIP_INTERFACE_STRING, str);
vector_unset(rip_enable_interface, index); vector_unset(rip->enable_interface, index);
rip_enable_apply_all(); /* TODOVJ */ rip_enable_apply_all(); /* TODOVJ */
@ -1042,11 +1042,11 @@ void rip_clean_network()
route_unlock_node(rn); route_unlock_node(rn);
} }
/* rip_enable_interface. */ /* rip->enable_interface. */
for (i = 0; i < vector_active(rip_enable_interface); i++) for (i = 0; i < vector_active(rip->enable_interface); i++)
if ((str = vector_slot(rip_enable_interface, i)) != NULL) { if ((str = vector_slot(rip->enable_interface, i)) != NULL) {
XFREE(MTYPE_RIP_INTERFACE_STRING, str); XFREE(MTYPE_RIP_INTERFACE_STRING, str);
vector_slot(rip_enable_interface, i) = NULL; vector_slot(rip->enable_interface, i) = NULL;
} }
} }
@ -1183,8 +1183,8 @@ int rip_show_network_config(struct vty *vty)
node->p.prefixlen); node->p.prefixlen);
/* Interface name RIP enable statement. */ /* Interface name RIP enable statement. */
for (i = 0; i < vector_active(rip_enable_interface); i++) for (i = 0; i < vector_active(rip->enable_interface); i++)
if ((ifname = vector_slot(rip_enable_interface, i)) != NULL) if ((ifname = vector_slot(rip->enable_interface, i)) != NULL)
vty_out(vty, " %s\n", ifname); vty_out(vty, " %s\n", ifname);
/* RIP neighbors listing. */ /* RIP neighbors listing. */
@ -1223,7 +1223,6 @@ void rip_if_init(void)
hook_register_prio(if_del, 0, rip_interface_delete_hook); hook_register_prio(if_del, 0, rip_interface_delete_hook);
/* RIP network init. */ /* RIP network init. */
rip_enable_interface = vector_init(1);
rip_enable_network = route_table_init(); rip_enable_network = route_table_init();
/* RIP passive interface. */ /* RIP passive interface. */

4
ripd/ripd.c
View File

@ -2689,9 +2689,10 @@ int rip_create(int socket)
rip->version_recv = rip->version_recv =
yang_get_default_enum("%s/version/receive", RIP_INSTANCE); yang_get_default_enum("%s/version/receive", RIP_INSTANCE);
/* Initialize RIP routig table. */ /* Initialize RIP data structures. */
rip->table = route_table_init(); rip->table = route_table_init();
rip->neighbor = route_table_init(); rip->neighbor = route_table_init();
rip->enable_interface = vector_init(1);
/* Distribute list install. */ /* Distribute list install. */
rip->distribute_ctx = rip->distribute_ctx =
@ -3373,6 +3374,7 @@ void rip_clean(void)
rip_clean_network(); rip_clean_network();
rip_passive_nondefault_clean(); rip_passive_nondefault_clean();
vector_free(rip->enable_interface);
rip_offset_clean(); rip_offset_clean();
rip_interfaces_clean(); rip_interfaces_clean();
rip_distance_reset(); rip_distance_reset();

3
ripd/ripd.h
View File

@ -144,6 +144,9 @@ struct rip {
/* Are we in passive-interface default mode? */ /* Are we in passive-interface default mode? */
bool passive_default; bool passive_default;
/* RIP enabled interfaces. */
vector enable_interface;
/* For redistribute route map. */ /* For redistribute route map. */
struct { struct {
char *name; char *name;