From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Sat, 13 Apr 2019 00:09:54 +0000 (-0400)
Subject: isisd: Add vrf_id to the main isis structure
X-Git-Tag: base_7.3~330^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=260fcb956b1fb4e98bfdfb10cfbe01c982af32bf;p=mirror%2Ffrr.git

isisd: Add vrf_id to the main isis structure

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/isisd/isis_main.c b/isisd/isis_main.c
index 7f49e9d89a..718924daf2 100644
--- a/isisd/isis_main.c
+++ b/isisd/isis_main.c
@@ -243,7 +243,7 @@ int main(int argc, char **argv, char **envp)
 	mt_init();
 
 	/* create the global 'isis' instance */
-	isis_new(1);
+	isis_new(1, VRF_DEFAULT);
 
 	isis_zebra_init(master);
 	isis_bfd_init();
diff --git a/isisd/isisd.c b/isisd/isisd.c
index 67f557ab50..029a9e0688 100644
--- a/isisd/isisd.c
+++ b/isisd/isisd.c
@@ -75,12 +75,13 @@ int clear_isis_neighbor_common(struct vty *, const char *id);
 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));
 	/*
 	 * Default values
 	 */
+	isis->vrf_id = vrf_id;
 	isis->max_area_addrs = 3;
 	isis->process_id = process_id;
 	isis->router_id = 0;
diff --git a/isisd/isisd.h b/isisd/isisd.h
index 393b1d67c7..b07120049a 100644
--- a/isisd/isisd.h
+++ b/isisd/isisd.h
@@ -63,6 +63,7 @@ extern struct zebra_privs_t isisd_privs;
 struct fabricd;
 
 struct isis {
+	vrf_id_t vrf_id;
 	unsigned long process_id;
 	int sysid_set;
 	uint8_t sysid[ISIS_SYS_ID_LEN]; /* SystemID for this IS */
@@ -190,7 +191,7 @@ struct isis_area {
 DECLARE_QOBJ_TYPE(isis_area)
 
 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_lookup(const char *);
 int isis_area_get(struct vty *vty, const char *area_tag);