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

Merge pull request #4529 from donaldsharp/vrf_conversions

Browse Source 
Vrf conversions
This commit is contained in:
Renato Westphal 2019-09-20 14:56:44 -03:00 committed by GitHub
commit 60aecb43e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
isisd/isis_main.c
View File

@ -243,7 +243,7 @@ int main(int argc, char **argv, char **envp)
mt_init(); mt_init();
/* create the global 'isis' instance */ /* create the global 'isis' instance */
isis_new(1); isis_new(1, VRF_DEFAULT);
isis_zebra_init(master); isis_zebra_init(master);
isis_bfd_init(); isis_bfd_init();

3
isisd/isisd.c
View File

@ -75,12 +75,13 @@ int clear_isis_neighbor_common(struct vty *, const char *id);
int isis_config_write(struct vty *); int isis_config_write(struct vty *);
void isis_new(unsigned long process_id) void isis_new(unsigned long process_id, vrf_id_t vrf_id)
{ {
isis = XCALLOC(MTYPE_ISIS, sizeof(struct isis)); isis = XCALLOC(MTYPE_ISIS, sizeof(struct isis));
/* /*
* Default values * Default values
*/ */
isis->vrf_id = vrf_id;
isis->max_area_addrs = 3; isis->max_area_addrs = 3;
isis->process_id = process_id; isis->process_id = process_id;
isis->router_id = 0; isis->router_id = 0;

3
isisd/isisd.h
View File

@ -62,6 +62,7 @@ extern struct zebra_privs_t isisd_privs;
struct fabricd; struct fabricd;
struct isis { struct isis {
vrf_id_t vrf_id;
unsigned long process_id; unsigned long process_id;
int sysid_set; int sysid_set;
uint8_t sysid[ISIS_SYS_ID_LEN]; /* SystemID for this IS */ uint8_t sysid[ISIS_SYS_ID_LEN]; /* SystemID for this IS */
@ -189,7 +190,7 @@ struct isis_area {
DECLARE_QOBJ_TYPE(isis_area) DECLARE_QOBJ_TYPE(isis_area)
void isis_init(void); void isis_init(void);
void isis_new(unsigned long); void isis_new(unsigned long process_id, vrf_id_t vrf_id);
struct isis_area *isis_area_create(const char *); struct isis_area *isis_area_create(const char *);
struct isis_area *isis_area_lookup(const char *); struct isis_area *isis_area_lookup(const char *);
int isis_area_get(struct vty *vty, const char *area_tag); int isis_area_get(struct vty *vty, const char *area_tag);

5
ospf6d/ospf6_top.c
View File

@ -136,7 +136,7 @@ static void ospf6_top_brouter_hook_remove(struct ospf6_route *route)
ospf6_abr_originate_summary(route); ospf6_abr_originate_summary(route);
} }
static struct ospf6 *ospf6_create(void) static struct ospf6 *ospf6_create(vrf_id_t vrf_id)
{ {
struct ospf6 *o; struct ospf6 *o;
@ -144,6 +144,7 @@ static struct ospf6 *ospf6_create(void)
/* initialize */ /* initialize */
monotime(&o->starttime); monotime(&o->starttime);
o->vrf_id = vrf_id;
o->area_list = list_new(); o->area_list = list_new();
o->area_list->cmp = ospf6_area_cmp; o->area_list->cmp = ospf6_area_cmp;
o->lsdb = ospf6_lsdb_create(o); o->lsdb = ospf6_lsdb_create(o);
@ -325,7 +326,7 @@ DEFUN_NOSH (router_ospf6,
OSPF6_STR) OSPF6_STR)
{ {
if (ospf6 == NULL) { if (ospf6 == NULL) {
ospf6 = ospf6_create(); ospf6 = ospf6_create(VRF_DEFAULT);
if (ospf6->router_id == 0) if (ospf6->router_id == 0)
ospf6_router_id_update(); ospf6_router_id_update();
} }

3
ospf6d/ospf6_top.h
View File

@ -31,6 +31,9 @@ struct ospf6_master {
/* OSPFv3 top level data structure */ /* OSPFv3 top level data structure */
struct ospf6 { struct ospf6 {
/* The relevant vrf_id */
vrf_id_t vrf_id;
/* my router id */ /* my router id */
uint32_t router_id; uint32_t router_id;