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 7f49e9d89a11558177cbaa86154864c3424a736b..718924daf24ab199262a0d8efebc67a18c5e7649 100644 (file)
--- 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 67f557ab5052fbac663a90965af071ed81a1981a..029a9e068898b34ad6b97d88baa296c4973c256e 100644 (file)
--- 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 393b1d67c7c7d9bd6e18dbb741cf72cc096b823c..b07120049adabcf7f6bb36e393dc06da320e31aa 100644 (file)
--- 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);