summaryrefslogtreecommitdiff
path: root/pimd/pim_instance.c
diff options
context:
space:
mode:
authorDavid Lamparter <equinox@diac24.net>2018-08-16 16:39:40 +0200
committerGitHub <noreply@github.com>2018-08-16 16:39:40 +0200
commit55d3dad27cad9e38c9bb9f70248661a06052c83a (patch)
treee8e0fbac5155e5e50eee628f2c75f4ed074acb62 /pimd/pim_instance.c
parentf5bffa5a7435696780d8a7f1ebe842e4cd7b3af4 (diff)
parent633fc9b133b73aee6c828b20339ce0762664e3f0 (diff)
Merge pull request #2448 from qlyoung/error-reference-cards
Error Reference Cards
Diffstat (limited to 'pimd/pim_instance.c')
-rw-r--r--pimd/pim_instance.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/pimd/pim_instance.c b/pimd/pim_instance.c
index e664bf3062..8dc48cc004 100644
--- a/pimd/pim_instance.c
+++ b/pimd/pim_instance.c
@@ -22,6 +22,7 @@
#include "hash.h"
#include "vrf.h"
+#include "lib_errors.h"
#include "pimd.h"
#include "pim_ssm.h"
@@ -94,10 +95,6 @@ static struct pim_instance *pim_instance_init(struct vrf *vrf)
zlog_debug("%s: NHT rpf hash init ", __PRETTY_FUNCTION__);
pim->ssm_info = pim_ssm_init();
- if (!pim->ssm_info) {
- pim_instance_terminate(pim);
- return NULL;
- }
pim->static_routes = list_new();
pim->static_routes->del = (void (*)(void *))pim_static_route_free;
@@ -132,14 +129,6 @@ static int pim_vrf_new(struct vrf *vrf)
struct pim_instance *pim = pim_instance_init(vrf);
zlog_debug("VRF Created: %s(%u)", vrf->name, vrf->vrf_id);
- if (pim == NULL) {
- zlog_err("%s %s: pim class init failure ", __FILE__,
- __PRETTY_FUNCTION__);
- /*
- * We will crash and burn otherwise
- */
- exit(1);
- }
vrf->info = (void *)pim;