summaryrefslogtreecommitdiff
path: root/isisd/isis_main.c
diff options
context:
space:
mode:
Diffstat (limited to 'isisd/isis_main.c')
-rw-r--r--isisd/isis_main.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/isisd/isis_main.c b/isisd/isis_main.c
index cb5b47bbd6..ed4b206851 100644
--- a/isisd/isis_main.c
+++ b/isisd/isis_main.c
@@ -101,6 +101,7 @@ void sigusr1(void);
static __attribute__((__noreturn__)) void terminate(int i)
{
+ isis_terminate();
isis_sr_term();
isis_zebra_stop();
exit(i);
@@ -185,8 +186,7 @@ FRR_DAEMON_INFO(isisd, ISIS, .vty_port = ISISD_VTY_PORT,
.proghelp = "Implementation of the IS-IS routing protocol.",
#endif
.copyright =
- "Copyright (c) 2001-2002 Sampo Saaristo,"
- " Ofer Wald and Hannes Gredler",
+ "Copyright (c) 2001-2002 Sampo Saaristo, Ofer Wald and Hannes Gredler",
.signals = isisd_signals,
.n_signals = array_size(isisd_signals),
@@ -234,7 +234,8 @@ int main(int argc, char **argv, char **envp)
}
/* thread master */
- master = frr_init();
+ isis_master_init(frr_init());
+ master = im->master;
/*
* initializations
@@ -260,7 +261,7 @@ int main(int argc, char **argv, char **envp)
mt_init();
/* create the global 'isis' instance */
- isis_new(1, VRF_DEFAULT);
+ isis_global_instance_create();
isis_zebra_init(master, instance);
isis_bfd_init();